功能调整以及样式调整

首页公告： 当选中最新消息时右侧更多按钮隐藏。选中参数背景色改为白色，字体调整为蓝色
入职登记添加有无手签章筛选，加学历筛选
手签章没有上传 则展示暂无
项目名称重复验证
知识分享添加未读已读功能

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/service/RuralProjectRecordsService.java

@@ -4436,7 +4436,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		projectRecords.setPage(page);
 
-		String decisionValue = statementCompanyComprehensiveService.getOfficeListInfo(beginDate);
 		//如果访问的是2023年4月份之后的月报信息，则获取新的office信息
 		if(StringUtils.isBlank(isThisMonth) || !"1".equals(isThisMonth)){
 			projectRecords.getSqlMap().put("officeId", "or parent_ids like concat('%',#{statementCompanyComprehensiveInfo.officeId},'%')");
@@ -4504,7 +4503,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	//公司级：chaoqi项目报表详细 年度级
 	public Page<RuralProjectRecords> findReportPageOverdueByYear(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords,
 														   StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,
-														   String year,String bigDateType,String smallDateType) {
+														   String 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");
@@ -4521,6 +4520,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/RuralProjectSignatureOldMessageDisposeController.java

@@ -183,14 +183,15 @@ 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);

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

@@ -236,7 +236,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             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){

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

@@ -3989,40 +3989,60 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         statementCompanyComprehensiveInfo.setType("1");
         List<StatementCompanyComprehensiveInfo> reportFormList1 = dao.selectReportAllByType(statementCompanyComprehensiveInfo);
         //项目表 各列合计
+        String xmnum1 = "0";
+        String xmnum2 = "0";
         String xmnum3 = "0";
-        String xmnum11 = "0";
-        String xmnum12 = "0";
+        String xmnum4 = "0";
         String xmnum5 = "0";
         String xmnum6 = "0";
-        String xmnum9 = "0";
-        String xmnum10 = "0";
         String xmnum7 = "0";
         String xmnum8 = "0";
+        String xmnum9 = "0";
+        String xmnum10 = "0";
+        String xmnum11 = "0";
+        String xmnum12 = "0";
+        String xmnum13 = "0";
+        String xmnum14 = "0";
+        String xmnum15 = "0";
+        String xmnum16 = "0";
         for(StatementCompanyComprehensiveInfo info:reportFormList1){
             //转BigDecimal 处理   合计
-            xmnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(xmnum3)).toString();       //本月电子归档
-            xmnum11 = new BigDecimal(info.getField11()).add(new BigDecimal(xmnum11)).toString();    //质量符合：未质量复核
-            xmnum12 = new BigDecimal(info.getField12()).add(new BigDecimal(xmnum12)).toString();    //质量符合：超期未质量符合
-            xmnum5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnum5)).toString();       //电子超期归档：超期未归档
-            xmnum6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnum6)).toString();       //电子超期归档：超期已归档
-            xmnum9 = new BigDecimal(info.getField9()).add(new BigDecimal(xmnum9)).toString();       //纸质归档：A类纸质归档
-            xmnum10 = new BigDecimal(info.getField10()).add(new BigDecimal(xmnum10)).toString();    //纸质归档：B类批量归档
-            xmnum7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnum7)).toString();       //上报超期：超期未上报
-            xmnum8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnum8)).toString();       //上报超期：超期已上报
-
+            xmnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(xmnum1)).toString();
+            xmnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(xmnum2)).toString();
+            xmnum3 = new BigDecimal(info.getField3()).add(new BigDecimal(xmnum3)).toString();
+            xmnum4 = new BigDecimal(info.getField4()).add(new BigDecimal(xmnum4)).toString();
+            xmnum5 = new BigDecimal(info.getField5()).add(new BigDecimal(xmnum5)).toString();
+            xmnum6 = new BigDecimal(info.getField6()).add(new BigDecimal(xmnum6)).toString();
+            xmnum7 = new BigDecimal(info.getField7()).add(new BigDecimal(xmnum7)).toString();
+            xmnum8 = new BigDecimal(info.getField8()).add(new BigDecimal(xmnum8)).toString();
+            xmnum9 = new BigDecimal(info.getField9()).add(new BigDecimal(xmnum9)).toString();
+            xmnum10 = new BigDecimal(info.getField10()).add(new BigDecimal(xmnum10)).toString();
+            xmnum11 = new BigDecimal(info.getField11()).add(new BigDecimal(xmnum11)).toString();
+            xmnum12 = new BigDecimal(info.getField12()).add(new BigDecimal(xmnum12)).toString();
+            xmnum13 = new BigDecimal(info.getField13()).add(new BigDecimal(xmnum13)).toString();
+            xmnum14 = new BigDecimal(info.getField14()).add(new BigDecimal(xmnum14)).toString();
+            xmnum15 = new BigDecimal(info.getField15()).add(new BigDecimal(xmnum15)).toString();
+            xmnum16 = new BigDecimal(info.getField16()).add(new BigDecimal(xmnum16)).toString();
         }
         //存放到对应报表的list集合，方便页面集合展示
         StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
         xminfo.setOfficeName("本"+nyr+"合计");
+        xminfo.setField1(xmnum1);
+        xminfo.setField2(xmnum2);
         xminfo.setField3(xmnum3);
-        xminfo.setField11(xmnum11);
-        xminfo.setField12(xmnum12);
+        xminfo.setField4(xmnum4);
         xminfo.setField5(xmnum5);
         xminfo.setField6(xmnum6);
-        xminfo.setField9(xmnum9);
-        xminfo.setField10(xmnum10);
         xminfo.setField7(xmnum7);
         xminfo.setField8(xmnum8);
+        xminfo.setField9(xmnum9);
+        xminfo.setField10(xmnum10);
+        xminfo.setField11(xmnum11);
+        xminfo.setField12(xmnum12);
+        xminfo.setField13(xmnum13);
+        xminfo.setField14(xmnum14);
+        xminfo.setField15(xmnum15);
+        xminfo.setField16(xmnum16);
         reportFormList1.add(xminfo);
         map.put("reportFormList1",reportFormList1);
         return map;

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/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;

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;
 
 	}

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;
 	}
 
 	/**
@@ -7739,6 +7740,9 @@ public class WorkProjectNotifyController extends BaseController {
 					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";
 					}
@@ -7786,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";
 					}
@@ -7802,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/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/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} ${ruralProjectRecords.sqlMap.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} ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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}  ${ruralProjectRecords.sqlMap.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},'%')
@@ -4747,7 +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
+			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)
@@ -6018,9 +6062,9 @@ 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>
@@ -6134,7 +6178,7 @@ GROUP BY
 		left join project_report_data prd on prd.project_id = a.id
 		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
-		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
+		LEFT JOIN 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
@@ -6148,13 +6192,17 @@ GROUP BY
 				and a.record_state != 7
 				and pmdr.id is null
 				and a.over_record_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				<if 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
-				and a.office_id in(select id  from sys_office where 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})
+				</if>
 				and prr.status = 7
 				and prr.del_flag = 0
 				and prr.accomplish_date >= #{beginDate}
@@ -6165,17 +6213,43 @@ GROUP BY
 				and a.reported_state != 7
 				and a.reported_state != 10
 				and a.reported_state != 11
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				<if 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
-				and a.office_id in(select id  from sys_office where 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})
+				</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},'%')
@@ -6308,7 +6382,7 @@ GROUP BY
 		left join project_report_data prd on prd.project_id = a.id
 		left join project_report_data_two prdt on prdt.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
-		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
+		LEFT JOIN 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
@@ -6321,13 +6395,17 @@ GROUP BY
 				and a.record_state != 7
 				and pmdr.id is null
 				and a.over_record_status = 1
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				<if 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
-				and a.office_id in(select id  from sys_office where 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})
+				</if>
 				and prr.status = 7
 				and prr.del_flag = 0
 				and prr.accomplish_date >= #{beginDate}
@@ -6338,17 +6416,43 @@ GROUP BY
 				and a.reported_state != 7
 				and a.reported_state != 10
 				and a.reported_state != 11
-				and a.office_id in(select id  from sys_office where id = #{statementCompanyComprehensiveInfo.officeId})
+				<if 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
-				and a.office_id in(select id  from sys_office where 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})
+				</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},'%')

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

@@ -378,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>
 
@@ -411,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>
@@ -1674,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",
@@ -1707,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}
@@ -2098,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",
@@ -2131,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}
@@ -2347,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}
@@ -2424,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/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

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/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -1216,12 +1216,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>";
 							}
 						}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/companyDataView.jsp

@@ -67,6 +67,31 @@
 						layui.form.render(); //重新渲染显示效果
 					}
 				});
+
+
+				$('#myDiv').bind('mouseover', function (event) {
+					console.log(1238123)
+					var $link = $(event.target).closest('input');
+					if ($link.length < 1) { return; }
+					var link = $link[0];
+					if (event.type == 'mouseover') {
+						$liveTip.css({
+							top: event.pageY,
+							left: event.pageX
+						});
+
+						link.title = '';
+						$liveTip.html('<div>' + link.value + '</div>').show();
+					};
+
+					if (event.type == 'mouseout') {
+						$liveTip.hide();
+						if (tipTitle) {
+							link.title = tipTitle;
+						};
+					};
+				});
+
 				//本月项目
 				form.on('radio(projectReportThisMonth)', function(data){
 					// console.log(data.elem); //得到radio原始DOM对象
@@ -1103,9 +1128,9 @@
 <%--					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;--%>
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px" >
-                        <input type="radio" title="当月" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne">
-						<input type="radio" title="本月" name="projectReport" value="thisMonth" lay-filter="projectReportMonth" id="thisMonth">
-						<input type="radio" title="当年" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" >
+                        <input type="radio" title="当月" name="projectReport" value="monthOne" lay-filter="projectReportMonth" checked id="monthOne"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+						<input type="radio" title="本月" name="projectReport" value="thisMonth" lay-filter="projectReportMonth" id="thisMonth"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" title="当年" name="projectReport" value="yearOne" lay-filter="projectReportMonth" id="yearOne" ><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 					</c:if>
 				</h2>
@@ -1117,9 +1142,9 @@
 					<div class="form-group-label"><h2>项目本月月报
 						<c:if test="${nyr eq '月'}">
 							<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px">
-								<input type="radio" name="projectReport" value="lastMonthThird" lay-filter="projectReportThisMonth" style="margin: 0px;padding-left: 0px" id="lastMonthThird" title="当月">
-								<input type="radio" name="projectReport" value="thisMonthThird" lay-filter="projectReportThisMonth" style="margin: 0px;padding-left: 0px" id="thisMonthThird" title="本月">
-								<input type="radio" name="projectReport" value="yearThird" lay-filter="projectReportThisMonth" style="margin: 0px;padding-left: 0px" id="yearThird" title="当年">
+								<input type="radio" name="projectReport" value="lastMonthThird" lay-filter="projectReportThisMonth" style="margin: 0px;padding-left: 0px" id="lastMonthThird" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+								<input type="radio" name="projectReport" value="thisMonthThird" lay-filter="projectReportThisMonth" style="margin: 0px;padding-left: 0px" id="thisMonthThird" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+								<input type="radio" name="projectReport" value="yearThird" lay-filter="projectReportThisMonth" style="margin: 0px;padding-left: 0px" id="yearThird" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 							</div>
 						</c:if>
 					</h2></div>
@@ -1131,9 +1156,9 @@
 				<div class="form-group-label"><h2>项目年报
 				<c:if test="${nyr eq '月'}">
 					<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;margin: 0px;padding-left: 0px">
-                        <input type="radio" name="projectReport" value="monthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="monthTwo" title="当月">
-                        <input type="radio" name="projectReport" value="thisMonthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="thisMonthTwo" title="本月">
-						<input type="radio" name="projectReport" value="yearTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="yearTwo" title="当年">
+                        <input type="radio" name="projectReport" value="monthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="monthTwo" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                        <input type="radio" name="projectReport" value="thisMonthTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="thisMonthTwo" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" name="projectReport" value="yearTwo" lay-filter="projectReportYear" style="margin: 0px;padding-left: 0px" id="yearTwo" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 				</c:if>
 				</h2></div>
@@ -1145,9 +1170,9 @@
 				<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="invoice" value="invoiceMonthOne"  lay-filter="invoiceMonth" id="invoiceMonthOne" checked title="当月">
-                        <input type="radio" name="invoice" value="invoiceThisMonthOne"  lay-filter="invoiceMonth" id="invoiceThisMonthOne" title="本月">
-						<input type="radio" name="invoice" value="invoiceYearOne"  lay-filter="invoiceMonth" id="invoiceYearOne" title="当年">
+                        <input type="radio" name="invoice" value="invoiceMonthOne"  lay-filter="invoiceMonth" id="invoiceMonthOne" checked title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                        <input type="radio" name="invoice" value="invoiceThisMonthOne"  lay-filter="invoiceMonth" id="invoiceThisMonthOne" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" name="invoice" value="invoiceYearOne"  lay-filter="invoiceMonth" id="invoiceYearOne" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 				</c:if>
 				</h2></div>
@@ -1159,9 +1184,9 @@
 					<div class="form-group-label"><h2>本月开票月报
 						<c:if test="${nyr eq '月'}">
 							<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-								<input type="radio" name="invoice" value="invoiceMonthThird"  lay-filter="invoiceThisMonth" id="invoiceMonthThird" title="当月">
-								<input type="radio" name="invoice" value="invoiceThisMonthThird"  lay-filter="invoiceThisMonth" id="invoiceThisMonthThird" title="本月">
-								<input type="radio" name="invoice" value="invoiceYearThird" lay-filter="invoiceThisMonth" id="invoiceYearThird" title="当年">
+								<input type="radio" name="invoice" value="invoiceMonthThird"  lay-filter="invoiceThisMonth" id="invoiceMonthThird" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+								<input type="radio" name="invoice" value="invoiceThisMonthThird"  lay-filter="invoiceThisMonth" id="invoiceThisMonthThird" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+								<input type="radio" name="invoice" value="invoiceYearThird" lay-filter="invoiceThisMonth" id="invoiceYearThird" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 							</div>
 						</c:if>
 					</h2></div>
@@ -1173,9 +1198,9 @@
 				<div class="form-group-label"><h2>开票年报
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-                        <input type="radio" name="invoice" value="invoiceMonthTwo"  lay-filter="invoiceYear" id="invoiceMonthTwo" title="当月">
-                        <input type="radio" name="invoice" value="invoiceThisMonthTwo"  lay-filter="invoiceYear" id="invoiceThisMonthTwo" title="本月">
-						<input type="radio" name="invoice" value="invoiceYearTwo" lay-filter="invoiceYear" id="invoiceYearTwo" title="当年">
+                        <input type="radio" name="invoice" value="invoiceMonthTwo"  lay-filter="invoiceYear" id="invoiceMonthTwo" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                        <input type="radio" name="invoice" value="invoiceThisMonthTwo"  lay-filter="invoiceYear" id="invoiceThisMonthTwo" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" name="invoice" value="invoiceYearTwo" lay-filter="invoiceYear" id="invoiceYearTwo" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 					</c:if>
 				</h2></div>
@@ -1187,9 +1212,9 @@
 				<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="reimbursement" value="reimbursementMonthOne"  lay-filter="reimbursementMonth" id="reimbursementMonthOne" checked title="当月">
-                        <input type="radio" name="reimbursement" value="reimbursementThisMonthOne"  lay-filter="reimbursementMonth" id="reimbursementThisMonthOne" title="本月">
-						<input type="radio" name="reimbursement" value="reimbursementYearOne" lay-filter="reimbursementMonth" id="reimbursementYearOne" title="当年">
+                        <input type="radio" name="reimbursement" value="reimbursementMonthOne"  lay-filter="reimbursementMonth" id="reimbursementMonthOne" checked title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                        <input type="radio" name="reimbursement" value="reimbursementThisMonthOne"  lay-filter="reimbursementMonth" id="reimbursementThisMonthOne" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" name="reimbursement" value="reimbursementYearOne" lay-filter="reimbursementMonth" id="reimbursementYearOne" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 					</c:if>
 				</h2></div>
@@ -1201,9 +1226,9 @@
 					<div class="form-group-label"><h2>本月报销月报
 						<c:if test="${nyr eq '月'}">
 							<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-								<input type="radio" name="reimbursement" value="reimbursementMonthThird"  lay-filter="reimbursementThisMonth" id="reimbursementMonthThird" title="当月">
-								<input type="radio" name="reimbursement" value="reimbursementThisMonthThird"  lay-filter="reimbursementThisMonth" id="reimbursementThisMonthThird" title="本月">
-								<input type="radio" name="reimbursement" value="reimbursementYearThird"  lay-filter="reimbursementThisMonth" id="reimbursementYearThird" title="当年">
+								<input type="radio" name="reimbursement" value="reimbursementMonthThird"  lay-filter="reimbursementThisMonth" id="reimbursementMonthThird" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+								<input type="radio" name="reimbursement" value="reimbursementThisMonthThird"  lay-filter="reimbursementThisMonth" id="reimbursementThisMonthThird" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+								<input type="radio" name="reimbursement" value="reimbursementYearThird"  lay-filter="reimbursementThisMonth" id="reimbursementYearThird" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 							</div>
 						</c:if>
 					</h2></div>
@@ -1215,9 +1240,9 @@
 					<div class="form-group-label"><h2>报销年报
 						<c:if test="${nyr eq '月'}">
 						<div  class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-                            <input type="radio" name="reimbursement" value="reimbursementMonthTwo"  lay-filter="reimbursementYear" id="reimbursementMonthTwo" title="当月">
-                            <input type="radio" name="reimbursement" value="reimbursementThisMonthTwo"  lay-filter="reimbursementYear" id="reimbursementThisMonthTwo" title="本月">
-							<input type="radio" name="reimbursement" value="reimbursementYearTwo"  lay-filter="reimbursementYear" id="reimbursementYearTwo" title="当年">
+                            <input type="radio" name="reimbursement" value="reimbursementMonthTwo"  lay-filter="reimbursementYear" id="reimbursementMonthTwo" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                            <input type="radio" name="reimbursement" value="reimbursementThisMonthTwo"  lay-filter="reimbursementYear" id="reimbursementThisMonthTwo" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+							<input type="radio" name="reimbursement" value="reimbursementYearTwo"  lay-filter="reimbursementYear" id="reimbursementYearTwo" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 						</div>
 						</c:if>
 					</h2></div>
@@ -1229,9 +1254,9 @@
 				<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" lay-filter="contractMonth" id="contractMonthOne" checked title="当月">
-                        <input type="radio" name="contract" value="contractThisMonthOne" lay-filter="contractMonth" id="contractThisMonthOne" title="本月">
-						<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="当年">
+                        <input type="radio" name="contract" value="contractMonthOne" lay-filter="contractMonth" id="contractMonthOne" checked title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                        <input type="radio" name="contract" value="contractThisMonthOne" lay-filter="contractMonth" id="contractThisMonthOne" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" name="contract" value="contractYearOne" lay-filter="contractMonth" id="contractYearOne" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 					</c:if>
 				</h2></div>
@@ -1243,9 +1268,9 @@
 					<div class="form-group-label"><h2>本月合同月报
 						<c:if test="${nyr eq '月'}">
 							<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-								<input type="radio" name="contract" value="contractMonthThird"  lay-filter="contractThisMonth" id="contractMonthThird" title="当月">
-								<input type="radio" name="contract" value="contractThisMonthThird"  lay-filter="contractThisMonth" id="contractThisMonthThird" title="本月">
-								<input type="radio" name="contract" value="contractYearThird" lay-filter="contractThisMonth" id="contractYearThird" title="当年">
+								<input type="radio" name="contract" value="contractMonthThird"  lay-filter="contractThisMonth" id="contractMonthThird" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+								<input type="radio" name="contract" value="contractThisMonthThird"  lay-filter="contractThisMonth" id="contractThisMonthThird" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+								<input type="radio" name="contract" value="contractYearThird" lay-filter="contractThisMonth" id="contractYearThird" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 							</div>
 						</c:if>
 					</h2></div>
@@ -1257,9 +1282,9 @@
 				<div class="form-group-label"><h2>合同年报
 					<c:if test="${nyr eq '月'}">
 					<div class="layui-input-block" style="float: right;height: 17.9px;bottom: 10px;">
-                        <input type="radio" name="contract" value="contractMonthTwo"  lay-filter="contractYear" id="contractMonthTwo" title="当月">
-                        <input type="radio" name="contract" value="contractThisMonthTwo"  lay-filter="contractYear" id="contractThisMonthTwo" title="本月">
-						<input type="radio" name="contract" value="contractYearTwo" lay-filter="contractYear" id="contractYearTwo" title="当年">
+                        <input type="radio" name="contract" value="contractMonthTwo"  lay-filter="contractYear" id="contractMonthTwo" title="当月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0007')"></a>
+                        <input type="radio" name="contract" value="contractThisMonthTwo"  lay-filter="contractYear" id="contractThisMonthTwo" title="本月"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0008')"></a>
+						<input type="radio" name="contract" value="contractYearTwo" lay-filter="contractYear" id="contractYearTwo" title="当年"><a href="#" style="margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;" class="layui-icon layui-icon-tips"  onclick="helpDetails('bz-0009')"></a>
 					</div>
 					</c:if>
 				</h2></div>
@@ -1331,28 +1356,28 @@
 						if("" != d.statementDate){
 							return "<a class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}else{
-							return "<span title='"+ d.field1 +"'>" +d.field1+ "</span>";
+							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field1 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增A类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&grade=2&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field1 + "</a>";
 						}
 					}}
 				,{field:'field2',align:'center', title: '新增B类',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
 							return "<a class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}else{
-							return "<span title='"+ d.field2 +"'>" +d.field2+ "</span>";
+							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field2 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('新增B类', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&grade=1&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field2 + "</a>";
 						}
 					}}
 				,{field:'field3',align:'center', title: '本${nyr}电子归档',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
 							return "<a class=\"attention-info\" title=\"" + d.field3 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}电子归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&recordState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field3 + "</a>";
 						}
 					}}
 				,{field:'field4',align:'center', title: '本${nyr}上报',rowspan:2,templet:function(d){
 						if("" != d.statementDate){
 							return "<a class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}else{
-							return "<span title='"+ d.field4 +"'>" +d.field4+ "</span>";
+							return "<a style=\"font-weight: bold\" class=\"attention-info\" title=\"" + d.field4 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('本${nyr}上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=${bigDateType}&smallDateType=${smallDateType}&year=${year}&reportedState=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field4 + "</a>";
 						}
 					}}
 				,{align:'center', title: '电子超期未归档',colspan: 2}
@@ -1367,14 +1392,14 @@
 						if("" != d.statementDate){
 							return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
 						}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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
 						}
 					}}
 				,{field:'field6',align:'center',title:'超期已归档',templet:function(d){
 					if("" != d.statementDate){
 						return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
 					}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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
 					}
 				}}
 
@@ -1382,14 +1407,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&isThisMonth=${isThisMonth}','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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
 						}
 					}}
 				,{field:'field14',align:'center',title:'超期已归档',templet:function(d){
 					if("" != d.statementDate){
 						return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
 					}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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
 					}
 				}}
 				<c:if test="${nyr eq '季'}">
@@ -1413,14 +1438,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&isThisMonth=${isThisMonth}','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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
 					}
 				}}
 				,{field:'field8',align:'center',title:'超期已上报',templet:function(d){
 					if("" != d.statementDate){
 						return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
 					}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&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
 					}
 				}}
 			]]
@@ -1655,14 +1680,14 @@
 				[
 					{field:'field5',align:'center',title:'超期未归档',templet:function(d){
 							if("" != d.statementDate){
-								return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
+								return "<a class=\"attention-info\" title=\"" + d.field5 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field5=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field5 + "</a>";
 							}else{
 								return "<span title='"+ d.field5 +"'>" +d.field5+ "</span>";
 							}
 						}}
 					,{field:'field6',align:'center',title:'超期已归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field6 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field6=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field6 + "</a>";
 						}else{
 							return "<span title='"+ d.field6 +"'>" +d.field6+ "</span>";
 						}
@@ -1670,14 +1695,14 @@
 
 					,{field:'field13',align:'center',title:'超期未归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field13 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field13=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field13 + "</a>";
 						}else{
 							return "<span title='"+ d.field13 +"'>" +d.field13+ "</span>";
 						}
 					}}
 					,{field:'field14',align:'center',title:'超期已归档',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field14 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已归档', '${ctx}/statement/StatementCompanyComprehensive/projectReportList?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field14=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field14 + "</a>";
 						}else{
 							return "<span title='"+ d.field14 +"'>" +d.field14+ "</span>";
 						}
@@ -1685,14 +1710,14 @@
 
 					,{field:'field7',align:'center',title:'超期未上报',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field7 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期未上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field7=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field7 + "</a>";
 						}else{
 							return "<span title='"+ d.field7 +"'>" +d.field7+ "</span>";
 						}
 					}}
 					,{field:'field8',align:'center',title:'超期已上报',templet:function(d){
 						if("" != d.statementDate){
-							return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=" + d.bigDateType +"&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
+							return "<a class=\"attention-info\" title=\"" + d.field8 + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('超期已上报', '${ctx}/statement/StatementCompanyComprehensive/projectReportListByYear?bigDateType=0&smallDateType=" + d.smallDateType +"&officeId="+d.officeId+"&year="+d.year+"&field8=5&isThisMonth=${isThisMonth}','95%', '95%')\">" + d.field8 + "</a>";
 						}else{
 							return "<span title='"+ d.field8 +"'>" +d.field8+ "</span>";
 						}

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>";
 					}
 				}}
 			]]