Merge remote-tracking branch 'origin/master'

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/MailDao.java

@@ -169,6 +169,5 @@ public interface MailDao {
 
     List<Map<TypeCasting, Object>> findWebNew(Map<String, Object> param);
 
-    List<Map<String, Object>> findDeptNew(Map<String, Object> param);
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/MailServiceImpl.java

@@ -280,39 +280,17 @@ public class MailServiceImpl implements MailService {
         param.put("type", type);
         param.put("Id", Id);
         //查询网站
-//        List<Map<TypeCasting, Object>> web = mailDao.findWeb(param);
-//        if (web.size() != 0) {
-//            for (int i = 0; i < web.size(); i++) {
-//                Object releaseDate = web.get(i).get("releaseDate");
-//                Object columnFirstName = web.get(i).get("columnFirstName");
-//
-//                int webUpdateCount = mailDao.findWebUpdateCount(columnFirstName, releaseDate);
-//                typeName.add(columnFirstName);
-//                listDate.add(releaseDate);
-//                listCount.add(webUpdateCount);
-//            }
-//            for (int i = 0; i <typeName.size() ; i++) {
-//                List<String> dept = mailDao.findDept(String.valueOf(typeName.get(i)));
-//                listDept.add(dept);
-//
-//            }
-//        }
         List<Map<TypeCasting, Object>> web = mailDao.findWebNew(param);
-        List<Map<String, Object>> deptList = mailDao.findDeptNew(param);
-        if (web != null && web.size() > 0) {
+        if(web != null && web.size() > 0){
             for (int i = 0; i < web.size(); i++) {
-                typeName.add(web.get(i).get("columnFirstName"));
-                listDate.add(web.get(i).get("releaseDate"));
+                typeName.add(web.get(i).get("column"));
+                listDate.add(web.get(i).get("maxTime"));
                 listCount.add(web.get(i).get("count"));
-                if (deptList != null && deptList.size() > 0) {
-                    List<String> dept=new ArrayList<>();
-                    for (int j = 0; j < deptList.size(); j++) {
-                        if(web.get(i).get("columnFirstName").equals(deptList.get(j).get("columnFirstName"))){
-                            dept.add(deptList.get(j).get("deptname").toString());
-                        }
-                    }
-                    listDept.add(dept);
-                    dept=new ArrayList<>();
+                //如果不为空
+                if(Blank.isNotEmpty(web.get(i).get("deptname"))){
+                    listDept.add(web.get(i).get("deptname"));
+                }else{
+                    listDept.add("");
                 }
             }
         }

nngkxxdp/src/main/resources/mapper/MailDao.xml

@@ -219,18 +219,45 @@
 
     <select id="findWebNew" resultType="java.util.Map">
         SELECT
-            a.columnFirstName,
-            count( * ) AS count,
-            MAX( a.releaseDate ) AS releaseDate
+            a.`COLUMN`,
+            a.child_column,
+            a.deptname,
+            b.count,
+            DATE_FORMAT( b.maxD, '%Y-%m-%d' ) AS maxTime
         FROM
-            article AS a
-        WHERE
-            a.type = #{type}
-          AND a.urlId = #{Id}
-        GROUP BY
-            a.columnFirstName
-        ORDER BY
-            releaseDate ASC
+            (
+                SELECT
+                    oc.deptId,
+                    oc.COLUMN,
+                    oc.child_column,
+                    oc.type,
+                    t.deptname
+                FROM
+                    other_column oc
+                        LEFT JOIN t_dept t ON t.deptid = oc.deptId
+                WHERE
+                    oc.type = #{type}
+                GROUP BY
+                    oc.COLUMN
+            ) a
+                LEFT JOIN (
+                SELECT
+                    oc.deptId,
+                    oc.COLUMN,
+                    oc.child_column,
+                    oc.chnlid,
+                    oc.type,
+                    sh.DOCRELTIME,
+                    count( oc.COLUMN ) AS count,
+                    max( sh.DOCRELTIME ) AS maxD
+                FROM
+                    other_column oc
+                        LEFT JOIN save_hlw_interface_data sh ON oc.chnlid = sh.CHNLID
+                WHERE
+                    oc.type = #{type}
+                GROUP BY
+                    oc.COLUMN
+            ) b ON a.COLUMN = b.COLUMN
     </select>
 
     <select id="findWebUpdateCount" resultType="java.lang.Integer">
@@ -264,32 +291,6 @@
         WHERE d.`column`=#{name}
     </select>
 
-    <select id="findDeptNew" resultType="java.util.Map">
-        SELECT
-            b.columnFirstName,
-            d.deptname
-        FROM
-            (
-                SELECT
-                    a.columnFirstName,
-                    MAX( a.releaseDate ) AS releaseDate
-                FROM
-                    article AS a
-                WHERE
-                    a.type = #{type}
-                  AND a.urlId = #{Id}
-                GROUP BY
-                    a.columnFirstName
-                ORDER BY
-                    releaseDate ASC
-            ) b
-                RIGHT JOIN dept d ON d.`column` = b.columnFirstName
-        WHERE
-            b.columnFirstName IS NOT NULL;
-    </select>
-
-
-
     <select id="findDeptName" resultType="java.lang.String">
 
         SELECT d.deptname