月报添加本月功能。

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

@@ -453,4 +453,12 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     RuralProjectRecords getMaterInfo(String id);
+
+
+    //公司级 查询项目超期信息（4种）
+    List<RuralProjectRecords> selectThisMonthReportPageOverdue(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
+
+    //公司级 查询项目超期信息的总条数
+    Integer selectThisMonthReportPageOverdueCount(@Param("ruralProjectRecords") RuralProjectRecords ruralProjectRecords, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
+
 }

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

@@ -1929,8 +1929,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         RuralProjectRecords record = ruralProjectRecordsService.get(projectReportRecord.getReport().getProject().getId());
 
         //启动流程操作
-        String title = "项目【"+ record.getProjectName()+"】归档待审批";
-        String str = "项目【"+ record.getProjectName()+"】归档待审批";
+        String title = "报告号：" + projectReportRecord.getReport().getNumber() + "。项目【"+ record.getProjectName()+"】归档待审批";
+        String str = "报告号：" + projectReportRecord.getReport().getNumber() + "。项目【"+ record.getProjectName()+"】归档待审批";
         // 用来设置启动流程的人员ID，引擎会自动把用户ID保存到activiti:initiator中
         identityService.setAuthenticatedUserId(user.getId());
         // 启动流程

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

@@ -4334,7 +4334,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 projectPaperFiling, String projectFlingBatchRelation) {
+													,String recordState,String reportedState,String year, String projectPaperFiling, String projectFlingBatchRelation,String isThisMonth) {
 		//将获取的datetype转为需要的具体时间   含年月日
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4351,6 +4351,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
 		projectRecords.setPage(page);
+		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+		}else{
+			projectRecords.getSqlMap().put("officeId", "");
+		}
+
 		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);
@@ -4404,10 +4411,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		return page;
 	}
 
-	//公司级：chaoqi项目报表详细
+	//公司级：超期项目报表详细
 	public Page<RuralProjectRecords> findReportPageOverdue(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-															String year,String bigDateType,String smallDateType) {
+															String year,String bigDateType,String smallDateType,String isThisMonth) {
 		if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getDepartmentLevel()) && "company".equals(statementCompanyComprehensiveInfo.getDepartmentLevel())){
 			bigDateType = "0";
 			statementCompanyComprehensiveInfo.setBigDateType("2");
@@ -4428,6 +4435,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
 		projectRecords.setPage(page);
+
+		String decisionValue = statementCompanyComprehensiveService.getOfficeListInfo(beginDate);
+		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
+		}else{
+			projectRecords.getSqlMap().put("officeId", "");
+		}
 		List<RuralProjectRecords> recordsList = dao.selectReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		int count = dao.selectReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		page.setPageNo(oldPageNo);
@@ -4445,6 +4460,47 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		return page;
 	}
 
