月报部分代码提交

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -333,16 +333,16 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
     Integer recordSignaturesCount();
 
     //公司级 查询项目报表
-    List<RuralProjectRecords> selectReportPage(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords,@Param("officeId") String officeId,@Param("grade")String grade,@Param("beginDate")String beginDate,@Param("endDate") String endDate,@Param("recordState")String recordState,@Param("reportedState")String reportedState);
+    List<RuralProjectRecords> selectReportPage(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords,@Param("officeId") String officeId,@Param("grade")String grade,@Param("beginDate")String beginDate,@Param("endDate") String endDate,@Param("recordState")String recordState,@Param("reportedState")String reportedState, @Param("projectPaperFiling")String projectPaperFiling, @Param("projectFlingBatchRelation")String projectFlingBatchRelation);
 
     //公司级 查询的符合条件的项目报表总数
-    Integer reportPageCount(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords,@Param("officeId") String officeId,@Param("grade")String grade,@Param("beginDate")String beginDate,@Param("endDate") String endDate,@Param("recordState")String recordState,@Param("reportedState")String reportedState);
+    Integer reportPageCount(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords,@Param("officeId") String officeId,@Param("grade")String grade,@Param("beginDate")String beginDate,@Param("endDate") String endDate,@Param("recordState")String recordState,@Param("reportedState")String reportedState, @Param("projectPaperFiling")String projectPaperFiling, @Param("projectFlingBatchRelation")String projectFlingBatchRelation);
 
     //公司级 查询项目超期信息（4种）
     List<RuralProjectRecords> selectReportPageOverdue(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
 
     //公司级 查询项目超期信息的总条数
-    Integer selectReportPageOverdueCount(StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo);
+    Integer selectReportPageOverdueCount(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
 
 
     //部门级 查询项目报表

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -3944,7 +3944,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 	//公司级：项目报表详细
 	public Page<RuralProjectRecords> findReportPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,String officeId,String grade,String bigDateType,String smallDateType
-													,String recordState,String reportedState,String year) {
+													,String recordState,String reportedState,String year, String projectPaperFiling, String projectFlingBatchRelation) {
 		//将获取的datetype转为需要的具体时间   含年月日
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -3961,8 +3961,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
 		projectRecords.setPage(page);
-		List<RuralProjectRecords> recordsList = dao.selectReportPage(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState);
-		int count = dao.reportPageCount(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState);
+		List<RuralProjectRecords> recordsList = dao.selectReportPage(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState,projectPaperFiling,projectFlingBatchRelation);
+		int count = dao.reportPageCount(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState,projectPaperFiling,projectFlingBatchRelation);
 		page.setPageNo(oldPageNo);
 		page.setCount(count);
 		page.setCountFlag(false);
@@ -4035,7 +4035,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		projectRecords.setPage(page);
 		List<RuralProjectRecords> recordsList = dao.selectReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
-		int count = dao.selectReportPageOverdueCount(statementCompanyComprehensiveInfo);
+		int count = dao.selectReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		page.setPageNo(oldPageNo);
 		page.setCount(count);
 		page.setCountFlag(false);
@@ -4073,7 +4073,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		projectRecords.setPage(page);
 		List<RuralProjectRecords> recordsList = dao.selectReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
-		int count = dao.selectReportPageOverdueCount(statementCompanyComprehensiveInfo);
+		int count = dao.selectReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		page.setPageNo(oldPageNo);
 		page.setCount(count);
 		page.setCountFlag(false);

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

@@ -240,12 +240,21 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         long l1 = System.currentTimeMillis();
         Integer month = c.get(Calendar.MONTH); //第一个月从0开始，所以得到月份＋1
         //当月最后一天
-        logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
+        logger.info("-----------公司级—月度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
+        logger.info("------------公司级—月度报表（结束）------------------");
+        /*logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
         statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
         logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
+        logger.info("-----------部门级—月度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
+        logger.info("------------部门级—月度报表（结束）------------------");
         logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
         logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
+        logger.info("-----------张静—月度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
+        logger.info("------------张静—月度报表（结束）------------------");*/
         map.put("msgMonth","月度报表处理完成");
         long l2 = System.currentTimeMillis();
         map.put("msgdate",(l2-l1));

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -100,6 +100,8 @@ public class StatementCompanyComprehensiveController extends BaseController {
                             , @Param(value = "grade")String grade
                             , @Param(value = "recordState")String recordState
                             , @Param(value = "reportedState")String reportedState
+                            , @Param(value = "projectPaperFiling")String projectPaperFiling
+                            , @Param(value = "projectFlingBatchRelation")String projectFlingBatchRelation
                             ,StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo){
 
         //每次都必须接收前端传参并放入model
@@ -110,10 +112,16 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("grade",grade);
         model.addAttribute("recordState",recordState);
         model.addAttribute("reportedState",reportedState);
+        model.addAttribute("projectPaperFiling",projectPaperFiling);
+        model.addAttribute("projectFlingBatchRelation",projectFlingBatchRelation);
         model.addAttribute("field5",statementCompanyComprehensiveInfo.getField5());
         model.addAttribute("field6",statementCompanyComprehensiveInfo.getField6());
         model.addAttribute("field7",statementCompanyComprehensiveInfo.getField7());
         model.addAttribute("field8",statementCompanyComprehensiveInfo.getField8());
+        model.addAttribute("field9",statementCompanyComprehensiveInfo.getField9());
+        model.addAttribute("field10",statementCompanyComprehensiveInfo.getField10());
+        model.addAttribute("field11",statementCompanyComprehensiveInfo.getField11());
+        model.addAttribute("field12",statementCompanyComprehensiveInfo.getField12());
 
         //这个是我删除的有需要可以补回，但是得注意projectRecords的submitmoney值
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
@@ -136,9 +144,9 @@ public class StatementCompanyComprehensiveController extends BaseController {
         //projectRecords.setProjectType("2");
         //获取项目信息
         Page<RuralProjectRecords> page = new Page<RuralProjectRecords>();
-        if(StringUtils.isNotBlank(grade) || StringUtils.isNotBlank(recordState) || StringUtils.isNotBlank(reportedState)) {
-            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year);
-        }else {
+        if(StringUtils.isNotBlank(grade) || StringUtils.isNotBlank(recordState) || StringUtils.isNotBlank(reportedState) || StringUtils.isNotBlank(projectPaperFiling) || StringUtils.isNotBlank(recordState) || StringUtils.isNotBlank(projectFlingBatchRelation)) {
+            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation);
+        }else{
             statementCompanyComprehensiveInfo.setType("1");
             page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);
         }
@@ -162,6 +170,8 @@ public class StatementCompanyComprehensiveController extends BaseController {
             , @Param(value = "grade")String grade
             , @Param(value = "recordState")String recordState
             , @Param(value = "reportedState")String reportedState
+            , @Param(value = "projectPaperFiling")String projectPaperFiling
+            , @Param(value = "projectFlingBatchRelation")String projectFlingBatchRelation
             ,StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo){
 
         //每次都必须接收前端传参并放入model
@@ -172,6 +182,8 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("grade",grade);
         model.addAttribute("recordState",recordState);
         model.addAttribute("reportedState",reportedState);
+        model.addAttribute("projectPaperFiling",projectPaperFiling);
+        model.addAttribute("projectFlingBatchRelation",projectFlingBatchRelation);
         model.addAttribute("field5",statementCompanyComprehensiveInfo.getField5());
         model.addAttribute("field6",statementCompanyComprehensiveInfo.getField6());
         model.addAttribute("field7",statementCompanyComprehensiveInfo.getField7());
@@ -198,8 +210,8 @@ public class StatementCompanyComprehensiveController extends BaseController {
         //projectRecords.setProjectType("2");
         //获取项目信息
         Page<RuralProjectRecords> page = new Page<RuralProjectRecords>();
-        if(StringUtils.isNotBlank(grade) || StringUtils.isNotBlank(recordState) || StringUtils.isNotBlank(reportedState)) {
-            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year);
+        if(StringUtils.isNotBlank(grade) || StringUtils.isNotBlank(recordState) || StringUtils.isNotBlank(reportedState) || StringUtils.isNotBlank(projectPaperFiling) || StringUtils.isNotBlank(recordState) || StringUtils.isNotBlank(projectFlingBatchRelation)) {
+            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation);
         }else {
             statementCompanyComprehensiveInfo.setType("1");
             page = projectRecordsService.findReportPageOverdueByYear(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);

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

@@ -337,6 +337,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             case 2:
                 //smallDateType  为月度时候
                 companyNotification(statementDate,"月","163",utilNotifyId);
+                companyReportNotification(statementDate,"月","167",utilNotifyId);
                 break;
         }
     }
@@ -3012,39 +3013,40 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         statementCompanyComprehensiveInfo.setType("1");
         List<StatementCompanyComprehensiveInfo> reportFormList1 = dao.selectReportAllByType(statementCompanyComprehensiveInfo);
         //项目表 各列合计
-        String xmnum1 = "0";
-        String xmnum2 = "0";
         String xmnum3 = "0";
-        String xmnum4 = "0";
+        String xmnum11 = "0";
+        String xmnum12 = "0";
         String xmnum5 = "0";
         String xmnum6 = "0";
+        String xmnum9 = "0";
+        String xmnum10 = "0";
         String xmnum7 = "0";
         String xmnum8 = "0";
-        String xmnum9 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList1){
             //转BigDecimal 处理   合计
-            xmnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnum1)).toString();
-            xmnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnum2)).toString();
-            xmnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(xmnum3)).toString();
-            xmnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(xmnum4)).toString();
-            xmnum5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnum5)).toString();
-            xmnum6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnum6)).toString();
-            xmnum7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnum7)).toString();
-            xmnum8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnum8)).toString();
-            xmnum9 = new BigDecimal(info.getField9()).add(new BigDecimal(xmnum9)).toString();
+            xmnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(xmnum3)).toString();       //本月电子归档
+            xmnum11 = new BigDecimal(info.getField11()).add(new BigDecimal(xmnum11)).toString();    //质量符合：未质量复核
+            xmnum12 = new BigDecimal(info.getField12()).add(new BigDecimal(xmnum12)).toString();    //质量符合：超期未质量符合
+            xmnum5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnum5)).toString();       //电子超期归档：超期未归档
+            xmnum6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnum6)).toString();       //电子超期归档：超期已归档
+            xmnum9 = new BigDecimal(info.getField9()).add(new BigDecimal(xmnum9)).toString();       //纸质归档：A类纸质归档
+            xmnum10 = new BigDecimal(info.getField10()).add(new BigDecimal(xmnum10)).toString();    //纸质归档：B类批量归档
+            xmnum7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnum7)).toString();       //上报超期：超期未上报
+            xmnum8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnum8)).toString();       //上报超期：超期已上报
+
         }
         //存放到对应报表的list集合，方便页面集合展示
         StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
         xminfo.setOfficeName("本"+nyr+"合计");
