霍煤宏骏修改

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

@@ -119,6 +119,36 @@ 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_reg")
+    public RestResult<Page<ContractSample>> getPageOutReg(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+    @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")
+    public RestResult<Page<ContractSample>> getPageOutDataInput(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_INPUT);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
     @ApiOperation("生技部审核历史分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -287,6 +317,23 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+
+    @ApiOperation("验收任务登记提交至外委登记")
+    @PostMapping("/submit_to_out_reg")
+    public RestResult<Boolean> submitToOutReg(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToOutReg(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation("外委登记提交至外委数据录入")
+    @PostMapping("/submit_to_out_data_input")
+    public RestResult<Boolean> submitToOutDataInput(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToOutDataInput(ids,getAccount()));
+    }
+
+
+
     @ApiOperation("验收组织提交至专家会审")
     @PostMapping("/submit_to_expert_review")
     public RestResult<Boolean> submitToExpertReviewFromOrg(@RequestParam("ids") Long [] ids) {

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

@@ -48,6 +48,20 @@ 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")
+    public RestResult<Page<Entrust>> getPageOut(Entrust entrust) {
+        entrust.setStatus(EntrustStatusEnum.OUT_DRAFT);
+        return success(entrustService.page(getPage(), entrust));
+    }
+
+
     @ApiOperation("委托审核分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -117,6 +131,18 @@ public class EntrustController extends ServiceController {
     @ApiOperation(value = "添加委托单", notes = "添加委托单")
     @PostMapping("/add_entrust")
     public RestResult<Boolean> addEntrust(@RequestBody EntrustDTO dto) {
+        dto.setStatus(EntrustStatusEnum.DRAFT);
+        dto.setProgress(EntrustStatusEnum.DRAFT);
+        return success(entrustService.saveEntrustDTO(dto,getAccount()));
+    }
+
+
+
+    @ApiOperation(value = "添加外委登记委托单", notes = "添加委托单")
+    @PostMapping("/add_out_entrust")
+    public RestResult<Boolean> addOutEntrust(@RequestBody EntrustDTO dto) {
+        dto.setStatus(EntrustStatusEnum.OUT_DRAFT);
+        dto.setProgress(EntrustStatusEnum.OUT_DRAFT);
         return success(entrustService.saveEntrustDTO(dto,getAccount()));
     }
 
@@ -139,6 +165,12 @@ public class EntrustController extends ServiceController {
 
 
 
+    @ApiOperation("提交至外委数据录入")
+    @PostMapping("/submit_to_out_input")
+    public RestResult<Boolean> submitToOutInput(@RequestParam("ids")Long [] ids) {
+        return success(entrustService.submitToOutInput(ids,getAccount()));
+    }
+
 
     @ApiOperation("提交至委托评审")
     @PostMapping("/submit_to_check")

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

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

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

@@ -25,6 +25,8 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     boolean submitToCheck(Long[] ids, Account account);
 
+    boolean submitToOutInput(Long[] ids, Account account);
+
     boolean backFromCheck(Long[] ids, Account account, String reason);
 
     boolean submitToMake(Long[] ids, Account account);

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

@@ -132,6 +132,34 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    public boolean submitToOutReg(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
+        contractSample.setProgress(ContractSampleStatusEnum.OUT_DRIFT);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.CHECK_ACCEPT_REG,ContractSampleStatusEnum.OUT_DRIFT,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) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.OUT_INPUT);
+        contractSample.setProgress(ContractSampleStatusEnum.OUT_INPUT);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.OUT_DRIFT,ContractSampleStatusEnum.OUT_INPUT,0,"验收任务登记提交外委登记",account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/sub_input","外委登记提交至外委数据录入，请及时处理","新的外委数据录入！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean submitToExpertReviewFromOrg(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

@@ -101,8 +101,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     public boolean saveEntrustDTO(EntrustDTO dto, Account account) {
         RestAssert.fail(StringUtils.isBlank(dto.getClient()),"委托单位不能为空！");
         Entrust entrust = dto.convert(Entrust.class);
-        entrust.setStatus(EntrustStatusEnum.DRAFT);
-        entrust.setProgress(EntrustStatusEnum.DRAFT);
         List<EntrustSampleDTO> sampleDTOList = dto.getSampleDTOList();
 
         if (null == entrust.getEntrustTime()){
@@ -165,6 +163,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    public boolean submitToOutInput(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的委托");
+        int count = super.count(Condition.create().in("id",ids).eq("status",EntrustStatusEnum.OUT_DRAFT));
+        RestAssert.fail(ids.length!=count,"请选择外委登记的委托");
+        Entrust entrust = new Entrust();
+        entrust.setStatus(EntrustStatusEnum.OUT_INPUT);
+        entrust.setProgress(EntrustStatusEnum.OUT_INPUT);
+        if (update(entrust,Condition.create().in("id",ids))){
+            entrustRecordService.record(ids,EntrustStatusEnum.OUT_DRAFT.getName(),EntrustStatusEnum.OUT_INPUT.getName(),0,account,"提交至外委数据录入");
+            lmsMsgService.sendMsg("/hmhj/accept_manage/sub_input","有外委登记提交过来，请及时填写外委数据","新的委托外委数据录入任务！",account,null);
+        }
+        return true;
+    }
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean backFromCheck(Long[] ids, Account account, String reason) {
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要驳回的委托");
         int count = super.count(Condition.create().in("id",ids).eq("status",EntrustStatusEnum.CHECK));