土工平台修改

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

@@ -149,6 +149,22 @@ 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_entrust_reg")
+    public RestResult<Page<ContractSample>> getPageEntrustReg(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+
     @ApiOperation("生技部审核历史分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -318,6 +334,14 @@ public class ContractSampleController extends ServiceController {
 
 
 
+    @ApiOperation("验收任务登记提交至委托登记")
+    @PostMapping("/submit_to_entrust_org")
+    public RestResult<Boolean> submitToEntrustOrg(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToEntrustOrg(ids,getAccount()));
+    }
+
+
+
     @ApiOperation("验收任务登记提交至外委登记")
     @PostMapping("/submit_to_out_reg")
     public RestResult<Boolean> submitToOutReg(@RequestParam("ids") Long [] ids) {

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

@@ -62,6 +62,21 @@ 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")
+    public RestResult<Page<Entrust>> getPageOutInput(Entrust entrust) {
+        entrust.setStatus(EntrustStatusEnum.OUT_INPUT);
+        return success(entrustService.page(getPage(), entrust));
+    }
+
+
     @ApiOperation("委托审核分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -172,6 +187,14 @@ public class EntrustController extends ServiceController {
     }
 
 
+
+    @ApiOperation("提交质量判定")
+    @PostMapping("/out_input_submit_to_quality_check")
+    public RestResult<Boolean> outInputSubmitToQualityCheck(@RequestParam("ids")Long [] ids) {
+        return success(entrustService.outInputSubmitToQualityCheck(ids,getAccount()));
+    }
+
+
     @ApiOperation("提交至委托评审")
     @PostMapping("/submit_to_check")
     public RestResult<Boolean> submitToCheck(@RequestParam("ids")Long [] ids) {

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

@@ -33,6 +33,8 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
 
     boolean submitToCheckAcceptOrg(Long[] ids, Account account);
 
+    boolean submitToEntrustOrg(Long[] ids, Account account);
+
     boolean submitToOutReg(Long[] ids, Account account);
 
     boolean submitToOutDataInput(Long[] ids, Account account);

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

@@ -46,4 +46,6 @@ public interface IEntrustService extends IBaseService<Entrust> {
     Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust);
 
     Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
+
+    boolean outInputSubmitToQualityCheck(Long[] ids, Account account);
 }

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

@@ -132,6 +132,21 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    public boolean submitToEntrustOrg(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
+        contractSample.setProgress(ContractSampleStatusEnum.ENTRUST_REG);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.CHECK_ACCEPT_REG,ContractSampleStatusEnum.ENTRUST_REG,0,"验收任务登记提交至委托登记",account);
+        lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register","委托登记由验收任务登记提交过来，请及时处理","新的委托登记任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean submitToOutReg(Long[] ids, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
         ContractSample contractSample = new ContractSample();

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

@@ -8,10 +8,7 @@ import com.patzn.cloud.commons.toolkit.StringHandleUtils;
 import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
 import com.patzn.cloud.service.hmhj.dto.EntrustSampleDTO;
 import com.patzn.cloud.service.hmhj.entity.*;
-import com.patzn.cloud.service.hmhj.enums.CodeTypeEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
+import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustVO;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustMapper;
@@ -470,6 +467,26 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return page.setRecords(baseMapper.selectVOList(page,entrust));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean outInputSubmitToQualityCheck(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的委托");
+        int count = super.count(Condition.create().in("id",ids).eq("status",EntrustStatusEnum.OUT_INPUT));
+        RestAssert.fail(ids.length!=count,"请选择外委数据录入的委托");
+        Entrust entrust = new Entrust();
+        entrust.setStatus(EntrustStatusEnum.QUALITY_CHECK);
+        entrust.setProgress(EntrustStatusEnum.QUALITY_CHECK);
+        if (update(entrust,Condition.create().in("id",ids))){
+            EntrustSample entrustSample = new EntrustSample();
+
+            entrustSample.setStatus(EntrustSampleStatusEnum.END);
+            entrustSample.setProgress(EntrustSampleStatusEnum.END);
+            entrustSampleService.update(entrustSample,Condition.create().in("entrust_id",ids));
+            entrustRecordService.record(ids,EntrustStatusEnum.OUT_INPUT.getName(),EntrustStatusEnum.QUALITY_CHECK.getName(),0,account,"外委数据录入提交至质量判定");
+            lmsMsgService.sendMsg("/hmhj/quality_manage/quality_decide","有外委数据录入提交过来进行质量判定，请及时进行质量判定","新的质量判定任务！",account,null);
+        }
+        return true;
+    }
 
 
 }