+	//公司级：超期项目报表详细
+	public Page<RuralProjectRecords> findThisMonthReportPageOverdue(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
+														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
+															String year,String bigDateType,String smallDateType) {
+		if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getDepartmentLevel()) && "company".equals(statementCompanyComprehensiveInfo.getDepartmentLevel())){
+			bigDateType = "0";
+			statementCompanyComprehensiveInfo.setBigDateType("2");
+		}
+		//将获取的datetype转为需要的具体时间   含年月日
+		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
+		String beginDate = map.get("beginDate");
+		String endDate = map.get("endDate");
+		if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
+			//查询该选择节点下所有的部门Id
+			List<String> officeIdList = Lists.newArrayList();
+			officeIdList.add(projectRecords.getOffice().getId());
+			projectRecords.setOfficeIdList(officeIdList);
+		}
+		//为了方便后台 limit 的显示,将页面传入的page暂存
+		Integer oldPageNo = page.getPageNo();
+		if((page.getPageNo()-1) >= 0) {
+			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
+		}
+		projectRecords.setPage(page);
+		List<RuralProjectRecords> recordsList = dao.selectThisMonthReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
+		int count = dao.selectThisMonthReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
+		page.setPageNo(oldPageNo);
+		page.setCount(count);
+		page.setCountFlag(false);
+		//查询负责人信息
+		for (RuralProjectRecords records : recordsList) {
+			this.queryContractInfos(records);
+			List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
+			records.setProjectLeaders(users);
+			records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+			records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+		}
+		page.setList(recordsList);
+		return page;
+	}
+
 	//公司级：chaoqi项目报表详细 年度级
 	public Page<RuralProjectRecords> findReportPageOverdueByYear(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,

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

@@ -193,10 +193,10 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
         logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
         logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
+        //statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
         logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
         logger.info("-----------张静—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
+        // statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
         logger.info("------------张静—月度报表（结束）------------------");
         //}
 

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

@@ -108,6 +108,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
                             , @Param(value = "reportedState")String reportedState
                             , @Param(value = "projectPaperFiling")String projectPaperFiling
                             , @Param(value = "projectFlingBatchRelation")String projectFlingBatchRelation
+                            , @Param(value = "isThisMonth")String isThisMonth   //是否为本月数据（0：不是；1：是）
                             ,StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo){
 
         //每次都必须接收前端传参并放入model
@@ -133,6 +134,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("field15",statementCompanyComprehensiveInfo.getField15());
         model.addAttribute("field16",statementCompanyComprehensiveInfo.getField16());
         model.addAttribute("departmentLevel",statementCompanyComprehensiveInfo.getDepartmentLevel());
+        model.addAttribute("isThisMonth",isThisMonth);
 
         //这个是我删除的有需要可以补回，但是得注意projectRecords的submitmoney值
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
@@ -156,10 +158,15 @@ public class StatementCompanyComprehensiveController extends BaseController {
         //获取项目信息
         Page<RuralProjectRecords> page = new Page<RuralProjectRecords>();
         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);
+            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation,isThisMonth);
         }else{
             statementCompanyComprehensiveInfo.setType("1");
-            page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);
+            //判定是否是获取本月的数据信息，若是获取本月信息，则进入该方法进行处理，否则则正常走之前的方法
+            if(StringUtils.isNotBlank(isThisMonth) && "1".equals(isThisMonth)){
+                page = projectRecordsService.findThisMonthReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);
+            }else{
+                page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth);
+            }
         }
         //查询工程类型
         if (projectRecords.getEngineeringType()!=null){
@@ -183,6 +190,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             , @Param(value = "reportedState")String reportedState
             , @Param(value = "projectPaperFiling")String projectPaperFiling
             , @Param(value = "projectFlingBatchRelation")String projectFlingBatchRelation
+            , @Param(value = "isThisMonth")String isThisMonth
             ,StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo){
 
         //每次都必须接收前端传参并放入model
@@ -200,6 +208,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("field6",statementCompanyComprehensiveInfo.getField6());
         model.addAttribute("field7",statementCompanyComprehensiveInfo.getField7());
         model.addAttribute("field8",statementCompanyComprehensiveInfo.getField8());
+        model.addAttribute("isThisMonth",isThisMonth);
         statementCompanyComprehensiveInfo.setDepartmentLevel("company");
 
         //这个是我删除的有需要可以补回，但是得注意projectRecords的submitmoney值
@@ -224,7 +233,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         //获取项目信息
         Page<RuralProjectRecords> page = new Page<RuralProjectRecords>();
         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);
+            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation,isThisMonth);
         }else {
             statementCompanyComprehensiveInfo.setType("1");
             page = projectRecordsService.findReportPageOverdueByYear(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);
@@ -315,6 +324,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
     public String billingReportList(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model
                                 ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType
                                 ,@Param("newlyAdded") String newlyAdded,@Param("collectionThisMonth") String collectionThisMonth
+                                , @Param(value = "isThisMonth")String isThisMonth   //是否为本月数据（0：不是；1：是）
                                  , @Param(value = "year") String year) {
 
         //每次都必须接收前端传参并放入model
@@ -324,6 +334,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("year",year);
         model.addAttribute("newlyAdded",newlyAdded);
         model.addAttribute("collectionThisMonth",collectionThisMonth);
+        model.addAttribute("isThisMonth",isThisMonth);
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workInvoice.getToflag())){
@@ -342,7 +353,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             workInvoice.setAccountCheckingUserId(null);
         }
         //获取信息
-        Page<WorkInvoice> page = workInvoiceService.findBillingReportPage(new Page<WorkInvoice>(request, response), workInvoice, officeIdd,bigDateType,smallDateType,newlyAdded,collectionThisMonth,year);
+        Page<WorkInvoice> page = workInvoiceService.findBillingReportPage(new Page<WorkInvoice>(request, response), workInvoice, officeIdd,bigDateType,smallDateType,newlyAdded,collectionThisMonth,year,isThisMonth);
 
 
         String getSumMoney = workInvoiceService.getSumMoney(workInvoice);
