Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/business/memInfo/dao/MemInfoRepository.java

@@ -78,8 +78,12 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> {
 
     List<CmsActivity> getCmsActivityList(@Param("entity") peopleNumberDTO peopleNumberDTO);
 
-    List<opmArticleDTO> getArticleCountByDateRange(@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+    List<opmArticleDTO> getArticleCountByDateRangeYes(@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 
-    List<opmArticleDTO> getArticleCountByMonthRange(@Param("startDateMonth")LocalDate startDateMonth,@Param("endDate") LocalDate endDate);
+    List<opmArticleDTO> getArticleCountByMonthRangeYes(@Param("startDateMonth")LocalDate startDateMonth,@Param("endDate") LocalDate endDate);
+
+    List<opmArticleDTO> getArticleCountByDateRangeNo(@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<opmArticleDTO> getArticleCountByMonthRangeNo(@Param("startDateMonth")LocalDate startDateMonth,@Param("endDate") LocalDate endDate);
 }
 

src/main/java/org/rcisoft/business/memInfo/entity/opmArticleDTO.java

@@ -31,6 +31,6 @@ public class opmArticleDTO extends CyIdIncreEntity<opmArticleDTO> {
     private String articleNum;
 
 
-    private Date updateDate;
+    private String date;
 
 }

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -402,11 +402,12 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         ArticleExamStatus list = new ArticleExamStatus();
 
         //审核通过
-        list.setArticleExamStatusDayYes(baseMapper.getArticleCountByDateRange(startDate, endDate));
-        list.setArticleExamStatusMonthYes(baseMapper.getArticleCountByMonthRange(startDateMonth, endDate));
+        list.setArticleExamStatusDayYes(baseMapper.getArticleCountByDateRangeYes(startDate, endDate));
+        list.setArticleExamStatusMonthYes(baseMapper.getArticleCountByMonthRangeYes(startDateMonth, endDate));
 
         //审核未通过
-
+        list.setArticleExamStatusDayNo(baseMapper.getArticleCountByDateRangeNo(startDate, endDate));
+        list.setArticleExamStatusMonthNo(baseMapper.getArticleCountByMonthRangeNo(startDateMonth, endDate));
 
         return list;
     }

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -385,11 +385,11 @@
     </select>
     <select id="queryOpmArticlesPaged" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
         select
-            a.create_date,
-            u.name as createName,
-            t.topic_name as topicName
+            a.create_date as createDate,
+            u.name as createUser,
+            t.topic_name as topic
         from opm_article a
-        left join sys.user u on u.business_id = a.create_by
+        left join sys_user u on u.business_id = a.create_by
         left join opm_topic t on t.business_id = a.topic_id
         where a.del_flag = 0
         and a.is_article = 1
@@ -449,10 +449,10 @@
         where c.del_flag = 0
         and NOT (c.end_time &lt; #{entity.firstDay} OR c.start_time &gt; #{entity.lastDay})
     </select>
-    <select id="getArticleCountByDateRange" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
+    <select id="getArticleCountByDateRangeYes" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
         SELECT
             DATE(a.update_date) as date,
-            COUNT(1) as count
+            COUNT(1) as articleNum
         FROM opm_article a
         WHERE a.del_flag = 0
           AND a.is_article = 1
@@ -460,10 +460,10 @@
           AND DATE(a.update_date) BETWEEN #{startDate} AND #{endDate}
         GROUP BY DATE(a.update_date)
     </select>
-    <select id="getArticleCountByMonthRange" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
+    <select id="getArticleCountByMonthRangeYes" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
         SELECT
             DATE_FORMAT(a.update_date, '%Y-%m') as date,
-            COUNT(1) as count
+            COUNT(1) as articleNum
         FROM opm_article a
         WHERE a.del_flag = 0
           AND a.is_article = 1
@@ -471,5 +471,27 @@
           AND DATE_FORMAT(a.update_date, '%Y-%m') BETWEEN #{startDateMonth} AND #{endDate}
         GROUP BY DATE_FORMAT(a.update_date, '%Y-%m')
     </select>
+    <select id="getArticleCountByDateRangeNo" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
+        SELECT
+            DATE(a.update_date) as date,
+            COUNT(1) as articleNum
+        FROM opm_article a
+        WHERE a.del_flag = 0
+          AND a.is_article = 1
+          AND a.exam_status = 0
+          AND DATE(a.update_date) BETWEEN #{startDate} AND #{endDate}
+        GROUP BY DATE(a.update_date)
+    </select>
+    <select id="getArticleCountByMonthRangeNo" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
+        SELECT
+            DATE_FORMAT(a.update_date, '%Y-%m') as date,
+            COUNT(1) as articleNum
+        FROM opm_article a
+        WHERE a.del_flag = 0
+          AND a.is_article = 1
+          AND a.exam_status = 0
+          AND DATE_FORMAT(a.update_date, '%Y-%m') BETWEEN #{startDateMonth} AND #{endDate}
+        GROUP BY DATE_FORMAT(a.update_date, '%Y-%m')
+    </select>
 
 </mapper>