Merge remote-tracking branch 'origin/master'

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

@@ -4757,7 +4757,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 isThisMonth) {
+													,String recordState,String reportedState,String year, String projectPaperFiling, String projectFlingBatchRelation,String isThisMonth,String officeName) {
 		//将获取的datetype转为需要的具体时间   含年月日
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4777,12 +4777,19 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		Office office = officeService.get(officeId);
 		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
 		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
-			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+			if (StringUtils.isNotEmpty(officeName) && (officeName.equals("工程一部")||officeName.equals("工程五部"))){
+				projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+			}
 		}else{
 			if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
 				projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
 			}else{
-				projectRecords.getSqlMap().put("officeId", "");
+				if (StringUtils.isNotEmpty(officeName) && (officeName.equals("工程一部")||officeName.equals("工程五部"))){
+					projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+				}else {
+					projectRecords.getSqlMap().put("officeId", "");
+				}
+
 			}
 		}
 
@@ -4842,7 +4849,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	//公司级：超期项目报表详细
 	public Page<RuralProjectRecords> findReportPageOverdue(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-															String year,String bigDateType,String smallDateType,String isThisMonth,String officeId) {
+															String year,String bigDateType,String smallDateType,String isThisMonth,String officeId,String officeName) {
 		if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getDepartmentLevel()) && "company".equals(statementCompanyComprehensiveInfo.getDepartmentLevel())){
 			bigDateType = "0";
 			statementCompanyComprehensiveInfo.setBigDateType("2");
@@ -4872,7 +4879,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}else{
 				statementCompanyComprehensiveInfo.setOfficeType("other");
 			}
-			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
+			if (StringUtils.isNotBlank(officeName) && (officeName.equals("工程一部")|| officeName.equals("工程五部"))){
+				projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
+			}
 		}else{
 			if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
 				projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
@@ -4901,7 +4910,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	//公司级：超期项目报表详细
 	public Page<RuralProjectRecords> findThisMonthReportPageOverdue(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-															String year,String bigDateType,String smallDateType,String officeId) {
+															String year,String bigDateType,String smallDateType,String officeId,String officeName) {
 		if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getDepartmentLevel()) && "company".equals(statementCompanyComprehensiveInfo.getDepartmentLevel())){
 			bigDateType = "0";
 			statementCompanyComprehensiveInfo.setBigDateType("2");
@@ -4928,7 +4937,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
 			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%','"+ office.getId() +"','%')");
 		}else{
-			projectRecords.getSqlMap().put("officeId", "");
+			if(StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+				projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
+			}else{
+				projectRecords.getSqlMap().put("officeId", "");
+			}
 		}
 
 		projectRecords.setPage(page);
@@ -4952,7 +4965,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	//公司级：chaoqi项目报表详细 年度级
 	public Page<RuralProjectRecords> findReportPageOverdueByYear(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-														   String year,String bigDateType,String smallDateType,String isThisMonth,String officeId) {
+														   String year,String bigDateType,String smallDateType,String isThisMonth,String officeId,String officeName) {
 		//将获取的datetype转为需要的具体时间   含年月日
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4978,7 +4991,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
 				projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%','"+ office.getId() +"','%')");
 			}else{
-				projectRecords.getSqlMap().put("officeId", "");
+				if (StringUtils.isNotBlank(officeName) && ("工程一部".equals(officeName) || "工程五部".equals(officeName))){
+					projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%','"+ office.getId() +"','%')");
+				}else {
+					projectRecords.getSqlMap().put("officeId", "");
+				}
+
 			}
 		}
 

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

@@ -135,6 +135,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("field16",statementCompanyComprehensiveInfo.getField16());
         model.addAttribute("departmentLevel",statementCompanyComprehensiveInfo.getDepartmentLevel());
         model.addAttribute("isThisMonth",isThisMonth);
+        model.addAttribute("officeName",statementCompanyComprehensiveInfo.getOfficeName());
 
         //这个是我删除的有需要可以补回，但是得注意projectRecords的submitmoney值
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
@@ -158,14 +159,14 @@ 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,isThisMonth);
+            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation,isThisMonth,statementCompanyComprehensiveInfo.getOfficeName());
         }else{
             statementCompanyComprehensiveInfo.setType("1");
             //判定是否是获取本月的数据信息，若是获取本月信息，则进入该方法进行处理，否则则正常走之前的方法
             if(StringUtils.isNotBlank(isThisMonth) && "1".equals(isThisMonth)){
-                page = projectRecordsService.findThisMonthReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,officeId);
+                page = projectRecordsService.findThisMonthReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,officeId,statementCompanyComprehensiveInfo.getOfficeName());
             }else{
-                page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth,officeId);
+                page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth,officeId,statementCompanyComprehensiveInfo.getOfficeName());
             }
         }
         //查询工程类型
@@ -209,6 +210,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("field7",statementCompanyComprehensiveInfo.getField7());
         model.addAttribute("field8",statementCompanyComprehensiveInfo.getField8());
         model.addAttribute("isThisMonth",isThisMonth);
+        model.addAttribute("officeName",statementCompanyComprehensiveInfo.getOfficeName());
         statementCompanyComprehensiveInfo.setDepartmentLevel("company");
 
         //这个是我删除的有需要可以补回，但是得注意projectRecords的submitmoney值
@@ -233,11 +235,11 @@ 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,isThisMonth);
+            page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation,isThisMonth,statementCompanyComprehensiveInfo.getOfficeName());
         }else {
             statementCompanyComprehensiveInfo.setType("1");
 
-            page = projectRecordsService.findReportPageOverdueByYear(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth, officeId);
+            page = projectRecordsService.findReportPageOverdueByYear(new Page<RuralProjectRecords>(request, response), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth, officeId,statementCompanyComprehensiveInfo.getOfficeName());
         }
         //查询工程类型
         if (projectRecords.getEngineeringType()!=null){
@@ -326,7 +328,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
                                 ,@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) {
+                                 , @Param(value = "year") String year, @Param(value = "officeName") String officeName) {
 
         //每次都必须接收前端传参并放入model
         model.addAttribute("bigDateType",bigDateType);
@@ -336,6 +338,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("newlyAdded",newlyAdded);
         model.addAttribute("collectionThisMonth",collectionThisMonth);
         model.addAttribute("isThisMonth",isThisMonth);
+        model.addAttribute("officeName",officeName);
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workInvoice.getToflag())){
@@ -354,7 +357,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,isThisMonth);
+        Page<WorkInvoice> page = workInvoiceService.findBillingReportPage(new Page<WorkInvoice>(request, response), workInvoice, officeIdd,bigDateType,smallDateType,newlyAdded,collectionThisMonth,year,isThisMonth,officeName);
 
 
         String getSumMoney = workInvoiceService.getSumMoney(workInvoice);
@@ -392,7 +395,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
     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) {
+                                    , @Param(value = "year") String year, @Param(value = "officeName") String officeName) {
 
         //每次都必须接收前端传参并放入model
         model.addAttribute("bigDateType",bigDateType);
@@ -400,6 +403,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("officeIdd",officeIdd);
         model.addAttribute("year",year);
         model.addAttribute("isThisMonth",isThisMonth);
+        model.addAttribute("officeName",officeName);
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workReimbursement.getToflag())){
@@ -414,7 +418,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,isThisMonth);
+        Page<WorkReimbursement> page = workReimbursementService.findReimbursementReportPage(new Page<WorkReimbursement>(request, response), workReimbursement,officeIdd,bigDateType,smallDateType,year,isThisMonth,officeName);
         List<WorkReimbursement> list = page.getList();
 
         //查询所有和当前登陆人有关的项目的审核
