凯和箱分布去掉好坏

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TCntrnoMapper.java

@@ -106,7 +106,6 @@ public interface TCntrnoMapper
      */
     public List<Map<String, Object>> getTCntrnoMessage(@Param("sql") String sql,
                                                        @Param("stand") String stand,
-                                                       @Param("bareWeight") String bareWeight,
                                                        @Param("tCntrno") TCntrno tCntrno);
 
     /**

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -279,10 +279,10 @@ public class TCntrnoServiceImpl implements ITCntrnoService {
         List<Map<String, Object>> mapList = new ArrayList<>();
         StringBuffer stringBuffer = new StringBuffer();//查类型数据
         StringBuffer standBuffer = new StringBuffer();//查空重
-        StringBuffer bareWeightBuffer = new StringBuffer();//查好坏
+        /*StringBuffer bareWeightBuffer = new StringBuffer();//查好坏*/
         String sql = null;//查类型数据
         String stand = null;//查空重
-        String bareWeight = null;//查好坏
+        /*String bareWeight = null;//查好坏*/
         if (CollectionUtils.isNotEmpty(list)) {
             for (String s : list) {
                 stringBuffer.append("MAX( CASE WHEN tt.f_no = '" + s);
@@ -291,15 +291,15 @@ public class TCntrnoServiceImpl implements ITCntrnoService {
                 standBuffer.append("THEN a.efCount ELSE 0 END ) AS '" + s + "空',");
                 standBuffer.append("MAX( CASE WHEN a.typeName ='"+s+"' AND a.dict_label = '重'");
                 standBuffer.append("THEN a.efCount ELSE 0 END ) AS '" + s + "重',");
-                bareWeightBuffer.append("MAX( CASE WHEN b.typeName ='"+s+"' AND b.dict_label = '好'");
+                /*bareWeightBuffer.append("MAX( CASE WHEN b.typeName ='"+s+"' AND b.dict_label = '好'");
                 bareWeightBuffer.append("THEN b.statusCount ELSE 0 END ) AS '" + s + "好',");
                 bareWeightBuffer.append("MAX( CASE WHEN b.typeName ='"+s+"' AND b.dict_label = '坏'");
-                bareWeightBuffer.append("THEN b.statusCount ELSE 0 END ) AS '" + s + "坏',");
+                bareWeightBuffer.append("THEN b.statusCount ELSE 0 END ) AS '" + s + "坏',");*/
             }
             sql = stringBuffer.subSequence(0, stringBuffer.length() - 1).toString();
             stand = standBuffer.subSequence(0, standBuffer.length() - 1).toString();
-            bareWeight = bareWeightBuffer.subSequence(0, bareWeightBuffer.length() - 1).toString();
-            mapList = tCntrnoMapper.getTCntrnoMessage(sql,stand,bareWeight,tCntrno);
+            /*bareWeight = bareWeightBuffer.subSequence(0, bareWeightBuffer.length() - 1).toString();*/
+            mapList = tCntrnoMapper.getTCntrnoMessage(sql,stand,tCntrno);
         }
         return mapList;
     }
@@ -340,8 +340,8 @@ public class TCntrnoServiceImpl implements ITCntrnoService {
             for (String s : list) {
                 mapList.add(s+"空");
                 mapList.add(s+"重");
-                mapList.add(s+"好");
-                mapList.add(s+"坏");
+               /* mapList.add(s+"好");
+                mapList.add(s+"坏");*/
             }
         }
         list.addAll(mapList);

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -396,8 +396,7 @@
     <select id="getTCntrnoMessage" parameterType="string" resultType="map">
         SELECT
         container.*,
-        box.*,
-        car.*
+        box.*
         FROM
         (
         SELECT
@@ -469,44 +468,6 @@
         GROUP BY
         a.f_updateaddress
         ) box ON container.地点 = box.f_updateaddress
-        LEFT JOIN (
-        SELECT
-        b.f_updateaddress
-        <if test=" bareWeight != null and bareWeight != ''">
-            ,${bareWeight}
-        </if>
-        FROM
-        (
-        SELECT
-        tc.f_updateaddress f_updateaddress,
-        tc.f_cntrstatus f_cntrstatus,
-        tc.statusCount statusCount,
-        tc.typeName typeName,
-        sdda.dict_label dict_label
-        FROM
-        (
-        SELECT
-        ta.f_name f_updateaddress,
-        tct.f_cntrstatus,
-        tc.f_no typeName,
-        COUNT( tct.f_updateaddress ) statusCount
-        FROM
-        t_cntrno tct
-        LEFT JOIN t_address ta ON tct.f_updateaddress = ta.f_id
-        LEFT JOIN t_cntr tc ON tct.f_typeid = tc.f_id
-        WHERE
-        tct.f_status = 'T'
-        GROUP BY
-        tct.f_updateaddress,
-        tct.f_cntrstatus,
-        tct.f_typeid
-        ) tc
-        LEFT JOIN sys_dict_data sdda ON sdda.dict_value = tc.f_cntrstatus
-        AND sdda.dict_type = 'f_cntrstatus'
-        ) b
-        GROUP BY
-        b.f_updateaddress
-        ) car ON container.地点 = car.f_updateaddress
 	<where>
         <if test="tCntrno.fUpdateaddress != null and tCntrno.fUpdateaddress != ''">
         container.地点   like concat('%', #{tCntrno.fUpdateaddress}, '%')</if>