【CHG】变配电修试队

railway-business/src/main/java/com/railway/business/bi/controller/ShowBdycController.java

@@ -73,10 +73,6 @@ public class ShowBdycController extends BaseController {
     startPage();
     showBdyc.setFoundMode(YcxxFoundModeEnum.PUSH.getCode());
     showBdyc.setRectifyResult(YcxxRectifyResultEnum.NOT_FINISHED.getCode());
-    if (null == showBdyc.getSsgq() || showBdyc.getSsgq().equals("变配电修试队")
-        || showBdyc.getSsgq().equals("9")) {
-      showBdyc.setSsgq(null);
-    }
     List<ShowBdyc> list = showBdycService.getList(showBdyc);
     return getDataTable(list);
   }

railway-business/src/main/java/com/railway/business/bi/controller/ShowDlycController.java

@@ -73,10 +73,6 @@ public class ShowDlycController extends BaseController {
     startPage();
     showDlyc.setFoundMode(YcxxFoundModeEnum.PUSH.getCode());
     showDlyc.setRectifyResult(YcxxRectifyResultEnum.NOT_FINISHED.getCode());
-    if (null == showDlyc.getSsgq() || showDlyc.getSsgq().equals("电力维修队")
-        || showDlyc.getSsgq().equals("3")) {
-      showDlyc.setSsgq(null);
-    }
     List<ShowDlyc> list = showDlycService.getList(showDlyc);
     return getDataTable(list);
   }

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

@@ -241,8 +241,13 @@
         dict_value=#{gravity})
       </if>
       <if test="ssgq!=null and ssgq!=''">
-        and sjgq=(select dict_label from sys_dict_data where dict_type='dlyc_sygq' and
-            (dict_value=#{ssgq} or dict_label=#{ssgq}))
+        and (
+        sjgq=(select dict_label from sys_dict_data where dict_type='dlyc_sygq' and
+        (dict_value=#{ssgq} or dict_label=#{ssgq}))
+        or
+        zrbm=(select dict_label from sys_dict_data where dict_type='dlyc_sygq' and
+        (dict_value=#{ssgq} or dict_label=#{ssgq}))
+        )
       </if>
       <if test="lineName!=null and lineName!=''">
         and line_name like concat('%', #{lineName}, '%')
@@ -305,7 +310,8 @@
             and rectify_result='未处理' and found_mode = '0'
             and file_id =
                 (select max(id) from show_file where data_type = 'yctj' and imp_result = '1')
-            and sjgq is not null) x
+            and (sjgq='变配电修试队' or zrbm='变配电修试队')
+          ) x
   </select>
 
   <resultMap id="TotalResultMap" type="com.railway.business.bi.domain.vo.YcxxTotalVO">