Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/centerservice/utils/ConvertServiceUtil.java

@@ -239,7 +239,12 @@ public class ConvertServiceUtil {
             });
             // 将数据分页
             page.setCount(list.size());
-            int startIndex = (int) ((page.getPageNo() - 1) * page.getPageSize());
+            int startIndex = 0;
+            if(page.getPageNo() > 0){
+                startIndex = (int) ((page.getPageNo() - 1) * page.getPageSize());
+            }else{
+                startIndex = 0;
+            }
             if (startIndex > list.size()) {
                 startIndex = 0;
                 page.setPageNo(1);

src/main/java/com/jeeplus/modules/knowledgeSharing/entity/KnowledgeSharingInfo.java

@@ -32,6 +32,8 @@ public class KnowledgeSharingInfo extends DataEntity<KnowledgeSharingInfo> {
     private String commentContent;
     private Office office;		// 部门ID
     private Office company;		// 公司ID
+    private String viewUserId;		// 查看人员id
+    private String readFlag;		// 查看结果（是否已浏览）
 
     public String getColumnName() {
         return columnName;
@@ -166,4 +168,20 @@ public class KnowledgeSharingInfo extends DataEntity<KnowledgeSharingInfo> {
     public void setCompany(Office company) {
         this.company = company;
     }
+
+    public String getViewUserId() {
+        return viewUserId;
+    }
+
+    public void setViewUserId(String viewUserId) {
+        this.viewUserId = viewUserId;
+    }
+
+    public String getReadFlag() {
+        return readFlag;
+    }
+
+    public void setReadFlag(String readFlag) {
+        this.readFlag = readFlag;
+    }
 }

src/main/java/com/jeeplus/modules/knowledgeSharing/service/KnowledgeSharingDetailsService.java

@@ -34,7 +34,8 @@ public class KnowledgeSharingDetailsService extends CrudService<KnowledgeSharing
     }
 
     public List<KnowledgeSharingInfo> findList(KnowledgeSharingInfo knowledgeSharingInfo) {
-        return super.findList(knowledgeSharingInfo);
+        List<KnowledgeSharingInfo> list = super.findList(knowledgeSharingInfo);
+        return list;
     }
 
 

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

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

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -96,6 +96,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public static final String ECONOMIC_EVALUATION="101";//经济评价模板key
 	public static final String SERIAL_COST_BIZCODE ="1004";
 	public static final String COORDINATE_BIZCODE ="1008";	//配合模板key
+	public static final String SHANGHAI_COORDINATE_BIZCODE ="1010";	//工程审价（上海）项目类型模板
 	private static final long serialVersionUID = 1L;
 	@NotNull(message = "合同信息不能为空")
 	private WorkContractInfo workContractInfo;		// 合同id

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

@@ -162,10 +162,17 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             projectRecords.setEndingCount(endingCount);
         }
         if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
-            //查询该选择节点下所有的部门Id
-            List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
-            officeIdList.add(projectRecords.getOffice().getId());
-            projectRecords.setOfficeIdList(officeIdList);
+            if("一部本部".equals(projectRecords.getOffice().getId())){
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            }else{
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());
+                officeIdList.add(projectRecords.getOffice().getId());
+                projectRecords.setOfficeIdList(officeIdList);
+            }
         }
         //根据当前登录人查询登陆人权限
         List<Office> officeListByUserId = ruralProjectMessageAllConfigService.getOfficeListByUserId(UserUtils.getUser().getId());

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

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

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

@@ -605,7 +605,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 					}
 				} else if ("2".equals(projectRecords.getProjectType())) {	//造价审核
 					//预算审核、结算审核、分包审核 需要纸质归档
-					if ("2".equals(projectRecords.getAttachmentProjectSort()) || "4".equals(projectRecords.getAttachmentProjectSort()) || "7".equals(projectRecords.getAttachmentProjectSort())) {
+					if ("2".equals(projectRecords.getAttachmentProjectSort()) || "4".equals(projectRecords.getAttachmentProjectSort()) || "7".equals(projectRecords.getAttachmentProjectSort()) || "9".equals(projectRecords.getAttachmentProjectSort())) {
 						assert createBy != null;
 						projectRecords.setPaperFilingStatus("");
 						projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_COST_BIZCODE));
@@ -627,7 +627,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				}
 				break;
 			case "2":
-				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort()) || "8".equals(projectRecords.getAttachmentProjectSort())){
+				if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort()) || "8".equals(projectRecords.getAttachmentProjectSort()) || "9".equals(projectRecords.getAttachmentProjectSort())){
 					projectRecords.setReportedState("10");
 				}else{
 					projectRecords.setReportedState(null);
@@ -3034,6 +3034,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 						projectReportData.setConditionType("1005");
 					}else if("8".equals(projectRecords.getAttachmentProjectSort())){
 						projectReportData.setConditionType("1007");
+					}else if("9".equals(projectRecords.getAttachmentProjectSort())){
+						projectReportData.setConditionType(RuralProjectRecords.SHANGHAI_COORDINATE_BIZCODE);
 					}
 					else{
 						projectReportData.setConditionType("1003");
@@ -4334,7 +4336,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 	//公司级：项目报表详细
 	public Page<RuralProjectRecords> findReportPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,String officeId,String grade,String bigDateType,String smallDateType
-													,String recordState,String reportedState,String year, String projectPaperFiling, String projectFlingBatchRelation) {
+													,String recordState,String reportedState,String year, String projectPaperFiling, String projectFlingBatchRelation,String isThisMonth) {
 		//将获取的datetype转为需要的具体时间   含年月日
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4351,6 +4353,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
 		projectRecords.setPage(page);
+		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{officeId},'%')");
+		}else{
+			projectRecords.getSqlMap().put("officeId", "");
+		}
+
 		List<RuralProjectRecords> recordsList = dao.selectReportPage(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState,projectPaperFiling,projectFlingBatchRelation);
 		int count = dao.reportPageCount(projectRecords,officeId,grade,beginDate,endDate,recordState,reportedState,projectPaperFiling,projectFlingBatchRelation);
 		page.setPageNo(oldPageNo);
@@ -4404,10 +4413,10 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		return page;
 	}
 
-	//公司级：chaoqi项目报表详细
+	//公司级：超期项目报表详细
 	public Page<RuralProjectRecords> findReportPageOverdue(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-															String year,String bigDateType,String smallDateType) {
+															String year,String bigDateType,String smallDateType,String isThisMonth) {
 		if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getDepartmentLevel()) && "company".equals(statementCompanyComprehensiveInfo.getDepartmentLevel())){
 			bigDateType = "0";
 			statementCompanyComprehensiveInfo.setBigDateType("2");
@@ -4428,6 +4437,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
 		projectRecords.setPage(page);
+
+		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
+		}else{
+			projectRecords.getSqlMap().put("officeId", "");
+		}
 		List<RuralProjectRecords> recordsList = dao.selectReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		int count = dao.selectReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		page.setPageNo(oldPageNo);
@@ -4445,10 +4461,51 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		return page;
 	}
 
+	//公司级：超期项目报表详细
+	public Page<RuralProjectRecords> findThisMonthReportPageOverdue(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
+														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
+															String year,String bigDateType,String smallDateType) {
+		if(StringUtils.isNotBlank(statementCompanyComprehensiveInfo.getDepartmentLevel()) && "company".equals(statementCompanyComprehensiveInfo.getDepartmentLevel())){
+			bigDateType = "0";
+			statementCompanyComprehensiveInfo.setBigDateType("2");
+		}
+		//将获取的datetype转为需要的具体时间   含年月日
+		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
+		String beginDate = map.get("beginDate");
+		String endDate = map.get("endDate");
+		if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
+			//查询该选择节点下所有的部门Id
+			List<String> officeIdList = Lists.newArrayList();
+			officeIdList.add(projectRecords.getOffice().getId());
+			projectRecords.setOfficeIdList(officeIdList);
+		}
+		//为了方便后台 limit 的显示,将页面传入的page暂存
+		Integer oldPageNo = page.getPageNo();
+		if((page.getPageNo()-1) >= 0) {
+			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
+		}
+		projectRecords.setPage(page);
+		List<RuralProjectRecords> recordsList = dao.selectThisMonthReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
+		int count = dao.selectThisMonthReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
+		page.setPageNo(oldPageNo);
+		page.setCount(count);
+		page.setCountFlag(false);
+		//查询负责人信息
+		for (RuralProjectRecords records : recordsList) {
+			this.queryContractInfos(records);
+			List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
+			records.setProjectLeaders(users);
+			records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+			records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+		}
+		page.setList(recordsList);
+		return page;
+	}
+
 	//公司级：chaoqi项目报表详细 年度级
 	public Page<RuralProjectRecords> findReportPageOverdueByYear(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-														   String year,String bigDateType,String smallDateType) {
+														   String year,String bigDateType,String smallDateType,String isThisMonth) {
 		//将获取的datetype转为需要的具体时间   含年月日
 		Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
 		String beginDate = map.get("beginDate");
@@ -4465,6 +4522,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		if((page.getPageNo()-1) >= 0) {
 			page.setPageNo((page.getPageNo() - 1) * page.getPageSize());
 		}
+		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
+		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
+			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
+		}else{
+			projectRecords.getSqlMap().put("officeId", "");
+		}
 		projectRecords.setPage(page);
 		List<RuralProjectRecords> recordsList = dao.selectReportPageOverdue(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);
 		int count = dao.selectReportPageOverdueCount(projectRecords,statementCompanyComprehensiveInfo,beginDate,endDate);

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

@@ -534,6 +534,16 @@ public class RuralProjectMessageAllController extends BaseController {
         return "modules/ruralprojectrecords/ruralporjectmessage/all/downloadRecordForm";
     }
 
+
+    /**
+     * 跳转归档信息导出信息页（纸质归档）
+     */
+    @RequestMapping(value = "skipDownloadPaperRecordForm")
+    public String skipDownloadPaperRecordForm(RuralProjectRecords projectRecords,Model model) {
+        model.addAttribute("projectRecords",projectRecords);
+        return "modules/ruralprojectrecords/ruralporjectmessage/all/downloadPaperRecordForm";
+    }
+
     /**
      * 查询归档
      * @return

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

@@ -1281,4 +1281,18 @@ public class RuralProjectRecordsController extends BaseController {
 	}
 
 
+	/**
+	 * 项目名称判重查询方法
+	 */
+	@RequestMapping(value = "reProjectName")
+	@ResponseBody
+	public Integer reProjectName(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+		if(StringUtils.isNotBlank(projectRecords.getProjectName())){
+			Integer projectNameCount = projectRecordsService.reProjectName(projectRecords.getProjectName());
+			return projectNameCount;
+		}
+		return 0;
+	}
+
+
 }

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

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

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

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

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

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

src/main/java/com/jeeplus/modules/sys/dao/OfficeDao.java

