航运基础资料完善

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

@@ -189,11 +189,14 @@ public class TCntrnoServiceImpl implements ITCntrnoService
     public List<Map<String, Object>> getTCntrnoMessage(TCntrno tCntrno) {
         StringBuffer stringBuffer = new StringBuffer();
         List<String> list = tCntrMapper.selectTCntrFNo();
-        for (String s : list) {
-            stringBuffer.append("MAX( CASE WHEN tt.f_no = '"+s);
-            stringBuffer.append("' THEN tt.typeidCount ELSE 0 END ) AS '" +s +"',");
+        String sql = null;
+        if (CollectionUtils.isNotEmpty(list)){
+            for (String s : list) {
+                stringBuffer.append("MAX( CASE WHEN tt.f_no = '"+s);
+                stringBuffer.append("' THEN tt.typeidCount ELSE 0 END ) AS '" +s +"',");
+            }
+            sql = stringBuffer.subSequence(0,stringBuffer.length() -1).toString();
         }
-        String sql = stringBuffer.subSequence(0,stringBuffer.length() -1).toString();
         return tCntrnoMapper.getTCntrnoMessage(sql,tCntrno);
     }
 

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

@@ -246,8 +246,10 @@
 FROM
 	(
 	SELECT
-		tt.f_updateaddress AS 地点,
-		${sql}
+		tt.f_updateaddress AS 地点
+		<if test=" sql != null and sql != ''">
+            ,${sql}
+        </if>
 	FROM
 		(
 		SELECT

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

@@ -83,7 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and tc.create_time <= #{cLoadDate[1]}
             </if>
         </where>
-        ORDER BY  CONVERT(tc.f_name USING gbk) asc
     </select>
     
     <select id="selectTCntrtrackingById" parameterType="Long" resultMap="TCntrtrackingResult">