@@ -470,6 +474,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 = "officeName") String officeName
                     , @Param(value = "isThisMonth")String isThisMonth   //是否为本月数据（0：不是；1：是）
                      ,@Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo) {
 
@@ -482,6 +487,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("field3",statementCompanyComprehensiveInfo.getField3());
         model.addAttribute("field4",statementCompanyComprehensiveInfo.getField4());
         model.addAttribute("isThisMonth",isThisMonth);
+        model.addAttribute("officeName",officeName);
 
 
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
@@ -505,7 +511,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,isThisMonth);
+            page = workContractInfoService.findContractStatementPage(new Page<WorkContractInfo>(request, response), workContractInfo, officeIdd, bigDateType, smallDateType, contractRecordState, year,isThisMonth,officeName);
         }
         List<WorkContractInfo> list = page.getList();
 
@@ -1200,14 +1206,14 @@ 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,isThisMonth);
+                page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response, -1), projectRecords, officeId, grade, bigDateType, smallDateType, recordState, reportedState, year,projectPaperFiling,projectFlingBatchRelation,isThisMonth,statementCompanyComprehensiveInfo.getOfficeName());
             }else{
                 statementCompanyComprehensiveInfo.setType("1");
                 //判定是否是获取本月的数据信息，若是获取本月信息，则进入该方法进行处理，否则则正常走之前的方法
                 if(StringUtils.isNotBlank(isThisMonth) && "1".equals(isThisMonth)){
-                    page = projectRecordsService.findThisMonthReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,officeId);
+                    page = projectRecordsService.findThisMonthReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,officeId,statementCompanyComprehensiveInfo.getOfficeName());
                 }else{
-                    page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth,officeId);
+                    page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth,officeId,statementCompanyComprehensiveInfo.getOfficeName());
                 }
                 // page = projectRecordsService.findReportPageOverdue(new Page<RuralProjectRecords>(request, response, -1), projectRecords,statementCompanyComprehensiveInfo,year,bigDateType, smallDateType,isThisMonth);
             }

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -154,6 +155,12 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String kpnum3 = "0";
         String kpnum4 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList2){
+            if (info.getOfficeName().equals("工程五部")){
+                BigDecimal bd = new BigDecimal(info.getField2());
+                // 使用setScale方法进行四舍五入，保留两位小数
+                BigDecimal roundedBd = bd.setScale(2, RoundingMode.HALF_UP);
+                info.setField2(roundedBd.toString());
+            }
             //转BigDecimal 处理
             kpnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpnum1)).toString();
             kpnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpnum2)).toString();
@@ -216,7 +223,17 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         reportFormList4.add(htinfo);*/
 
         //公司级：项目报表总览 年度级
+        Office gcOneOffice = officeService.getByName("工程一部");
+        List<String> oneChildrenOffice = officeService.getChildrenOffice(gcOneOffice.getId());
+        Office gcFiveOffice = officeService.getByName("工程五部");
+        List<String> fiveChildrenOffice = officeService.getChildrenOffice(gcFiveOffice.getId());
+        Map<String, String> dateMap = this.getDateNew(Integer.parseInt(bigDateType), Integer.parseInt(smallDateType), Integer.parseInt(year));
+        //报表时间
+        String statementDate = dateMap.get("statementDate");
+
         //type:类型（1：项目；2：开票；3：报销；4：合同）
+        ArrayList<StatementCompanyComprehensiveInfo> xmOneYearList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> xmFiveYearList = new ArrayList<>();
         statementCompanyComprehensiveInfo.setType("1");
         statementCompanyComprehensiveInfo.setOfficeIdList(new ArrayList<>());
         List<StatementCompanyComprehensiveInfo> reportFormList5 = this.selectAllByTypeInYearReport(statementCompanyComprehensiveInfo);
@@ -238,6 +255,20 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String xmnumyear15 = "0";
         String xmnumyear16 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList5){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                xmOneYearList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                xmOneYearList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                xmFiveYearList.add(info);
+            }
             //转BigDecimal 处理   合计
             xmnumyear1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnumyear1)).toString();
             xmnumyear2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnumyear2)).toString();
@@ -276,8 +307,30 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         xmyearinfo.setField15(xmnumyear15);
         xmyearinfo.setField16(xmnumyear16);
         reportFormList5.add(xmyearinfo);
+        //将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo gcOneInfo = allCollect(xmOneYearList);
+        gcOneInfo.setOfficeId(gcOneOffice.getId());
+        gcOneInfo.setOfficeName(gcOneOffice.getName());
+        StatementCompanyComprehensiveInfo gcFiveInfo = allCollect(xmFiveYearList);
+        gcFiveInfo.setOfficeId(gcFiveOffice.getId());
+        gcFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList5.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList5.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList5.add(i+1,gcOneInfo);
+            }
+            if ("工程五部-王晓青团队".equals(info.getOfficeName())){
+                reportFormList5.add(i+1,gcFiveInfo);
+            }
+        }
+
 //        公司级报告年纪项目结束
         //公司级：开票报表开始
+        ArrayList<StatementCompanyComprehensiveInfo> kpOneYearList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> kpFiveYearList = new ArrayList<>();
         //类型（1：项目；2：开票；3：报销；4：合同）
         statementCompanyComprehensiveInfo.setType("2");
         statementCompanyComprehensiveInfo.setOfficeIdList(new ArrayList<>());
@@ -288,6 +341,20 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String kpyearnum3 = "0";
         String kpyearnum4 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList6){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                kpOneYearList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                kpOneYearList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                kpFiveYearList.add(info);
+            }
             //转BigDecimal 处理
             kpyearnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpyearnum1)).toString();
             kpyearnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpyearnum2)).toString();
@@ -302,8 +369,29 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         kpyearinfo.setField3(kpyearnum3);
         kpyearinfo.setField4(kpyearnum4);
         reportFormList6.add(kpyearinfo);
+        //将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo kpOneInfo = allCollect(kpOneYearList);
+        kpOneInfo.setOfficeId(gcOneOffice.getId());
+        kpOneInfo.setOfficeName(gcOneOffice.getName());
+        StatementCompanyComprehensiveInfo kpFiveInfo = allCollect(kpFiveYearList);
+        kpFiveInfo.setOfficeId(gcFiveOffice.getId());
+        kpFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList6.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList6.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList6.add(i+1,kpOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList6.add(i+1,kpFiveInfo);
+            }
+        }
 //        公司级开票报表结束
     //公司级：报销报表
+        ArrayList<StatementCompanyComprehensiveInfo> bxOneYearList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> bxFiveYearList = new ArrayList<>();
         //类型（1：项目；2：开票；3：报销；4：合同）
         statementCompanyComprehensiveInfo.setType("3");
         statementCompanyComprehensiveInfo.setOfficeIdList(new ArrayList<>());
@@ -312,6 +400,20 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String bxyearnum1 = "0";
         String bxyearnum2 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList7){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                bxOneYearList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                bxOneYearList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                bxFiveYearList.add(info);
+            }
             //转BigDecimal 处理
             bxyearnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxyearnum1)).toString();
             bxyearnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxyearnum2)).toString();
@@ -322,8 +424,30 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         bxyearinfo.setField1(bxyearnum1);
         bxyearinfo.setField2(bxyearnum2);
         reportFormList7.add(bxyearinfo);
+        //将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo bxOneInfo = allCollect(bxOneYearList);
+        bxOneInfo.setOfficeId(gcOneOffice.getId());
+        bxOneInfo.setOfficeName(gcOneOffice.getName());
+        StatementCompanyComprehensiveInfo bxFiveInfo = allCollect(bxFiveYearList);
+        bxFiveInfo.setOfficeId(gcFiveOffice.getId());
+        bxFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList7.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList7.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList7.add(i+1,bxOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList7.add(i+1,bxFiveInfo);
+            }
+        }
+
         //公司级：报销报表结束
         //公司级：合同报表
+        ArrayList<StatementCompanyComprehensiveInfo> htOneYearList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> htFiveYearList = new ArrayList<>();
         //类型（1：项目；2：开票；3：报销；4：合同）
         statementCompanyComprehensiveInfo.setType("4");
         statementCompanyComprehensiveInfo.setOfficeIdList(new ArrayList<>());