-        xminfo.setField1(xmnum1);
-        xminfo.setField2(xmnum2);
         xminfo.setField3(xmnum3);
-        xminfo.setField4(xmnum4);
+        xminfo.setField11(xmnum11);
+        xminfo.setField12(xmnum12);
         xminfo.setField5(xmnum5);
         xminfo.setField6(xmnum6);
+        xminfo.setField9(xmnum9);
+        xminfo.setField10(xmnum10);
         xminfo.setField7(xmnum7);
         xminfo.setField8(xmnum8);
-        xminfo.setField9(xmnum9);
         reportFormList1.add(xminfo);
         map.put("reportFormList1",reportFormList1);
         return map;

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

@@ -2874,6 +2874,19 @@
 				and rprr.accomplish_date <= #{endDate}
 			</if>
 
+			<if test="projectPaperFiling == '5'.toString() ">
+				and ppf.status = 5
+				and ppf.del_flag = 0
+				and ppf.audit_pass_date >= #{beginDate}
+				and ppf.audit_pass_date &lt;= #{endDate}
+			</if>
+			<if test="projectFlingBatchRelation == '5'.toString() ">
+				and pfp.status = 5
+				and pfp.del_flag = 0
+				and pfp.audit_pass_date >= #{beginDate}
+				and pfp.audit_pass_date &lt;= #{endDate}
+			</if>
+
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
@@ -3034,6 +3047,18 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
+			<if test="projectPaperFiling == '5'.toString() ">
+				and ppf.status = 5
+				and ppf.del_flag = 0
+				and ppf.audit_pass_date >= #{beginDate}
+				and ppf.audit_pass_date &lt;= #{endDate}
+			</if>
+			<if test="projectFlingBatchRelation == '5'.toString() ">
+				and pfp.status = 5
+				and pfp.del_flag = 0
+				and pfp.audit_pass_date >= #{beginDate}
+				and pfp.audit_pass_date &lt;= #{endDate}
+			</if>
 
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
@@ -3215,6 +3240,13 @@
 			LEFT JOIN rural_project_records a ON sdi.field4 = a.id
 		</if>
 