@@ -379,6 +390,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
     @RequestMapping("reimbursementReportList")
     public String reimbursementReportList(WorkReimbursement workReimbursement, HttpServletRequest request, HttpServletResponse response, Model model
                                     ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType
+                                    , @Param(value = "isThisMonth")String isThisMonth   //是否为本月数据（0：不是；1：是）
                                     , @Param(value = "year") String year) {
 
         //每次都必须接收前端传参并放入model
@@ -386,6 +398,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("smallDateType",smallDateType);
         model.addAttribute("officeIdd",officeIdd);
         model.addAttribute("year",year);
+        model.addAttribute("isThisMonth",isThisMonth);
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workReimbursement.getToflag())){
@@ -400,7 +413,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         }
         //workReimbursement.setOfficeId(UserUtils.getSelectOffice().getId());
         //获取信息
-        Page<WorkReimbursement> page = workReimbursementService.findReimbursementReportPage(new Page<WorkReimbursement>(request, response), workReimbursement,officeIdd,bigDateType,smallDateType,year);
+        Page<WorkReimbursement> page = workReimbursementService.findReimbursementReportPage(new Page<WorkReimbursement>(request, response), workReimbursement,officeIdd,bigDateType,smallDateType,year,isThisMonth);
         List<WorkReimbursement> list = page.getList();
 
         //查询所有和当前登陆人有关的项目的审核
@@ -456,6 +469,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
     public String contractStatementList(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model
                      ,@Param("officeIdd") String officeIdd,@Param("bigDateType")String bigDateType,@Param("smallDateType")String smallDateType
                      ,@Param("contractRecordState")String contractRecordState, @Param(value = "year") String year
+                    , @Param(value = "isThisMonth")String isThisMonth   //是否为本月数据（0：不是；1：是）
                      ,@Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo) {
 
         //每次都必须接收前端传参并放入model
@@ -466,6 +480,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("contractRecordState",contractRecordState);
         model.addAttribute("field3",statementCompanyComprehensiveInfo.getField3());
         model.addAttribute("field4",statementCompanyComprehensiveInfo.getField4());
+        model.addAttribute("isThisMonth",isThisMonth);
 
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
@@ -489,7 +504,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             statementCompanyComprehensiveInfo.setType("4");
             page = workContractInfoService.findContractStatementPageOverdue(new Page<WorkContractInfo>(request, response), workContractInfo, statementCompanyComprehensiveInfo, bigDateType, smallDateType, year);
         }else {
-            page = workContractInfoService.findContractStatementPage(new Page<WorkContractInfo>(request, response), workContractInfo, officeIdd, bigDateType, smallDateType, contractRecordState, year);
+            page = workContractInfoService.findContractStatementPage(new Page<WorkContractInfo>(request, response), workContractInfo, officeIdd, bigDateType, smallDateType, contractRecordState, year,isThisMonth);
         }
         List<WorkContractInfo> list = page.getList();
 
@@ -1117,6 +1132,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             , @Param(value = "reportedState")String reportedState
             , @Param(value = "projectPaperFiling")String projectPaperFiling
             , @Param(value = "projectFlingBatchRelation")String projectFlingBatchRelation
+            , @Param(value = "isThisMonth")String isThisMonth
             ,StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo){
 
         //每次都必须接收前端传参并放入model
@@ -1137,6 +1153,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("field10",statementCompanyComprehensiveInfo.getField10());
         model.addAttribute("field11",statementCompanyComprehensiveInfo.getField11());
         model.addAttribute("field12",statementCompanyComprehensiveInfo.getField12());
+        model.addAttribute("isThisMonth",isThisMonth);
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }
@@ -1182,10 +1199,16 @@ public class StatementCompanyComprehensiveController extends BaseController {
         try {
             Page<RuralProjectRecords> page = new Page<RuralProjectRecords>();
             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, -1), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation);
+                page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response, -1), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation,isThisMonth);
             }else{
                 statementCompanyComprehensiveInfo.setType("1");
-                page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);
+                //判定是否是获取本月的数据信息，若是获取本月信息，则进入该方法进行处理，否则则正常走之前的方法
+                if(StringUtils.isNotBlank(isThisMonth) && "1".equals(isThisMonth)){
+                    page = projectRecordsService.findThisMonthReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType);
+                }else{
+                    page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth);
+                }
+                // page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth);
             }
             List<RuralProjectRecords> ruralProjectRecordsList = projectRecordsService.disposeProjectType(page.getList());
             new ExportExcel("数据一览表", RuralProjectRecordsExport.class).setDataList(ruralProjectRecordsList).write(response, fileName).dispose();

src/main/java/com/jeeplus/modules/statement/dao/StatementCompanyComprehensiveDao.java

@@ -25,7 +25,7 @@ public interface StatementCompanyComprehensiveDao  extends CrudDao<StatementComp
      * 查询项目相关的部门信息
      * @return
      */
-    List<Office> getOfficeListInfo();
+    List<Office> getOfficeListInfo(@Param("decisionValue")String decisionValue);
 
     /**
      * 根据部门id查询所有子部门信息

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -4022,7 +4022,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	}
 
 	//公司级：合同报表详细
-	public Page<WorkContractInfo> findContractStatementPage(Page<WorkContractInfo> page, WorkContractInfo workContractInfo,String officeId,String bigDateType,String smallDateType,String contractRecordState,String year) {
+	public Page<WorkContractInfo> findContractStatementPage(Page<WorkContractInfo> page, WorkContractInfo workContractInfo,String officeId,String bigDateType,String smallDateType,String contractRecordState,String year,String isThisMonth) {
 		//将获取的datetype转为需要的具体时间
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4040,6 +4040,12 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
 		workContractInfo.setPage(page);
+
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			workContractInfo.getSqlMap().put("officeId"," or parent_ids like concat('%',#{officeIdd},'%')");
+		}else{
+			workContractInfo.getSqlMap().put("officeId","");
+		}
 		int count = dao.findContractStatementPageCount(workContractInfo,officeId,beginDate,endDate,contractRecordState);
 		List<WorkContractInfo> list = dao.findContractStatementPage(workContractInfo,officeId,beginDate,endDate,contractRecordState);
 		page.setCount(count);

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1420,7 +1420,8 @@ public class WorkFullManageController extends BaseController {
 		}
 		//报告状态
 		String dataStatus=projectReportData.getStatus();
-		if (dataStatus.equals("5") && null != projectReportData.getAuditPassDate()){
+		System.out.println("dataStatus" + dataStatus);
+		if ((dataStatus.equals("5") || dataStatus.equals("7")) && null != projectReportData.getAuditPassDate()){
 			String ss = sdf.format(projectReportData.getAuditPassDate());
 			data.put("shenDate",ss);
 		}else{

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -2943,7 +2943,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 	}
 
 	//公司级：开票报表详细
-	public Page<WorkInvoice> findBillingReportPage(Page<WorkInvoice> page, WorkInvoice workInvoice,String officeId,String bigDateType,String smallDateType,String newlyAdded,String collectionThisMonth,String year) {
+	public Page<WorkInvoice> findBillingReportPage(Page<WorkInvoice> page, WorkInvoice workInvoice,String officeId,String bigDateType,String smallDateType,String newlyAdded,String collectionThisMonth,String year,String isThisMonth) {
 		//将获取的datetype转为需要的具体时间
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -2951,11 +2951,20 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 
 		if(StringUtils.isNotBlank(workInvoice.getOfficeId())){
 			//查询该选择节点下所有的部门Id
-			List<String> officeIdList = officeService.getChildrenOffice(workInvoice.getOfficeId());
+			List<String> officeIdList = Lists.newArrayList();
+			if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+				officeService.getChildrenOffice(workInvoice.getOfficeId());
+			}
 			officeIdList.add(workInvoice.getOfficeId());
 			workInvoice.setOfficeIdList(officeIdList);
 		}
 
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			workInvoice.getSqlMap().put("officeId"," or parent_ids like concat('%',#{officeIdd},'%')");
+		}else{
+			workInvoice.getSqlMap().put("officeId","");
+		}
+
 		//为了方便后台 limit 的显示,将页面传入的page暂存
 		Integer oldPageNo = page.getPageNo();
 		if((page.getPageNo()-1) >= 0) {

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -307,6 +307,7 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		if (user!=null && StringUtils.isNotBlank(user.getId())){
 			user = UserUtils.get(user.getId());
 			workProjectNotify.setOfficeId(user.getOffice().getId());
+			workProjectNotify.setCompanyId(user.getCompany().getId());
 		}
 		super.save(workProjectNotify);
 		if("待通知".equals(workProjectNotify.getRemarks()) && "2".equals(workProjectNotify.getStatus())){

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -7685,6 +7685,23 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取状态2（针对状态1进行精确所在指定季度或者月份）
 					String smallDateType = arguments[2];
 
+					Integer yearInt = new Integer(year);
+					Integer bigDateTypeInt = new Integer(bigDateType);
+					Integer smallDateTypeInt = new Integer(smallDateType);
+					if(yearInt >= 2023 ){
+						if(bigDateTypeInt == 2 ){
+							if(smallDateTypeInt > 3){
+								model.addAttribute("isThisMonth","1");//年度合同报表
+							}else{
+								model.addAttribute("isThisMonth","0");//年度合同报表
+							}
+						}else{
+							model.addAttribute("isThisMonth","0");//年度合同报表
+						}
+					}else{
+						model.addAttribute("isThisMonth","0");//年度合同报表
+					}
+
 
 					Map<String, List<StatementCompanyComprehensiveInfo>> stringListMap = statementCompanyComprehensiveService.viewList(year,bigDateType,smallDateType);
 					model.addAttribute("reportFormList1",stringListMap.get("reportFormList1"));//项目报表
@@ -7695,6 +7712,11 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("reportFormList6",stringListMap.get("reportFormList6"));//年度开票报表
 					model.addAttribute("reportFormList7",stringListMap.get("reportFormList7"));//年度报销报表
 					model.addAttribute("reportFormList8",stringListMap.get("reportFormList8"));//年度合同报表
+
+					model.addAttribute("reportFormList9",stringListMap.get("reportFormList9"));//当月项目报表
+					model.addAttribute("reportFormList10",stringListMap.get("reportFormList10"));//当月开票报表
+					model.addAttribute("reportFormList11",stringListMap.get("reportFormList11"));//当月报销报表
+					model.addAttribute("reportFormList12",stringListMap.get("reportFormList12"));//当月合同报表
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/statement/companyDataView";
 					}

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -1550,7 +1550,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
 
     //公司级：报销报表详细
-    public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType,String year) {
+    public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType,String year,String isThisMonth) {
         //将获取的datetype转为需要的具体时间
         Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
         String beginDate = map.get("beginDate");
@@ -1559,7 +1559,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         workReimbursement.setCreateBy(UserUtils.getUser());
         if(StringUtils.isNotBlank(workReimbursement.getOfficeId())){
             //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(workReimbursement.getOfficeId());
+            List<String> officeIdList = Lists.newArrayList();
+            if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+                officeIdList = officeService.getChildrenOffice(workReimbursement.getOfficeId());
+            }
             officeIdList.add(workReimbursement.getOfficeId());
             workReimbursement.setOfficeIdList(officeIdList);
         }
@@ -1567,7 +1570,11 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             //查询报销类型parentIds
             workReimbursement.setBusinessTypeParentIds(workReimbursement.getBusinessType()+",");
         }
-
+        if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+            workReimbursement.getSqlMap().put("officeId"," or parent_ids like concat('%',#{officeIdd},'%')");
+        }else{
+            workReimbursement.getSqlMap().put("officeId","");
+        }
         //为了方便后台 limit 的显示,将页面传入的page暂存
         Integer oldPageNo = page.getPageNo();
         if((page.getPageNo()-1) >= 0) {

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

@@ -2903,7 +2903,7 @@
 		<where>
 			a.del_flag=0
 		    and a.status = 5
-			and a.office_id in(select id  from sys_office where id = #{officeId} or parent_ids like concat('%',#{officeId},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeId} ${ruralProjectRecords.sqlMap.officeId})
 		    <if test="grade == '1'.toString() or grade == '2'.toString()">
 				and a.submit_money = #{grade}
 				and a.create_date >= #{beginDate}
@@ -3079,7 +3079,7 @@
 		<where>
 			a.del_flag=0
 			and a.status = 5
-			and a.office_id in(select id  from sys_office where id = #{officeId} or parent_ids like concat('%',#{officeId},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeId} ${ruralProjectRecords.sqlMap.officeId})
 			<if test="grade == '1'.toString() or grade == '2'.toString()">
 				and a.submit_money = #{grade}
 				and a.create_date >= #{beginDate}
@@ -3376,13 +3376,13 @@
 				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 a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 			</if>
 			<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 a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 				and prr.status = 7
 				and prr.del_flag = 0
 				and prr.accomplish_date >= #{beginDate}
@@ -3393,12 +3393,12 @@
 				and a.reported_state != 7
 				and a.reported_state != 10
 				and a.reported_state != 11
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 			</if>
 			<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 a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 				and rprr.report_status = 5
 				and rprr.del_flag = 0
 				and rprr.accomplish_date >= #{beginDate}
@@ -3586,13 +3586,13 @@
 				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 a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 			</if>
 			<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 a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 				and prr.status = 7
 				and prr.del_flag = 0
 				and prr.accomplish_date >= #{beginDate}
@@ -3603,12 +3603,12 @@
 				and a.reported_state != 7
 				and a.reported_state != 10
 				and a.reported_state != 11
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 			</if>
 			<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 a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
 				and rprr.report_status = 5
 				and rprr.del_flag = 0
 				and rprr.accomplish_date >= #{beginDate}
@@ -4716,6 +4716,7 @@
 			a.del_flag = 0
 			and a.submit_money = 2
 			and a.status = 5
+			and a.paper_filing_status != 10
 			and prd.status = 5
 			and (ppf.status is null or ppf.status = 1)
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
@@ -4746,6 +4747,7 @@
 			AND a.STATUS = 5
 			and (prd.status = 5 or prd.status = 7)
 			AND a.submit_money = 1
+			and a.paper_filing_status != 10
 			AND (pfp.STATUS IS NULL or (pfp.STATUS != 5 and pfp.STATUS != 7))
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
 			and (pmdrd.id is null or pmdrd.status = 1 or pmdrd.status = 2 or pmdrd.status = 3 or pmdrd.status = 4)
@@ -6023,4 +6025,428 @@ GROUP BY
 		where id = #{id}
 	</update>
 
+	<select id="selectThisMonthReportPageOverdue" resultType="RuralProjectRecords">
+		SELECT
+		<include refid="projectRecordsColumnss"/>
+		,a.record_state as "recordState"
+		,a.submit_money as "submitMoney"
+		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
+		,(case
+		when a.submit_money = '1' and prd.status = '5' then
+		'已完成'
+		when a.submit_money = '2' and prdt.status = '5' then
+		'已完成' else '未完成'
+		end) as completionStatus
+		,(case
+		when a.submit_money = '1' and pfp.status = '5' then
+		'已归档'
+		when a.submit_money = '2' and ppf.status = '5' then
+		'已归档' else '未归档'
+		end) as downArchiveStatus
+		,a.project_type as projectType,
+		wci.name AS "workContractInfo.name",
+		wci.contract_num as "workContractInfo.contractNum",
+		wci.contract_price as "workContractInfo.contractPrice",
+		sub.name as "projectMasterName",
+		sob.name as "projectMasterOffice",
+		wct.id AS "workContractInfo.client.id",
+		wct.name AS "workContractInfo.client.name",
+		o.top_company AS "office.name",
+		o.name AS "createByOffice",
+		ifnull(prd.number ,"") as "projectReportNumber"
+		,ifnull(prd.status,0) as "projectReportStatus"
+		,ifnull(prd.name,"") as "projectReportName"
+		<choose>
+			<when test="statementCompanyComprehensiveInfo.field5  != null and statementCompanyComprehensiveInfo.field5 == '5'.toString()">
+				,ifnull(prr.status,6) as "projectReportRecordStatus"
+			</when>
+			<otherwise>
+				<choose>
+					<when test="statementCompanyComprehensiveInfo.field6  != null and statementCompanyComprehensiveInfo.field6 == '5'.toString()">
+						,ifnull(prr.status,7) as "projectReportRecordStatus"
+					</when>
+					<otherwise>
+						,ifnull(prr.status,0) as "projectReportRecordStatus"
+					</otherwise>
+				</choose>
+			</otherwise>
+		</choose>
+		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
+		prrd.file_num as recodeNum,
+		prr.process_instance_id as prrProcessInstanceId,
+		prrd.process_instance_id as prrdProcessInstanceId
+		,prd.id as prdId
+		,prr.id as prrId
+		,prrd.id as prrdId
+		,prd.audit_pass_date as auditPassDate
+		,if(date_add(prd.audit_pass_date,interval #{ruralProjectRecords.endingCount} day) >now(),"0","1") as reportedType
+		,ifnull(rprr.report_status,0) as "reportStatus"
+		,ifnull(rprr.sync_status,0) as "syncStatus"
+		,ifnull(pas.status,0) as "approvalSignatureStatus"
+		,ifnull(pas.process_instance_id,"") as "approvalSignatureProcessInstanceId"
+		,ifnull(prs.status,0) as "reportSignatureStatus"
+		,ifnull(prs.process_instance_id,"") as "reportSignatureProcessInstanceId"
+		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
+		,ifnull(pmdr.status,0) as "defectRecordStatus"
+		,pmdr.process_instance_id as "pmdrProcessInstanceId"
+		,pmdr.id as pmdrId
+		,ifnull(ppf.status,0) as "paperFilingStatus"
+		,ppf.process_instance_id as "ppfProcessInstanceId"
+		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
+		,ifnull(prd.approval_fee ,"") as "approvalFee"
+		,ifnull(prd.review_fee ,"") as "reviewFee"
+		,ifnull(prd.verify_fee ,"") as "verifyFee"
+		,ifnull(prd.verify_rate ,"") as "verifyRate"
+		,prd.audit_pass_date as "reportAuditDate"
+		,prdt.audit_pass_date as "reportTwoAuditDate"
+		/*,SUM(wi.money) as "money"*/
+		,prd.ZiXunShouRu as "money"
+		,prd.signature_flag as "signatureFlag"
+		,prd.signature_contract_id as "signatureContractId"
+		,prd.signature_url as "signatureUrl"
+		,a.report_signature_flag as "reportSignatureFlag"
+		,a.report_signature_url as "reportSignatureUrl"
+		,a.report_signature_contract_id as "reportSignatureContractId"
+		,prsi.id as "prsiId"
+		,a.attachment_project_sort as "attachmentProjectSort"
+		,rprr.ZiXunBDE as "ziXunBDE"
+		FROM rural_project_records a
+		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>
+			a.status = 5
+			and a.del_flag = 0
+
+			<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})
+			</if>
+			<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})
+				and prr.status = 7
+				and prr.del_flag = 0
+				and prr.accomplish_date >= #{beginDate}
+				and prr.accomplish_date &lt;= #{endDate}
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
+				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+			</if>
+			<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})
+				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>
+		GROUP BY a.id
+		<choose>
+			<when test="ruralProjectRecords.page !=null and ruralProjectRecords.page.orderBy != null and ruralProjectRecords.page.orderBy != ''">
+				ORDER BY ${ruralProjectRecords.page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+		<if test="ruralProjectRecords.page.pageSize != -1">
+			limit ${ruralProjectRecords.page.pageNo},${ruralProjectRecords.page.pageSize}
+		</if>
+	</select>
+
+	<select id="selectThisMonthReportPageOverdueCount" resultType="integer">
+		select
+		count(DISTINCT a.id)
+		from rural_project_records a
+
+		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>
+			a.status = 5
+			and a.del_flag = 0
+			<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})
+			</if>
+			<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})
+				and prr.status = 7
+				and prr.del_flag = 0
+				and prr.accomplish_date >= #{beginDate}
+				and prr.accomplish_date &lt;= #{endDate}
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
+				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
+				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+			</if>
+			<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})
+				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>
+
+
+
+
 </mapper>

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

@@ -214,6 +214,11 @@
 	<select id="getOfficeListInfo" resultType="Office">
 		select o.id,o.name from statement_office_info a
 		left join sys_office o on o.id = a.office_id
+		<where>
+			<if test="decisionValue != null and decisionValue != ''">
+				a.decision_value = #{decisionValue}
+			</if>
+		</where>
 		ORDER BY o.code
 	</select>
 
@@ -228,7 +233,7 @@
 	<select id="getAllOfficeListInfo" resultType="Office">
 		select a.id,a.name from sys_office a
 		<where>
-			a.parent_id = 'ffe5af5b557e46f28b000c94716e228a'
+			a.parent_ids like concat ('%','ffe5af5b557e46f28b000c94716e228a','%') and a.id not in ('ee4e055e2f074aef934d283880983a38','5c38f1ce85224d74bd9d110ea6fab976','eb6879557ca8497fb18864eb7ac13809')
 			and a.del_flag = 0
 		</where>
 		ORDER BY a.code

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -1520,7 +1520,7 @@
 		<where>
 			a.del_flag=0
 			and a.contract_state = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${workContractInfo.sqlMap.officeId})
 
 			<choose>
 				<when test="contractRecordState == '5'.toString() ">
@@ -1613,7 +1613,7 @@
 		<where>
 			a.del_flag=0
 			and a.contract_state = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${workContractInfo.sqlMap.officeId})
 
 			<choose>
 				<when test="contractRecordState == '5'.toString() ">

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -2013,7 +2013,7 @@
 		<where>
 			a.del_flag=0
 			and a.invoice_state = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${WorkInvoice.sqlMap.officeId})
 			<if test="newlyAdded == '5'.toString() ">
 				and a.invoice_date >= #{beginDate}
 				and a.invoice_date &lt;= #{endDate}
@@ -2164,7 +2164,7 @@
 		<where>
 			a.del_flag=0
 			and a.invoice_state = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${WorkInvoice.sqlMap.officeId})
 			<if test="newlyAdded == '5'.toString() ">
 				and a.invoice_date >= #{beginDate}
 				and a.invoice_date &lt;= #{endDate}

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -539,7 +539,7 @@
 
 				 a.del_flag=0
 				and a.status = 5
-				and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+				and a.office_id in(select id  from sys_office where id = #{officeIdd} ${workReimbursement.sqlMap.officeId})
 				and a.accomplish_date >= #{beginDate}
 				and a.accomplish_date <= #{endDate}
 
@@ -636,7 +636,7 @@
 
 			a.del_flag=0
 			and a.status = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${workReimbursement.sqlMap.officeId})
 			and a.accomplish_date >= #{beginDate}
 			and a.accomplish_date <= #{endDate}
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -807,7 +807,7 @@
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
-					<div id="moresees" style="clear:both;display:none;" class="lw6">
+					<div id="moresees" style="clear:both;display:none;" class="form-group layui-row first lw12">
 
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">登记人：</label>
@@ -980,7 +980,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">质量复核：</label>
+							<label class="layui-form-label">质量复核时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportBeginDate" name="reportBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -993,7 +993,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告签发：</label>
+							<label class="layui-form-label">报告签发时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportTwoBeginDate" name="reportTwoBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportTwoBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1006,7 +1006,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">电子归档：</label>
+							<label class="layui-form-label">电子归档时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportRecordBeginDate" name="reportRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1019,7 +1019,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">纸质归档：</label>
+							<label class="layui-form-label">纸质归档时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="paperRecordBeginDate" name="paperRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1032,7 +1032,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">上报审核：</label>
+							<label class="layui-form-label">上报审核时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportedBeginDate" name="reportedBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportedBeginDate}" pattern="yyyy-MM-dd"/>"/>

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

