土工平台修改

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java

 package com.patzn.cloud.service.lims.hmhj.controller;
+import com.google.common.collect.Lists;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
@@ -149,6 +150,23 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("外委数据录入历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_out_data_input_his")
+    public RestResult<Page<ContractSampleVO>> getPageOutDataInput(ContractSampleVO contractSample) {
+        contractSample.setStatusList(Lists.newArrayList(
+                ContractSampleStatusEnum.ENTRUST_REG,
+                ContractSampleStatusEnum.BACK_PRO_TEC_CHECK
+        ));
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+
+
 
     @ApiOperation("委托登记分页列表")
     @ApiImplicitParams({
@@ -286,6 +304,24 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("验收结果录入历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_check_result_input_his")
+    public RestResult<Page<ContractSampleVO>> getPageCheckResultInputHis(ContractSampleVO contractSample) {
+        contractSample.setStatusList(Lists.newArrayList(
+                ContractSampleStatusEnum.OUT_DRIFT,
+                ContractSampleStatusEnum.OUT_INPUT,
+                ContractSampleStatusEnum.ENTRUST_REG
+        ));
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+
+
 
 
     @ApiOperation("根据ID查询列表分页列表")
@@ -377,6 +413,12 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("外委登记提交至验收结果录入")
+    @PostMapping("/out_reg_pass_to_check_result")
+    public RestResult<Boolean> outRegPassToCheckResult(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.outRegPassToCheckResult(ids,getAccount()));
+    }
+
 
     @ApiOperation("外委登记提交至外委数据录入")
     @PostMapping("/submit_to_out_data_input")
@@ -408,6 +450,13 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("生技部审核通过接口")
+    @PostMapping("/pro_tech_check_pass")
+    public RestResult<Boolean> proTechCheckPass(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.proTechCheckPass(ids,getAccount()));
+    }
+
+
     @ApiOperation("生技部审核退回")
     @PostMapping("/back_pro_tech_check")
     public RestResult<Boolean> backProTechCheck(@RequestParam("ids") Long [] ids,@RequestParam("reason") String reason) {

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java

@@ -137,6 +137,28 @@ public class EntrustController extends ServiceController {
     }
 
 
+
+    @ApiOperation("外委数据录入历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_out_input_his")
+    public RestResult<Page<EntrustVO>> getPageOutInputHis(EntrustVO entrust) {
+        entrust.setStatusList(Lists.newArrayList(
+                EntrustStatusEnum.CHECK,
+                EntrustStatusEnum.MAKE,
+                EntrustStatusEnum.TEST,
+                EntrustStatusEnum.OUT_INPUT,
+                EntrustStatusEnum.QUALITY_CHECK
+        ));
+        return success(entrustService.pageVO(getPage(), entrust));
+    }
+
+
+
     @ApiOperation("委托审核分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleService.java

@@ -27,6 +27,8 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
 
     boolean submitToProTechCheck(Long[] ids, Account account);
 
+    boolean proTechCheckPass(Long[] ids, Account account);
+
     boolean backProTechCheck(Long[] ids, String reason, Account account);
 
     boolean submitToCheckAcceptReg(Long[] ids, Account account);
@@ -37,6 +39,8 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
 
     boolean submitToOutReg(Long[] ids, Account account);
 
+    boolean outRegPassToCheckResult(Long[] ids, Account account);
+
     boolean submitToOutDataInput(Long[] ids, Account account);
 
     boolean submitToExpertReviewFromOrg(Long[] ids, Account account);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java

@@ -89,6 +89,18 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return super.update(contractSample,Condition.create().in("id",ids));
     }
 
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean proTechCheckPass(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
+        contractSample.setProgress(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean backProTechCheck(Long[] ids, String reason, Account account) {
@@ -160,6 +172,20 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     }
 
 
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean outRegPassToCheckResult(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_RESULT_INPUT);
+        contractSample.setProgress(ContractSampleStatusEnum.CHECK_RESULT_INPUT);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.OUT_DRIFT,ContractSampleStatusEnum.CHECK_RESULT_INPUT,0,"外委登记提交至验收结果录入",account);
+//        lmsMsgService.sendMsg("/hmhj/accept_manage/sub_register","验收任务登记提交至外委登记，请及时处理","新的外委登记任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean submitToOutDataInput(Long[] ids, Account account) {