1.A071自测bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -360,10 +360,10 @@
             and n.notice_status != '6610'
             and n.notice_status != '6615'
             <if test="param.beginDate != null">
-                and n.notice_date >= #{param.beginDate}
+                and date_ge(CAST(n.notice_date as date), #{param.beginDate})
             </if>
             <if test="param.endDate != null">
-                and n.notice_date <![CDATA[ <= ]]> #{param.endDate}
+                and date_le(CAST(n.notice_date as date), #{param.endDate})
             </if>
             <if test="param.receiveOrgCode != null">
                 and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ReportAnalysisServiceImpl.java

@@ -65,6 +65,11 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
     private String rootOrgCode;
 
     /**
+     * 告知类已发起统计数据范围： 来源FlowStatusEnum： 待受理 + 已驳回 + 已完成
+     */
+    private List<String> noticeLaunchesStatusList = Arrays.asList("6612", "6614", "6616");
+
+    /**
      * 维保备案已发起统计数据范围
      */
     private List<String> mainLaunchesStatusList = Arrays.asList("维保单位已撤回", "维保单位已驳回", "维保单位待受理", "监管单位已驳回", "监管单位待受理", "已完成");
@@ -146,8 +151,8 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
             vo.setEquCategoryName(getEquipCategoryNameByCode(c.getEquCategory()));
             vo.setEquDefineName(getEquipCategoryNameByCode(c.getEquDefine()));
             vo.setFinishedNumber(this.countDocumentNum(countDataBOList, FlowStatusEnum.TO_BE_FINISHED.getCode(), c));
-            // 已发起： 已完成 + 待受理
-            vo.setLaunchesNumber(this.countDocumentNum(countDataBOList, FlowStatusEnum.TO_BE_PROCESSED.getCode(), c) + vo.getFinishedNumber());
+            // 已发起
+            vo.setLaunchesNumber(this.countDocumentNum(countDataBOList, noticeLaunchesStatusList, c));
             return vo;
         }).collect(Collectors.toList());
     }