修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -49,8 +49,8 @@ public class ZEngineeringIndustryController extends BaseController {
     private final IZEngineeringIndustryService iZEngineeringIndustryService;
 
     @GetMapping("getByUserList")
-    public R<?> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy){
-        return R.ok(iZEngineeringIndustryService.getByUserList(type,enginName,enginType,enginProcedure,enginStatus, pageQuery,nodeType,createBy));
+    public R<?> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy,String enginClassification){
+        return R.ok(iZEngineeringIndustryService.getByUserList(type,enginName,enginType,enginProcedure,enginStatus, pageQuery,nodeType,createBy,enginClassification));
     }
 
     @GetMapping("/getByUserListAndDicts/{dictType}")
@@ -63,8 +63,7 @@ public class ZEngineeringIndustryController extends BaseController {
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:list")
     @GetMapping("/list")
-    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery,String type) {
-        bo.setType(type);
+    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
         return iZEngineeringIndustryService.queryPageList(bo, pageQuery);
     }
 
@@ -76,7 +75,7 @@ public class ZEngineeringIndustryController extends BaseController {
     @PostMapping("/export")
     public void export(ZEngineeringIndustryBo bo, HttpServletResponse response) {
         List<ZEngineeringIndustryVo> list = iZEngineeringIndustryService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工业工程|市政工程", ZEngineeringIndustryVo.class, response);
+        ExcelUtil.exportExcel(list, "市政工程", ZEngineeringIndustryVo.class, response);
     }
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringIndustryMapper.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface ZEngineeringIndustryMapper extends BaseMapperPlus<ZEngineeringIndustryMapper, ZEngineeringIndustry, ZEngineeringIndustryVo> {
 
-    Page<Map<String,Object>> getByUserList(@Param("names") List DateList, @Param("by")String name, @Param("type")String type,@Param("szAndGy")String szAndGy,@Param("pa") Page<?> page,@Param("enginName")String enginName,@Param("enginType")String enginType);
+    Page<Map<String,Object>> getByUserList(@Param("names") List DateList, @Param("by")String name, @Param("type")String type,@Param("szAndGy")String szAndGy,@Param("pa") Page<?> page,@Param("enginName")String enginName,@Param("enginType")String enginType,@Param("enginClassification")String enginClassification);
     Page<Map<String,Object>> getByUserList1(@Param("names") List DateList, @Param("by")String name, @Param("type")String type,@Param("szAndGy")String szAndGy,@Param("pa") Page<?> page,@Param("enginName")String enginName,@Param("enginType")String enginType);
     List<Map<String,String>> getReviewStatusByNodeId(@Param("id") String id);
     List<Map<String,String>> getDicts(@Param("type") String type);

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -19,7 +19,7 @@ import java.util.Map;
  */
 public interface IZEngineeringIndustryService {
 
-    TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy);
+    TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy,String enginClassification);
 
     /**
      * 查询工业工程|市政工程

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringGYServiceImpl.java

@@ -131,6 +131,12 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         ZEngineeringGY add = BeanUtil.toBean(bo, ZEngineeringGY.class);
         validEntityBeforeSave(add);
         if (StringUtils.isEmpty(bo.getId())){
+            LambdaQueryWrapper<ZEngineeringGY> lqw = buildQueryWrapper(bo);
+            lqw.eq(ZEngineeringGY::getEnginName,bo.getEnginName()).eq(ZEngineeringGY::getEnginClassification,bo.getEnginClassification());
+            Long selected = baseMapper.selectCount(lqw);
+            if (selected>0){
+                throw new IllegalArgumentException("同一工程类型,不能建相同工程名称数据!");
+            }
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -67,7 +67,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     private ZEngineeringCivilMapper zEngineeringCivilMapper;
 
     @Override
-    public TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy) {
+    public TableDataInfo<Map<String, Object>> getByUserList(String type,String enginName,String enginType,String enginProcedure,String enginStatus,PageQuery pageQuery,String nodeType,String createBy,String enginClassification) {
         Page<T> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         String leftJoin = null;
         String szAndGy = null;
@@ -89,6 +89,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         else if ("5".equals(type)){
             leftJoin = "z_engineering_gy"; // 工业工程
+            szAndGy = "gy";
         }
         else if ("6".equals(type)){
             leftJoin = "z_engineering_air_wall"; // 带气工程
@@ -108,7 +109,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         if (type.equals("6")) {
             listPage = baseMapper.getByUserList1(DateList, username, leftJoin, szAndGy, page,enginName,enginType);
         } else {
-            listPage = baseMapper.getByUserList(DateList, username, leftJoin, szAndGy, page,enginName,enginType);
+            listPage = baseMapper.getByUserList(DateList, username, leftJoin, szAndGy, page,enginName,enginType,enginClassification);
         }
 
         if ("1".equals(type)){ // 顶管
@@ -245,15 +246,20 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         else if ("5".equals(type)){ // 工业工程
             listPage.getRecords().forEach(item -> {
-                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));;
-                ;
+                String date = new SimpleDateFormat("yyyy_MM").format(Date.from(((LocalDateTime)item.get("createTime")).atZone(ZoneId.systemDefault()).toInstant()));
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
                 List<SysDictData> municipalEngineeringNode = new ArrayList<>();
-                municipalEngineeringNode.addAll(sysDictMap.get("gy_inner"));
-                municipalEngineeringNode.addAll(sysDictMap.get("gy_out"));
-                municipalEngineeringNode.addAll(sysDictMap.get("gy_tyg"));
+                if (item.get("enginClassification").equals("室内管线")){
+                    municipalEngineeringNode.addAll(sysDictMap.get("gy_inner"));
+                }
+                if (item.get("enginClassification").equals("室外管线")){
+                    municipalEngineeringNode.addAll(sysDictMap.get("gy_out"));
+                }
+                if (item.get("enginClassification").equals("调压柜")){
+                    municipalEngineeringNode.addAll(sysDictMap.get("gy_tyg"));
+                }
                 mapList.forEach(ite -> {
                     String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
                     try {

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -847,7 +847,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
                 List<ZEngineeringReview> ReviewList = zEngineeringReviewMapper.selectList(lqw2);
-                if (ReviewList.size() > 0) {
+                if (!ReviewList.isEmpty()) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
                 if("下管".equals(item2.getType())){
@@ -883,7 +883,6 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 }
                 stateList.add(map);
                 ReViewStateMap.set(stateList);
-                ;
             });
             statemap.put(item.getId(),ReViewStateMap.get());
 
@@ -902,12 +901,12 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             MonthTableNameHandler.setData(date);
             LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
             lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
-            List <ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
+            List<ZEngineeringNode> nodeList=baseMapper.selectList(lqw);
             nodeList.stream().forEach(item2->{
                 LambdaQueryWrapper<ZEngineeringReview> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringReview::getEngInfoId, item2.getId()).orderByDesc(ZEngineeringReview::getReviewTime);
                 List<ZEngineeringReview> ReviewList= zEngineeringReviewMapper.selectList(lqw2);
-                if (ReviewList.size()>0)
+                if (!ReviewList.isEmpty())
                 {
                     nodeTypeList.add(ReviewList.get(0));
                 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringIndustryMapper.xml

@@ -63,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             epj.id AS id,
             epj.engin_name AS enginName,
+        <if test="szAndGy=='gy'">
+            epj.engin_classification AS enginClassification,
+        </if>
             <if test="szAndGy=='pk'">
                 if(#{type} = 'z_touch_operation_engineering',epj.mode_operation,'') AS modeOperation,
             </if>
@@ -78,6 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="enginType != '' and enginType != null and szAndGy!='pk'">
             and epj.engin_type LIKE CONCAT('%',#{enginType},'%')
         </if>
+        <if test="enginClassification != '' and enginClassification != null and szAndGy=='gy'">
+            and epj.engin_classification LIKE CONCAT('%',#{enginClassification},'%')
+        </if>
         <if test="enginType != '' and enginType != null and szAndGy=='pk'">
             and epj.mode_operation LIKE CONCAT('%',#{enginType},'%')
         </if>
@@ -87,6 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT
             epj.id AS id,
             epj.engin_name AS enginName,
+            <if test="szAndGy=='gy'">
+                epj.engin_classification AS enginClassification,
+            </if>
             <if test="szAndGy=='pk'">
                 if(#{type} = 'z_touch_operation_engineering',epj.mode_operation,'') AS modeOperation,
             </if>
@@ -102,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enginType != '' and enginType != null and szAndGy!='pk'">
                 and epj.engin_type LIKE CONCAT('%',#{enginType},'%')
             </if>
+            <if test="enginClassification != '' and enginClassification != null and szAndGy=='gy'">
+                and epj.engin_classification LIKE CONCAT('%',#{enginClassification},'%')
+            </if>
             <if test="enginType != '' and enginType != null and szAndGy=='pk'">
                 and epj.mode_operation LIKE CONCAT('%',#{enginType},'%')
             </if>