@@ -19,6 +19,7 @@ import java.util.List;
 public interface OfficeDao extends TreeDao<Office> {
 
 	public Office getByCode(String code);
+	public Office getByName(String name);
 	public void saveBranchOffice(Office office);
 	public void updateUseable(Office office);
 

src/main/java/com/jeeplus/modules/sys/service/OfficeService.java

@@ -198,6 +198,12 @@ public class OfficeService extends TreeService<OfficeDao, Office> {
     }
 
 
+    @Transactional(readOnly = true)
+    public Office getByName(String name){
+        return dao.getByName(name);
+    }
+
+
 	@Transactional(readOnly = false)
 	public void save(Office office) {
 		super.save(office);

src/main/java/com/jeeplus/modules/sys/web/HelpController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.sys.web;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.persistence.Page;
@@ -48,7 +49,13 @@ public class HelpController extends BaseController {
     public String list(Help help, HttpServletRequest request, HttpServletResponse response, Model model) {
         // 根据菜单id查询出此菜单的所有下级菜单
         if (Objects.nonNull(help) && StringUtils.isNotBlank(help.getMenuId())) {
-            help.setMenuIdList(helpService.getByParentMenuId(help.getMenuId()));
+            if("其他".equals(help.getMenuId())){
+                List<String> menuIdList = Lists.newArrayList();
+                menuIdList.add(help.getMenuId());
+                help.setMenuIdList(menuIdList);
+            }else{
+                help.setMenuIdList(helpService.getByParentMenuId(help.getMenuId()));
+            }
             model.addAttribute("menuId", help.getMenuId());
         }
         Page<Help> page = helpService.findList(new Page<Help>(request, response), help);
@@ -77,7 +84,7 @@ public class HelpController extends BaseController {
                 model.addAttribute("help", result);
             } else if (StringUtils.isNotBlank(help.getMenuId())) {
                 Menu menu = systemService.getMenu(help.getMenuId());
-                if (Objects.nonNull(help)) {
+                if (null != menu) {
                     Help h = new Help();
                     h.setMenuId(menu.getId());
                     h.setMenuName(menu.getName());
@@ -122,6 +129,20 @@ public class HelpController extends BaseController {
             }
             if (StringUtils.isNotBlank(byNumber.getDescription())) {
                 content = byNumber.getDescription();
+                Calendar cal = Calendar.getInstance();
+                //获取当前年份
+                int year = cal.get(Calendar.YEAR);
+                int month = cal.get(Calendar.MONTH);
+                int thisMonth = cal.get(Calendar.MONTH)+1;
+                if(content.contains("{year}")){
+                    content = content.replaceAll("\\{year}",String.valueOf(year)+"年 ");
+                }
+                if(content.contains("{month}")){
+                    content = content.replaceAll("\\{month}",String.valueOf(month)+"月 ");
+                }
+                if(content.contains("{thisMonth}")){
+                    content = content.replaceAll("\\{thisMonth}",String.valueOf(thisMonth)+"月 ");
+                }
             }
         }
         map.put("title", title);

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -454,13 +454,21 @@ public class LoginController extends BaseController{
 			info.setParentType("1");
 		}
 		//查询知识分享信息
-		List<KnowledgeSharingInfo> knowledgeSharingDetailsList = knowledgeSharingDetailsService.findList(new KnowledgeSharingInfo());
+		KnowledgeSharingInfo knowledgeSharingInfo = new KnowledgeSharingInfo();
+		knowledgeSharingInfo.setViewUserId(UserUtils.getUser().getId());
+		List<KnowledgeSharingInfo> knowledgeSharingDetailsList = knowledgeSharingDetailsService.findList(knowledgeSharingInfo);
 		for (KnowledgeSharingInfo info : knowledgeSharingDetailsList) {
 			OaNotify notify = new OaNotify();
 			notify.setTitle(info.getSubject());
 			notify.setType(info.getColumnId());
 			notify.setUpdateDate(info.getUpdateDate());
-			notify.setReadFlagStr("");
+			if("1".equals(info.getReadFlag())){
+				notify.setReadFlagStr("已读");
+			}else if ("0".equals(info.getReadFlag())){
+				notify.setReadFlagStr("未读");
+			}else{
+				notify.setReadFlagStr("");
+			}
 			notify.setId(info.getId());
 
 			for (KnowledgeSharingTypeInfo mianDict : typeInfoList) {

src/main/java/com/jeeplus/modules/sys/web/MenuController.java

@@ -287,6 +287,12 @@ public class MenuController extends BaseController {
 				mapList.add(map);
 			}
 		}
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("id", "其他");
+		map.put("pIds", "0,1,");
+		map.put("pId", "1");
+		map.put("name", "其他");
+		mapList.add(map);
 		return mapList;
 	}
 }

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -531,6 +531,20 @@ public class OfficeController extends BaseController {
         HashSet<Map<String, Object>> mapSet = new HashSet<>();
         //查询所有有关部门
         List<Office> list = officeService.findByParentIdsLike(office);
+        if("6".equals(type)){
+            Office info = new Office();
+            info.setId("一部本部");
+            info.setName("一部本部");
+            info.setTopCompany("一部本部");
+            info.setIsSon("0");
+            info.setState("0");
+            info.setUseable("1");
+            info.setGrade("2");
+            info.setType("2");
+            info.setParent(officeService.getByName("工程一部"));
+            info.setParentIds("0,ffe5af5b557e46f28b000c94716e228a,7f776d072d7b4c839cef4e63ce6dbfa5,");
+            list.add(info);
+        }
         for (int i = 0; i < list.size(); i++) {
             Office e = list.get(i);
             if ((StringUtils.isBlank(extId) || (extId != null && !extId.equals(e.getId()) && e.getParentIds().indexOf("," + extId + ",") == -1))
@@ -567,7 +581,7 @@ public class OfficeController extends BaseController {
             List<Map<String,Object>> mapList1=new ArrayList<>(mapSet);
             return mapList1;
         }
-        if(!"2".equals(type)){
+        if(!"2".equals(type) && !"6".equals(type)){
             List<User> userList= new ArrayList<>();
             //判定参数必须存在
             if (StringUtils.isNotBlank(selectName)){

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

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

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

@@ -635,10 +635,10 @@ public class WorkFullManageController extends BaseController {
 	 * @throws IOException
 	 */
 	@RequestMapping("/downLoadAttachOtherService")
-	public void downLoadAttach(String file,HttpServletResponse response,String belongProject) throws IOException {
+	public void downLoadAttachOtherService(String file,HttpServletResponse response,String belongProject) throws IOException {
 		String bucketName = "";
 		if ("cpa".equals(belongProject)) {
-			bucketName = "xgxm-test";
+			bucketName = Global.getBucketName();
 		}
 		file = "http://oss.gangwaninfo.com" + file;
 		downLoadFile(file,response,bucketName);
@@ -649,7 +649,24 @@ public class WorkFullManageController extends BaseController {
 	 */
 	@RequestMapping("/downLoadAttach")
 	public String downLoadAttach(String file,HttpServletResponse response) throws IOException {
-		downLoadFile(file,response,null);
+		file = file.replace("amp;","");
+		String fileName = file.substring(file.lastIndexOf("/") + 1, file.length());
+		String aliyunUrl = Global.getAliyunUrl();
+		String aliDownloadUrl = Global.getAliDownloadUrl();
+		String cons = "";
+		if (file.contains(aliyunUrl)){
+			cons = aliyunUrl;
+		}else if (file.contains("http://gangwan-app.oss-cn-hangzhou.aliyuncs.com")){
+			cons = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com";
+		}else {
+			cons = aliDownloadUrl;
+		}
+		String key = file.split(cons+"/")[1];
+		logger.info("-----------------------------------------");
+		logger.info("fileName="+fileName);
+		logger.info("key="+key);
+		logger.info("-----------------------------------------");
+		new OSSClientUtil().downByStream(key,fileName,response,request.getHeader("USER-AGENT"));
 		return null;
 		/*OutputStream out = null;
 		InputStream in = null;
@@ -1420,7 +1437,8 @@ public class WorkFullManageController extends BaseController {
 		}
 		//报告状态
 		String dataStatus=projectReportData.getStatus();
-		if (dataStatus.equals("5") && null != projectReportData.getAuditPassDate()){
+		System.out.println("dataStatus" + dataStatus);
+		if ((dataStatus.equals("5") || dataStatus.equals("7")) && null != projectReportData.getAuditPassDate()){
 			String ss = sdf.format(projectReportData.getAuditPassDate());
 			data.put("shenDate",ss);
 		}else{

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

@@ -215,11 +215,11 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 			officeIdList.add(workInvoice.getOfficeId());
 			workInvoice.setOfficeIdList(officeIdList);
 		}
-		int count = dao.queryCountNew(workInvoice);
+		int count = dao.queryCount(workInvoice);
 		page.setCount(count);
 		page.setCountFlag(false);
 		workInvoice.setPage(page);
-		List<WorkInvoice> list = dao.findListNew(workInvoice);
+		List<WorkInvoice> list = dao.findList(workInvoice);
 		page.setList(list);
 		return page;
 

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

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

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

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

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

@@ -580,13 +580,13 @@ public class WorkProjectNotifyController extends BaseController {
 				model.addAttribute("page", resultPage);
 			} else {
 				// 中台数据查询失败时，查询本系统分页待办数据
-				Page<WorkProjectNotify> page = findPage(user, workProjectNotify);
+				Page<WorkProjectNotify> page = findPage(user, workProjectNotify,request,response);
 				model.addAttribute("page", page);
 			}
 
 		} else {
 			// 本系统待办分页数据查询
-			Page<WorkProjectNotify> page = findPage(user, workProjectNotify);
+			Page<WorkProjectNotify> page = findPage(user, workProjectNotify,request,response);
 			model.addAttribute("page", page);
 		}
 		return "modules/workprojectnotify/workProjectNotifyList";
@@ -598,13 +598,14 @@ public class WorkProjectNotifyController extends BaseController {
 	 * @param workProjectNotify
 	 * @return
 	 */
-	public Page<WorkProjectNotify> findPage(User user,WorkProjectNotify workProjectNotify) {
+	public Page<WorkProjectNotify> findPage(User user,WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response) {
 		workProjectNotify.setUser(user);
 		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
 		workProjectNotify.setRemarks("待审批");
-		Page<WorkProjectNotify> pageList = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10),workProjectNotify);
+		Page<WorkProjectNotify> pageList = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, -1),workProjectNotify);
 		disposePageResp(pageList.getList()); // 结果处理
-		return pageList;
+		Page<WorkProjectNotify> resultPage = ConvertServiceUtil.getSortAndPaging(new Page<WorkProjectNotify>(request, response), pageList.getList());
+		return resultPage;
 	}
 
 	/**
@@ -7707,6 +7708,23 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取状态2（针对状态1进行精确所在指定季度或者月份）
 					String smallDateType = arguments[2];
 
+					Integer yearInt = new Integer(year);
+					Integer bigDateTypeInt = new Integer(bigDateType);
+					Integer smallDateTypeInt = new Integer(smallDateType);
+					if(yearInt >= 2023 ){
+						if(bigDateTypeInt == 2 ){
+							if(smallDateTypeInt > 3){
+								model.addAttribute("isThisMonth","1");//年度合同报表
+							}else{
+								model.addAttribute("isThisMonth","0");//年度合同报表
+							}
+						}else{
+							model.addAttribute("isThisMonth","0");//年度合同报表
+						}
+					}else{
+						model.addAttribute("isThisMonth","0");//年度合同报表
+					}
+
 
 					Map<String, List<StatementCompanyComprehensiveInfo>> stringListMap = statementCompanyComprehensiveService.viewList(year,bigDateType,smallDateType);
 					model.addAttribute("reportFormList1",stringListMap.get("reportFormList1"));//项目报表
@@ -7717,6 +7735,14 @@ public class WorkProjectNotifyController extends BaseController {
 					model.addAttribute("reportFormList6",stringListMap.get("reportFormList6"));//年度开票报表
 					model.addAttribute("reportFormList7",stringListMap.get("reportFormList7"));//年度报销报表
 					model.addAttribute("reportFormList8",stringListMap.get("reportFormList8"));//年度合同报表
+
+					model.addAttribute("reportFormList9",stringListMap.get("reportFormList9"));//当月项目报表
+					model.addAttribute("reportFormList10",stringListMap.get("reportFormList10"));//当月开票报表
+					model.addAttribute("reportFormList11",stringListMap.get("reportFormList11"));//当月报销报表
+					model.addAttribute("reportFormList12",stringListMap.get("reportFormList12"));//当月合同报表
+					model.addAttribute("year",year);
+					model.addAttribute("bigDateType",bigDateType);
+					model.addAttribute("smallDateType",smallDateType);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/statement/companyDataView";
 					}
@@ -7764,6 +7790,9 @@ public class WorkProjectNotifyController extends BaseController {
 					}else {
 						model.addAttribute("showFlag","0");
 					}
+					model.addAttribute("year",year);
+					model.addAttribute("bigDateType",bigDateType);
+					model.addAttribute("smallDateType",smallDateType);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/statement/departmentCompanyDataView";
 					}
@@ -7780,6 +7809,9 @@ public class WorkProjectNotifyController extends BaseController {
 
 					Map<String, List<StatementCompanyComprehensiveInfo>> stringListMap = statementCompanyComprehensiveService.departmentReportViewList(year,bigDateType,smallDateType);
 					model.addAttribute("reportFormList1",stringListMap.get("reportFormList1"));//项目报表
+					model.addAttribute("year",year);
+					model.addAttribute("bigDateType",bigDateType);
+					model.addAttribute("smallDateType",smallDateType);
 					//判断并只显示七个部门的项目信息
 					String sevenOfficeId = statementCompanyComprehensiveService.selectSevenOfficeId();
 

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

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

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -112,6 +112,9 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	private String handSignatureUrl;	//手签章路径(展示)
 	private String userLoginFlag;	//用户登录状态
 	private String otherServiceFlag;	//是否获取其他服务待办
+	private String isHandSignature;	//是否有手签章
+	private String certificateType; //执业资格证书类型
+	private String certificateName; //执业资格证书名称
 
 	//劳动关系临时属性
 	private String relationshipStatus;
@@ -853,4 +856,28 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setOtherServiceFlag(String otherServiceFlag) {
 		this.otherServiceFlag = otherServiceFlag;
 	}
+
+	public String getIsHandSignature() {
+		return isHandSignature;
+	}
+
+	public void setIsHandSignature(String isHandSignature) {
+		this.isHandSignature = isHandSignature;
+	}
+
+	public String getCertificateType() {
+		return certificateType;
+	}
+
+	public void setCertificateType(String certificateType) {
+		this.certificateType = certificateType;
+	}
+
+	public String getCertificateName() {
+		return certificateName;
+	}
+
+	public void setCertificateName(String certificateName) {
+		this.certificateName = certificateName;
+	}
 }

src/main/resources/mappings/modules/knowledgeSharing/KnowledgeSharingDetailsDao.xml

@@ -31,6 +31,9 @@
 		SELECT
 			<include refid="businessQuestionsColumns"/>
 			,ifnull((select sum(ksv.visit_count) from knowledge_sharing_view ksv where a.id = ksv.knowledge_sharing_id),0) as "readCount"
+			<if test="viewUserId != null and viewUserId != ''">
+				,ifnull(( SELECT count( ksv.user_id ) FROM knowledge_sharing_view ksv WHERE a.id = ksv.knowledge_sharing_id AND ksv.user_id = #{viewUserId} ), 0 ) AS "readFlag"
+			</if>
 			,(select count(ksc.id) from knowledge_sharing_comment ksc where a.id = ksc.knowledge_sharing_id) as "replyCount"
 		FROM knowledge_sharing_info a
 		left join sys_user su on su.id = a.create_by

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

@@ -597,6 +597,7 @@ END) as projectScale*/
 			</if>
 			<if test="paperRecordBeginDate !=null or paperRecordBeginDate !=null">
 				AND (ppf.status in (5,7) or pfp.status in (5,7))
+				and (a.paper_filing_status != 10 or a.paper_filing_status is null)
 			</if>
 			<!-- 上报审核时间 -->
 			<if test="reportedBeginDate !=null">
@@ -1051,6 +1052,7 @@ END) as projectScale*/
 			</if>
 			<if test="paperRecordBeginDate !=null or paperRecordBeginDate !=null">
 				AND (ppf.status in (5,7) or pfp.status in (5,7))
+				and (a.paper_filing_status != 10 or a.paper_filing_status is null)
 			</if>
 			<!-- 上报审核时间 -->
 			<if test="reportedBeginDate !=null">
@@ -1446,6 +1448,7 @@ END) as projectScale*/
 			</if>
 			<if test="paperRecordBeginDate !=null or paperRecordBeginDate !=null">
 				AND (ppf.status in (5,7) or pfp.status in (5,7))
+				and (a.paper_filing_status != 10 or a.paper_filing_status is null)
 			</if>
 			<!-- 上报审核时间 -->
 			<if test="reportedBeginDate !=null">

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

@@ -2903,7 +2903,10 @@
 		<where>
 			a.del_flag=0
 		    and a.status = 5
-			and a.office_id in(select id  from sys_office where id = #{officeId} or parent_ids like concat('%',#{officeId},'%'))
+
+			<if test="officeId != null and officeId != ''">
+				and a.office_id in(select id  from sys_office where id = #{officeId} ${ruralProjectRecords.sqlMap.officeId})
+			</if>
 		    <if test="grade == '1'.toString() or grade == '2'.toString()">
 				and a.submit_money = #{grade}
 				and a.create_date >= #{beginDate}
@@ -3079,7 +3082,9 @@
 		<where>
 			a.del_flag=0
 			and a.status = 5
-			and a.office_id in(select id  from sys_office where id = #{officeId} or parent_ids like concat('%',#{officeId},'%'))
+			<if test="officeId != null and officeId != ''">
+				and a.office_id in(select id  from sys_office where id = #{officeId} ${ruralProjectRecords.sqlMap.officeId})
+			</if>
 			<if test="grade == '1'.toString() or grade == '2'.toString()">
 				and a.submit_money = #{grade}
 				and a.create_date >= #{beginDate}
@@ -3371,18 +3376,25 @@
 			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>
-			and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
+
+			<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+				and sdi.office_id = #{statementCompanyComprehensiveInfo.officeId}
+			</if>
 			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
 				and a.record_state != 7
 				and pmdr.id is null
 				and a.over_record_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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>
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field6 == '5'.toString() ">
 				and a.record_state = 7
 				and pmdr.id is null
 				and a.over_record_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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 prr.status = 7
 				and prr.del_flag = 0
 				and prr.accomplish_date >= #{beginDate}
@@ -3393,12 +3405,16 @@
 				and a.reported_state != 7
 				and a.reported_state != 10
 				and a.reported_state != 11
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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>
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
 				and a.reported_state = 7
 				and a.over_due_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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 rprr.report_status = 5
 				and rprr.del_flag = 0
 				and rprr.accomplish_date >= #{beginDate}
@@ -3581,18 +3597,24 @@
 			<if test="statementCompanyComprehensiveInfo.smallDateType != null and statementCompanyComprehensiveInfo.smallDateType !=''">
 				and sdi.small_date_type = #{statementCompanyComprehensiveInfo.smallDateType}
 			</if>
-			and sdi.office_id = #{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>
 			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
 				and a.record_state != 7
 				and pmdr.id is null
 				and a.over_record_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<if 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>
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field6 == '5'.toString() ">
 				and a.record_state = 7
 				and pmdr.id is null
 				and a.over_record_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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 prr.status = 7
 				and prr.del_flag = 0
 				and prr.accomplish_date >= #{beginDate}
@@ -3603,12 +3625,16 @@
 				and a.reported_state != 7
 				and a.reported_state != 10
 				and a.reported_state != 11
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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>
 			</if>
 			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
 				and a.reported_state = 7
 				and a.over_due_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId} or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%'))
+				<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 rprr.report_status = 5
 				and rprr.del_flag = 0
 				and rprr.accomplish_date >= #{beginDate}
@@ -4255,6 +4281,24 @@
 				and rprr.accomplish_date >= #{beginDate}
 				and rprr.accomplish_date &lt;= #{endDate}
 			</if>
+			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.paper_filing_status != 7
+				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},'%'))
+				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},'%'))
+				and ppf.status = 7
+				and ppf.del_flag = 0
+				and ppf.audit_pass_date >= #{beginDate}
+				and ppf.audit_pass_date &lt;= #{endDate}
+				and pmdr.id is null
+			</if>
 
 			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
 				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
@@ -4716,6 +4760,7 @@
 			a.del_flag = 0
 			and a.submit_money = 2
 			and a.status = 5
+			and a.paper_filing_status != 10
 			and prd.status = 5
 			and (ppf.status is null or ppf.status = 1)
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
@@ -4746,6 +4791,7 @@
 			AND a.STATUS = 5
 			and (prd.status = 5 or prd.status = 7)
 			AND a.submit_money = 1
+			and (a.paper_filing_status != 10 or a.paper_filing_status is null)
 			AND (pfp.STATUS IS NULL or (pfp.STATUS != 5 and pfp.STATUS != 7))
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
 			and (pmdrd.id is null or pmdrd.status = 1 or pmdrd.status = 2 or pmdrd.status = 3 or pmdrd.status = 4)
@@ -6016,11 +6062,495 @@ GROUP BY
 
 	<update id="updateProjectBatchArchiveOnOverDue">
 		update rural_project_records
-		set over_batch_archive_status = 1
+		set over_paper_filing_status = 1
 		<if test="status != null and status != ''">
-			,batch_archive_status = ${status}
+			,paper_filing_status = ${status}
 		</if>
 		where id = #{id}
 	</update>
 
+	<select id="selectThisMonthReportPageOverdue" resultType="RuralProjectRecords">
+		SELECT
+		<include refid="projectRecordsColumnss"/>
+		,a.record_state as "recordState"
+		,a.submit_money as "submitMoney"
+		,(case when a.submit_money = '1' then 'B级' when a.submit_money = '2' then 'A级' else '' end) as projectScale
+		,(case
+		when a.submit_money = '1' and prd.status = '5' then
+		'已完成'
+		when a.submit_money = '2' and prdt.status = '5' then
+		'已完成' else '未完成'
+		end) as completionStatus
+		,(case
+		when a.submit_money = '1' and pfp.status = '5' then
+		'已归档'
+		when a.submit_money = '2' and ppf.status = '5' then
+		'已归档' else '未归档'
+		end) as downArchiveStatus
+		,a.project_type as projectType,
+		wci.name AS "workContractInfo.name",
+		wci.contract_num as "workContractInfo.contractNum",
+		wci.contract_price as "workContractInfo.contractPrice",
+		sub.name as "projectMasterName",
+		sob.name as "projectMasterOffice",
+		wct.id AS "workContractInfo.client.id",
+		wct.name AS "workContractInfo.client.name",
+		o.top_company AS "office.name",
+		o.name AS "createByOffice",
+		ifnull(prd.number ,"") as "projectReportNumber"
+		,ifnull(prd.status,0) as "projectReportStatus"
+		,ifnull(prd.name,"") as "projectReportName"
+		<choose>
+			<when test="statementCompanyComprehensiveInfo.field5  != null and statementCompanyComprehensiveInfo.field5 == '5'.toString()">
+				,ifnull(prr.status,6) as "projectReportRecordStatus"
+			</when>
+			<otherwise>
+				<choose>
+					<when test="statementCompanyComprehensiveInfo.field6  != null and statementCompanyComprehensiveInfo.field6 == '5'.toString()">
+						,ifnull(prr.status,7) as "projectReportRecordStatus"
+					</when>
+					<otherwise>
+						,ifnull(prr.status,0) as "projectReportRecordStatus"
+					</otherwise>
+				</choose>
+			</otherwise>
+		</choose>
+		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
+		prrd.file_num as recodeNum,
+		prr.process_instance_id as prrProcessInstanceId,
+		prrd.process_instance_id as prrdProcessInstanceId
+		,prd.id as prdId
+		,prr.id as prrId
+		,prrd.id as prrdId
+		,prd.audit_pass_date as auditPassDate
+		,if(date_add(prd.audit_pass_date,interval #{ruralProjectRecords.endingCount} day) >now(),"0","1") as reportedType
+		,ifnull(rprr.report_status,0) as "reportStatus"
+		,ifnull(rprr.sync_status,0) as "syncStatus"
+		,ifnull(pas.status,0) as "approvalSignatureStatus"
+		,ifnull(pas.process_instance_id,"") as "approvalSignatureProcessInstanceId"
+		,ifnull(prs.status,0) as "reportSignatureStatus"
+		,ifnull(prs.process_instance_id,"") as "reportSignatureProcessInstanceId"
+		,rprr.process_instance_id as "reportedProcessInstanceId"
+		,ifnull(prdt.status,0) as "projectReportStatusTwo"
+		,prdt.id as prdtId
+		,prdt.process_instance_id as prdtProcessinstanceId
+		,ifnull(pmdr.status,0) as "defectRecordStatus"
+		,pmdr.process_instance_id as "pmdrProcessInstanceId"
+		,pmdr.id as pmdrId
+		,ifnull(ppf.status,0) as "paperFilingStatus"
+		,ppf.process_instance_id as "ppfProcessInstanceId"
+		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
+		,ifnull(prd.approval_fee ,"") as "approvalFee"
+		,ifnull(prd.review_fee ,"") as "reviewFee"
+		,ifnull(prd.verify_fee ,"") as "verifyFee"
+		,ifnull(prd.verify_rate ,"") as "verifyRate"
+		,prd.audit_pass_date as "reportAuditDate"
+		,prdt.audit_pass_date as "reportTwoAuditDate"
+		/*,SUM(wi.money) as "money"*/
+		,prd.ZiXunShouRu as "money"
+		,prd.signature_flag as "signatureFlag"
+		,prd.signature_contract_id as "signatureContractId"
+		,prd.signature_url as "signatureUrl"
+		,a.report_signature_flag as "reportSignatureFlag"
+		,a.report_signature_url as "reportSignatureUrl"
+		,a.report_signature_contract_id as "reportSignatureContractId"
+		,prsi.id as "prsiId"
+		,a.attachment_project_sort as "attachmentProjectSort"
+		,rprr.ZiXunBDE as "ziXunBDE"
+		FROM rural_project_records a
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		left join rural_project_records_reported rprr on rprr.id = a.id
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
+		LEFT JOIN sys_user sua on a.create_by = sua.id
+		<if test="ruralProjectRecords.leaderNameStr !=null and ruralProjectRecords.leaderNameStr !=''">
+			LEFT JOIN work_project_user w on a.id = w.project_id
+			LEFT JOIN sys_user su on w.user_id = su.id
+		</if>
+		LEFT JOIN sys_user sub on a.project_master_id = sub.id
+		LEFT JOIN sys_office sob ON sob.id = sub.office_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+		LEFT JOIN work_client_info wct on wci.client_id = wct.id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id and pmdr.del_flag = 0
+		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
+		left join project_approval_signature pas on pas.project_id = a.id
+		left join project_report_signature prs on prs.project_id = a.id
+		left join project_report_signature_info prsi on prsi.project_report_id = prd.number
+		<where>
+			a.status = 5
+			and a.del_flag = 0
+
+			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
+				and a.record_state != 7
+				and pmdr.id is null
+				and a.over_record_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field6 == '5'.toString() ">
+				and a.record_state = 7
+				and pmdr.id is null
+				and a.over_record_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+				and prr.status = 7
+				and prr.del_flag = 0
+				and prr.accomplish_date >= #{beginDate}
+				and prr.accomplish_date &lt;= #{endDate}
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
+				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
+				and a.reported_state = 7
+				and a.over_due_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+				and rprr.report_status = 5
+				and rprr.del_flag = 0
+				and rprr.accomplish_date >= #{beginDate}
+				and rprr.accomplish_date &lt;= #{endDate}
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.paper_filing_status != 7
+				AND a.paper_filing_status != '10'
+				AND a.paper_filing_status != '11'
+				and a.over_paper_filing_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.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
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+				and ppf.status = 7
+				and ppf.del_flag = 0
+				and ppf.audit_pass_date >= #{beginDate}
+				and ppf.audit_pass_date &lt;= #{endDate}
+				and pmdr.id is null
+			</if>
+
+			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
+				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
+			</if>
+			<if test="ruralProjectRecords.projectName != null and ruralProjectRecords.projectName != ''">
+				AND a.project_name like concat(concat('%',#{ruralProjectRecords.projectName}),'%')
+			</if>
+			<if test="ruralProjectRecords.scaleType != null and ruralProjectRecords.scaleType != ''">
+				AND a.scale_type = #{ruralProjectRecords.scaleType}
+			</if>
+			<if test="ruralProjectRecords.scaleUnit != null and ruralProjectRecords.scaleUnit != ''">
+				AND a.scale_unit = #{ruralProjectRecords.scaleUnit}
+			</if>
+			<if test="ruralProjectRecords.scaleQuantity != null and ruralProjectRecords.scaleQuantity != ''">
+				AND a.scale_quantity = #{ruralProjectRecords.scaleQuantity}
+			</if>
+			<if test="ruralProjectRecords.projectSite != null and ruralProjectRecords.projectSite != ''">
+				AND a.project_site LIKE concat('%',#{ruralProjectRecords.projectSite},'%')
+			</if>
+			<if test="ruralProjectRecords.remarks != null and ruralProjectRecords.remarks != ''">
+				AND a.remarks LIKE concat('%',#{ruralProjectRecords.remarks},'%')
+			</if>
+			<if test="ruralProjectRecords.projectDesc != null and ruralProjectRecords.projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{ruralProjectRecords.projectDesc},'%')
+			</if>
+			<if test="ruralProjectRecords.area != null and ruralProjectRecords.area.id != null and ruralProjectRecords.area.id != ''">
+				AND a.area_id = #{ruralProjectRecords.area.id}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.name !=null and ruralProjectRecords.workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{ruralProjectRecords.workContractInfo.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractNum !=null and ruralProjectRecords.workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{ruralProjectRecords.workContractInfo.contractNum}),'%')
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractPrice !=null and ruralProjectRecords.workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{ruralProjectRecords.workContractInfo.contractPrice}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractType !=null and ruralProjectRecords.workContractInfo.contractType !=''">
+				AND wci.contract_type = #{ruralProjectRecords.workContractInfo.contractType}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo!=null and ruralProjectRecords.workContractInfo.client !=null and ruralProjectRecords.workContractInfo.client.name !=null and ruralProjectRecords.workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{ruralProjectRecords.workContractInfo.client.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.leaderNameStr !=null and ruralProjectRecords.leaderNameStr !=''">
+				AND su.name like concat(concat('%',#{ruralProjectRecords.leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="ruralProjectRecords.projectStatus !=null">
+				AND a.status = #{ruralProjectRecords.projectStatus}
+			</if>
+			<if test="ruralProjectRecords.beginDate !=null">
+				AND a.create_date >= #{ruralProjectRecords.beginDate}
+			</if>
+			<if test="ruralProjectRecords.endDate !=null">
+				AND a.create_date &lt; #{ruralProjectRecords.endDate}
+			</if>
+			<if test="ruralProjectRecords.projectType !=null and ruralProjectRecords.projectType !=''">
+				and project_type= #{ruralProjectRecords.projectType}
+			</if>
+			<if test="ruralProjectRecords.engineeringType !=null and ruralProjectRecords.engineeringType !=''">
+				and a.engineering_type= #{ruralProjectRecords.engineeringType}
+			</if>
+			<!--<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>-->
+			<if test="ruralProjectRecords.officeIdList!=null and ruralProjectRecords.officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{ruralProjectRecords.officeId}
+				</foreach>
+			</if>
+
+			<if test="ruralProjectRecords.reportData!=null and ruralProjectRecords.reportData.number !=null and ruralProjectRecords.reportData.number !=''">
+				and prd.number like concat('%',#{ruralProjectRecords.reportData.number},'%')
+			</if>
+			<if test="ruralProjectRecords.filingProjectStatus!=null and ruralProjectRecords.filingProjectStatus !=''">
+				and pfp.status =${ruralProjectRecords.filingProjectStatus}
+			</if>
+			<if test="ruralProjectRecords.submitMoney!=null and ruralProjectRecords.submitMoney !=''">
+				and a.submit_money =#{ruralProjectRecords.submitMoney}
+			</if>
+			<if test="ruralProjectRecords.createBy !=null and ruralProjectRecords.createBy !=''">
+				<if test="ruralProjectRecords.createBy.name !=null and ruralProjectRecords.createBy.name !=''">
+					AND sua.name like concat(concat('%',#{ruralProjectRecords.createBy.name}),'%')
+				</if>
+			</if>
+			<if test="ruralProjectRecords.office!=null and ruralProjectRecords.office.name!=null and ruralProjectRecords.office.name!=''">
+				AND o.name like concat(concat('%',#{ruralProjectRecords.office.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.sqlMap.delFlag !=null and ruralProjectRecords.sqlMap.delFlag!=''">
+				${ruralProjectRecords.sqlMap.delFlag}
+			</if>
+			<if test="ruralProjectRecords.sqlMap.dsf !=null and ruralProjectRecords.sqlMap.dsf!=''">
+				AND ((w1.user_id = #{ruralProjectRecords.currentUser.id} AND w1.del_flag='0' AND a.company_id = #{ruralProjectRecords.currentUser.company.id} )${ruralProjectRecords.sqlMap.dsf} )
+			</if>
+		</where>
+		GROUP BY a.id
+		<choose>
+			<when test="ruralProjectRecords.page !=null and ruralProjectRecords.page.orderBy != null and ruralProjectRecords.page.orderBy != ''">
+				ORDER BY ${ruralProjectRecords.page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+		<if test="ruralProjectRecords.page.pageSize != -1">
+			limit ${ruralProjectRecords.page.pageNo},${ruralProjectRecords.page.pageSize}
+		</if>
+	</select>
+
+	<select id="selectThisMonthReportPageOverdueCount" resultType="integer">
+		select
+		count(DISTINCT a.id)
+		from rural_project_records a
+
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		left join rural_project_records_reported rprr on rprr.id = a.id
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
+		LEFT JOIN sys_user sua on a.create_by = sua.id
+		<if test="ruralProjectRecords.leaderNameStr !=null and ruralProjectRecords.leaderNameStr !=''">
+			LEFT JOIN work_project_user w on a.id = w.project_id
+			LEFT JOIN sys_user su on w.user_id = su.id
+		</if>
+		LEFT JOIN sys_user sub on a.project_master_id = sub.id
+		LEFT JOIN sys_office sob ON sob.id = sub.office_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+		LEFT JOIN work_client_info wct on wci.client_id = wct.id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id and pmdr.del_flag = 0
+		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
+		left join project_approval_signature pas on pas.project_id = a.id
+		left join project_report_signature prs on prs.project_id = a.id
+		left join project_report_signature_info prsi on prsi.project_report_id = prd.number
+		<where>
+			a.status = 5
+			and a.del_flag = 0
+			<if test="statementCompanyComprehensiveInfo.field5 == '5'.toString() ">
+				and a.record_state != 7
+				and pmdr.id is null
+				and a.over_record_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field6 == '5'.toString() ">
+				and a.record_state = 7
+				and pmdr.id is null
+				and a.over_record_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+				and prr.status = 7
+				and prr.del_flag = 0
+				and prr.accomplish_date >= #{beginDate}
+				and prr.accomplish_date &lt;= #{endDate}
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field7 == '5'.toString() ">
+				and a.over_due_status = 1
+				and a.reported_state != 7
+				and a.reported_state != 10
+				and a.reported_state != 11
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field8 == '5'.toString() ">
+				and a.reported_state = 7
+				and a.over_due_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+				and rprr.report_status = 5
+				and rprr.del_flag = 0
+				and rprr.accomplish_date >= #{beginDate}
+				and rprr.accomplish_date &lt;= #{endDate}
+			</if>
+			<if test="statementCompanyComprehensiveInfo.field13 == '5'.toString() ">
+				and a.paper_filing_status != 7
+				AND a.paper_filing_status != '10'
+				AND a.paper_filing_status != '11'
+				and a.over_paper_filing_status = 1
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.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
+				<if test="statementCompanyComprehensiveInfo.officeId != null and statementCompanyComprehensiveInfo.officeId !=''">
+					and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				</if>
+				and ppf.status = 7
+				and ppf.del_flag = 0
+				and ppf.audit_pass_date >= #{beginDate}
+				and ppf.audit_pass_date &lt;= #{endDate}
+				and pmdr.id is null
+			</if>
+
+			<if test="ruralProjectRecords.projectId != null and ruralProjectRecords.projectId != ''">
+				AND a.project_id like concat('%',#{ruralProjectRecords.projectId},'%')
+			</if>
+			<if test="ruralProjectRecords.projectName != null and ruralProjectRecords.projectName != ''">
+				AND a.project_name like concat(concat('%',#{ruralProjectRecords.projectName}),'%')
+			</if>
+			<if test="ruralProjectRecords.scaleType != null and ruralProjectRecords.scaleType != ''">
+				AND a.scale_type = #{ruralProjectRecords.scaleType}
+			</if>
+			<if test="ruralProjectRecords.scaleUnit != null and ruralProjectRecords.scaleUnit != ''">
+				AND a.scale_unit = #{ruralProjectRecords.scaleUnit}
+			</if>
+			<if test="ruralProjectRecords.scaleQuantity != null and ruralProjectRecords.scaleQuantity != ''">
+				AND a.scale_quantity = #{ruralProjectRecords.scaleQuantity}
+			</if>
+			<if test="ruralProjectRecords.projectSite != null and ruralProjectRecords.projectSite != ''">
+				AND a.project_site LIKE concat('%',#{ruralProjectRecords.projectSite},'%')
+			</if>
+			<if test="ruralProjectRecords.remarks != null and ruralProjectRecords.remarks != ''">
+				AND a.remarks LIKE concat('%',#{ruralProjectRecords.remarks},'%')
+			</if>
+			<if test="ruralProjectRecords.projectDesc != null and ruralProjectRecords.projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{ruralProjectRecords.projectDesc},'%')
+			</if>
+			<if test="ruralProjectRecords.area != null and ruralProjectRecords.area.id != null and ruralProjectRecords.area.id != ''">
+				AND a.area_id = #{ruralProjectRecords.area.id}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.name !=null and ruralProjectRecords.workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{ruralProjectRecords.workContractInfo.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractNum !=null and ruralProjectRecords.workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{ruralProjectRecords.workContractInfo.contractNum}),'%')
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractPrice !=null and ruralProjectRecords.workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{ruralProjectRecords.workContractInfo.contractPrice}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo !=null and ruralProjectRecords.workContractInfo.contractType !=null and ruralProjectRecords.workContractInfo.contractType !=''">
+				AND wci.contract_type = #{ruralProjectRecords.workContractInfo.contractType}
+			</if>
+			<if test="ruralProjectRecords.workContractInfo!=null and ruralProjectRecords.workContractInfo.client !=null and ruralProjectRecords.workContractInfo.client.name !=null and ruralProjectRecords.workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{ruralProjectRecords.workContractInfo.client.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.leaderNameStr !=null and ruralProjectRecords.leaderNameStr !=''">
+				AND su.name like concat(concat('%',#{ruralProjectRecords.leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="ruralProjectRecords.projectStatus !=null">
+				AND a.status = #{ruralProjectRecords.projectStatus}
+			</if>
+			<if test="ruralProjectRecords.beginDate !=null">
+				AND a.create_date >= #{ruralProjectRecords.beginDate}
+			</if>
+			<if test="ruralProjectRecords.endDate !=null">
+				AND a.create_date &lt; #{ruralProjectRecords.endDate}
+			</if>
+			<if test="ruralProjectRecords.projectType !=null and ruralProjectRecords.projectType !=''">
+				and project_type= #{ruralProjectRecords.projectType}
+			</if>
+			<if test="ruralProjectRecords.engineeringType !=null and ruralProjectRecords.engineeringType !=''">
+				and a.engineering_type= #{ruralProjectRecords.engineeringType}
+			</if>
+			<!--<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>-->
+			<if test="ruralProjectRecords.officeIdList!=null and ruralProjectRecords.officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{ruralProjectRecords.officeId}
+				</foreach>
+			</if>
+
+			<if test="ruralProjectRecords.reportData!=null and ruralProjectRecords.reportData.number !=null and ruralProjectRecords.reportData.number !=''">
+				and prd.number like concat('%',#{ruralProjectRecords.reportData.number},'%')
+			</if>
+			<if test="ruralProjectRecords.filingProjectStatus!=null and ruralProjectRecords.filingProjectStatus !=''">
+				and pfp.status =${ruralProjectRecords.filingProjectStatus}
+			</if>
+			<if test="ruralProjectRecords.submitMoney!=null and ruralProjectRecords.submitMoney !=''">
+				and a.submit_money =#{ruralProjectRecords.submitMoney}
+			</if>
+			<if test="ruralProjectRecords.createBy !=null and ruralProjectRecords.createBy !=''">
+				<if test="ruralProjectRecords.createBy.name !=null and ruralProjectRecords.createBy.name !=''">
+					AND sua.name like concat(concat('%',#{ruralProjectRecords.createBy.name}),'%')
+				</if>
+			</if>
+			<if test="ruralProjectRecords.office!=null and ruralProjectRecords.office.name!=null and ruralProjectRecords.office.name!=''">
+				AND o.name like concat(concat('%',#{ruralProjectRecords.office.name}),'%')
+			</if>
+			<if test="ruralProjectRecords.sqlMap.delFlag !=null and ruralProjectRecords.sqlMap.delFlag!=''">
+				${ruralProjectRecords.sqlMap.delFlag}
+			</if>
+			<if test="ruralProjectRecords.sqlMap.dsf !=null and ruralProjectRecords.sqlMap.dsf!=''">
+				AND ((w1.user_id = #{ruralProjectRecords.currentUser.id} AND w1.del_flag='0' AND a.company_id = #{ruralProjectRecords.currentUser.company.id} )${ruralProjectRecords.sqlMap.dsf} )
+			</if>
+		</where>
+	</select>
+
+
+
+
 </mapper>

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

@@ -214,6 +214,11 @@
 	<select id="getOfficeListInfo" resultType="Office">
 		select o.id,o.name from statement_office_info a
 		left join sys_office o on o.id = a.office_id
+		<where>
+			<if test="decisionValue != null and decisionValue != ''">
+				a.decision_value = #{decisionValue}
+			</if>
+		</where>
 		ORDER BY o.code
 	</select>
 
@@ -228,7 +233,7 @@
 	<select id="getAllOfficeListInfo" resultType="Office">
 		select a.id,a.name from sys_office a
 		<where>
-			a.parent_id = 'ffe5af5b557e46f28b000c94716e228a'
+			a.parent_ids like concat ('%','ffe5af5b557e46f28b000c94716e228a','%') and a.id not in ('ee4e055e2f074aef934d283880983a38','5c38f1ce85224d74bd9d110ea6fab976','eb6879557ca8497fb18864eb7ac13809')
 			and a.del_flag = 0
 		</where>
 		ORDER BY a.code
@@ -373,7 +378,6 @@
 			AND a.reported_state != '10'
 			AND a.reported_state != '11'
 			and a.over_due_status = 1
-			and pmdrd.id is null
 		</where>
 	</select>
 
@@ -406,7 +410,6 @@
 			and a.over_due_status = 1
 			and rprr.report_status = 5
 			and rprr.del_flag = 0
-			and pmdrd.id is null
 			and rprr.accomplish_date >= #{beginDate}
 			and rprr.accomplish_date &lt;= #{endDate}
 		</where>
@@ -1669,9 +1672,9 @@
 
 	<select id="selectAllByOfficeId" parameterType="StatementCompanyComprehensiveInfo" resultType="StatementCompanyComprehensiveInfo">
 		SELECT
+			DISTINCT a.id as "id",
 			su.NAME as "userName",
 			so.NAME as "officeName",
-			a.id as "id",
 			a.del_flag as "delFlag",
 			a.create_date as "createDate",
 			a.year as "year",
@@ -1702,9 +1705,6 @@
 				statement_office_comprehensive_info a
 				LEFT JOIN sys_user su ON su.id = a.user_id
 				LEFT JOIN sys_office so ON a.office_id = so.id
-				<if test="type == '1'.toString()">
-					left join statement_office_info soi on a.office_id = soi.office_id
-				</if>
 		<where>
 				a.type = #{type}
 			and big_date_type =#{bigDateType}
@@ -2093,9 +2093,9 @@
 
 	<select id="selectAllByOfficeIdByYear" parameterType="StatementCompanyComprehensiveInfo" resultType="StatementCompanyComprehensiveInfo">
 		SELECT
+		distinct a.id as "id",
 		su.NAME as "userName",
 		so.NAME as "officeName",
-		a.id as "id",
 		a.del_flag as "delFlag",
 		a.create_date as "createDate",
 		a.year as "year",
@@ -2126,9 +2126,6 @@
 		statement_office_comprehensive_info_two a
 		LEFT JOIN sys_user su ON su.id = a.user_id
 		LEFT JOIN sys_office so ON a.office_id = so.id
-		<if test="type == '1'.toString()">
-			left join statement_office_info soi on a.office_id = soi.office_id
-		</if>
 		<where>
 			a.type = #{type}
 			and big_date_type =#{bigDateType}
@@ -2342,8 +2339,8 @@
 			a.del_flag=0
 			and a.submit_money = 2
 			and a.status = 5
-			and a.record_state = 7
-			and a.over_record_status = 1
+			and a.paper_filing_status = 7
+			and a.over_paper_filing_status = 1
 			and ppf.status = 7
 			and ppf.del_flag = 0
 			and ppf.audit_pass_date >= #{beginDate}
@@ -2419,8 +2416,8 @@
 			a.del_flag=0
 			and a.submit_money = 2
 			and a.status = 5
-			and a.record_state = 7
-			and a.over_record_status = 1
+			and a.paper_filing_status = 7
+			and a.over_paper_filing_status = 1
 			and ppf.status = 7
 			and ppf.del_flag = 0
 			and ppf.audit_pass_date >= #{beginDate}

src/main/resources/mappings/modules/sys/OfficeDao.xml

@@ -145,6 +145,14 @@
 		<include refid="officeJoins"/>
 		WHERE a.code = #{code}
 	</select>
+
+	<select id="getByName" resultType="Office">
+		SELECT
+			<include refid="officeColumns"/>
+		FROM sys_office a
+		<include refid="officeJoins"/>
+		WHERE a.name = #{name}
+	</select>
 	<select id="findList" resultType="Office">
 		SELECT
 			<include refid="officeColumns"/>

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

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

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

@@ -37,7 +37,6 @@
 		a.bank AS "bank",
 		a.bank_number AS "bankNumber",
 		a.cancle_reason AS "cancaleReason",
-		u.name AS "drawer.name",
 		su.name AS "createBy.name",
 		so.top_company AS "office.name",
 		w.name AS "client.name",
@@ -64,12 +63,9 @@
 		a.cancellation_remark as "cancellationRemark",
 		a.account_checking_user_id as "accountCheckingUserId",
 		a.area_id as "area.id",
-		acu.name as "accountCheckingUserName",
 		a.new_drawer_id as "newDrawerId",
-		(select name from sys_user where id = a.new_drawer_id) as "newDrawerName",
 		a.new_drawer as "newDrawer",
-		a.actual_drawer_id as "actualDrawerId",
-		(select name from sys_user where id = a.actual_drawer_id) as "actualDrawerName"
+		a.actual_drawer_id as "actualDrawerId"
 	</sql>
 
 	<sql id="newWorkInvoiceColumns">
@@ -457,8 +453,18 @@
 			<include refid="workInvoiceColumns"/>
 			,wid.number as "widNumber"
 			,wid.total_money as "widTotalMoney"
+
+		,ifnull(( SELECT wir.receipt_date FROM work_invoice_receipt wir WHERE wir.invoice_id = a.id ORDER BY wir.receipt_date DESC LIMIT 1 ),a.receipt_money_date) AS "receiptMoneyDate",
+		ifnull((select sum(wir.money) from work_invoice_receipt wir where wir.invoice_id = a.id ),0) as "receiptMoneyD"
 		FROM work_invoice a
-		<include refid="workInvoiceJoins"/>
+		LEFT JOIN sys_user su ON su.id = a.create_by
+		LEFT JOIN work_client_info w ON  w.id = a.client_id
+		LEFT JOIN rural_project_records p ON  p.id = a.project_id
+		LEFT JOIN project_report_data prd ON  p.id = prd.project_id
+		left JOIN work_contract_info ci on ci.id = p.contract_id
+		JOIN sys_office o ON o.id = a.office_id
+		JOIN sys_office s ON s.id = a.company_id
+		LEFT join sys_office so on so.id = a.office_id
 		left join work_invoice_project_relation wipr on a.id = wipr.invoice_id
 		left join rural_project_records rprs on wipr.project_id = rprs.id
 		left join rural_project_records rpr on rpr.id = wipr.project_id
@@ -1163,7 +1169,14 @@
 	<select id="queryCount" resultType="int" >
 		SELECT count(DISTINCT(a.id))
 		FROM work_invoice a
-		<include refid="workInvoiceJoins"/>
+		LEFT JOIN sys_user su ON su.id = a.create_by
+		LEFT JOIN work_client_info w ON  w.id = a.client_id
+		LEFT JOIN rural_project_records p ON  p.id = a.project_id
+		LEFT JOIN project_report_data prd ON  p.id = prd.project_id
+		left JOIN work_contract_info ci on ci.id = p.contract_id
+		JOIN sys_office o ON o.id = a.office_id
+		JOIN sys_office s ON s.id = a.company_id
+		LEFT join sys_office so on so.id = a.office_id
 		left join work_invoice_detail wid on a.id = wid.invoice_id
 		left join work_invoice_project_relation wipr on a.id = wipr.invoice_id
 		left join rural_project_records rprs on wipr.project_id = rprs.id
@@ -1179,7 +1192,10 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="number != null and number != ''">
-				AND a.number = #{number}
+				AND a.number LIKE
+				<if test="dbName == 'oracle'">'%'||#{number}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{number}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{number},'%')</if>
 			</if>
 			<if test="invoiceState != null and invoiceState != ''">
 				AND a.invoice_state = #{invoiceState}
@@ -2013,7 +2029,7 @@
 		<where>
 			a.del_flag=0
 			and a.invoice_state = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${WorkInvoice.sqlMap.officeId})
 			<if test="newlyAdded == '5'.toString() ">
 				and a.invoice_date >= #{beginDate}
 				and a.invoice_date &lt;= #{endDate}
@@ -2164,7 +2180,7 @@
 		<where>
 			a.del_flag=0
 			and a.invoice_state = 5
-			and a.office_id in(select id  from sys_office where id = #{officeIdd} or parent_ids like concat('%',#{officeIdd},'%'))
+			and a.office_id in(select id  from sys_office where id = #{officeIdd} ${WorkInvoice.sqlMap.officeId})
 			<if test="newlyAdded == '5'.toString() ">
 				and a.invoice_date >= #{beginDate}
 				and a.invoice_date &lt;= #{endDate}

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

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

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.jeeplus.modules.workstaff.dao.WorkStaffBasicInfoDao">
 
 	<sql id="workStaffBasicInfoColumns">
-		a.id AS "id",
+		DISTINCT a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -169,12 +169,25 @@
 			<include refid="workStaffBasicInfoColumns"/>
 		,su.name as "auditUserName"
 		,suc.login_flag as "userLoginFlag"
+		,(SELECT
+		GROUP_CONCAT(mdd.detail_name)
+		FROM
+		work_staff_certificate wsc
+		left join main_dict_detail mdd on mdd.detail_key = wsc.name
+		left join main_dict md on md.id = mdd.type_id and md.type_name = 'certificate_type'
+		WHERE
+		wsc.del_flag = '0'
+		AND wsc.staff_id = a.achive_id) as "certificateName"
 		FROM work_staff_basic_info a
 		<include refid="workStaffBasicInfoJoins"/>
 		LEFT JOIN sys_user su ON su.id = a.audit_user_id
 		LEFT JOIN sys_user suc ON suc.id = a.user_id
+		LEFT JOIN work_staff_certificate wsc ON wsc.staff_id = a.achive_id and wsc.del_flag = 0
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="certificateType != null and certificateType != ''">
+				and wsc.name = #{certificateType}
+			</if>
 			<if test="company != null and company.id != null and company.id != ''">
 				AND a.company_id = #{company.id}
 			</if>
@@ -220,6 +233,19 @@
 			<if test="achiveId != null and achiveId !=''">
 				AND a.achive_id = #{achiveId}
 			</if>
+			<if test="highestEducation != null and highestEducation !=''">
+				AND a.highest_education = #{highestEducation}
+			</if>
+			<if test="isHandSignature != null and isHandSignature !=''">
+				<choose>
+					<when test="isHandSignature == 1">
+						and hand_signature is not null
+					</when>
+					<otherwise>
+						and (hand_signature is null or hand_signature = '')
+					</otherwise>
+				</choose>
+			</if>
             <if test="sqlMap.dsf !=null and sqlMap.dsf !=''">
                 AND ((a.user_id = #{currentUser.id} AND a.branch_office = #{currentUser.branchOffice.id})${sqlMap.dsf} )
             </if>

src/main/webapp/webpage/modules/oa/oaNotifyAdminForm.jsp

@@ -4,10 +4,16 @@
 <head>
     <title>通知管理</title>
     <meta name="decorator" content="default"/>
+
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <script src="${ctxStatic}/common/html/js/script.js"></script>
     <style type="text/css">
         img {width: 50px; height: 50px;}
     </style>
     <script type="text/javascript" src="${ctxStatic}/ckeditor/ckeditor.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script type="text/javascript" language="JavaScript" for="window" event="onload">
         var validateForm;
         function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -81,6 +87,25 @@
                 multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
             }
         }
+        function insertTitleCollection(tValue){
+            var list = "${oaNotify.workAttachments}";
+            var size = (list.split('url')).length-1;
+            var files = tValue;
+            for(var i = 0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "107";
+                console.log(file);
+                var timestamp = new Date().getTime();
+
+                var storeAs = "oaNotify";
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                $("#addFile" + divId).show();
+                multipartUploadWithStsCollection(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, size);
+            }
+        }
 
         function changeUser(ids,names,parents) {
             var split = ids.split(',');
@@ -127,61 +152,62 @@
         }
 
     </script>
-
 </head>
 <body >
 <div class="single-form">
     <div class="container">
-        <form:form id="inputForm" modelAttribute="oaNotify" enctype="multipart/form-data" action="${ctx}/oa/oaNotify/adminUpdate" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="oaNotify" enctype="multipart/form-data" action="${ctx}/oa/oaNotify/adminUpdate" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
+            <form:hidden path="flagOffice"/>
             <sys:message content="${message}"/>
-
             <div class="form-group layui-row first">
+                <div class="layui-row">
+                    <div class="form-group-label"><h2>通告状态</h2></div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">通告状态：</label>
+                        <div class="layui-input-block">
+                            <input type="radio" title="短期" lay-filter="ext" checked name="ext" id="ext" value="0">
+                            <input type="radio" title="长期" lay-filter="ext" name="ext" id="ext1" value="1">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>通告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>通告标题：</label>
                     <div class="layui-input-block">
-                        <form:input path="title" htmlEscape="false" maxlength="30" class="form-control required layui-input"/>
+                        <form:input path="title" htmlEscape="false" placeholder="请输入通告标题" maxlength="30" class="form-control judgment layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>通告编号：</label>
+                    <label class="layui-form-label">文号：</label>
                     <div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="number" htmlEscape="false" readonly="true" maxlength="30" class="form-control layui-input"/>
-                            <span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty oaNotify.status}">${fns:getDictLabel(oaNotify.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>
-                        </div>
+                        <form:input path="referenceNumber" placeholder="请输入文号" htmlEscape="false" maxlength="30" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>通告类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="type" class="form-control required simple-select">
+                    <div class="layui-input-block readOnlyFFF">
+                        <form:select path="type" class="form-control judgment simple-select">
                             <form:options items="${fns:getMainDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">创建日期：</label>
-                    <div class="layui-input-block">
-                        <input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
-                               value="<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 ">
-                    <label class="layui-form-label"><span class="require-item">*</span>开始日期：</label>
-                    <div class="layui-input-block">
-                        <input id="startDate" name="startDate" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  class="laydate-icondate form-control layer-date layui-input laydate-icon required"
-                               value="<fmt:formatDate value="${oaNotify.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+                <div id="divv">
+                    <div class="layui-item layui-col-sm6 ">
+                        <label class="layui-form-label"><span class="require-item">*</span>开始日期：</label>
+                        <div class="layui-input-block">
+                            <input id="startDate" placeholder="请输入开始日期" name="startDate" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  class="laydate-icondate form-control layer-date layui-input laydate-icon required"
+                                   value="<fmt:formatDate value="${oaNotify.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+                        </div>
                     </div>
-                </div>
-                <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>结束日期：</label>
-                    <div class="layui-input-block">
-                        <input id="endDate" name="endDate" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  class="laydate-icondate form-control layer-date layui-input laydate-icon required"
-                               value="<fmt:formatDate value="${oaNotify.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>结束日期：</label>
+                        <div class="layui-input-block">
+                            <input id="endDate" name="endDate" placeholder="请输入结束日期" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  class="laydate-icondate form-control layer-date layui-input laydate-icon required"
+                                   value="<fmt:formatDate value="${oaNotify.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+                        </div>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -200,15 +226,138 @@
                     <label class="layui-form-label"><span class="require-item">*</span>内容：</label>
                     <div class="layui-input-block">
                         <form:textarea path="contents" htmlEscape="false"  colspan="3" rows="6"  maxlength="550" class="form-control "/>
-                        <form:hidden id="content" path="content" htmlEscape="false" maxlength="64" class="form-control required"/>
+                        <form:hidden id="content" path="content" htmlEscape="false" maxlength="64" class="form-control judgment"/>
                         <sys:ckeditor replace="contents" uploadPath="/oa/oa"/>
                     </div>
                 </div>
             </div>
+
+            <div class="layui-item layui-col-sm6" >
+                <div class="form-group-label" ><h2>通告范围-部门</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:treeselectoffices id="offices" name="" value="" labelName="memberNameStr" labelValue=""
+                                           retnParent="true" checked="true" notAllowSelectParent="true" title="部门" url="/sys/office/treeData?type=2"  cssClass="form-control " allowClear="true"/>
+                </div>
+                <table id="officeTable" class="table table-bordered table-condensed details">
+                    <thead>
+                    <tr>
+                        <th class="hide"></th>
+                        <th>部门</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody id="officeTableList">
+                    </tbody>
+                </table>
+                <script type="text/template" id="officeTpl">//<!--
+                    <tr id="officeList{{idx}}">
+                        <td class="hide">
+                            <input id="officeList{{idx}}_id" name="officeList[{{idx}}].id" readonly="true" value="{{row.id}}" type="hidden" class="form-control officeId"/>
+                        </td>
+                        <td>
+                            {{row.name}}
+                        </td>
+                        <td class="text-center op-td">
+                                    <a href=javascript:void(0); onclick="delRow(this, '#officeList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
+                        </td>
+                    </tr>//-->
+                </script>
+            </div>
+
+            <div class="layui-item layui-col-sm6" >
+                <div class="form-group-label"><h2>通告范围-成员</h2></div>
+                <div class="layui-item nav-btns">
+                    <sys:treeselectusers id="users" name="" value="" labelName="memberNameStr" labelValue=""
+                                         retnParent="true" title="用户" url="/sys/office/treeData?type=3" checked="true" cssClass="form-control " allowClear="true" notAllowSelectParent="true"/>
+                </div>
+                <table id="userTable" class="table table-bordered table-condensed details">
+                    <thead>
+                    <tr>
+                        <th class="hide"></th>
+                        <th>姓名</th>
+                        <th>部门</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody id="userTableList">
+                    </tbody>
+                </table>
+                <script type="text/template" id="userTpl">//<!--
+                    <tr id="userList{{idx}}">
+                        <td class="hide">
+                            <input id="userList{{idx}}_id" name="userList[{{idx}}].id" readonly="true" value="{{row.id}}" type="hidden" class="form-control userId"/>
+                        </td>
+                        <td>
+                        {{row.name}}
+                        </td>
+                        <td>
+                        {{row.officeName}}
+                        </td>
+                        <td class="text-center op-td">
+                                    <a href=javascript:void(0); onclick="delRow(this, '#userList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
+                        </td>
+                    </tr>//-->
+                </script>
+                <script type="text/javascript">
+                    var userIdx = 0, userTpl = $("#userTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                    var officeIdx = 0, officeTpl = $("#officeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+
+                    $(document).ready(function() {
+                        var data = ${fns:toJson(oaNotify.officeList)};
+                        if (data!=null) {
+                            for (var i = 0; i < data.length; i++) {
+                                addRow('#officeTableList', officeIdx, officeTpl, data[i]);
+                                officeIdx = officeIdx + 1;
+                            }
+                        }
+                        var dataBank = ${fns:toJson(oaNotify.userList)};
+                        if (dataBank!=null) {
+                            for (var i = 0; i < dataBank.length; i++) {
+                                addRow('#userTableList', userIdx, userTpl, dataBank[i]);
+                                userIdx = userIdx + 1;
+                            }
+                        }
+                    });
+
+                    function addRow(list, idx, tpl, row){
+                        var idx1 = 0;
+                        if('#userTableList'==list){
+                            idx1 = $("#userTableList tr").length
+                        }else if('#officeTableList'==list){
+                            idx1 = $("#officeTableList tr").length
+                        }
+                        bornTemplete(list, idx, tpl, row, idx1);
+                    }
+                    function bornTemplete(list, idx, tpl, row, idx1){
+                        $(list).append(Mustache.render(tpl, {
+                            idx: idx, delBtn: true, row: row,
+                            order:idx1 + 1, idx1:idx1
+                        }));
+                        $(list+idx).find("select").each(function(){
+                            $(this).val($(this).attr("data-value"));
+                        });
+                        $(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+                            var ss = $(this).attr("data-value").split(',');
+                            for (var i=0; i<ss.length; i++){
+                                if($(this).val() == ss[i]){
+                                    $(this).attr("checked","checked");
+                                }
+                            }
+                        });
+                    }
+                    function delRow(obj, prefix,idx){
+                        $(obj).parent().parent().remove();
+                    }
+                </script>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>附件信息</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+                    <sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+                                        name="linkman.id"  title="选择资料库"
+                                        cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+                                        searchLabel="资料库" searchKey="fileName"></sys:collectSelect>
                 </div>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
                     <span id="fileName_attachment" ></span>
@@ -228,7 +377,7 @@
                             <th>文件预览</th>
                             <th>上传人</th>
                             <th>上传时间</th>
-                            <th width="150px">操作</th>
+                            <th width="200px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
@@ -236,13 +385,13 @@
                             <tr>
                                     <%-- <td>${status.index + 1}</td>--%>
                                 <c:choose>
-                                    <c:when test="${workReimbursement.uploadMode == 2}">
+                                    <c:when test="${oaNotify.uploadMode == 2}">
                                         <c:choose>
                                             <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
                                                 <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
                                             </c:when>
                                             <c:otherwise>
@@ -259,7 +408,24 @@
                                                                 <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:otherwise>
+                                                                </c:choose>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>
@@ -274,7 +440,7 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
                                             </c:when>
                                             <c:otherwise>
                                                 <c:choose>
@@ -290,7 +456,24 @@
                                                                 <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                    </c:otherwise>
+                                                                </c:choose>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>
@@ -299,14 +482,13 @@
                                         </c:choose>
                                     </c:otherwise>
                                 </c:choose>
-
                                 <td>${workClientAttachment.createBy.name}</td>
                                 <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                             <%--附件下载删除--%>
                                         <c:choose>
-                                            <c:when test="${workReimbursement.uploadMode == 2}">
+                                            <c:when test="${oaNotify.uploadMode == 2}">
                                                 <c:choose>
                                                     <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
                                                         <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -320,13 +502,13 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:otherwise>
                                         </c:choose>
-
-                                        <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-                                            <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                        </c:if>
                                         <c:if test="${workClientAttachment.collectFlag != 1}">
                                             <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
                                         </c:if>
+                                        <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+                                            <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+                                        </c:if>
+
                                     </div>
                                 </td>
                             </tr>
@@ -339,5 +521,30 @@
         </form:form>
     </div>
 </div>
+<script>
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        //有无合同监听器
+        layui.form.on('radio(ext)', function(data){
+            var span=data.value;
+            if(span==0){
+                $("#divv").show();
+            }else{
+                $("#divv input").val('');
+                $("#divv").hide();
+            }
+        });
+    });
+    $("input[name='ext']").on('ifChecked',function(event){
+        radioVal = $(this).val();
+        if(radioVal == 0){
+            //选择持久状态
+            $("#divv").show();
+        }else{
+            $("#divv input").val('');
+            $("#divv").hide();
+        }
+    });
+</script>
 </body>
 </html>

src/main/webapp/webpage/modules/oa/oaNotifyHomeView.jsp

@@ -137,6 +137,7 @@
 
             <c:if test="${oaNotify.createBy.id eq fns:getUser().id}">
                 <div class="form-group layui-row">
+                    <c:if test="${!empty oaNotify.officeList}">
                     <div class="form-group-label"><h2>通告范围-部门</h2></div>
                     <table id="officeTable" class="table table-bordered table-condensed details">
                         <thead>
@@ -147,6 +148,7 @@
                         <tbody id="officeTableList">
                         </tbody>
                     </table>
+                    </c:if>
                     <script type="text/template" id="officeTpl">//<!--
                     <tr id="officeList{{idx}}">
                         <td>
@@ -156,6 +158,7 @@
                     </script>
                 </div>
                 <div class="form-group layui-row">
+                    <c:if test="${!empty oaNotify.userList}">
                     <div class="form-group-label"><h2>通告范围-成员</h2></div>
                     <table id="userTable" class="table table-bordered table-condensed details">
                         <thead>
@@ -167,6 +170,7 @@
                         <tbody id="userTableList">
                         </tbody>
                     </table>
+                    </c:if>
                     <script type="text/template" id="userTpl">//<!--
                     <tr id="userList{{idx}}">
                         <td>
@@ -233,50 +237,51 @@
                 </div>
             </c:if>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>通告附件</h2></div>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                                <%-- <th>序号</th>--%>
-                            <th>文件预览</th>
-                            <th>上传人</th>
-                            <th>上传时间</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-
-                        <c:forEach items="${oaNotify.workAttachments}" var="workClientAttachment" varStatus="status">
+            <c:if test="${!empty oaNotify.workAttachments}">
+                <div class="form-group layui-row">
+                    <div class="form-group-label"><h2>通告附件</h2></div>
+                    <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                        <table id="upTable" class="table table-bordered table-condensed details">
+                            <thead>
                             <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                        <c:choose>
-                                            <c:when test="${oaNotify.uploadMode == 2}">
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                    <%-- <th>序号</th>--%>
+                                <th>文件预览</th>
+                                <th>上传人</th>
+                                <th>上传时间</th>
+                                <th width="100px">操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="file_attachment">
+
+                            <c:forEach items="${oaNotify.workAttachments}" var="workClientAttachment" varStatus="status">
+                                <tr>
+                                        <%-- <td>${status.index + 1}</td>--%>
+                                    <c:choose>
+                                        <c:when test="${oaNotify.uploadMode == 2}">
+                                            <c:choose>
+                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                    <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <c:choose>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <c:choose>
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
                                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
                                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
                                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                </c:when>
+                                                                <c:otherwise>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
@@ -287,44 +292,44 @@
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
+                                                                </c:otherwise>
+                                                            </c:choose>
+                                                        </c:otherwise>
+                                                    </c:choose>
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <c:choose>
+                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                    <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <c:choose>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                            <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <c:choose>
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
                                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
                                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
                                                        or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                </c:when>
+                                                                <c:otherwise>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
@@ -335,37 +340,39 @@
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
                                                                                    or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
+                                                                </c:otherwise>
+                                                            </c:choose>
+                                                        </c:otherwise>
+                                                    </c:choose>
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </c:otherwise>
+                                    </c:choose>
 
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box">
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
-                                           class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+                                    <td>${workClientAttachment.createBy.name}</td>
+                                    <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                    <td class="op-td">
+                                        <div class="op-btn-box">
+                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                               class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </c:forEach>
 
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
+            </c:if>
+
             <!--在“我的通告”中只能查看到个人接收的，只改变未读状态为已读，不显示所有的查看状态;
             在“通告管理”中只有管理员权限才能查看，显示该条通告的所有查看状态；
             -->
@@ -471,7 +478,7 @@
                     <div class="layui-input-block" style="margin-left:0px;position: relative">
                         <form:textarea placeholder="请输入评论信息：" path="commentContent" class="form-control required" rows="4" maxlength="255" />
                     </div>
-                    <div style="float: right;margin-right: 10%">
+                    <div style="float: right;">
                         <br/>
                         <a href="javascript:void(0)" id="submitComment" class="layui-btn" onclick="submitComment()">发表</a>
                         <a href="javascript:void(0)" id="resetComment" class="layui-btn layui-btn-primary" onclick="resetComment()">清空</a>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -114,6 +114,7 @@
 
             <c:if test="${oaNotify.createBy.id eq fns:getUser().id}">
                 <div class="form-group layui-row">
+                    <c:if test="${!empty oaNotify.officeList}">
                     <div class="form-group-label"><h2>通告范围-部门</h2></div>
                     <table id="officeTable" class="table table-bordered table-condensed details">
                         <thead>
@@ -124,6 +125,7 @@
                         <tbody id="officeTableList">
                         </tbody>
                     </table>
+                    </c:if>
                     <script type="text/template" id="officeTpl">//<!--
                     <tr id="officeList{{idx}}">
                         <td>
@@ -133,6 +135,7 @@
                     </script>
                 </div>
                 <div class="form-group layui-row">
+                    <c:if test="${!empty oaNotify.userList}">
                     <div class="form-group-label"><h2>通告范围-成员</h2></div>
                     <table id="userTable" class="table table-bordered table-condensed details">
                         <thead>
@@ -144,6 +147,7 @@
                         <tbody id="userTableList">
                         </tbody>
                     </table>
+                    </c:if>
                     <script type="text/template" id="userTpl">//<!--
                     <tr id="userList{{idx}}">
                         <td>
@@ -210,160 +214,162 @@
                 </div>
             </c:if>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>通告附件</h2></div>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                                <%-- <th>序号</th>--%>
-                            <th>文件预览</th>
-                            <th>上传人</th>
-                            <th>上传时间</th>
-                            <th width="150px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-
-                        <c:forEach items="${oaNotify.workAttachments}" var="workClientAttachment" varStatus="status">
+            <c:if test="${!empty oaNotify.workAttachments}">
+                <div class="form-group layui-row">
+                    <div class="form-group-label"><h2>通告附件</h2></div>
+                    <div class="layui-item layui-col-xs12" style="padding:0 16px;">
+                        <table id="upTable" class="table table-bordered table-condensed details">
+                            <thead>
                             <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${oaNotify.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50"
-                                                         onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')"
-                                                         alt="${workClientAttachment.attachmentName}"></td>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)"
-                                                               onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a>
-                                                        </td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
-                                                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
+                                    <%-- <th>序号</th>--%>
+                                <th>文件预览</th>
+                                <th>上传人</th>
+                                <th>上传时间</th>
+                                <th width="150px">操作</th>
+                            </tr>
+                            </thead>
+                            <tbody id="file_attachment">
 
+                            <c:forEach items="${oaNotify.workAttachments}" var="workClientAttachment" varStatus="status">
+                                <tr>
+                                        <%-- <td>${status.index + 1}</td>--%>
+                                    <c:choose>
+                                        <c:when test="${oaNotify.uploadMode == 2}">
+                                            <c:choose>
+                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                    <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <c:choose>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <c:choose>
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                </c:when>
+                                                                <c:otherwise>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
+                                                                </c:otherwise>
+                                                            </c:choose>
+                                                        </c:otherwise>
+                                                    </c:choose>
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <c:choose>
+                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                               or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                    <td><img src="${workClientAttachment.url}" width="50" height="50"
+                                                             onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')"
+                                                             alt="${workClientAttachment.attachmentName}"></td>
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <c:choose>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                            <td><a class="attention-info" href="javascript:void(0)"
+                                                                   onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a>
+                                                            </td>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <c:choose>
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                </c:when>
+                                                                <c:otherwise>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'avi')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'wmv')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpg')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mpeg')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mov')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rm')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ram')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'swf')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'flv')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'mp4')
+                                                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'rmvb')}">
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openDialogView('预览','${ctx}/sys/picturepreview/videoPreview?url=${workClientAttachment.url}','90%','90%')" >${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
+                                                                </c:otherwise>
+                                                            </c:choose>
+                                                        </c:otherwise>
+                                                    </c:choose>
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </c:otherwise>
+                                    </c:choose>
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box">
-                                            <%--附件下载删除--%>
-                                        <c:choose>
-                                            <c:when test="${oaNotify.uploadMode == 2}">
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            </c:otherwise>
-                                        </c:choose>
-                                        <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-                                        </c:if>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
 
-                        </tbody>
-                    </table>
+                                    <td>${workClientAttachment.createBy.name}</td>
+                                    <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                    <td class="op-td">
+                                        <div class="op-btn-box">
+                                                <%--附件下载删除--%>
+                                            <c:choose>
+                                                <c:when test="${oaNotify.uploadMode == 2}">
+                                                    <c:choose>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                            <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                        </c:otherwise>
+                                                    </c:choose>
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                </c:otherwise>
+                                            </c:choose>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
+            </c:if>
             <!--在“我的通告”中只能查看到个人接收的，只改变未读状态为已读，不显示所有的查看状态;
             在“通告管理”中只有管理员权限才能查看，显示该条通告的所有查看状态；
             -->

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectReportSignatureInfoForm.jsp

@@ -880,7 +880,7 @@
                     <label class="layui-form-label">咨询员：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselectZXY id="consultant" name="consultant" value="${consultant}" labelName="consultantName" labelValue="${consultantName}"
-                                                       cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" />
+                                                       cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

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

@@ -0,0 +1,188 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>选择下载模板类型</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+	<script type="text/javascript">
+
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			var beginDateTime = $("#beginDate").val();
+			var endDateTime = $("#endDate").val();
+			if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
+					&&endDateTime != null && endDateTime != undefined && endDateTime != ''){
+				var startDate = new Date(beginDateTime.replace(/-/g, "/"));
+				var endDate = new Date(endDateTime.replace(/-/g, "/"));
+				var time = endDate.getTime() - startDate.getTime();
+				var days = parseInt(time / (1000 * 60 * 60 * 24));
+				if(days<0){
+					parent.layer.msg("项目创建结束时间需大于开始时间!", {icon: 5});
+					$("#endDate").val('');
+					return;
+				}
+			}
+			if((beginDateTime != null && beginDateTime != undefined && beginDateTime != '')
+					&&(endDateTime == null || endDateTime == undefined || endDateTime == '')){
+				parent.layer.msg("请选择创建结束时间!", {icon: 5});
+				return;
+			}
+			if((endDateTime != null && endDateTime != undefined && endDateTime != '')
+					&&(beginDateTime == null || beginDateTime == undefined || beginDateTime == '')){
+				parent.layer.msg("请选择创建开始时间!", {icon: 5});
+				return;
+			}
+
+		   var recordTypeStr=$("#recordTypeStr").val();
+		   if(recordTypeStr==null||recordTypeStr==""){
+               top.layer.msg('请选择归档状态！', {icon: 0});
+               return false;
+		   }
+		   $("#inputForm").submit();
+		  return true;
+		}
+        var validateForm;
+		$(document).ready(function() {
+			contentDetailTypeShow();
+			validateForm = $("#inputFormAdd").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			laydate.render({
+				elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#paperRecordBeginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+			laydate.render({
+				elem: '#paperRecordEndDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+				event: 'focus', //响应事件。如果没有传入event，则按照默认的click
+				type : 'date'
+				, trigger: 'click'
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="single-form-small">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/ruralProject/ruralProjectMessageAll/recordDownload" method="post" class="form-horizontal">
+			<input type="hidden" id="recordTypeStr" name="recordTypeStr" value="">
+			<div class="form-group layui-row first">
+				<div class="layui-item layui-col-sm8 ">
+					<label class="layui-form-label double-line">归档发起时间：</label>
+					<div class="layui-input-block">
+						<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+						<span class="group-sep">-</span>
+						<input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm8 ">
+					<label class="layui-form-label double-line">归档通过时间：</label>
+					<div class="layui-input-block">
+						<input id="paperRecordBeginDate" name="paperRecordBeginDate" placeholder="归档通过开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.paperRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+						<span class="group-sep">-</span>
+						<input id="paperRecordEndDate" name="paperRecordEndDate" placeholder="归档通过结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+							   value="<fmt:formatDate value="${projectRecords.paperRecordEndDate}" pattern="yyyy-MM-dd"/>"/>
+						</input>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm8">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>纸质归档状态：</label>
+					<div class="layui-input-block">
+						<div id="recordType" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+					</div>
+				</div>
+			</div>
+		</form:form>
+	</div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+	function contentDetailTypeShow() {
+		$.ajax({
+			type:'post',
+			url:'${ctx}/ruralProject/ruralProjectMessageAll/getRecordType',
+			data:{
+				"type":'archive_paper_state'
+			},
+			success:function(data){
+				if(data.success) {
+					var data = data.body.list;
+					$("#recordType").val(data);
+					xmSelect.render({
+						el: '#recordType',
+						language: 'zn',
+						toolbar:{
+							show: true,
+						},
+						autoRow: true,
+						on: function(data){
+							//arr:  当前多选已选中的数据
+							var arr = data.arr;
+							console.log(arr)
+							//change, 此次选择变化的数据,数组
+							var change = data.change;
+							//isAdd, 此次操作是新增还是删除
+							var isAdd = data.isAdd;
+
+							console.log('已有: '+arr.length+' 变化: '+change.length+', 状态: ' + isAdd)
+
+							var list = [];
+							//遍历当前选择的数据
+							for (var i in arr){
+								list.push(arr[i].value);
+							}
+							$("#recordTypeStr").val(list);
+						},
+						data:data
+					})
+				}
+			}
+		})
+	}
+
+	var recordType = xmSelect.render({
+		el: '#recordType',
+		toolbar:{
+			show: true,
+		},
+		autoRow: true,
+		language: 'zn',
+		data: [
+		]
+	})
+</script>
+</body>
+</html>

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

@@ -807,7 +807,7 @@
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
-					<div id="moresees" style="clear:both;display:none;" class="lw6">
+					<div id="moresees" style="clear:both;display:none;" class="form-group layui-row first lw12">
 
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">登记人：</label>
@@ -827,7 +827,7 @@
 							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
+												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" />
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -913,12 +913,7 @@
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:option value="0" label="未归档"/>
-									<form:option value="2" label="归档中"/>
-									<form:option value="5" label="已归档"/>
-									<form:option value="6" label="超期未归档"/>
-									<form:option value="7" label="超期归档"/>
-									<form:option value="10" label="无需归档"/>
+									<form:options items="${fns:getDictList('archive_paper_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 									<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
 								</form:select>
 							</div>
@@ -980,7 +975,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">质量复核：</label>
+							<label class="layui-form-label">质量复核时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportBeginDate" name="reportBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -993,7 +988,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">报告签发：</label>
+							<label class="layui-form-label">报告签发时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportTwoBeginDate" name="reportTwoBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportTwoBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1006,7 +1001,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">电子归档：</label>
+							<label class="layui-form-label">电子归档时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportRecordBeginDate" name="reportRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1019,7 +1014,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">纸质归档：</label>
+							<label class="layui-form-label">纸质归档时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="paperRecordBeginDate" name="paperRecordBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.paperRecordBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1032,7 +1027,7 @@
 						</div>
 
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">上报审核：</label>
+							<label class="layui-form-label">上报审核时间：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<input id="reportedBeginDate" name="reportedBeginDate" placeholder="审核开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 									   value="<fmt:formatDate value="${ruralProjectRecords.reportedBeginDate}" pattern="yyyy-MM-dd"/>"/>
@@ -1057,10 +1052,13 @@
 							<table:exportExcel url="${ctx}/ruralProject/ruralProjectMessageAll/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
 						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:recordDownload">
-							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('归档信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadRecordForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 归档信息导出</a>
+							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('归档信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadRecordForm','40%', '50%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 归档信息导出</a>
 						</shiro:hasPermission>
+						<%--<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:paperRecordDownload">
+							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('纸质归档信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadPaperRecordForm','40%', '50%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 纸质归档信息导出</a>
+						</shiro:hasPermission>--%>
 						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:reportedDownload">
-							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('上报信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadReportedForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 上报信息导出</a>
+							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('上报信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadReportedForm','40%', '50%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 上报信息导出</a>
 						</shiro:hasPermission>
 
 
@@ -1216,12 +1214,12 @@
 						var paperNoArchivedDays=d.paperNoArchivedDays;
 						if(st.action){
 							if (d.submitMoney=="1"){
-								var xml = "<span title='纸质归档时间："+ d.filingBatchAuditPassDate +"'  onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span title='纸质归档时间："+ d.filingBatchAuditPassDate +"'  onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"new-status-label new-status-label-" + st.label + "\" >" + st.status + "</span>";
 							}else if (d.submitMoney=="2"){
-								var xml = "<span title='纸质归档时间："+ d.paperFilingAuditPassDate +"'  onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								var xml = "<span title='纸质归档时间："+ d.paperFilingAuditPassDate +"'  onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label new-status-label-" + st.label + "\" >" + st.status + "</span>";
 							}
 						}else{
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label new-status-label-" + st.label + "\" >" + st.status + "</span>";
 						}if(paperNoArchivedDays != null && paperNoArchivedDays != undefined && '' != paperNoArchivedDays){
 							if (d.submitMoney=="1"){
 								if(5 != d.downProjectReportRecordStatus){

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

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

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

@@ -122,7 +122,7 @@
 						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>";
 						}else{
-							return "<span title='"+ d.field3 +"'>" +d.field3+ "</span>";
+							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>";
 						}
 					}}
 				,{align:'center', title: '质量复核',colspan: 2}
@@ -136,14 +136,14 @@
 						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>";
 						}else{
-							return "<span title='"+ d.field11 +"'>" +d.field11+ "</span>";
+							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>";
 					}else{
-						return "<span title='"+ d.field12 +"'>" +d.field12+ "</span>";
+						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>";
 					}
 				}}
 
@@ -151,28 +151,28 @@
 						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>";
 						}else{
-							return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
+							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>";
 					}else{
-						return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
+						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>";
 					}else{
-						return "<span title='"+ d.field9 +"'>" +d.field9+ "</span>";
+						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>";
 					}else{
-						return "<span title='"+ d.field10 +"'>" +d.field10+ "</span>";
+						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>";
 					}
 				}}
 
@@ -180,14 +180,14 @@
 					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>";
 					}else{
-						return "<span title='"+ d.field13 +"'>" +d.field13+ "</span>";
+						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>";
 					}else{
-						return "<span title='"+ d.field14 +"'>" +d.field14+ "</span>";
+						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>";
 					}
 				}}
 
@@ -195,14 +195,14 @@
 					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>";
 					}else{
-						return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
+						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>";
 					}else{
-						return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
+						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

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

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

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

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

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

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

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

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -62,10 +62,22 @@
                 $(".layui-tab-title li").eq(ggType-1).attr("class","layui-this");
             }*/
             $(".layui-tab-title li").click(function() {
+                console.log(this.value)
                 $(".layui-tab-title li").each(function () {
                     $(this).removeAttr("class","layui-this");
+                    $(this).removeAttr("style","background-color: #FFFFFF");
+                    $("li a").attr('style','color: #ffffee');//修改style属性
                 })
+
+                // <li value="0" class="layui-this" style="background-color: #FFFFFF"><a style="color: #0d8ddb">最新消息</a></li>
                 $(this).attr("class","layui-this");
+                $(this).attr("style","background-color: #FFFFFF");
+                $(".layui-this a").attr('style','color: #0d8ddb');//修改style属性
+                if(this.value === 0 ){
+                    $(".informBordMore").attr('style','display: none');//修改style属性\
+                }else{
+                    $(".informBordMore").removeAttr("style","display: none");
+                }
                 //创建一个临时行数值
                 var count = 0;
                 //清除公告栏下已存在的li信息
@@ -830,14 +842,14 @@
                                         <li value="3"><a style="color: #ffffee">公司标准或规范</a></li>
                                         <li value="4"><a style="color: #ffffee">行业标准或规范</a></li>
                                         <li value="5"><a style="color: #ffffee">其他</a></li>--%>
-                                        <li value="0"><a style="color: #ffffee">最新消息</a></li>
+                                        <li value="0" class="layui-this" style="background-color: #FFFFFF"><a style="color: #0d8ddb">最新消息</a></li>
                                         <li value="1"><a style="color: #ffffee">通告</a></li>
                                         <li value="2"><a style="color: #ffffee">知识分享</a></li>
                                     </ul>
                                 </div>
                         </div>
                     </div>
-                    <div class="bord-more">
+                    <div class="bord-more informBordMore" style="display: none">
                         <a href="javascript:void(0)" onclick='openNotifyTab("${ctx }/oa/oaNotify/self","公告信息", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
                     </div>
                 </div>

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -62,7 +62,7 @@
 <div class="single-form">
 	<div class="container">
 
-			<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data" action="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal layui-form">
+			<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data" action="${ctx}/workcontractinfo/workContractInfo/newSaveAudit" method="post" class="form-horizontal layui-form">
 				<form:hidden path="id"/>
 			    <form:hidden path="home"/>
 				<form:hidden path="act.taskId"/>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -572,7 +572,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-	<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/saveAudit" method="post" class="form-horizontal layui-form">
+	<form:form id="inputForm" modelAttribute="workContractInfo" enctype="multipart/form-data"  action ="${ctx}/workcontractinfo/workContractInfo/newSaveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>

src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -174,6 +174,15 @@
                             </input>
                         </div>
                     </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">证书类型：</label>
+                        <div class="layui-input-block">
+                            <form:select path="certificateType" class="form-control simple-select required">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getMainDictList('certificate_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
                 </div>
             </form:form>
 	        </div>
@@ -233,6 +242,7 @@
                         "<span title=" + d.name + ">" + d.name + "</span></a>";
                     return xml;
                 }}
+                ,{field:'certificateName',align:'center', title: '证书',minWidth:150}
                 ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
@@ -273,6 +283,7 @@
                     ,"id":"${workStaffBasicInfo.id}"
                     ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
                     ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
+                    ,"certificateName":"${workStaffBasicInfo.certificateName}"
                     ,"role":"${workStaffBasicInfo.roleName}"
                     ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
                     ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -765,7 +765,7 @@
                                 <img class="layui-upload-img" width="200px" height="150px" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workStaffBasicInfo.handSignatureUrl}','90%','90%')" id="handSignatureImg" src="${workStaffBasicInfo.handSignatureUrl}">
                             </c:when>
                             <c:otherwise>
-                                <img class="layui-upload-img" width="200px" height="150px" id="handSignatureImg">
+                                <img class="layui-upload-img" width="100px" height="75px" id="handSignatureImg">
                             </c:otherwise>
                         </c:choose>
                         <p id="handSignatureText"></p>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -99,7 +99,7 @@
                 <input type="hidden" input="params" value="">
                 <input id="toflag" name="toflag" type="hidden" value="1"/>
                 <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-                <div class="commonQuery">
+                <div class="commonQuery lw6">
                     <div class="layui-item query athird">
                         <label class="layui-form-label">姓    名：</label>
                         <div class="layui-input-block">
@@ -126,7 +126,7 @@
                     </div>
                     <div style="    clear:both;"></div>
                 </div>
-                <div id="moresees" style="clear:both;display:none;">
+                <div id="moresees" style="clear:both;display:none;" class="form-group layui-row first lw12">
                     <div class="layui-item query athird">
                         <label class="layui-form-label">工    号：</label>
                         <div class="layui-input-block">
@@ -163,6 +163,21 @@
                         </div>
                     </div>
                     <div class="layui-item query athird">
+                        <label class="layui-form-label">是否有手签章：</label>
+                        <div class="layui-input-block">
+                            <form:select path="isHandSignature" class="form-control simple-select">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">最高学历：</label>
+                        <div class="layui-input-block">
+                            <form:input path="highestEducation" htmlEscape="false" maxlength="20"  class=" form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item query athird">
                         <label class="layui-form-label">入职日期：</label>
                         <div class="layui-input-block readOnlyFFF">
                             <input id="beginEntryDate" name="beginEntryDate" type="text" placeholder="开始时间" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -355,7 +355,7 @@
                                     <img class="layui-upload-img" width="200px" height="150px" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workStaffBasicInfo.handSignatureUrl}','90%','90%')" id="handSignatureImg" src="${workStaffBasicInfo.handSignatureUrl}">
                                 </c:when>
                                 <c:otherwise>
-                                    <img class="layui-upload-img" width="200px" height="150px" id="handSignatureImg">
+                                    <img class="layui-upload-img" width="100px" height="75px" id="handSignatureImg" src="${ctxStatic}/common/images/not_available_picture.jpg">
                                 </c:otherwise>
                             </c:choose>
                             <p id="handSignatureText"></p>