@@ -334,6 +458,20 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String htyearnum3 = "0";
         String htyearnum4 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList8){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                htOneYearList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                htOneYearList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                htFiveYearList.add(info);
+            }
             //转BigDecimal 处理
             htyearnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(htyearnum1)).toString();
             htyearnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(htyearnum2)).toString();
@@ -348,6 +486,26 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         htyearinfo.setField3(htyearnum3);
         htyearinfo.setField4(htyearnum4);
         reportFormList8.add(htyearinfo);
+
+        //将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo htOneInfo = allCollect(htOneYearList);
+        htOneInfo.setOfficeId(gcOneOffice.getId());
+        htOneInfo.setOfficeName(gcOneOffice.getName());
+        StatementCompanyComprehensiveInfo htFiveInfo = allCollect(htFiveYearList);
+        htFiveInfo.setOfficeId(gcFiveOffice.getId());
+        htFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList8.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList8.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList8.add(i+1,htOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList8.add(i+1,htFiveInfo);
+            }
+        }
         //公司级：合同报表结束
 
         //计算当月公司级报表数据（需动态获取数据信息）
@@ -383,6 +541,16 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         List<StatementCompanyComprehensiveInfo> reportFormList12 = thisStatementCompanyContract(year,bigDateType, month,officeList);
 
         //项目信息处理
+        ArrayList<StatementCompanyComprehensiveInfo> xmOneList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> xmFiveList = new ArrayList<>();
+        //修改工程一部及工程五部名称,新增汇总行
+        Office gcOneOffice = officeService.getByName("工程一部");
+        List<String> oneChildrenOffice = officeService.getChildrenOffice(gcOneOffice.getId());
+        Office gcFiveOffice = officeService.getByName("工程五部");
+        List<String> fiveChildrenOffice = officeService.getChildrenOffice(gcFiveOffice.getId());
+        Map<String, String> dateMap = this.getDateNew(bigDateType, month, year);
+        //报表时间
+        String statementDate = dateMap.get("statementDate");
         //项目表 各列合计
         String xmnum1 = "0";
         String xmnum2 = "0";
@@ -401,6 +569,20 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String xmnum15 = "0";
         String xmnum16 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList9){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                xmOneList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                xmOneList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                xmFiveList.add(info);
+            }
             //转BigDecimal 处理   合计
             xmnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnum1)).toString();
             xmnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnum2)).toString();
@@ -439,15 +621,51 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         xminfo.setField15(xmnum15);
         xminfo.setField16(xmnum16);
         reportFormList9.add(xminfo);
+//将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo gcOneInfo = allCollect(xmOneList);
+        gcOneInfo.setOfficeId(gcOneOffice.getId());
+        gcOneInfo.setOfficeName(gcOneOffice.getName());
+
+        StatementCompanyComprehensiveInfo gcFiveInfo = allCollect(xmFiveList);
+        gcFiveInfo.setOfficeId(gcFiveOffice.getId());
+        gcFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList9.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList9.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList9.add(i+1,gcOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList9.add(i+1,gcFiveInfo);
+            }
+        }
         map.put("reportFormList9",reportFormList9);
 
         //开票信息处理
+        ArrayList<StatementCompanyComprehensiveInfo> kpOneList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> kpFiveList = new ArrayList<>();
         //各列合计
         String kpnum1 = "0";
         String kpnum2 = "0";
         String kpnum3 = "0";
         String kpnum4 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList10){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                kpOneList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                kpOneList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                kpFiveList.add(info);
+            }
             //转BigDecimal 处理
             kpnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpnum1)).toString();
             kpnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpnum2)).toString();
@@ -462,13 +680,50 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         kpinfo.setField3(kpnum3);
         kpinfo.setField4(kpnum4);
         reportFormList10.add(kpinfo);
+//将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo kpOneInfo = allCollect(kpOneList);
+        kpOneInfo.setOfficeId(gcOneOffice.getId());
+        kpOneInfo.setOfficeName(gcOneOffice.getName());
+
+        StatementCompanyComprehensiveInfo kpFiveInfo = allCollect(kpFiveList);
+        kpFiveInfo.setOfficeId(gcFiveOffice.getId());
+        kpFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList10.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList10.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList10.add(i+1,kpOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList10.add(i+1,kpFiveInfo);
+            }
+        }
+
         map.put("reportFormList10",reportFormList10);
 
         //报销信息处理
+        ArrayList<StatementCompanyComprehensiveInfo> bxOneList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> bxFiveList = new ArrayList<>();
         //合计
         String bxnum1 = "0";
         String bxnum2 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList11){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                bxOneList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                bxOneList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                bxFiveList.add(info);
+            }
             //转BigDecimal 处理
             bxnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxnum1)).toString();
             bxnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxnum2)).toString();
@@ -479,15 +734,51 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         bxinfo.setField1(bxnum1);
         bxinfo.setField2(bxnum2);
         reportFormList11.add(bxinfo);
+//将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo bxOneInfo = allCollect(bxOneList);
+        bxOneInfo.setOfficeId(gcOneOffice.getId());
+        bxOneInfo.setOfficeName(gcOneOffice.getName());
+
+        StatementCompanyComprehensiveInfo bxFiveInfo = allCollect(bxFiveList);
+        bxFiveInfo.setOfficeId(gcFiveOffice.getId());
+        bxFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList11.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList11.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList11.add(i+1,bxOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList11.add(i+1,bxFiveInfo);
+            }
+        }
         map.put("reportFormList11",reportFormList11);
 
         //合同信息处理
+        ArrayList<StatementCompanyComprehensiveInfo> htOneList = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> htFiveList = new ArrayList<>();
         //合计
         String htnum1 = "0";
         String htnum2 = "0";
         String htnum3 = "0";
         String htnum4 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList12){
+            //将工程一部及子部门的数据添加到集合中
+            if (info.getOfficeId().equals(gcOneOffice.getId())){
+                info.setOfficeName("工程一部-本部");
+                htOneList.add(info);
+            }
+            if (oneChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程一部-"+info.getOfficeName());
+                htOneList.add(info);
+            }
+            //将工程五部的子部门信息添加到集合中
+            if (fiveChildrenOffice.contains(info.getOfficeId())){
+                info.setOfficeName("工程五部-"+info.getOfficeName());
+                htFiveList.add(info);
+            }
             //转BigDecimal 处理
             htnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(htnum1)).toString();
             htnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(htnum2)).toString();
@@ -502,11 +793,161 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         htinfo.setField3(htnum3);
         htinfo.setField4(htnum4);
         reportFormList12.add(htinfo);
+//将工程一部和工程五部汇总行插入到集合中
+        StatementCompanyComprehensiveInfo htOneInfo = allCollect(htOneList);
+        htOneInfo.setOfficeId(gcOneOffice.getId());
+        htOneInfo.setOfficeName(gcOneOffice.getName());
+
+        StatementCompanyComprehensiveInfo htFiveInfo = allCollect(htFiveList);
+        htFiveInfo.setOfficeId(gcFiveOffice.getId());
+        htFiveInfo.setOfficeName(gcFiveOffice.getName());
+
+
+        for (int i = 0; i < reportFormList12.size(); i++) {
+            StatementCompanyComprehensiveInfo info = reportFormList12.get(i);
+
+            if ("工程一部-苏州团队".equals(info.getOfficeName())){
+                reportFormList12.add(i+1,htOneInfo);
+            }
+            if ("工程五部-刘万前团队".equals(info.getOfficeName())){
+                reportFormList12.add(i+1,htFiveInfo);
+            }
+        }
         map.put("reportFormList12",reportFormList12);
 
         return map;
     }
 
