Merge branch 'dev_routine_work' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/GridMemberDataAnalysisFromDTO.java

@@ -30,11 +30,11 @@ public class GridMemberDataAnalysisFromDTO {
     @NotBlank(message = "请选择组织类型", groups = { listGridMemberDatas4PcWork.class })
     private String orgType;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyyMMdd")
+    @JsonFormat(pattern = "yyyyMMdd")
     private Date startTime;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyyMMdd")
+    @JsonFormat(pattern = "yyyyMMdd")
     private Date endTime;
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -499,10 +499,10 @@
                 AND CREATED_BY = #{staffId}
             </if>
             <if test="startTime != null and startTime != ''">
-                AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) &gt;= #{startTime}
+                AND DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) &gt;= #{startTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) &lt;= #{endTime}
+                AND DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) &lt;= #{endTime}
             </if>
         ORDER BY CREATED_TIME DESC
     </select>