修改审计查询和审计统计的数量不一致问题

src/main/java/platform/modules/government/service/ProjectDeclarationService.java

@@ -818,8 +818,10 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
 
         List<String> result = new ArrayList<>();
         Example example = new Example(ProjectApplication.class);
+        Example.Criteria criteriaAnd = example.createCriteria();
+        criteriaAnd.andEqualTo("del_flag", "0");//不显示删除的
         Example.Criteria criteria = example.createCriteria();
-
+        example.and(criteria);
         criteria.andEqualTo("approve_status", Constant.ProjectApplicationStatus.NOTIFY);//待通知
         criteria.orEqualTo("approve_status", Constant.ProjectApplicationStatus.LOCAL_AUDIT); //属地初审
         criteria.orEqualTo("approve_status", Constant.ProjectApplicationStatus.CENTRE_AUDIT);//材料审核
@@ -833,7 +835,6 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
         criteria.orEqualTo("approve_status", Constant.ProjectApplicationStatus.UPLOAD_CS);//待财政上传
         criteria.orEqualTo("approve_status", Constant.ProjectApplicationStatus.UPLOAD_CZ);//待处室上传
         criteria.orEqualTo("approve_status", Constant.ProjectApplicationStatus.COMMIT_FILE);//待中心窗口上传
-        criteria.orEqualTo("del_flag", "0");//不显示删除的
 
         List<ProjectApplication> projectList = projectApplicationDao.selectByExample(example);
         for (ProjectApplication project : projectList) {

src/main/resources/application-aliyun.yml

@@ -202,9 +202,9 @@ resetPassword: 123456
 maxFileSize: 5120MB
 maxRequestSize: 5120MB
 # 企业服务中心负责人电话：wei.pp的电话
-company-master-phone: 18362602202
+#company-master-phone: 18362602202
 # 企业服务中心负责人电话：lingwei的电话
-#company-master-phone: 18625008937
+company-master-phone: 18625008937
 #endpoints:
 #    health:
 #      sensitive: false

src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
 
   #redis
   redis:
-    host: 192.168.1.115
+    host: 127.0.0.1
     password:
     port: 6379
     pool:

src/main/resources/mapper/government/ProjectApplicationDao.xml

@@ -77,10 +77,10 @@
         LEFT JOIN s_street s ON s.id = a.street_id
         WHERE 1=1
         <if test="condition.begin_date != null and condition.begin_date !='' ">
-            <![CDATA[ and DATE_FORMAT(a.create_time, '%Y-%m-%d')>=  DATE_FORMAT(#{condition.begin_date}, '%Y-%m-%d')   ]]>
+            <![CDATA[ and DATE_FORMAT(a.apply_date, '%Y-%m-%d')>=  DATE_FORMAT(#{condition.begin_date}, '%Y-%m-%d')   ]]>
         </if>
         <if test="condition.end_date != null and condition.end_date !='' ">
-            <![CDATA[ and DATE_FORMAT(a.create_time, '%Y-%m-%d')<=  DATE_FORMAT(#{condition.end_date}, '%Y-%m-%d')   ]]>
+            <![CDATA[ and DATE_FORMAT(a.apply_date, '%Y-%m-%d')<=  DATE_FORMAT(#{condition.end_date}, '%Y-%m-%d')   ]]>
         </if>
         <if test="condition.type != null and condition.type !='' ">
             <![CDATA[ and DATE_SUB(CURDATE(), INTERVAL #{condition.type} YEAR) <= date(a.create_time)   ]]>