+    public StatementCompanyComprehensiveInfo allCollect(List<StatementCompanyComprehensiveInfo> statementCompanyComprehensiveInfos){
+        //获取集合中的第一个,判断汇总的类型
+        StatementCompanyComprehensiveInfo comprehensiveInfo = statementCompanyComprehensiveInfos.get(0);
+        StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
+        switch (comprehensiveInfo.getType()){
+            case "1":
+                String xmnum1 = "0";
+                String xmnum2 = "0";
+                String xmnum3 = "0";
+                String xmnum4 = "0";
+                String xmnum5 = "0";
+                String xmnum6 = "0";
+                String xmnum7 = "0";
+                String xmnum8 = "0";
+                String xmnum9 = "0";
+                String xmnum10 = "0";
+                String xmnum11 = "0";
+                String xmnum12 = "0";
+                String xmnum13 = "0";
+                String xmnum14 = "0";
+                String xmnum15 = "0";
+                String xmnum16 = "0";
+                for (StatementCompanyComprehensiveInfo info : statementCompanyComprehensiveInfos) {
+                    //转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();
+                    xmnum10 = new BigDecimal(info.getField10()).add(new BigDecimal(xmnum10)).toString();
+                    xmnum11 = new BigDecimal(info.getField11()).add(new BigDecimal(xmnum11)).toString();
+                    xmnum12 = new BigDecimal(info.getField12()).add(new BigDecimal(xmnum12)).toString();
+                    xmnum13 = new BigDecimal(info.getField13()).add(new BigDecimal(xmnum13)).toString();
+                    xmnum14 = new BigDecimal(info.getField14()).add(new BigDecimal(xmnum14)).toString();
+                    xmnum15 = new BigDecimal(info.getField15()).add(new BigDecimal(xmnum15)).toString();
+                    xmnum16 = new BigDecimal(info.getField16()).add(new BigDecimal(xmnum16)).toString();
+                }
+                //存放到对应报表的list集合，方便页面集合展示
+                xminfo.setField1(xmnum1);
+                xminfo.setField2(xmnum2);
+                xminfo.setField3(xmnum3);
+                xminfo.setField4(xmnum4);
+                xminfo.setField5(xmnum5);
+                xminfo.setField6(xmnum6);
+                xminfo.setField7(xmnum7);
+                xminfo.setField8(xmnum8);
+                xminfo.setField9(xmnum9);
+                xminfo.setField10(xmnum10);
+                xminfo.setField11(xmnum11);
+                xminfo.setField12(xmnum12);
+                xminfo.setField13(xmnum13);
+                xminfo.setField14(xmnum14);
+                xminfo.setField15(xmnum15);
+                xminfo.setField16(xmnum16);
+                xminfo.setType(comprehensiveInfo.getType());
+                xminfo.setYear(comprehensiveInfo.getYear());
+                xminfo.setBigDateType(comprehensiveInfo.getBigDateType());
+                xminfo.setSmallDateType(comprehensiveInfo.getSmallDateType());
+                xminfo.setStatementDate(comprehensiveInfo.getStatementDate());
+                break;
+            case "2":
+                String kpnum1 = "0";
+                String kpnum2 = "0";
+                String kpnum3 = "0";
+                String kpnum4 = "0";
+                for(StatementCompanyComprehensiveInfo info:statementCompanyComprehensiveInfos){
+                    //转BigDecimal 处理
+                    kpnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpnum1)).toString();
+                    kpnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(kpnum2)).toString();
+                    kpnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(kpnum3)).toString();
+                    kpnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(kpnum4)).toString();
+                }
+                xminfo.setField1(kpnum1);
+                xminfo.setField2(kpnum2);
+                xminfo.setField3(kpnum3);
+                xminfo.setField4(kpnum4);
+                xminfo.setType(comprehensiveInfo.getType());
+                xminfo.setYear(comprehensiveInfo.getYear());
+                xminfo.setBigDateType(comprehensiveInfo.getBigDateType());
+                xminfo.setSmallDateType(comprehensiveInfo.getSmallDateType());
+                xminfo.setStatementDate(comprehensiveInfo.getStatementDate());
+                break;
+            case "3":
+                String bxnum1 = "0";
+                String bxnum2 = "0";
+                for(StatementCompanyComprehensiveInfo info:statementCompanyComprehensiveInfos){
+                    //转BigDecimal 处理
+                    bxnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxnum1)).toString();
+                    bxnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxnum2)).toString();
+                }
+                xminfo.setField1(bxnum1);
+                xminfo.setField2(bxnum2);
+                xminfo.setType(comprehensiveInfo.getType());
+                xminfo.setYear(comprehensiveInfo.getYear());
+                xminfo.setBigDateType(comprehensiveInfo.getBigDateType());
+                xminfo.setSmallDateType(comprehensiveInfo.getSmallDateType());
+                xminfo.setStatementDate(comprehensiveInfo.getStatementDate());
+                break;
+            case "4":
+                String htnum1 = "0";
+                String htnum2 = "0";
+                String htnum3 = "0";
+                String htnum4 = "0";
+                for(StatementCompanyComprehensiveInfo info:statementCompanyComprehensiveInfos){
+                    //转BigDecimal 处理
+                    htnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(htnum1)).toString();
+                    htnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(htnum2)).toString();
+                    htnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(htnum3)).toString();
+                    htnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(htnum4)).toString();
+                }
+                xminfo.setField1(htnum1);
+                xminfo.setField2(htnum2);
+                xminfo.setField3(htnum3);
+                xminfo.setField4(htnum4);
+                xminfo.setType(comprehensiveInfo.getType());
+                xminfo.setYear(comprehensiveInfo.getYear());
+                xminfo.setBigDateType(comprehensiveInfo.getBigDateType());
+                xminfo.setSmallDateType(comprehensiveInfo.getSmallDateType());
+                xminfo.setStatementDate(comprehensiveInfo.getStatementDate());
+                break;
+        }
+        return xminfo;
+    }
+
+
+
     /**
      * 公司级信息处理
      * @param bigDateType 状态1（0：年；1：季度；2：月份）
@@ -3968,17 +4409,17 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
                     statementCompanyComprehensiveInfo.setOfficeId(office.getId());
                     statementCompanyComprehensiveInfo.setOfficeName(office.getName());
 
-                    Boolean insertFlag = true;
-                    for(int i= 0;i< list.size(); i++){
-                        StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo1 = list.get(i);
-                        if("工程四部".equals(statementCompanyComprehensiveInfo1.getOfficeName())){
-                            list.add(i+1,statementCompanyComprehensiveInfo);
-                            insertFlag = false;
-                        }
-                    }
-                    if(insertFlag){
-                        list.add(statementCompanyComprehensiveInfo);
-                    }
+//                    Boolean insertFlag = true;
+//                    for(int i= 0;i< list.size(); i++){
+//                        StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo1 = list.get(i);
+//                        if("工程四部".equals(statementCompanyComprehensiveInfo1.getOfficeName())){
+//                            list.add(i+1,statementCompanyComprehensiveInfo);
+//                            insertFlag = false;
+//                        }
+//                    }
+//                    if(insertFlag){
+//                        list.add(statementCompanyComprehensiveInfo);
+//                    }
                 }
             }
 
@@ -4013,13 +4454,41 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
                 statementCompanyComprehensiveInfo.setOfficeId(office.getId());
                 statementCompanyComprehensiveInfo.setOfficeName(office.getName());
 
+
+                Office office1 = officeService.getByName("工程一部");
+                List<String> childrenOffice = officeService.getChildrenOffice(office1.getId());
+
                 Boolean insertFlag = true;
                 for(int i= 0;i< list.size(); i++){
                     StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo1 = list.get(i);
-                    if("工程四部".equals(statementCompanyComprehensiveInfo1.getOfficeName())){
+                    if("刘万前团队".equals(statementCompanyComprehensiveInfo1.getOfficeName())){
                         list.add(i+1,statementCompanyComprehensiveInfo);
                         insertFlag = false;
                     }
+                    //修改部门名称
+                    if (statementCompanyComprehensiveInfo1.getOfficeId().equals(office1.getId())){
+                        statementCompanyComprehensiveInfo1.setOfficeName("工程一部-本部");
+                    }
+                    //一部子部门
+
+                    if (childrenOffice.contains(statementCompanyComprehensiveInfo1.getOfficeId())){
+                        String name = "工程一部-"+statementCompanyComprehensiveInfo1.getOfficeName();
+                        statementCompanyComprehensiveInfo1.setOfficeName(name);
+                    }
+                    //五部子部门
+                    if (info.getOfficeIdList().contains(statementCompanyComprehensiveInfo1.getOfficeId())){
+                        String name = "工程五部-"+statementCompanyComprehensiveInfo1.getOfficeName();
+                        statementCompanyComprehensiveInfo1.setOfficeName(name);
+                    }
+
+                }
+                //将一部的汇总行插入到列表中
+                StatementCompanyComprehensiveInfo gcOneCollect=gcCollect(info,statementDate);
+                for(int i= 0;i< list.size(); i++) {
+                    StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo1 = list.get(i);
+                    if ("工程一部-苏州团队".equals(statementCompanyComprehensiveInfo1.getOfficeName())) {
+                        list.add(i + 1, gcOneCollect);
+                    }
                 }
                 if(insertFlag){
                     list.add(statementCompanyComprehensiveInfo);
@@ -4029,6 +4498,36 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         return list;
     }
 
+
+    public StatementCompanyComprehensiveInfo gcCollect(StatementCompanyComprehensiveInfo info,String statementDate){
+
+        //将工程一部及子部门的名称修改并加入汇总行
+        //工程一部及子部门
+        info.setOfficeIdList(null);
+        List<Office> officeOneList = dao.getAllWBChildrenOfficeListInfo("工程一部");
+        Office office1 = officeService.getByName("工程一部");
+        officeOneList.add(office1);
+        List<String> officeId1 = Lists.newArrayList();
+        //获取所有子集节点，并遍历子集节点计算出所有数据信息
+        for (Office officeInfo : officeOneList) {
+            officeId1.add(officeInfo.getId());
+            info.setOfficeIdList(officeId1);
+        }
+        StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo = dao.selectAllWbByType(info);
+        statementCompanyComprehensiveInfo.setYear(info.getYear());
+        statementCompanyComprehensiveInfo.setType(info.getType());
+        statementCompanyComprehensiveInfo.setBigDateType(info.getBigDateType());
+        statementCompanyComprehensiveInfo.setSmallDateType(info.getSmallDateType());
+        statementCompanyComprehensiveInfo.setStatementDate(statementDate);
+        Office office = officeService.getByName("工程一部");
+        statementCompanyComprehensiveInfo.setOfficeId(office.getId());
+        statementCompanyComprehensiveInfo.setOfficeName(office.getName());
+
+        return statementCompanyComprehensiveInfo;
+    }
+
+
+
 //根据公司级报告查询所有的表内容
     public List<StatementCompanyComprehensiveInfo> selectAllByTypeInYearReport(StatementCompanyComprehensiveInfo info){
         info.setBigDateType("0");
@@ -4412,6 +4911,14 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         //type:类型（1：项目；2：开票；3：报销；4：合同）
         statementCompanyComprehensiveInfo.setType("1");
         List<StatementCompanyComprehensiveInfo> reportFormList1 = dao.selectReportAllByType(statementCompanyComprehensiveInfo);
+        //查询工程一部和工程五部的部门信息及子部门
+        Office office = officeService.getByName("工程一部");
+        List<String> childrenOffice = officeService.getChildrenOffice(office.getId());
+        Office office2 = officeService.getByName("工程五部");
+        List<String> childrenOffice2 = officeService.getChildrenOffice(office2.getId());
+        //存放工程一部和工程五部的集合
+        ArrayList<StatementCompanyComprehensiveInfo> gcOne = new ArrayList<>();
+        ArrayList<StatementCompanyComprehensiveInfo> gcFive = new ArrayList<>();
         //项目表 各列合计
         String xmnum1 = "0";
         String xmnum2 = "0";
@@ -4430,6 +4937,27 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         String xmnum15 = "0";
         String xmnum16 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList1){
+            /*
+            添加一部与五部的汇总行及修改部门名称
+             */
+            //一部本部名称
+            if (info.getOfficeId().equals(office.getId())){
+                info.setOfficeName("工程一部-本部");
+                gcOne.add(info);
+            }
+            //一部子部门
+            if (childrenOffice.contains(info.getOfficeId())){
+                String name = office.getName()+"-"+info.getOfficeName();
+                info.setOfficeName(name);
+                gcOne.add(info);
+            }
+            //五部子部门
+            if (childrenOffice2.contains(info.getOfficeId())){
+                String name = office2.getName()+"-"+info.getOfficeName();
+                info.setOfficeName(name);
+                gcFive.add(info);
+            }
+
             //转BigDecimal 处理   合计
             xmnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnum1)).toString();
             xmnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnum2)).toString();