+		<if test="statementCompanyComprehensiveInfo.field11 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field5 = a.id
+		</if>
+		<if test="statementCompanyComprehensiveInfo.field12 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field6 = a.id
+		</if>
+
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
@@ -3385,25 +3417,181 @@
 
 	<select id="selectReportPageOverdueCount" resultType="integer">
 		select
-			count(DISTINCT id)
-		from statement_data_info
+			count(DISTINCT a.id)
+		from statement_data_info sdi
+		<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field1 = a.id
+		</if>
+		<if test="statementCompanyComprehensiveInfo.field6 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field2 = a.id
+		</if>
+		<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field3 = a.id
+		</if>
+		<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field4 = a.id
+		</if>
+
+		<if test="statementCompanyComprehensiveInfo.field11 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field5 = a.id
+		</if>
+		<if test="statementCompanyComprehensiveInfo.field12 == '5'.toString() ">
+			LEFT JOIN rural_project_records a ON sdi.field6 = a.id
+		</if>
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		left join rural_project_records_reported rprr on rprr.id = a.id
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
+		LEFT JOIN sys_user sua on a.create_by = sua.id
+		<if test="ruralProjectRecords.leaderNameStr !=null and ruralProjectRecords.leaderNameStr !=''">
+			LEFT JOIN work_project_user w on a.id = w.project_id
+			LEFT JOIN sys_user su on w.user_id = su.id
+		</if>
+		LEFT JOIN sys_user sub on a.project_master_id = sub.id
+		LEFT JOIN sys_office sob ON sob.id = sub.office_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+		LEFT JOIN work_client_info wct on wci.client_id = wct.id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
+		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
+		left join project_approval_signature pas on pas.project_id = a.id
+		left join project_report_signature prs on prs.project_id = a.id
+		left join project_report_signature_info prsi on prsi.project_report_id = prd.number
 		<where>
