reafact(jg): 设备移交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferController.java

@@ -163,12 +163,14 @@ public class JgEquipTransferController extends BaseController {
     @GetMapping(value = "/finishSy/proCon")
     @ApiOperation(value = "查询指定使用单位下的可用装置，已纳管且使用登记证编号为空或者null", notes = "不包括流程中的")
     public ResponseModel<IPage<IdxBizJgProjectContraption>> getJgProjectContraptionPage(@RequestParam String useUnitCreditCode,
+                                                                                        @RequestParam(required = false) String projectContraption,
+                                                                                        @RequestParam(required = false) String projectContraptionNo,
                                                                                         @RequestParam(value = "current") int current,
                                                                                         @RequestParam(value = "size") int size) {
         Page<IdxBizJgProjectContraption> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.getJgProjectContraptionPage(useUnitCreditCode, page));
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.getJgProjectContraptionPage(projectContraption, projectContraptionNo, useUnitCreditCode, page));
     }
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java

@@ -981,11 +981,13 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         commonService.saveExecuteFlowData2Redis(jgEquipTransfer.getInstanceId(), this.buildInstanceRuntimeData(jgEquipTransfer));
     }
 
-    public IPage<IdxBizJgProjectContraption> getJgProjectContraptionPage(String useUnitCreditCode, Page<IdxBizJgProjectContraption> page) {
+    public IPage<IdxBizJgProjectContraption> getJgProjectContraptionPage(String projectContraption, String projectContraptionNo, String useUnitCreditCode, Page<IdxBizJgProjectContraption> page) {
         if (useUnitCreditCode.contains("_")) {
             useUnitCreditCode = useUnitCreditCode.split("_")[1];
         }
         LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(org.apache.commons.lang3.StringUtils.isNotEmpty(projectContraption), IdxBizJgProjectContraption::getProjectContraption, projectContraption);
+        wrapper.like(org.apache.commons.lang3.StringUtils.isNotEmpty(projectContraptionNo), IdxBizJgProjectContraption::getProjectContraptionNo, projectContraptionNo);
         wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
                 .eq(IdxBizJgProjectContraption::getIsIntoManagement, true)
                 .eq(IdxBizJgProjectContraption::getEquList, "8000")