@@ -4448,6 +4976,33 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             xmnum15 = new BigDecimal(info.getField15()).add(new BigDecimal(xmnum15)).toString();
             xmnum16 = new BigDecimal(info.getField16()).add(new BigDecimal(xmnum16)).toString();
         }
+        //生成工程一部和工程五部的汇总行
+        StatementCompanyComprehensiveInfo gcOneInfo = dataCollect(gcOne,office);
+        StatementCompanyComprehensiveInfo gcFiveInfo = dataCollect(gcFive,office2);
+        //将汇总行插入到列表中
+        Integer count = 0;
+        Integer count1 = 0;
+        for (int i = 0; i < reportFormList1.size(); i++) {
+
+            StatementCompanyComprehensiveInfo info = reportFormList1.get(i);
+            //一部汇总
+            if (childrenOffice.contains(info.getOfficeId())){
+                count++;
+                if (childrenOffice.size() == count){
+                    reportFormList1.add(i+1,gcOneInfo);
+                }
+            }
+
+            //五部汇总
+            if (childrenOffice2.contains(info.getOfficeId())){
+                count1++;
+                if (childrenOffice2.size() == count1){
+                    reportFormList1.add(i+1,gcFiveInfo);
+                }
+            }
+
+        }
+
         //存放到对应报表的list集合，方便页面集合展示
         StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
         xminfo.setOfficeName("本"+nyr+"合计");