@@ -516,6 +516,7 @@
 					<input id="smallDateType" name="smallDateType" type="hidden" value="${smallDateType}"/>
 					<input id="newlyAdded" name="newlyAdded" type="hidden" value="${newlyAdded}"/>
 					<input id="collectionThisMonth" name="collectionThisMonth" type="hidden" value="${collectionThisMonth}"/>
+					<input id="isThisMonth" name="isThisMonth" type="hidden" value="${isThisMonth}"/>
 
 				<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
 

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

@@ -554,6 +554,7 @@
 					<input id="contractRecordState" name="contractRecordState" type="hidden" value="${contractRecordState}"/>
 					<input id="field3" name="field3" type="hidden" value="${field3}"/>
 					<input id="field4" name="field4" type="hidden" value="${field4}"/>
+					<input id="isThisMonth" name="isThisMonth" type="hidden" value="${isThisMonth}"/>
 
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 				<div class="commonQuery lw7">

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

@@ -1002,7 +1002,7 @@
 				<div class="form-group-label"><h2>合同${nyr}报
 					<c:if test="${nyr eq '月'}">
 						<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-							<input type="radio" name="contract" value="contractMonthOne" checked="checked" lay-filter="contractMonth" id="contractMonthOne" checked title="当月">
+							<input type="radio" name="contract" value="contractMonthOne" lay-filter="contractMonth" id="contractMonthOne" checked title="当月">
 							<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="当年">
 
 						</div>

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

@@ -385,6 +385,7 @@
 					<input id="field14" name="field14" type="hidden" value="${field14}"/>
 					<input id="field15" name="field15" type="hidden" value="${field15}"/>
 					<input id="field16" name="field16" type="hidden" value="${field16}"/>
+					<input id="isThisMonth" name="isThisMonth" type="hidden" value="${isThisMonth}"/>
 
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">

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

@@ -97,6 +97,7 @@
                     <input id="year" name="year" type="hidden" value="${year}"/>
                     <input id="bigDateType" name="bigDateType" type="hidden" value="${bigDateType}"/>
                     <input id="smallDateType" name="smallDateType" type="hidden" value="${smallDateType}"/>
+                    <input id="isThisMonth" name="isThisMonth" type="hidden" value="${isThisMonth}"/>
 
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery">