修改ugpbug

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProblemCodeLibController.java

@@ -129,11 +129,11 @@ public class ProblemCodeLibController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "质量问题代码库表分页查询", notes = "质量问题代码库表分页查询")
     public ResponseModel<IPage<ProblemCodeLib>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
+            (value = "size") int size, ProblemCodeLib problemCodeLib) {
         Page<ProblemCodeLib> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(problemCodeLibServiceImpl.queryProblemCodeInfoPage(page));
+        return ResponseHelper.buildResponse(problemCodeLibServiceImpl.queryProblemCodeInfoPage(page,problemCodeLib));
     }
 
     /**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemCodeLibServiceImpl.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.annotation.Resource;
@@ -32,10 +33,11 @@ public class ProblemCodeLibServiceImpl extends BaseService<ProblemCodeLibDto, Pr
     @Value("${dict.code.unit:UNIT_MANAGE}")
     private String unitManage;
 
-    public IPage<ProblemCodeLib> queryProblemCodeInfoPage(Page<ProblemCodeLib> page) {
+    public IPage<ProblemCodeLib> queryProblemCodeInfoPage(Page<ProblemCodeLib> page, ProblemCodeLib problemCodeLib) {
         LambdaQueryWrapper<ProblemCodeLib> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProblemCodeLib::getIsDelete, Boolean.FALSE);
         lambdaQueryWrapper.orderByDesc(ProblemCodeLib::getRecDate);
+        createWarpper(lambdaQueryWrapper,problemCodeLib);
         Map<String, String> dictValueMap = getDictInfoMapByCode(unitManage);
         IPage<ProblemCodeLib> problemCodeLibIPage = problemCodeLibMapper.selectPage(page, lambdaQueryWrapper);
         problemCodeLibIPage.getRecords().forEach(item -> {
@@ -47,6 +49,26 @@ public class ProblemCodeLibServiceImpl extends BaseService<ProblemCodeLibDto, Pr
         return problemCodeLibIPage;
     }
 
+    public void createWarpper(LambdaQueryWrapper<ProblemCodeLib> lambdaQueryWrapper, ProblemCodeLib problemCodeLib){
+        if(!ValidationUtil.isEmpty(problemCodeLib)) {
+            if (!ValidationUtil.isEmpty(problemCodeLib.getGenStage())) {
+                lambdaQueryWrapper.like(ProblemCodeLib::getGenStage, problemCodeLib.getGenStage());
+            }
+            if (!ValidationUtil.isEmpty(problemCodeLib.getContent())) {
+                lambdaQueryWrapper.like(ProblemCodeLib::getContent, problemCodeLib.getContent());
+            }
+            if (!ValidationUtil.isEmpty(problemCodeLib.getCode())) {
+                lambdaQueryWrapper.like(ProblemCodeLib::getCode, problemCodeLib.getCode());
+            }
+            if (!ValidationUtil.isEmpty(problemCodeLib.getRecUserName())) {
+                lambdaQueryWrapper.like(ProblemCodeLib::getRecUserName, problemCodeLib.getRecUserName());
+            }
+            if (!ValidationUtil.isEmpty(problemCodeLib.getRecDate())) {
+                lambdaQueryWrapper.like(ProblemCodeLib::getRecDate, problemCodeLib.getRecDate());
+            }
+        }
+    }
+
     /**
      * 处理监管指标类型列表展示问题
      * @param idxThresholds 子表单提交的数据

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -328,7 +328,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             taskType = TaskTypeEnum.流程.getKey();
         }
         if (ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus())) {
-            unitIds.add(superviseRule.getInspectionUnitId());
+            unitIds.add(project.getTestingUnitId());
             taskType = TaskTypeEnum.流程.getKey();
         }
         if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) || ProjectInitiationEnum.安装开工资料提交.getName().equals(project.getStatus()) || ProjectInitiationEnum.设计开工资料提交.getName().equals(project.getStatus())) {