@@ -4474,6 +5029,129 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
 
 
     /**
+     * 工程一部,工程五部的汇总行处理
+     */
+    public StatementCompanyComprehensiveInfo dataCollect(List<StatementCompanyComprehensiveInfo> dataInfo, Office office){
+        //项目表 各列合计
+        String xmnum1 = "0";
+        String xmnum2 = "0";
+        String xmnum3 = "0";
+        String xmnum4 = "0";
+        String xmnum5 = "0";
+        String xmnum6 = "0";
+        String xmnum7 = "0";
+        String xmnum8 = "0";
+        String xmnum9 = "0";
+        String xmnum10 = "0";
+        String xmnum11 = "0";
+        String xmnum12 = "0";
+        String xmnum13 = "0";
+        String xmnum14 = "0";
+        String xmnum15 = "0";
+        String xmnum16 = "0";
+        //判定当前是哪个部门
+        Office office1 = officeService.get(office.getId());
+        StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
+        //工程一部汇总行
+        if (office1.getName().equals("工程一部")){
+            for (StatementCompanyComprehensiveInfo info : dataInfo) {
+                //转BigDecimal 处理   合计
+                xminfo.setYear(info.getYear());
+                xminfo.setType(info.getType());
+                xminfo.setBigDateType(info.getBigDateType());
+                xminfo.setSmallDateType(info.getSmallDateType());
+                xminfo.setStatementDate(info.getStatementDate());
+                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();
+                xmnum10 = new BigDecimal(info.getField10()).add(new BigDecimal(xmnum10)).toString();
+                xmnum11 = new BigDecimal(info.getField11()).add(new BigDecimal(xmnum11)).toString();
+                xmnum12 = new BigDecimal(info.getField12()).add(new BigDecimal(xmnum12)).toString();
+                xmnum13 = new BigDecimal(info.getField13()).add(new BigDecimal(xmnum13)).toString();
+                xmnum14 = new BigDecimal(info.getField14()).add(new BigDecimal(xmnum14)).toString();
+                xmnum15 = new BigDecimal(info.getField15()).add(new BigDecimal(xmnum15)).toString();
+                xmnum16 = new BigDecimal(info.getField16()).add(new BigDecimal(xmnum16)).toString();
+            }
+            //存放到对应报表的list集合，方便页面集合展示
+            xminfo.setOfficeId(office.getId());
+            xminfo.setOfficeName("工程一部");
+
+            xminfo.setField1(xmnum1);
+            xminfo.setField2(xmnum2);
+            xminfo.setField3(xmnum3);
+            xminfo.setField4(xmnum4);
+            xminfo.setField5(xmnum5);
+            xminfo.setField6(xmnum6);
+            xminfo.setField7(xmnum7);
+            xminfo.setField8(xmnum8);
+            xminfo.setField9(xmnum9);
+            xminfo.setField10(xmnum10);
+            xminfo.setField11(xmnum11);
+            xminfo.setField12(xmnum12);
+            xminfo.setField13(xmnum13);
+            xminfo.setField14(xmnum14);
+            xminfo.setField15(xmnum15);
+            xminfo.setField16(xmnum16);
+        }
+        //工程五部汇总行
+        if (office1.getName().equals("工程五部")){
+            for (StatementCompanyComprehensiveInfo info : dataInfo) {
+                //转BigDecimal 处理   合计
+                xminfo.setYear(info.getYear());
+                xminfo.setType(info.getType());
+                xminfo.setBigDateType(info.getBigDateType());
+                xminfo.setSmallDateType(info.getSmallDateType());
+                xminfo.setStatementDate(info.getStatementDate());
+                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();
+                xmnum10 = new BigDecimal(info.getField10()).add(new BigDecimal(xmnum10)).toString();
+                xmnum11 = new BigDecimal(info.getField11()).add(new BigDecimal(xmnum11)).toString();
+                xmnum12 = new BigDecimal(info.getField12()).add(new BigDecimal(xmnum12)).toString();
+                xmnum13 = new BigDecimal(info.getField13()).add(new BigDecimal(xmnum13)).toString();
+                xmnum14 = new BigDecimal(info.getField14()).add(new BigDecimal(xmnum14)).toString();
+                xmnum15 = new BigDecimal(info.getField15()).add(new BigDecimal(xmnum15)).toString();
+                xmnum16 = new BigDecimal(info.getField16()).add(new BigDecimal(xmnum16)).toString();
+            }
+            //存放到对应报表的list集合，方便页面集合展示
+            xminfo.setOfficeId(office.getId());
+            xminfo.setOfficeName("工程五部");
+            xminfo.setField1(xmnum1);
+            xminfo.setField2(xmnum2);
+            xminfo.setField3(xmnum3);
+            xminfo.setField4(xmnum4);
+            xminfo.setField5(xmnum5);
+            xminfo.setField6(xmnum6);
+            xminfo.setField7(xmnum7);
+            xminfo.setField8(xmnum8);
+            xminfo.setField9(xmnum9);
+            xminfo.setField10(xmnum10);
+            xminfo.setField11(xmnum11);
+            xminfo.setField12(xmnum12);
+            xminfo.setField13(xmnum13);
+            xminfo.setField14(xmnum14);
+            xminfo.setField15(xmnum15);
+            xminfo.setField16(xmnum16);
+        }
+
+
+        return xminfo;
+    }
+
+
+    /**
      * 部门级信息处理
      * @param bigDateType 状态1（0：年；1：季度；2：月份）
      * @param smallDateType 状态2（针对状态1进行精确所在指定季度或者月份）

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

@@ -4031,7 +4031,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,String isThisMonth) {
+	public Page<WorkContractInfo> findContractStatementPage(Page<WorkContractInfo> page, WorkContractInfo workContractInfo,String officeId,String bigDateType,String smallDateType,String contractRecordState,String year,String isThisMonth,String officeName) {
 		//将获取的datetype转为需要的具体时间
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4053,12 +4053,21 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		Office office = officeService.get(officeId);
 		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
 		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
-			workContractInfo.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+			if (StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+				workContractInfo.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+			}else {
+				workContractInfo.getSqlMap().put("officeId", "");
+			}
 		}else{
 			if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
 				workContractInfo.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
 			}else{
-				workContractInfo.getSqlMap().put("officeId", "");
+				if (StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+					workContractInfo.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+				}else {
+					workContractInfo.getSqlMap().put("officeId", "");
+				}
+
 			}
 		}
 

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

@@ -3626,7 +3626,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,String isThisMonth) {
+	public Page<WorkInvoice> findBillingReportPage(Page<WorkInvoice> page, WorkInvoice workInvoice,String officeId,String bigDateType,String smallDateType,String newlyAdded,String collectionThisMonth,String year,String isThisMonth,String officeName) {
 		//将获取的datetype转为需要的具体时间
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -3651,12 +3651,21 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		Office office = officeService.get(officeId);
 		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
 		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
-			workInvoice.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+			if(org.apache.commons.lang3.StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+				workInvoice.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+			}else{
+				workInvoice.getSqlMap().put("officeId", "");
+			}
 		}else{
 			if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
 				workInvoice.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
 			}else{
-				workInvoice.getSqlMap().put("officeId", "");
+				if(org.apache.commons.lang3.StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+					workInvoice.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+				}else{
+					workInvoice.getSqlMap().put("officeId", "");
+				}
+
 			}
 		}
 

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

@@ -1654,7 +1654,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
 
     //公司级：报销报表详细
-    public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType,String year,String isThisMonth) {
+    public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType,String year,String isThisMonth,String officeName) {
         //将获取的datetype转为需要的具体时间
         Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
         String beginDate = map.get("beginDate");
@@ -1684,12 +1684,21 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         Office office = officeService.get(officeId);
         //如果访问的是2023年4月份之后的月报信息，则获取新的office信息
         if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
-            workReimbursement.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+            if(org.apache.commons.lang3.StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+                workReimbursement.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+            }else{
+                workReimbursement.getSqlMap().put("officeId", "");
+            }
         }else{
             if(null != office && StringUtils.isNotBlank(office.getName()) && office.getName().equals("工程五部")){
                 workReimbursement.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
             }else{
-                workReimbursement.getSqlMap().put("officeId", "");
+                if(org.apache.commons.lang3.StringUtils.isNotBlank(officeName) && (officeName.equals("工程五部") || officeName.equals("工程一部"))){
+                    workReimbursement.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+                }else{
+                    workReimbursement.getSqlMap().put("officeId", "");
+                }
+
             }
         }
 

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

@@ -3498,9 +3498,7 @@
 			</if>
 
 			<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
-				<if test="statementCompanyComprehensiveInfo.officeType != null and statementCompanyComprehensiveInfo.officeType !='gcwb'">
-					and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
-				</if>
+					and sdi.office_id in (select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} ${ruralProjectRecords.sqlMap.officeId})
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
 				and pmdr.id is null
@@ -3548,13 +3546,17 @@
 				AND a.paper_filing_status != '10'
 				AND a.paper_filing_status != '11'
 				and a.over_paper_filing_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
+				</if>
 				and pmdr.id is null
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field14 == '5'.toString() ">
 				and a.submit_money = 2
 				and a.paper_filing_status = 7
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
+				</if>
 				and ppf.status = 7
 				and ppf.del_flag = 0
 				and ppf.audit_pass_date >= #{beginDate}
@@ -3743,9 +3745,7 @@
 			</if>
 
 			<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
-				<if test="statementCompanyComprehensiveInfo.officeType != null and statementCompanyComprehensiveInfo.officeType !='gcwb'">
-					and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
-				</if>
+					and sdi.office_id in (select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} ${ruralProjectRecords.sqlMap.officeId})
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
 				and pmdr.id is null
@@ -3792,13 +3792,17 @@
 				AND a.paper_filing_status != '10'
 				AND a.paper_filing_status != '11'
 				and a.over_paper_filing_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
+				</if>
 				and pmdr.id is null
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field14 == '5'.toString() ">
 				and a.submit_money = 2
 				and a.paper_filing_status = 7
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId}  ${ruralProjectRecords.sqlMap.officeId})
+				</if>
 				and ppf.status = 7
 				and ppf.del_flag = 0
 				and ppf.audit_pass_date >= #{beginDate}

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

@@ -1623,12 +1623,12 @@
 			and a.year = #{year}
 			and a.small_date_type = #{smallDateType}
 
-			<if test="officeIdList!=null and officeIdList.size!=0">
-			and a.office_id not in
-			<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
-				#{officeId}
-			</foreach>
-			</if>
+<!--			<if test="officeIdList!=null and officeIdList.size!=0">-->
+<!--			and a.office_id not in-->
+<!--			<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">-->
+<!--				#{officeId}-->
+<!--			</foreach>-->
+<!--			</if>-->
 		</where>
 	</select>
 
@@ -1705,12 +1705,12 @@
 			and a.year = #{year}
 			and a.small_date_type = #{smallDateType}
 
-			<if test="officeIdList!=null and officeIdList.size!=0">
-				and a.office_id not in
-				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
-					#{officeId}
-				</foreach>
-			</if>
+<!--			<if test="officeIdList!=null and officeIdList.size!=0">-->
+<!--				and a.office_id not in-->
+<!--				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">-->
+<!--					#{officeId}-->
+<!--				</foreach>-->
+<!--			</if>-->
 		</where>
 	</select>
 

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

@@ -517,6 +517,7 @@
 					<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}"/>
+					<input id="officeName" name="officeName" type="hidden" value="${officeName}"/>
 
 				<%--<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->--%>
 

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

@@ -1354,28 +1354,28 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增A类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '新增B类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}
 					}}
 				,{field:'field3',align:'center', title: '本${nyr}电子归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&recordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&recordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&recordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}
 					}}
 				,{field:'field4',align:'center', title: '本${nyr}上报',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}
@@ -1390,14 +1390,14 @@
 			[
 				{field:'field5',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</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+"&officeName="+d.officeName+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
 						}
 					}}
 				,{field:'field6',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</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+"&officeName="+d.officeName+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
 					}
@@ -1405,14 +1405,14 @@
 
 				,{field:'field13',align:'center',title:'超期未归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
 						}
 					}}
 				,{field:'field14',align:'center',title:'超期已归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
 					}
@@ -1420,14 +1420,14 @@
 				<c:if test="${nyr eq '季'}">
 				,{field:'field15',align:'center',title:'超期未归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field15 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field15=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field15 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field15 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field15=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field15 + "</a>";
 					}else{
 						return "<span title='"+ d.field15 +"'>" +d.field15+ "</span>";
 					}
 				}}
 				,{field:'field16',align:'center',title:'超期已归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field16 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field16=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field16 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field16 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field16=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field16 + "</a>";
 					}else{
 						return "<span title='"+ d.field16 +"'>" +d.field16+ "</span>";
 					}
@@ -1436,14 +1436,14 @@
 
 				,{field:'field7',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</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+"&officeName="+d.officeName+"&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
 					}
 				}}
 				,{field:'field8',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</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+"&officeName="+d.officeName+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
 					}
@@ -1495,7 +1495,7 @@
 				,{field:'officeName',align:'center', title: '部门'}
 				,{field:'field1',align:'center', title: '新增发票',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&newlyAdded=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&newlyAdded=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
@@ -1503,7 +1503,7 @@
 				,{field:'field2',align:'center', title: '开票金额'}
 				,{field:'field3',align:'center', title: '本${nyr}收款发票',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&collectionThisMonth=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&collectionThisMonth=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 						}
@@ -1544,7 +1544,7 @@
 				,{field:'officeName',align:'center', title: '部门'}
 				,{field:'field1',align:'center', title: '新增报销',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
@@ -1583,14 +1583,14 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '本${nyr}纸质归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&contractRecordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&contractRecordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
 							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
 						}
@@ -1600,14 +1600,14 @@
 				[
 					{field:'field3',align:'center',title:'超期未归档',templet:function(d){
 							if("" != d.statementDate){
-								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field3=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
+								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field3=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 							}else{
 								return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 							}
 						}}
 					,{field:'field4',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/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field4=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field4=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
 							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
 						}
@@ -1647,28 +1647,28 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增A类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '新增B类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
 							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
 						}
 					}}
 				,{field:'field3',align:'center', title: '本年电子归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&recordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&recordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 						}
 					}}
 				,{field:'field4',align:'center', title: '本年上报',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
 							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
 						}
@@ -1680,14 +1680,14 @@
 				[
 					{field:'field5',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/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
+								return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
 							}else{
 								return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
 							}
 						}}
 					,{field:'field6',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/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
 						}else{
 							return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
 						}
@@ -1695,14 +1695,14 @@
 
 					,{field:'field13',align:'center',title:'超期未归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
 						}else{
 							return "<span title='"+ d.field13 +"'>" +d.field13+ "</span>";
 						}
 					}}
 					,{field:'field14',align:'center',title:'超期已归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
 						}else{
 							return "<span title='"+ d.field14 +"'>" +d.field14+ "</span>";
 						}
@@ -1710,14 +1710,14 @@
 
 					,{field:'field7',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/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
 						}else{
 							return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
 						}
 					}}
 					,{field:'field8',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/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
 						}else{
 							return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
 						}
@@ -1770,7 +1770,7 @@
 				,{field:'officeName',align:'center', title: '部门'}
 				,{field:'field1',align:'center', title: '新增发票',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&newlyAdded=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&newlyAdded=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
@@ -1778,7 +1778,7 @@
 				,{field:'field2',align:'center', title: '开票金额'}
 				,{field:'field3',align:'center', title: '本${nyr}收款发票',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&collectionThisMonth=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&collectionThisMonth=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 						}
@@ -1820,7 +1820,7 @@
 				,{field:'officeName',align:'center', title: '部门'}
 				,{field:'field1',align:'center', title: '新增报销',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
@@ -1860,14 +1860,14 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '本年纸质归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&contractRecordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&contractRecordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
 							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
 						}
@@ -1877,14 +1877,14 @@
 				[
 					{field:'field3',align:'center',title:'超期未归档',templet:function(d){
 							if("" != d.statementDate){
-								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field3=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
+								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field3=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 							}else{
 								return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 							}
 						}}
 					,{field:'field4',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/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field4=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field4=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
 							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
 						}
@@ -1925,28 +1925,28 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增A类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=2&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&grade=2&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '新增B类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=1&isThisMonth=1','95%', '95%')\">" + d.field2 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&grade=1&isThisMonth=1','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
 							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
 						}
 					}}
 				,{field:'field3',align:'center', title: '本${nyr}电子归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&recordState=5&isThisMonth=1','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&recordState=5&isThisMonth=1','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 						}
 					}}
 				,{field:'field4',align:'center', title: '本${nyr}上报',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&reportedState=5&isThisMonth=1','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&reportedState=5&isThisMonth=1','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
 							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
 						}
@@ -1961,14 +1961,14 @@
 				[
 					{field:'field5',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5&isThisMonth=1','95%', '95%')\">" + d.field5 + "</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+"&officeName="+d.officeName+"&field5=5&isThisMonth=1','95%', '95%')\">" + d.field5 + "</a>";
 							}else{
 								return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
 							}
 						}}
 					,{field:'field6',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5&isThisMonth=1','95%', '95%')\">" + d.field6 + "</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+"&officeName="+d.officeName+"&field6=5&isThisMonth=1','95%', '95%')\">" + d.field6 + "</a>";
 						}else{
 							return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
 						}
@@ -1976,14 +1976,14 @@
 
 					,{field:'field13',align:'center',title:'超期未归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field13=5&isThisMonth=1','95%', '95%')\">" + d.field13 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field13=5&isThisMonth=1','95%', '95%')\">" + d.field13 + "</a>";
 						}else{
 							return "<span title='"+ d.field13 +"'>" +d.field13+ "</span>";
 						}
 					}}
 					,{field:'field14',align:'center',title:'超期已归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5&isThisMonth=1','95%', '95%')\">" + d.field14 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field14=5&isThisMonth=1','95%', '95%')\">" + d.field14 + "</a>";
 						}else{
 							return "<span title='"+ d.field14 +"'>" +d.field14+ "</span>";
 						}
@@ -1991,14 +1991,14 @@
 					<c:if test="${nyr eq '季'}">
 					,{field:'field15',align:'center',title:'超期未归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field15 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field15=5&isThisMonth=1','95%', '95%')\">" + d.field15 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field15 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field15=5&isThisMonth=1','95%', '95%')\">" + d.field15 + "</a>";
 						}else{
 							return "<span title='"+ d.field15 +"'>" +d.field15+ "</span>";
 						}
 					}}
 					,{field:'field16',align:'center',title:'超期已归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field16 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field16=5&isThisMonth=1','95%', '95%')\">" + d.field16 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field16 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field16=5&isThisMonth=1','95%', '95%')\">" + d.field16 + "</a>";
 						}else{
 							return "<span title='"+ d.field16 +"'>" +d.field16+ "</span>";
 						}
@@ -2007,14 +2007,14 @@
 
 					,{field:'field7',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5&isThisMonth=1','95%', '95%')\">" + d.field7 + "</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+"&officeName="+d.officeName+"&field7=5&isThisMonth=1','95%', '95%')\">" + d.field7 + "</a>";
 						}else{
 							return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
 						}
 					}}
 					,{field:'field8',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/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5&isThisMonth=1','95%', '95%')\">" + d.field8 + "</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+"&officeName="+d.officeName+"&field8=5&isThisMonth=1','95%', '95%')\">" + d.field8 + "</a>";
 						}else{
 							return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
 						}
@@ -2066,7 +2066,7 @@
 				,{field:'officeName',align:'center', title: '部门'}
 				,{field:'field1',align:'center', title: '新增发票',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&newlyAdded=5&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&newlyAdded=5&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
@@ -2074,7 +2074,7 @@
 				,{field:'field2',align:'center', title: '开票金额'}
 				,{field:'field3',align:'center', title: '本${nyr}收款发票',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&collectionThisMonth=5&isThisMonth=1','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}收款发票', '${ctx}/statement/StatementCompanyComprehensive/billingReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&collectionThisMonth=5&isThisMonth=1','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 						}
@@ -2115,7 +2115,7 @@
 				,{field:'officeName',align:'center', title: '部门'}
 				,{field:'field1',align:'center', title: '新增报销',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增报销', '${ctx}/statement/StatementCompanyComprehensive/reimbursementReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
@@ -2154,14 +2154,14 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field1',align:'center', title: '新增',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&isThisMonth=1','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
 							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '本${nyr}纸质归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&contractRecordState=5&isThisMonth=1','95%', '95%')\">" + d.field2 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}纸质归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&contractRecordState=5&isThisMonth=1','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
 							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
 						}
@@ -2171,14 +2171,14 @@
 				[
 					{field:'field3',align:'center',title:'超期未归档',templet:function(d){
 							if("" != d.statementDate){
-								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field3=5&isThisMonth=1','95%', '95%')\">" + d.field3 + "</a>";
+								return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field3=5&isThisMonth=1','95%', '95%')\">" + d.field3 + "</a>";
 							}else{
 								return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
 							}
 						}}
 					,{field:'field4',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/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&field4=5&isThisMonth=1','95%', '95%')\">" + d.field4 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/contractStatementList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeIdd="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field4=5&isThisMonth=1','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
 							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
 						}

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

@@ -120,7 +120,7 @@
 				,{field:'officeName',align:'center', title: '部门',rowspan:2}
 				,{field:'field3',align:'center', title: '本${nyr}电子归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&recordState=5','95%', '95%')\">" + d.field3 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&recordState=5','95%', '95%')\">" + d.field3 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&recordState=5','95%', '95%')\">" + d.field3 + "</a>";
 						}
@@ -134,14 +134,14 @@
 			[
 				{field:'field11',align:'center',title:'未质量复核',templet:function(d){
 						if("" != d.statementDate){
-							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>";
+							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+"&officeName="+d.officeName+"&field11=5','95%', '95%')\">" + d.field11 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field11 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('未质量复核', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field11=5','95%', '95%')\">" + d.field11 + "</a>";
 						}
 					}}
 				,{field:'field12',align:'center',title:'超期未质量复核',templet:function(d){
 					if("" != d.statementDate){
-						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>";
+						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+"&officeName="+d.officeName+"&field12=5','95%', '95%')\">" + d.field12 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field12 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未质量复核', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field12=5','95%', '95%')\">" + d.field12 + "</a>";
 					}
@@ -149,28 +149,28 @@
 
 				,{field:'field5',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/projectReportList?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.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field5=5','95%', '95%')\">" + d.field5 + "</a>";
 						}else{
 							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field5=5','95%', '95%')\">" + d.field5 + "</a>";
 						}
 					}}
 				,{field:'field6',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/projectReportList?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.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field6=5','95%', '95%')\">" + d.field6 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field6=5','95%', '95%')\">" + d.field6 + "</a>";
 					}
 				}}
 				,{field:'field9',align:'center',title:'A类纸质归档',templet:function(d){
 					if("" != d.statementDate){
-						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>";
+						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+"&officeName="+d.officeName+"&projectPaperFiling=5','95%', '95%')\">" + d.field9 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field9 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('A类纸质归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&projectPaperFiling=5','95%', '95%')\">" + d.field9 + "</a>";
 					}
 				}}
 				,{field:'field10',align:'center',title:'B类批量归档',templet:function(d){
 					if("" != d.statementDate){
-						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>";
+						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+"&officeName="+d.officeName+"&projectFlingBatchRelation=5','95%', '95%')\">" + d.field10 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field10 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('B类批量归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&projectFlingBatchRelation=5','95%', '95%')\">" + d.field10 + "</a>";
 					}
@@ -178,14 +178,14 @@
 
 				,{field:'field13',align:'center',title:'超期未归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field13=5','95%', '95%')\">" + d.field13 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field13=5','95%', '95%')\">" + d.field13 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field13=5','95%', '95%')\">" + d.field13 + "</a>";
 					}
 				}}
 				,{field:'field14',align:'center',title:'超期已归档',templet:function(d){
 					if("" != d.statementDate){
-						return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5','95%', '95%')\">" + d.field14 + "</a>";
+						return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field14=5','95%', '95%')\">" + d.field14 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field14=5','95%', '95%')\">" + d.field14 + "</a>";
 					}
@@ -193,14 +193,14 @@
 
 				,{field:'field7',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/projectReportList?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.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field7=5','95%', '95%')\">" + d.field7 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field7=5','95%', '95%')\">" + d.field7 + "</a>";
 					}
 				}}
 				,{field:'field8',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/projectReportList?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.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&officeName="+d.officeName+"&field8=5','95%', '95%')\">" + d.field8 + "</a>";
 					}else{
 						return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&field8=5','95%', '95%')\">" + d.field8 + "</a>";
 					}

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

@@ -555,6 +555,7 @@
 					<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}"/>
+					<input id="officeName" name="officeName" type="hidden" value="${officeName}"/>
 
 				<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 				<div class="commonQuery lw7">

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

@@ -386,6 +386,7 @@
 					<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}"/>
+					<input id="officeName" name="officeName" type="hidden" value="${officeName}"/>
 
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">

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

@@ -98,6 +98,7 @@
                     <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}"/>
+                    <input id="officeName" name="officeName" type="hidden" value="${officeName}"/>
 
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery">