Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

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

@@ -11,6 +11,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FolderToZipUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
@@ -19,12 +21,15 @@ import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
 import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -124,10 +129,43 @@ public class ZEngineeringIndustryController extends BaseController {
      */
 //    @SaCheckPermission("zdsz:engineeringIndustry:query")
     @GetMapping("/{id}/{type}")
-    public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id, @PathVariable String type) {
+    public R<ZEngineeringIndustryVo> query(@PathVariable String id, @PathVariable String type) {
         return R.ok(iZEngineeringIndustryService.query(id, type));
     }
 
+    @Value("${filePath}")
+    private String filePath;
+
+    @GetMapping(value = "/downloadZip/{type}/{name}")
+    public void downloadZip(@PathVariable String type,@PathVariable String name,HttpServletResponse response) {
+//        File file = new File(zipPath);//创建指定目录和文件名称的文件对象
+        try {
+            // 创建最外层文件夹
+            byte[] fileNameBytes = filePath.getBytes("UTF-8");
+            // 使用UTF-8编码创建文件
+            File file = new File(new String(fileNameBytes, "UTF-8"));
+            if (!file.exists()) {
+                file.mkdirs();
+            }
+            byte[] typeFileNameBytes = (file.getPath() + "/" + type).getBytes("UTF-8");
+            // 使用UTF-8编码创建文件
+            File typeFile = new File(new String(typeFileNameBytes, "UTF-8"));
+            if (!typeFile.exists()) {
+                typeFile.mkdirs();
+            }
+            byte[] enginNameFileNameBytes = (typeFile.getPath() + "/" + name).getBytes("UTF-8");
+            // 使用UTF-8编码创建文件
+            File enginNameFile = new File(new String(enginNameFileNameBytes, "UTF-8"));
+            if (!enginNameFile.exists()) {
+                enginNameFile.mkdirs();
+            }
+            System.out.println(enginNameFile.getPath());
+            FolderToZipUtil.zip(enginNameFile.getPath(),name,response);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * 工业工程|市政工程根据工程类型查询工程名称
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringInfoBo.java

@@ -93,6 +93,17 @@ public class ZEngineeringInfoBo extends BaseEntity {
      * 备注
      */
     private String remark;
+
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
+
+    private String nodeName;
     /**
      * 状态
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringInfrastructureVo.java

@@ -27,6 +27,15 @@ import java.util.List;
 public class ZEngineeringInfrastructureVo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    private Object nodeReViewStateList;
+
+    public Object getNodeReViewStateList() {
+        return nodeReViewStateList;
+    }
+
+    public void setNodeReViewStateList(Object nodeReViewStateList) {
+        this.nodeReViewStateList = nodeReViewStateList;
+    }
 
     /**
      * ID

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

@@ -86,7 +86,9 @@ public interface IZEngineeringNodeService {
     List<String> nodeTypeList(List<ZEngineeringCivil> zEngineeringCivilList,String type,String state,ZEngineeringCivilBo bo);
     Map<String,Object> ReViewList(List<ZEngineeringCivilVo> zEngineeringCivilList);
     Map<String,Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list);
+    Map<String,Object> ReViewInfrastructureList(List<ZEngineeringInfrastructureVo> list);
     Map<String,Object> ReViewSZList(List<ZEngineeringIndustryVo> list);
+    Map<String,Object> ReViewGYList(List<ZEngineeringIndustryVo> list);
 
     /**
      * 校验并批量删除工程节点信息

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

@@ -339,10 +339,21 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
                         if (!enginNameFile.exists()) {
                             enginNameFile.mkdirs();
                         }
-
+                        byte[] CreateTimeFileNameBytes;
+                       if (StringUtils.isNotBlank(item.getNodeName())){
+                           //节点类型
+                           byte[] nodeType = (enginNameFile.getPath() + "/" + item.getNodeName()).getBytes("UTF-8");
+                           // 使用UTF-8编码创建文件
+                           File f = new File(new String(nodeType, "UTF-8"));
+                           if (!f.exists()) {
+                               f.mkdirs();
+                           }
+                           CreateTimeFileNameBytes = (f.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
+                       }else {
+                           CreateTimeFileNameBytes = (enginNameFile.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
+                       }
                         // 时间
                         //                        File CreateTimeFile = new File(Type.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(zEngineeringInfoBo.getCreateTime()) );
-                        byte[] CreateTimeFileNameBytes = (enginNameFile.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
                         // 使用UTF-8编码创建文件
                         File CreateTimeFile = new File(new String(CreateTimeFileNameBytes, "UTF-8"));
                         if (!CreateTimeFile.exists()) {

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

@@ -161,12 +161,14 @@ public class ZEngineeringAirWallServiceImpl implements IZEngineeringAirWallServi
         ZEngineeringAirWall update = BeanUtil.toBean(bo, ZEngineeringAirWall.class);
         validEntityBeforeSave(update);
         boolean flag = baseMapper.updateById(update) > 0;
+        // 查询数据库中已存在的主表创建时间
+        ZEngineeringAirWallVo vo = baseMapper.selectVoById(bo.getId());
         if (flag) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
             zEngiineeringPhotoBo.setParentId(update.getId());
-            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
+            zEngiineeringPhotoBo.setCreateTime(vo.getCreateTime());
             List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
             // 插入前端传来的新文件
             if (!ObjectUtils.isEmpty(bo.getFiles())) {
@@ -332,13 +334,16 @@ public class ZEngineeringAirWallServiceImpl implements IZEngineeringAirWallServi
     public Boolean updateNodeByBo(ZEngineeringAirWallBo bo) {
         ZEngineeringAirWall update = BeanUtil.toBean(bo, ZEngineeringAirWall.class);
         boolean flag = baseMapper.updateById(update) > 0;
+
+        // 查询数据库中已存在的主表创建时间
+        ZEngineeringAirWallVo vo = baseMapper.selectVoById(bo.getId());
         if (flag) {
             if (!ObjectUtils.isEmpty(bo.getFiles())) {
                 List<ZEngiineeringPhoto> list = new ArrayList<>();
                 // 查询数据库中已存在的文件列表
                 ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
                 zEngiineeringPhotoBo.setParentId(update.getId());
-                zEngiineeringPhotoBo.setCreateTime(update.getCreateTime());
+                zEngiineeringPhotoBo.setCreateTime(vo.getCreateTime());
                 List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
                 // 插入前端传来的新文件
                 for (ZFileBo pic : bo.getFiles()) {

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

@@ -283,6 +283,16 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
         validEntityBeforeSave(update);
         int i = baseMapper.updateById(update);
+        if (ObjectUtils.isEmpty(bo.getFiles())){
+            List<ZFileBo> files = new ArrayList<>();
+            for (ZEngiineeringPhotoVo pic : bo.getPics()) {
+                ZFileBo zFileBo = new ZFileBo();
+                zFileBo.setName(pic.getFileName());
+                zFileBo.setUrl(pic.getPicUrl());
+                files.add(zFileBo);
+            }
+            bo.setFiles(files);
+        }
         if (!ObjectUtils.isEmpty(bo.getFiles())) {
             ZEngineeringDangerousVo queryById = this.queryById(bo.getId());
             List<ZEngiineeringPhoto> list = new ArrayList<>();
@@ -311,9 +321,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
             }
 
             // 删除数据库中多余的文件
-            List<String> photosToDelete = existingPhotos.stream()
-                .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
-                .collect(Collectors.toList());
+            List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
                 photosToDelete.forEach(item->{
                     ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();

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

@@ -254,7 +254,11 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     public TableDataInfo<ZEngineeringIndustryVo> queryPageList(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringIndustryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        Map<String, Object> ReviewList = nodeService.ReViewSZList(result.getRecords());
+        Map<String, Object> ReviewList;
+        if ("1".equals(bo.getType()))
+            ReviewList = nodeService.ReViewGYList(result.getRecords());
+        else
+            ReviewList = nodeService.ReViewSZList(result.getRecords());
         result.getRecords().forEach(item -> {
             item.setNodeReViewStateList(ReviewList.get(item.getId()));
         });
@@ -331,6 +335,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(update);
         boolean flag = baseMapper.updateById(update) > 0;
+        bo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
         if (flag) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
             // 查询数据库中已存在的文件列表
@@ -484,12 +489,13 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     public Boolean updateNodeByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         boolean flag = baseMapper.updateById(update) > 0;
+        bo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
         if (flag) {
             if (!ObjectUtils.isEmpty(bo.getFiles())) {
                 List<ZEngiineeringPhoto> list = new ArrayList<>();
                 // 查询数据库中已存在的文件列表
                 ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
-                zEngiineeringPhotoBo.setCreateTime(update.getCreateTime());
+                zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
                 zEngiineeringPhotoBo.setParentId(update.getId());
                 List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
                 // 插入前端传来的新文件
@@ -575,12 +581,13 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+
         ids.forEach(item -> {
             ZEngineeringIndustryVo vo = baseMapper.selectVoById(item);
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
-            zEngiineeringPhotoBo.setCreateTime(vo.getCreateTime());
             zEngiineeringPhotoBo.setParentId(item);
+            zEngiineeringPhotoBo.setCreateTime(vo.getCreateTime());
             // 将查询出的url放入existingPhotos
             List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
             // 若存在 则进行删除
@@ -590,7 +597,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 });
             }
             // 初始化工程节点对象
-//            ZEngineeringIndustryVo vo = baseMapper.selectVoById(item);
+
             ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
             zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
             zEngineeringNodeBo.setCivliId(vo.getId());

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

@@ -104,6 +104,10 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     public TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
         Page<ZEngineeringInfrastructureVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Map<String, Object> ReviewList = izEngineeringNodeService.ReViewInfrastructureList(result.getRecords());
+        result.getRecords().forEach(item -> {
+            item.setNodeReViewStateList(ReviewList.get(item.getId()));
+        });
         return TableDataInfo.build(result);
     }
 

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

@@ -746,6 +746,52 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
+    public Map<String, Object> ReViewInfrastructureList(List<ZEngineeringInfrastructureVo> list) {
+        Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
+        List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
+        Map<String,Object> statemap=new HashMap<>();
+        AtomicReference<List<Map<String, Object>>> ReViewStateMap= new AtomicReference<>(new ArrayList<>());
+        list.stream().forEach(item->{
+            String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+            MonthTableNameHandler.setData(date);
+            LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+            lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
+            // lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
+            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)
+                {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
+
+            });
+            System.out.println(nodeList.toString());
+            System.out.println(nodeTypeList.toString());
+            List stateList=new ArrayList();
+            sysDictMap.get("engineering_infrastructure").stream().forEach(item3 -> {
+                Map<String,Object> map=new HashMap<>();
+                if (nodeList.size()>0&&nodeList.stream().anyMatch(x->x.getType().equals(item3.getDictValue()))){
+                    map.put("Type",item3.getDictValue());
+                    map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewStatus():"0");
+                    map.put("content",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals(item3.getDictValue())).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent():"暂未审核");
+                }else {
+                    map.put("Type",item3.getDictValue());
+                    map.put("state","0");
+                    map.put("content","暂未审核");
+                }
+                stateList.add(map);
+                ReViewStateMap.set(stateList);;
+            });
+            statemap.put(item.getId(),ReViewStateMap.get());
+
+            MonthTableNameHandler.removeData();
+        });
+        return statemap;
+    }
+    @Override
     public Map<String, Object> ReViewPipeJackingList(List<ZEngineeringPipeJackingVo> list) {
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
@@ -793,6 +839,46 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     }
 
     @Override
+    public Map<String, Object> ReViewGYList(List<ZEngineeringIndustryVo> list) {
+
+        List<ZEngineeringReview> nodeTypeList=new ArrayList<>();
+        Map<String,Object> statemap=new HashMap<>();
+        list.stream().forEach(item->{
+            String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+            MonthTableNameHandler.setData(date);
+            LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
+            lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
+            // lqw.eq(StringUtils.isNotBlank(type), ZEngineeringNode::getType, type);
+            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)
+                {
+                    nodeTypeList.add(ReviewList.get(0));
+                }
+
+            });
+            System.out.println(nodeList.toString());
+            System.out.println(nodeTypeList.toString());
+            Map<String,Object> map=new HashMap<>();
+            if (nodeList.size()>0&&nodeList.stream().anyMatch(x->x.getType().equals("工业工程"))){
+                map.put("Type","工业工程");
+                map.put("state",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewStatus():"0");
+                map.put("content",nodeTypeList.stream().anyMatch(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).collect(Collectors.toList()).get(0).getId()))?nodeTypeList.stream().filter(y->y.getEngInfoId().equals(nodeList.stream().filter(x->x.getType().equals("工业工程")).collect(Collectors.toList()).get(0).getId())).collect(Collectors.toList()).get(0).getReviewContent():"暂未审核");
+            }else {
+                map.put("Type","工业工程");
+                map.put("state","0");
+                map.put("content","暂未审核");
+            }
+            statemap.put(item.getId(),Arrays.asList(map));
+            MonthTableNameHandler.removeData();
+        });
+        return statemap;
+    }
+
+    @Override
     public Map<String,Object> ReViewSZList(List<ZEngineeringIndustryVo> list){
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         List<ZEngineeringReview> nodeTypeList=new ArrayList<>();

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

@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         and epj.type = '2'
                     </if>
                 </if>
+                and epj.del_flag = '0'
         WHERE ei.create_by = #{by} AND epj.id IS NOT NULL GROUP BY epj.id
         <foreach collection="names" item="name">
             union
@@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and epj.type = '2'
                 </if>
             </if>
+            and epj.del_flag = '0'
             WHERE ei.create_by = #{by} AND epj.id IS NOT NULL GROUP BY epj.id
 
         </foreach>