修改首页通知信息，修改超期提醒查看功能，修改项目电子归档筛选信息

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

@@ -100,6 +100,7 @@ import java.math.BigDecimal;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -1776,7 +1777,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			//Date类的一个方法，如果info.getAdventDateDate()早于 new Date() 返回true，否则返回false
 			if(info.getAdventDateDate().before(new Date())){
 				notifyStr = "项目【"+ info.getProjectName()+"】上报已超期";
-				titleStr = "项目【"+ info.getProjectName()+"】上报已超期。超期时间："+info.getAdventDate() +"。请尽快上报";
+				titleStr = "项目【"+ info.getProjectName()+"】上报已超期。超期时间："+info.getAdventDate() +"。";
 			}else{
 				notifyStr = "项目【"+ info.getProjectName()+"】即将上报超期";
 				titleStr = "项目【"+ info.getProjectName()+"】即将上报超期。超期时间："+info.getAdventDate();
@@ -1788,6 +1789,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			for (User user: projectLeaders) {
 				//根据标题查询通知信息中是否存在未读的信息，有则进行更新并对重复数量进行+1操作
 				WorkProjectNotify byTitleAndUnread = workProjectNotifyService.getByTitleAndUnread(titleStr,user.getId());
+
+				//计算两日期之间的天数
+				Integer interval = Integer.valueOf(this.getInterval(java.sql.Date.valueOf(info.getAdventDate()), new Date()));
+				if(interval > 0){
+					titleStr = titleStr + "已超期：" + interval + "天。请尽快上报";
+				}
+
 				if(null != byTitleAndUnread){
 					byTitleAndUnread.setExigency("1");
 					workProjectNotifyService.updateOverDueInfo(byTitleAndUnread);
@@ -2809,7 +2817,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			//Date类的一个方法，如果info.getAdventDateDate()早于 new Date() 返回true，否则返回false
 			if(info.getAdventDateDate().before(new Date())){
 				notifyStr = "项目【"+ info.getProjectName()+"】归档已超期";
-				titleStr = "项目【"+ info.getProjectName()+"】归档已超期。超期时间："+info.getAdventDate() +"。请尽快归档";
+				titleStr = "项目【"+ info.getProjectName()+"】归档已超期。超期时间："+info.getAdventDate() +"。";
 			}else{
 				notifyStr = "项目【"+ info.getProjectName()+"】即将归档超期";
 				titleStr = "项目【"+ info.getProjectName()+"】即将归档超期。超期时间："+info.getAdventDate();
@@ -2820,8 +2828,15 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			for (User user: projectLeaders) {
 				//根据标题查询通知信息中是否存在未读的信息，有则进行更新并对重复数量进行+1操作
 				WorkProjectNotify byTitleAndUnread = workProjectNotifyService.getByTitleAndUnread(titleStr,user.getId());
+				//计算两日期之间的天数
+				Integer interval = Integer.valueOf(this.getInterval(java.sql.Date.valueOf(info.getAdventDate()), new Date()));
+				if(interval > 0){
+					titleStr = titleStr + "已超期：" + interval + "天。请尽快归档";
+				}
+
 				if(null != byTitleAndUnread){
 					byTitleAndUnread.setExigency("1");
+					byTitleAndUnread.setTitle(titleStr);
 					workProjectNotifyService.updateOverDueInfo(byTitleAndUnread);
 				}else{
 					workProjectNotifyService
@@ -2852,6 +2867,33 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	}
 
 	/**
+	 * 计算两日期相差天数
+	 * @param beginDate
+	 * @param endDate
+	 * @return
+	 * @throws Exception
+	 */
+	public String getInterval(Date beginDate, Date endDate){
+		long day = 0;
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		try {
+			if(beginDate != null){
+				String begin = sdf.format(beginDate);
+				beginDate  = sdf.parse(begin);
+			}
+			if(endDate!= null){
+				String end= sdf.format(endDate);
+				endDate= sdf.parse(end);
+			}
+		} catch (Exception e){
+			e.getMessage();
+		}
+		day = (endDate.getTime()-beginDate.getTime())/(24*60*60*1000);
+		return String.valueOf(day);
+	}
+
+
+	/**
 	 * 修改项目计划附件id信息
 	 * @param projectRecord
 	 */

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -4,7 +4,6 @@
 package com.jeeplus.modules.workcontractinfo.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
@@ -164,6 +163,11 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 
 	private boolean cancelDelFalg; //合同作废和删除判定
 
+
+	private String createNameStr;   //创建人
+	private String createOffice;   //创建人部门
+	private String createId;     //创建人id
+
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
 	}
@@ -1208,4 +1212,28 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setOverDueStatus(String overDueStatus) {
 		this.overDueStatus = overDueStatus;
 	}
+
+	public String getCreateNameStr() {
+		return createNameStr;
+	}
+
+	public void setCreateNameStr(String createNameStr) {
+		this.createNameStr = createNameStr;
+	}
+
+	public String getCreateOffice() {
+		return createOffice;
+	}
+
+	public void setCreateOffice(String createOffice) {
+		this.createOffice = createOffice;
+	}
+
+	public String getCreateId() {
+		return createId;
+	}
+
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoAllController.java

@@ -60,6 +60,12 @@ public class WorkContractInfoAllController extends BaseController {
     @RequiresPermissions("workcontractinfo:workContractInfo:list")
     @RequestMapping(value = {"list", ""})
     public String list(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+
+
+        if(StringUtils.isNotBlank(workContractInfo.getCreateNameStr())){
+            model.addAttribute("createName", workContractInfo.getCreateNameStr());
+        }
+
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workContractInfo.getToflag())){
             if (workContractInfo.getToflag().equals("1")){

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -6,36 +6,25 @@ package com.jeeplus.modules.workcontractinfo.web;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.zxing.aztec.decoder.Decoder;
 import com.jeeplus.common.beanvalidator.BeanValidators;
 import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
-import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.websocket.onchat.ChatServerPool;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
-import com.jeeplus.modules.contractclient.entity.WorkContractClient;
-import com.jeeplus.modules.contractclient.service.WorkContractClientService;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportInfo;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.service.OfficeService;
-import com.jeeplus.modules.sys.service.WorkattachmentService;
-import com.jeeplus.modules.sys.utils.RoleActivityEnname;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
 import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
@@ -48,8 +37,10 @@ import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
-import com.jeeplus.modules.workcontractinfo.dao.WorkContractInfoCopyDao;
-import com.jeeplus.modules.workcontractinfo.entity.*;
+import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractListInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractReview;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoTookDisposeService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractReviewService;
@@ -140,6 +131,11 @@ public class WorkContractInfoController extends BaseController {
     @RequiresPermissions("workcontractinfo:workContractInfo:list")
     @RequestMapping(value = {"list", ""})
     public String list(WorkContractInfo workContractInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+
+        if(StringUtils.isNotBlank(workContractInfo.getCreateNameStr())){
+            model.addAttribute("createName", workContractInfo.getCreateNameStr());
+        }
+
         //进行查询之后进行任何操作，返回还是查询之后的数据页面
         if (StringUtils.isNotBlank(workContractInfo.getToflag())){
             if (workContractInfo.getToflag().equals("1")){

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

@@ -2404,54 +2404,84 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/projectrecord/workContentFromAndView/workFollowView";
 					}
 
-				} else if (workProjectNotify.getType().equals("94")) {    //项目登记
-					boolean flag = false;
+				} else if (workProjectNotify.getType().equals("94")) {    //项目超期处理
 					//通过通知信息id获取项目登记对象
-					ProjectRecords projectRecords = projectRecordsService.get(workProjectNotify.getNotifyId());
 					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(workProjectNotify.getNotifyId());
-					if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {
-						projectRecordsService.queryProjectDetail(projectRecords);
-						flag = true;
-					}
-					if (flag){
-						projectRecords.setAct(getByAct(projectRecords.getProcessInstanceId()));
-						projectRecords.setHome("home");
-						model.addAttribute("processInstanceId", projectRecords.getProcessInstanceId());
-						model.addAttribute("projectRecords", projectRecords);
-						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-							return "modules/projectrecord/projectRecordsView";
-						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-							return "modules/projectrecord/projectRecordsAudit";
-						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-							return "modules/projectrecord/projectRecordsModify";
-						} else {
-							return "modules/projectrecord/projectRecordsView";
+					if (ruralProjectRecords!=null&& StringUtils.isNotBlank(ruralProjectRecords.getId())) {
+						ruralProjectRecords = ruralProjectRecordsService.get(ruralProjectRecords.getId());
+
+						//根据归属部门Id查询归属部门名称显示
+						String belongingDepartmentName = ruralProjectRecordsService.getBelongingDepartmentNameByBelongingDepartment(ruralProjectRecords.getBelongingDepartment());
+						model.addAttribute("belongingDepartmentName",belongingDepartmentName);
+
+
+						ruralProjectRecordsService.queryNewProjectDetail(ruralProjectRecords);
+
+						if(null != ruralProjectRecords.getReportSignatureUploadFileUser() && StringUtils.isNotBlank(ruralProjectRecords.getReportSignatureUploadFileUser().getId())){
+							ruralProjectRecords.setReportSignatureUploadFileUser(UserUtils.get(ruralProjectRecords.getReportSignatureUploadFileUser().getId()));
 						}
-					}else {
-						if (ruralProjectRecords != null && StringUtils.isNotBlank(ruralProjectRecords.getId())) {
-							ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
-							ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
-							projectPlanInfo.setProjectId(ruralProjectRecords.getId());
-							//获取项目计划信息
-							List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
-							//项目计划附件信息
-							List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
-							ruralProjectRecords.setProjectPlanList(projectPlanList);
-							ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
+
+						ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+						projectPlanInfo.setProjectId(ruralProjectRecords.getId());
+						if(null != ruralProjectRecords.getWorkContractInfo()){
+							if(null != ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()){
+								ruralProjectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+							}
 						}
-						ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getProcessInstanceId()));
-						ruralProjectRecords.setHome("home");
-						model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
-						model.addAttribute("projectRecords", ruralProjectRecords);
-						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-							return "modules/ruralprojectrecords/ruralProjectRecordsView";
-						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
-						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-							return "modules/ruralprojectrecords/ruralProjectRecordsModify";
-						} else {
-							return "modules/ruralprojectrecords/ruralProjectRecordsView";
+						//获取项目计划信息
+						List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+
+
+						ruralProjectRecords.setProjectPlanList(projectPlanList);
+						List<MainDictDetail> mainDictList = Lists.newArrayList();
+						//工程咨询
+						if("1".equals(ruralProjectRecords.getProjectType())){
+							mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+							//造价审核
+						} else if("2".equals(ruralProjectRecords.getProjectType())){
+							mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+						}
+						if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+							//处理项目类别
+							for (MainDictDetail info: mainDictList) {
+								if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+									ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+									break;
+								}
+							}
+						}
+
+						//查询项目报告信息
+						ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+						//如果项目报告不为空，则查询项目线上归档信息
+						if(null != projectReportData){
+							ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+							if(null != projectReportRecord){
+								model.addAttribute("projectId", ruralProjectRecords.getId());
+							}else{
+								model.addAttribute("projectId", "");
+							}
 						}
+
+						model.addAttribute("flagProjectReportData",projectReportData);
+
+					}
+					model.addAttribute("projectRecords", ruralProjectRecords);
+					RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(ruralProjectRecords.getId());
+					if (null!=reported){
+						model.addAttribute("reportedId",reported.getId());
+					}
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("engineeringInfo",engineeringInfos);
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						return "modules/ruralprojectrecords/view/ruralProjectRecordsView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
+					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						return "modules/ruralprojectrecords/ruralProjectRecordsModify";
+					} else {
+						return "modules/ruralprojectrecords/ruralProjectRecordsView";
 					}
 
 				}else if ("95".equals(workProjectNotify.getType())) {    //项目上报管理

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

@@ -353,7 +353,14 @@
 		ifnull(prd.number ,"") as "projectReportNumber"
 		,ifnull(prd.status,0) as "projectReportStatus"
 		,ifnull(prd.name,"") as "projectReportName"
-		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		<choose>
+			<when test="projectReportRecordStatus  != null and projectReportRecordStatus != ''">
+				,ifnull(prr.status,#{projectReportRecordStatus}) as "projectReportRecordStatus"
+			</when>
+			<otherwise>
+				,ifnull(prr.status,0) as "projectReportRecordStatus"
+			</otherwise>
+		</choose>
 		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
         prrd.file_num as recodeNum,
 		prr.process_instance_id as prrProcessInstanceId,

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

@@ -334,6 +334,9 @@
 					</otherwise>
 				</choose>
 			</if>
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or u.name like concat('%',#{createNameStr},'%'))
+			</if>
 			AND a.company_id = #{currentUser.company.id} ${sqlMap.dsf}
 		</where>
 		<choose>
@@ -350,6 +353,7 @@
 	<select id="queryCount" resultType="int" >
 		SELECT count(1)
 		FROM work_contract_info a
+		LEFT JOIN sys_user u on u.id = a.create_by
 		<if test="client != null and client.name != null and client.name != ''">
 			LEFT JOIN work_client_info client ON client.id = a.client_id
 		</if>
@@ -407,6 +411,9 @@
 					</otherwise>
 				</choose>
 			</if>
+			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
+				AND (a.create_by = #{createId} or u.name like concat('%',#{createNameStr},'%'))
+			</if>
 			AND a.company_id = #{currentUser.company.id} ${sqlMap.dsf}
 		</where>
 		<choose>

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -74,7 +74,7 @@
 		<include refid="workProjectNotifyColumns"/>
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
-		WHERE a.title = #{title} and a.notify_user = #{userId} and a.status = 0 order by update_date desc limit 1
+		WHERE a.title like concat('%',#{title},'%')  and a.notify_user = #{userId} and a.status = 0 order by update_date desc limit 1
 	</select>
 
 	<select id="getByNotifyIdAndNotifyUser" resultType="WorkProjectNotify">
@@ -513,10 +513,13 @@
 	</update>
 	<update id="updateOverDueInfo">
 		UPDATE work_project_notify SET
-		   update_by = #{updateBy.id},
-		   update_date = #{updateDate},
-			exigency = #{exigency},
-			repetition_count = repetition_count+1
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			exigency = #{exigency}
+			<if test="title != null and title != ''">
+				,title = #{title}
+			</if>
+			,repetition_count = repetition_count+1
 		WHERE id = #{id}
 	</update>
 

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

@@ -1235,8 +1235,8 @@
             "<span class= \"label label-danger\" >${workProjectNotify.repetitionCount}</span>"+
             </c:if>--%>
             <c:choose>
-                <c:when test="${workProjectNotify.exigency == 1}">
-                    "<span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">${workProjectNotify.title}</font></span>" +
+                <c:when test="${workProjectNotify.repetitionCount> 1}">
+                    "<span class=\"bord-record\" title=\"${workProjectNotify.title}\"><font color=\"red\">【${workProjectNotify.repetitionCount}】</font><font>${workProjectNotify.title}</font></span>" +
                 </c:when>
                 <c:otherwise>
                     "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +

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

@@ -610,6 +610,13 @@
 							<form:input path="contractPrice" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 						</div>
 					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">创建人：</label>
+						<div class="layui-input-block  with-icon">
+							<sys:inquireselectUserNotReadolny id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
+															  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+						</div>
+					</div>
 				</div>
 				</form:form>
 			</div>

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

@@ -614,6 +614,14 @@
 							</input>
 						</div>
 					</div>
+
+					<div class="layui-item query athird">
+						<label class="layui-form-label">创建人：</label>
+						<div class="layui-input-block  with-icon">
+							<sys:inquireselectUserNotReadolny id="create" name="createId" value="${createId}" labelName="createNameStr" labelValue="${createName}"
+															  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+						</div>
+					</div>
 				</div>
 				</form:form>
 			</div>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyShowList.jsp

@@ -241,9 +241,15 @@
                         }
                         else if(d.type == "94"){
                         	if(d.exigency == '1'){
-								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('超期归档', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
-										"<span title=\""+ d.title +"\"><font color=\"red\">"+ d.title +"</font></span>" +
-										"</a>";
+                        		if(d.repetitionCount>1){
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('超期归档', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\"><font color=\"red\">【"+ d.repetitionCount +"】</font><font>"+ d.title +"</font></span>" +
+											"</a>";
+								}else{
+									return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('超期归档', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
+											"<span title=\""+ d.title +"\"><font>"+ d.title +"</font></span>" +
+											"</a>";
+								}
 							}else{
 								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('超期归档', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','95%','95%')\">" +
 										"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
@@ -309,6 +315,7 @@
                     ,"date":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
                     ,"remarks":"${workProjectNotify.remarks}"
                     ,"exigency":"${workProjectNotify.exigency}"
+                    ,"repetitionCount":"${workProjectNotify.repetitionCount}"
                 }
                 </c:forEach>
                 </c:if>