Merge branch 'V0.1.0' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.0

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/mapper/AppCockpitMapper.java

@@ -84,7 +84,7 @@ public interface AppCockpitMapper extends BaseMapper {
      * @param date
      * @return
      */
-    AppOverviewTaskInfoDto selectOverViewQuestionInfo(@Param("orgPath") String orgPath, @Param("date") Date date);
+    AppOverviewTaskInfoDto selectOverViewQuestionInfo(@Param("orgPath") String orgPath, @Param("date") Date date, @Param("end") Date end);
 
     /**
      * 获取机构（暂时只查营业网点、离行）基础信息

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -261,11 +261,11 @@ public class AppCockpitServiceImpl implements AppCockpitService {
 
         CompletableFuture<AppOverviewTaskInfoDto> edu = CompletableFuture.supplyAsync(() ->
                 {
-                    Date currentQuarter = DateUtil.beginOfQuarter(new Date());
-                    Date currentQuarterEnd = DateUtil.endOfQuarter(new Date());
-                    Date prevQuarter = DateUtil.beginOfQuarter(new Date()).offset(DateField.MONTH, -3);
+                    //Date currentQuarter = DateUtil.beginOfQuarter(new Date());
+                    //Date currentQuarterEnd = DateUtil.endOfQuarter(new Date());
+                    //Date prevQuarter = DateUtil.beginOfQuarter(new Date()).offset(DateField.MONTH, -3);
 
-                    AppOverviewTaskInfoDto result = appCockpitMapper.selectOverViewEduTaskInfo(org.getPath(), currentQuarter, currentQuarterEnd, prevQuarter);
+                    AppOverviewTaskInfoDto result = appCockpitMapper.selectOverViewEduTaskInfo(org.getPath(), currentMonth, currentMonthEnd, prevMonth);
                     if (ObjectUtil.isNull(result)) {
                         result = new AppOverviewTaskInfoDto();
                     }
@@ -289,11 +289,12 @@ public class AppCockpitServiceImpl implements AppCockpitService {
                 , threadPoolTaskExecutor
         );
 
-        Date currentQuarter = DateUtil.beginOfQuarter(new Date());
-        Date currentQuarterEnd = DateUtil.endOfQuarter(new Date());
-        Date prevQuarter = DateUtil.beginOfMonth(currentQuarter).offset(DateField.MONTH, -3);
+
         CompletableFuture<AppOverviewTaskInfoDto> drill = CompletableFuture.supplyAsync(() ->
                 {
+                    Date currentQuarter = DateUtil.beginOfQuarter(new Date());
+                    Date currentQuarterEnd = DateUtil.endOfQuarter(new Date());
+                    Date prevQuarter = DateUtil.beginOfMonth(currentQuarter).offset(DateField.MONTH, -3);
                     AppOverviewTaskInfoDto result = appCockpitMapper.selectOverViewDrillTaskInfo(org.getPath(), currentQuarter, currentQuarterEnd, prevQuarter);
                     if (ObjectUtil.isNull(result)) {
                         result = new AppOverviewTaskInfoDto();
@@ -303,10 +304,12 @@ public class AppCockpitServiceImpl implements AppCockpitService {
                 , threadPoolTaskExecutor
         );
 
-        Date near90 = DateUtil.beginOfDay(new Date()).offset(DateField.DAY_OF_YEAR, -90);
         CompletableFuture<AppOverviewTaskInfoDto> question = CompletableFuture.supplyAsync(() ->
                 {
-                    AppOverviewTaskInfoDto result = appCockpitMapper.selectOverViewQuestionInfo(org.getPath(), near90);
+                    //Date near90 = DateUtil.beginOfDay(new Date()).offset(DateField.DAY_OF_YEAR, -90);
+                    Date currentYear = DateUtil.beginOfYear(new Date());
+                    Date currentYearEnd = DateUtil.endOfYear(new Date());
+                    AppOverviewTaskInfoDto result = appCockpitMapper.selectOverViewQuestionInfo(org.getPath(), currentYear,currentYearEnd);
                     if (ObjectUtil.isNull(result)) {
                         result = new AppOverviewTaskInfoDto();
                     }

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -55,7 +55,7 @@
                sum(if(t.plan_end_time < #{date}, (if(t.`status` = 3, 1, 0)), 0)) as prevcompleted
         FROM core_resumption t
                  inner join core_resumption_plan p on t.plan_id = p.id and p.plan_exec in (2,3,4)
-        WHERE plan_end_time >= #{prevdate}
+        WHERE plan_end_time >= #{date}
           and plan_end_time <= #{end}
           and t.org_path like concat(#{orgPath}, '%')
     </select>
@@ -67,7 +67,7 @@
                sum(if(t.plan_end_time &lt; #{date}, (if(t.`status` = 3, 1, 0)), 0)) as prevcompleted
         FROM core_safety_task t
                  INNER JOIN core_safecheck_plan p on t.plan_id = p.id and p.check_type = 3
-        WHERE plan_end_time >= #{prevdate}
+        WHERE plan_end_time >= #{date}
             and plan_end_time &lt;= #{end}
           and org_path like concat(#{orgPath}, '%')
     </select>
@@ -79,7 +79,7 @@
                sum(if(t.end_date &lt; #{date} and t.`status` = 2, 1, 0)) as prevcompleted
         FROM core_edu_training_task t
                  left join core_edu_training_plan p on t.plan_id = p.id
-        WHERE t.end_date >= #{prevdate}
+        WHERE t.end_date >= #{date}
           and t.end_date &lt;= #{end}
           and t.org_path like concat(#{orgPath}, '%')
           and (p.plan_cycle &lt; 4 or t.plan_id is null)
@@ -105,8 +105,8 @@
                sum(if(t.plan_end_time &lt; #{date} and t.`status` = 2, 1, 0)) as prevcompleted
         FROM core_monitoring_retrieval_task t
                  inner join core_monitoring_retrieval_plan p on t.plan_id = p.id and p.plan_cycle &lt; 4
-        WHERE t.plan_end_time >= #{prevdate}
-          and t.plan_end_time &lt; #{end}
+        WHERE t.plan_end_time >= #{date}
+          and t.plan_end_time &lt;= #{end}
           and t.org_path like concat(#{orgPath}, '%')
     </select>
     <select id="selectOverViewQuestionInfo" resultType="com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto">
@@ -114,6 +114,7 @@
                sum(if(reform_status = 11, 1, 0))  as completed
         FROM core_question
         WHERE submit_time >= #{date}
+          and submit_time &lt;= #{end}
           and org_path like concat(#{orgPath}, '%')
     </select>