【CHG】修改查询条件

railway-business/src/main/java/com/railway/business/bi/service/impl/ShowFileServiceImpl.java

@@ -26,6 +26,7 @@ import com.railway.business.bi.service.IShowTestPlanKgService;
 import com.railway.business.bi.service.IShowYdtsService;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.enums.BusinessStatus;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.ExcelUtil;
@@ -102,6 +103,7 @@ public class ShowFileServiceImpl implements IShowFileService {
       }
       for (ShowBpdjxjh show : bdList) {
         show.setFileId(fileId);
+        show.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
         bpdjxjhService.create(show);
       }
     }
@@ -136,6 +138,7 @@ public class ShowFileServiceImpl implements IShowFileService {
           }
           for (ShowTestPlanKg bdyc : bdList) {
             bdyc.setFileId(fileId);
+            bdyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             kgService.create(bdyc);
           }
           break;
@@ -150,6 +153,7 @@ public class ShowFileServiceImpl implements IShowFileService {
           }
           for (ShowTestPlanDt dlyc : dlList) {
             dlyc.setFileId(fileId);
+            dlyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             dtService.create(dlyc);
           }
           break;
@@ -190,6 +194,7 @@ public class ShowFileServiceImpl implements IShowFileService {
             if(StringUtils.isEmpty(bdyc.getSubstationName()) || "0".equals(bdyc.getSubstationName())){
               continue;
             }
+            bdyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             bdyc.setFileId(fileId);
             ydtsService.create(bdyc);
           }
@@ -208,6 +213,7 @@ public class ShowFileServiceImpl implements IShowFileService {
               continue;
             }
             dlyc.setFileId(fileId);
+            dlyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             gsdService.create(dlyc);
           }
           break;
@@ -225,6 +231,7 @@ public class ShowFileServiceImpl implements IShowFileService {
               continue;
             }
             dlyc.setFileId(fileId);
+            dlyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             gsyService.create(dlyc);
           }
           break;
@@ -264,6 +271,7 @@ public class ShowFileServiceImpl implements IShowFileService {
           for (ShowSbxj bdyc : bdList) {
             bdyc.setFileId(fileId);
             bdyc.setQybds("1");
+            bdyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             sbxjService.create(bdyc);
           }
           break;
@@ -276,6 +284,7 @@ public class ShowFileServiceImpl implements IShowFileService {
           }
           for (ShowSbxj dlyc : bdList) {
             dlyc.setFileId(fileId);
+            dlyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             sbxjService.create(dlyc);
           }
           break;
@@ -323,6 +332,7 @@ public class ShowFileServiceImpl implements IShowFileService {
             }
             bdyc.setFileId(fileId);
             bdyc.setFoundMode(foundMode);
+            bdyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             bdycService.create(bdyc);
           }
           break;
@@ -342,6 +352,7 @@ public class ShowFileServiceImpl implements IShowFileService {
             }
             dlyc.setFileId(fileId);
             dlyc.setFoundMode(foundMode);
+            dlyc.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
             dlycService.create(dlyc);
           }
           break;

railway-business/src/main/resources/mapper/bi/ShowBpdjxjhMapper.xml

@@ -150,6 +150,7 @@
     FROM show_bpdjxjh
     <where>
       del_flag='0'
+      and file_id = (select max(id) from show_file where data_type='bdsjxjh' and imp_result = '1')
       <if test="lineName!=null and lineName!=''">
         and lin_name like concat('%', #{lineName}, '%')
       </if>
@@ -169,6 +170,8 @@
     select count(*) from show_bpdjxjh
     <where>
       del_flag='0'
+      and file_id = (select max(id) from show_file where data_type='bdsjxjh' and imp_result = '1')
+      and (completion_state != '1' || completion_state = '0' or completion_state is null)
       <if test="jhMonth!=null and jhMonth!=''">
         and jh_month like concat('%', #{jhMonth})
       </if>
@@ -178,7 +181,9 @@
   <select id="getActual" resultType="java.lang.Integer">
     select count(*) from show_bpdjxjh
     <where>
-      del_flag='0' and completion_state = '1'
+      del_flag='0'
+      and file_id = (select max(id) from show_file where data_type='bdsjxjh' and imp_result = '1')
+      and completion_state = '1'
       <if test="month!=null and month!=''">
         and LPAD(MONTH(completion_date), 2, 0) like concat('%', #{month})
       </if>