Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java

@@ -172,12 +172,8 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
      */
     List<SatisfactionInfoResultDTO> selectIssueVoteInfo(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
-
     List<IssueProjectCategoryDictDTO> selectCategory(@Param("customerId") String customerId, @Param("ids") Set<String> set);
 
-
-	List<IssueDTO> getIssueTotalList(@Param("customerId") String customerId, @Param("date") String date);
-
 	/**
 	 * @Author sun
 	 * @Description 查询议题库已删除网格下可能存在的项目Id集合

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java

@@ -103,14 +103,14 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 	 */
 	private void customerStats(String customerId, Date date) {
 		Date lastDate = DateUtils.getLastDayOfMonth(date);
-		//机关议题日统计
-		saveIssueAgencyDaily(customerId, date);
-		//机关议题月统计
-		saveIssueAgencyMonthly(customerId, lastDate);
 		//网格议题日统计
 		saveIssueGridDaily(customerId, date);
 		//网格议题月统计
 		saveIssueGridMonthly(customerId, lastDate);
+		//机关议题日统计
+		saveIssueAgencyDaily(customerId, date);
+		//机关议题月统计
+		saveIssueAgencyMonthly(customerId, lastDate);
 	}
 
 	@Override

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -12,7 +12,7 @@
         WHERE
             DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
-        AND DATE(UPDATED_TIME) <![CDATA[ <= ]]> #{date}
+        AND DATE(CREATED_TIME) <![CDATA[ <= ]]> #{date}
         <if test="gridList != null and gridList.size() > 0">
         <foreach collection="gridList" item="gridId" index="index">
             AND GRID_ID != #{gridId}
@@ -322,20 +322,6 @@
         </foreach>
         order by a.category_type,a.sort
     </select>
-    <select id="getIssueTotalList" resultType="com.epmet.dto.issue.IssueDTO">
-        SELECT ORG_ID AS "agencyId",
-               ORG_ID_PATH AS "pIds",
-               ISSUE_STATUS AS "status",
-               COUNT(ID) AS "count"
-        FROM
-            issue
-        WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND DATE(CREATED_TIME) <![CDATA[ <= ]]> #{date}
-        GROUP BY
-            ORG_ID, ISSUE_STATUS
-    </select>
 
     <select id="selectProjectByGrids" resultType="java.lang.String">
         SELECT DISTINCT