-			year = #{year}
-			and type = #{type}
-			and big_date_type = #{bigDateType}
-			and small_date_type = #{smallDateType}
-			and office_id = #{officeId}
-			<if test="field5 == '5'.toString()">
-				and field1 IS NOT NULL and field1 != ''
+			a.status = 5
+			and a.del_flag = 0
+			and sdi.year = #{statementCompanyComprehensiveInfo.year}
+			and sdi.type = #{statementCompanyComprehensiveInfo.type}
+			and sdi.big_date_type = #{statementCompanyComprehensiveInfo.bigDateType}
+			and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
+			and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
+			<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},'%'))
 			</if>
-			<if test="field6 == '5'.toString() ">
-				and field2 IS NOT NULL and field2 != ''
+			<if test="statementCompanyComprehensiveInfo.field6 == '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="field7 == '5'.toString() ">
-				and field3 IS NOT NULL and field3 != ''
+			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
+				and a.over_due_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="field8 == '5'.toString() ">
-				and field4 IS NOT NULL and field4 != ''
+			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
+				and a.reported_state = 7
+				and a.over_due_status = 1
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				and rprr.report_status = 5
+				and rprr.del_flag = 0
+				and rprr.accomplish_date >= #{beginDate}
+				and rprr.accomplish_date &lt;= #{endDate}
+			</if>
+
+			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
+				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
+			</if>
+			<if test="ruralProjectRecords.projectName != null and ruralProjectRecords.projectName != ''">
+				AND a.project_name like concat(concat('%',#{ruralProjectRecords.projectName}),'%')
+			</if>
+			<if test="ruralProjectRecords.scaleType != null and ruralProjectRecords.scaleType != ''">
+				AND a.scale_type = #{ruralProjectRecords.scaleType}
+			</if>
+			<if test="ruralProjectRecords.scaleUnit != null and ruralProjectRecords.scaleUnit != ''">
+				AND a.scale_unit = #{ruralProjectRecords.scaleUnit}
+			</if>
+			<if test="ruralProjectRecords.scaleQuantity != null and ruralProjectRecords.scaleQuantity != ''">
+				AND a.scale_quantity = #{ruralProjectRecords.scaleQuantity}
+			</if>
+			<if test="ruralProjectRecords.projectSite != null and ruralProjectRecords.projectSite != ''">
+				AND a.project_site LIKE concat('%',#{ruralProjectRecords.projectSite},'%')
+			</if>
+			<if test="ruralProjectRecords.remarks != null and ruralProjectRecords.remarks != ''">
+				AND a.remarks LIKE concat('%',#{ruralProjectRecords.remarks},'%')
+			</if>
+			<if test="ruralProjectRecords.projectDesc != null and ruralProjectRecords.projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{ruralProjectRecords.projectDesc},'%')
+			</if>
+			<if test="ruralProjectRecords.area != null and ruralProjectRecords.area.id != null and ruralProjectRecords.area.id != ''">
+				AND a.area_id = #{ruralProjectRecords.area.id}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.name !=null and ruralProjectRecords.workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{ruralProjectRecords.workContractInfo.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractNum !=null and ruralProjectRecords.workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{ruralProjectRecords.workContractInfo.contractNum}),'%')
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractPrice !=null and ruralProjectRecords.workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{ruralProjectRecords.workContractInfo.contractPrice}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractType !=null and ruralProjectRecords.workContractInfo.contractType !=''">
+				AND wci.contract_type = #{ruralProjectRecords.workContractInfo.contractType}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo!=null and ruralProjectRecords.workContractInfo.client !=null and ruralProjectRecords.workContractInfo.client.name !=null and ruralProjectRecords.workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{ruralProjectRecords.workContractInfo.client.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.leaderNameStr !=null and ruralProjectRecords.leaderNameStr !=''">
+				AND su.name like concat(concat('%',#{ruralProjectRecords.leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="ruralProjectRecords.projectStatus !=null">
+				AND a.status = #{ruralProjectRecords.projectStatus}
+			</if>
+			<if test="ruralProjectRecords.beginDate !=null">
+				AND a.create_date >= #{ruralProjectRecords.beginDate}
+			</if>
+			<if test="ruralProjectRecords.endDate !=null">
+				AND a.create_date &lt; #{ruralProjectRecords.endDate}
+			</if>
+			<if test="ruralProjectRecords.projectType !=null and ruralProjectRecords.projectType !=''">
+				and project_type= #{ruralProjectRecords.projectType}
+			</if>
+			<if test="ruralProjectRecords.engineeringType !=null and ruralProjectRecords.engineeringType !=''">
+				and a.engineering_type= #{ruralProjectRecords.engineeringType}
+			</if>
+			<!--<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>-->
+			<if test="ruralProjectRecords.officeIdList!=null and ruralProjectRecords.officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{ruralProjectRecords.officeId}
+				</foreach>
+			</if>
+
+			<if test="ruralProjectRecords.reportData!=null and ruralProjectRecords.reportData.number !=null and ruralProjectRecords.reportData.number !=''">
+				and prd.number like concat('%',#{ruralProjectRecords.reportData.number},'%')
+			</if>
+			<if test="ruralProjectRecords.filingProjectStatus!=null and ruralProjectRecords.filingProjectStatus !=''">
+				and pfp.status =${ruralProjectRecords.filingProjectStatus}
+			</if>
+			<if test="ruralProjectRecords.submitMoney!=null and ruralProjectRecords.submitMoney !=''">
+				and a.submit_money =#{ruralProjectRecords.submitMoney}
+			</if>
+			<if test="ruralProjectRecords.createBy !=null and ruralProjectRecords.createBy !=''">
+				<if test="ruralProjectRecords.createBy.name !=null and ruralProjectRecords.createBy.name !=''">
+					AND sua.name like concat(concat('%',#{ruralProjectRecords.createBy.name}),'%')
+				</if>
+			</if>
+			<if test="ruralProjectRecords.office!=null and ruralProjectRecords.office.name!=null and ruralProjectRecords.office.name!=''">
+				AND o.name like concat(concat('%',#{ruralProjectRecords.office.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.sqlMap.delFlag !=null and ruralProjectRecords.sqlMap.delFlag!=''">
+				${ruralProjectRecords.sqlMap.delFlag}
+			</if>
+			<if test="ruralProjectRecords.sqlMap.dsf !=null and ruralProjectRecords.sqlMap.dsf!=''">
+				AND ((w1.user_id = #{ruralProjectRecords.currentUser.id} AND w1.del_flag='0' AND a.company_id = #{ruralProjectRecords.currentUser.company.id} )${ruralProjectRecords.sqlMap.dsf} )
 			</if>
 		</where>
 	</select>

src/main/resources/mappings/modules/statement/StatementCompanyComprehensiveDao.xml

@@ -776,6 +776,14 @@
 			<if test="field4 != null and field4 != ''">
 				and field4 = #{field4}
 			</if>
+
+			<if test="field5 != null and field5 != ''">
+				and field5 = #{field5}
+			</if>
+
+			<if test="field6 != null and field6 != ''">
+				and field6 = #{field6}
+			</if>
 		</where>
 	</delete>
 
@@ -1871,8 +1879,11 @@
 		a.field7 as "field7",
 		a.field8 as "field8",
 		a.field9 as "field9",
+		a.field10 as "field10",
+		a.field11 as "field11",
+		a.field12 as "field12",
 		(select name from sys_office where id = office_id) officeName
-		from statement_audit_office_data_info a
+		from statement_company_comprehensive_info a
 		<where>
 			a.type = #{type}
 			and a.del_flag = 0

src/main/webapp/webpage/modules/statement/companyReportDataView.jsp

@@ -131,61 +131,61 @@
 				,{align:'center', title: '上报超期',colspan:2}
             ],
 			[
-				{field:'field6',align:'center',title:'未质量复核',templet:function(d){
+				{field:'field11',align:'center',title:'未质量复核',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('未质量复核', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5','95%', '95%')\">" + d.field6 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field11 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('未质量复核', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field11=5','95%', '95%')\">" + d.field11 + "</a>";
 						}else{
-							return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
+							return "<span title='"+ d.field11 +"'>" +d.field11+ "</span>";
 						}
 					}}
-				,{field:'field7',align:'center',title:'超期未质量复核',templet:function(d){
+				,{field:'field12',align:'center',title:'超期未质量复核',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未质量复核', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5','95%', '95%')\">" + d.field7 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field12 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未质量复核', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field12=5','95%', '95%')\">" + d.field12 + "</a>";
 					}else{
-						return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
+						return "<span title='"+ d.field12 +"'>" +d.field12+ "</span>";
 					}
 				}}
 
-				,{field:'field4',align:'center',title:'超期未归档',templet:function(d){
+				,{field:'field5',align:'center',title:'超期未归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field4=5','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5','95%', '95%')\">" + d.field5 + "</a>";
 						}else{
-							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
+							return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
 						}
 					}}
-				,{field:'field5',align:'center',title:'超期已归档',templet:function(d){
+				,{field:'field6',align:'center',title:'超期已归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5','95%', '95%')\">" + d.field5 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5','95%', '95%')\">" + d.field6 + "</a>";
 					}else{
-						return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
+						return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
 					}
 				}}
-				,{field:'field1',align:'center',title:'A类纸质归档',templet:function(d){
+				,{field:'field9',align:'center',title:'A类纸质归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('A类纸质归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&projectPaperFiling=5','95%', '95%')\">" + d.field1 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field9 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('A类纸质归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&projectPaperFiling=5','95%', '95%')\">" + d.field9 + "</a>";
 					}else{
-						return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
+						return "<span title='"+ d.field9 +"'>" +d.field9+ "</span>";
 					}
 				}}
-				,{field:'field2',align:'center',title:'B类批量归档',templet:function(d){
+				,{field:'field10',align:'center',title:'B类批量归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('B类批量归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&projectFlingBatchRelation=5','95%', '95%')\">" + d.field2 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field10 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('B类批量归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&projectFlingBatchRelation=5','95%', '95%')\">" + d.field10 + "</a>";
 					}else{
-						return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
+						return "<span title='"+ d.field10 +"'>" +d.field10+ "</span>";
 					}
 				}}
-				,{field:'field8',align:'center',title:'超期未上报',templet:function(d){
+				,{field:'field7',align:'center',title:'超期未上报',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5','95%', '95%')\">" + d.field8 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5','95%', '95%')\">" + d.field7 + "</a>";
 					}else{
-						return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
+						return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
 					}
 				}}
-				,{field:'field9',align:'center',title:'超期已上报',templet:function(d){
+				,{field:'field8',align:'center',title:'超期已上报',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field9 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportDataZJList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field9=5','95%', '95%')\">" + d.field9 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5','95%', '95%')\">" + d.field8 + "</a>";
 					}else{
-						return "<span title='"+ d.field9 +"'>" +d.field9+ "</span>";
+						return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
 					}
 				}}
 			]]
@@ -201,15 +201,15 @@
 					,"smallDateType":"${reportFormList.smallDateType}"
 					,"statementDate":"${reportFormList.statementDate}"
 					,"officeName":"${reportFormList.officeName}"
-					,"field1":"${reportFormList.field1}"
-					,"field2":"${reportFormList.field2}"
 					,"field3":"${reportFormList.field3}"
-					,"field4":"${reportFormList.field4}"
+					,"field11":"${reportFormList.field11}"
+					,"field12":"${reportFormList.field12}"
 					,"field5":"${reportFormList.field5}"
 					,"field6":"${reportFormList.field6}"
+					,"field9":"${reportFormList.field9}"
+					,"field10":"${reportFormList.field10}"
 					,"field7":"${reportFormList.field7}"
 					,"field8":"${reportFormList.field8}"
-					,"field9":"${reportFormList.field9}"
 				}
 				</c:forEach>
 			]

src/main/webapp/webpage/modules/statement/projectReportList.jsp

@@ -370,10 +370,16 @@
 					<input id="grade" name="grade" type="hidden" value="${grade}"/>
 					<input id="recordState" name="recordState" type="hidden" value="${recordState}"/>
 					<input id="reportedState" name="reportedState" type="hidden" value="${reportedState}"/>
+					<input id="projectPaperFiling" name="projectPaperFiling" type="hidden" value="${projectPaperFiling}"/>
+					<input id="projectFlingBatchRelation" name="projectFlingBatchRelation" type="hidden" value="${projectFlingBatchRelation}"/>
 					<input id="field5" name="field5" type="hidden" value="${field5}"/>
 					<input id="field6" name="field6" type="hidden" value="${field6}"/>
 					<input id="field7" name="field7" type="hidden" value="${field7}"/>
 					<input id="field8" name="field8" type="hidden" value="${field8}"/>
+					<input id="field9" name="field9" type="hidden" value="${field9}"/>
+					<input id="field9" name="field10" type="hidden" value="${field10}"/>
+					<input id="field9" name="field11" type="hidden" value="${field11}"/>
+					<input id="field9" name="field12" type="hidden" value="${field12}"/>
 
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">