展示代码提交

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureOldMessageDisposeController.java

@@ -194,9 +194,9 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("-----------部门级—年度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOfficeByYear(2022,0,3);
         logger.info("------------部门级—年度报表（结束）------------------");
-        /*logger.info("-----------张静—月度报表（开始）------------------");
+        logger.info("-----------张静—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeReportDataStatementCompany(2022,2,7);
-        logger.info("------------张静—月度报表（结束）------------------");*/
+        logger.info("------------张静—月度报表（结束）------------------");
         //}
 
         map.put("msgMonth","月度报表处理完成");

src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java

@@ -1,10 +1,8 @@
 package com.jeeplus.modules.statement.service;
 
 import com.google.common.collect.Lists;
-import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchImportInfo;
 import com.jeeplus.modules.statement.dao.StatementCompanyComprehensiveDao;
 import com.jeeplus.modules.statement.entity.ReportDataEntity;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
@@ -363,29 +361,10 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String statementDate = dateMap.get("statementDate");
         //公司级项目处理
         disposeReportDataStatementCompanyProject(year,beginDate,endDate,statementDate,bigDateType, smallDateType);
-        //查询部门信息
-        List<Office> officeList = dao.getAllOfficeListInfo();
 
         //创建utilNotifyId参数
         //参数是由 year、bigDateType、smallDateType参数设定
         String utilNotifyId = year + "," + bigDateType + "," + smallDateType;
-        /*//发送通知
-        switch (bigDateType){
-            //年度汇总
-            case 0:
-                companyNotification(statementDate,"年","161",utilNotifyId);
-                break;
-            //季度汇总
-            case 1:
-                //smallDateType  为季度时候
-                companyNotification(statementDate,"季","162",utilNotifyId);
-                break;
-            //月度汇总
-            case 2:
-                //smallDateType  为月度时候
-                companyNotification(statementDate,"月","163",utilNotifyId);
-                break;
-        }*/
         companyReportNotification(statementDate,"月","167",utilNotifyId);
     }
 
@@ -464,8 +443,10 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             for (String key : overDueNotRecordProjectIdListAllMap.keySet()) {
                 if(officeInfo.getId().equals(key) || key.contains(officeInfo.getId())){
                     List<ReportDataEntity> reportDataEntities = overDueNotRecordProjectIdListAllMap.get(key);
-                    overDueNotRecordProjectListAll.addAll(reportDataEntities);
-                    comprehensiveInfo.setField4(String.valueOf(Integer.parseInt(comprehensiveInfo.getField4()) + reportDataEntities.size()));
+                    if(null != reportDataEntities) {
+                        overDueNotRecordProjectListAll.addAll(reportDataEntities);
+                        comprehensiveInfo.setField4(String.valueOf(Integer.parseInt(comprehensiveInfo.getField4()) + reportDataEntities.size()));
+                    }
                 }
 
             }
@@ -499,8 +480,10 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             for (String key : overDueRecordProjectIdListAllMap.keySet()) {
                 if(officeInfo.getId().equals(key) || key.contains(officeInfo.getId())){
                     List<ReportDataEntity> reportDataEntities = overDueRecordProjectIdListAllMap.get(key);
-                    overDueRecordProjectListAll.addAll(reportDataEntities);
-                    comprehensiveInfo.setField5(String.valueOf(Integer.parseInt(comprehensiveInfo.getField5()) + reportDataEntities.size()));
+                    if(null != reportDataEntities) {
+                        overDueRecordProjectListAll.addAll(reportDataEntities);
+                        comprehensiveInfo.setField5(String.valueOf(Integer.parseInt(comprehensiveInfo.getField5()) + reportDataEntities.size()));
+                    }
                 }
 
             }
@@ -533,8 +516,10 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             for (String key : getProjectReportDataListMap.keySet()) {
                 if(officeInfo.getId().equals(key) || key.contains(officeInfo.getId())){
                     List<ReportDataEntity> reportDataEntities = getProjectReportDataListMap.get(key);
-                    getProjectReportDataListAll.addAll(reportDataEntities);
-                    comprehensiveInfo.setField6(String.valueOf(Integer.parseInt(comprehensiveInfo.getField6()) + reportDataEntities.size()));
+                    if(null != reportDataEntities) {
+                        getProjectReportDataListAll.addAll(reportDataEntities);
+                        comprehensiveInfo.setField6(String.valueOf(Integer.parseInt(comprehensiveInfo.getField6()) + reportDataEntities.size()));
+                    }
                 }
 
             }
@@ -567,8 +552,10 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             for (String key : getProjectReportDataListMap.keySet()) {
                 if(officeInfo.getId().equals(key) || key.contains(officeInfo.getId())){
                     List<ReportDataEntity> reportDataEntities = getOverDueProjectReportDataListMap.get(key);
-                    getOverDueProjectReportDataListAll.addAll(reportDataEntities);
-                    comprehensiveInfo.setField7(String.valueOf(Integer.parseInt(comprehensiveInfo.getField7()) + reportDataEntities.size()));
+                    if(null != reportDataEntities){
+                        getOverDueProjectReportDataListAll.addAll(reportDataEntities);
+                        comprehensiveInfo.setField7(String.valueOf(Integer.parseInt(comprehensiveInfo.getField7()) + reportDataEntities.size()));
+                    }
                 }
 
             }

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -15,7 +15,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.Calendar;
 import java.util.List;
@@ -174,6 +173,9 @@ public class WorkCalendarTaskService  {
             logger.info("-----------部门级—年度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
             logger.info("------------部门级—年度报表（结束）------------------");
+            logger.info("-----------张静—月度报表（开始）------------------");
+            statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
+            logger.info("------------张静—月度报表（结束）------------------");
         }
 
     }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -4007,6 +4007,14 @@ GROUP BY
 		<if test="statementCompanyComprehensiveInfo.field2 == '5'.toString() ">
 			LEFT JOIN rural_project_records a ON sdi.field2 = a.id
 		</if>
+
+		<if test="statementCompanyComprehensiveInfo.field4 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field1 = a.id
+		</if>
+		<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field2 = a.id
+		</if>
+
 		<if test="statementCompanyComprehensiveInfo.field6 == '5'.toString() ">
 			LEFT JOIN rural_project_records a ON sdi.field3 = a.id
 		</if>
@@ -4058,6 +4066,25 @@ GROUP BY
 				and a.over_record_status = 1
 				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
 			</if>
+
+			<if test="statementCompanyComprehensiveInfo.field4 == '5'.toString() ">
+				and a.record_state != 7
+				and pmdr.id is null
+				and a.over_record_status = 1
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
+				and a.record_state = 7
+				and pmdr.id is null
+				and a.over_record_status = 1
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				and prr.status = 5
+				and prr.del_flag = 0
+				and prr.accomplish_date >= #{beginDate}
+				and prr.accomplish_date &lt;= #{endDate}
+			</if>
+
+
 			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
 				and a.record_state != 7
 				and pmdr.id is null
@@ -4207,6 +4234,13 @@ GROUP BY
 			<if test="field2 == '5'.toString() ">
 				and field2 IS NOT NULL and field2 != ''
 			</if>
+
+			<if test="field4 == '5'.toString()">
+				and field1 IS NOT NULL and field1 != ''
+			</if>
+			<if test="field5 == '5'.toString() ">
+				and field2 IS NOT NULL and field2 != ''
+			</if>
 			<if test="field6 == '5'.toString() ">
 				and field3 IS NOT NULL and field3 != ''
 			</if>