处理超期提醒通知信息共嗯那个

src/main/java/com/jeeplus/modules/processProjectPlan/service/ProcessProjectPlanService.java

@@ -90,7 +90,7 @@ public class ProcessProjectPlanService extends CrudService<ProcessProjectPlanDao
             }
         }
         //向接收人发起通知操作
-        String notifyStr = "项目编号："+projectRecords.getProjectId()+"，项目名称："+ projectRecords.getProjectName();
+        /*String notifyStr = "项目编号："+projectRecords.getProjectId()+"，项目名称："+ projectRecords.getProjectName();
         String titleStr = "项目名称："+ projectRecords.getProjectName();
         //Set转List
         List<String> masterIdList = new ArrayList<>(masterIdSet);
@@ -111,7 +111,7 @@ public class ProcessProjectPlanService extends CrudService<ProcessProjectPlanDao
                                     "0",
                                     "待通知",
                                     ""));
-        }
+        }*/
 
         //项目计划附件信息
         for (WorkClientAttachment workClientAttachment : projectRecords.getWorkAttachments()){

src/main/java/com/jeeplus/modules/projectAccessory/service/CollectAccessoryService.java

@@ -137,7 +137,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                     //List<User> officeUserList = UserUtils.getOfficeUserList();
                     List<User> officeUserList = Lists.newArrayList();
                     officeUserList.add(loginUser);
-                    for (User user : officeUserList) {
+                    /*for (User user : officeUserList) {
                         workProjectNotifyService
                                 .save(UtilNotify
                                         .saveNotify(collectAccessoryInfo.getId(),
@@ -149,7 +149,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                                                 "0",
                                                 "待通知",
                                                 "文件共享成功"));
-                    }
+                    }*/
                     break;
                 case "3":
                     //公司共享
@@ -157,7 +157,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                     //List<User> companyUserList = UserUtils.getCompanyUserList();
                     List<User> companyUserList = Lists.newArrayList();
                     companyUserList.add(loginUser);
-                    for (User user : companyUserList) {
+                    /*for (User user : companyUserList) {
                         workProjectNotifyService
                                 .save(UtilNotify
                                         .saveNotify(collectAccessoryInfo.getId(),
@@ -169,7 +169,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                                                 "0",
                                                 "待通知",
                                                 "文件共享成功"));
-                    }
+                    }*/
                     break;
             }
         }
@@ -201,7 +201,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                     //List<User> officeUserList = UserUtils.getOfficeUserList();
                     List<User> officeUserList = Lists.newArrayList();
                     officeUserList.add(loginUser);
-                    for (User user : officeUserList) {
+                    /*for (User user : officeUserList) {
                         workProjectNotifyService
                                 .save(UtilNotify
                                         .saveNotify(collectAccessoryInfo.getId(),
@@ -213,7 +213,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                                                 "0",
                                                 "待通知",
                                                 "文件部门共享成功"));
-                    }
+                    }*/
                     break;
                 case "3":
                     //公司共享
@@ -221,7 +221,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                     //List<User> companyUserList = UserUtils.getCompanyUserList();
                     List<User> companyUserList = Lists.newArrayList();
                     companyUserList.add(loginUser);
-                    for (User user : companyUserList) {
+                    /*for (User user : companyUserList) {
                         workProjectNotifyService
                                 .save(UtilNotify
                                         .saveNotify(collectAccessoryInfo.getId(),
@@ -233,7 +233,7 @@ public class CollectAccessoryService extends CrudService<CollectAccessoryDao, Co
                                                 "0",
                                                 "待通知",
                                                 "文件公司共享成功"));
-                    }
+                    }*/
                     break;
             }
         }

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectAccessoryService.java

@@ -328,7 +328,7 @@ public class ProjectAccessoryService extends TreeService<ProjectAccessoryDao, Pr
                     //List<User> officeUserList = UserUtils.getOfficeUserList();
                     List<User> officeUserList = Lists.newArrayList();
                     officeUserList.add(loginUser);
-                    for (User user : officeUserList) {
+                    /*for (User user : officeUserList) {
                         workProjectNotifyService
                                 .save(UtilNotify
                                         .saveNotify(collectAccessoryInfo.getId(),
@@ -340,7 +340,7 @@ public class ProjectAccessoryService extends TreeService<ProjectAccessoryDao, Pr
                                                 "0",
                                                 "待通知",
                                                 "部门文件共享成功"));
-                    }
+                    }*/
                     break;
                 case "3":
                     //公司共享
@@ -348,7 +348,7 @@ public class ProjectAccessoryService extends TreeService<ProjectAccessoryDao, Pr
                     //List<User> companyUserList = UserUtils.getCompanyUserList();
                     List<User> companyUserList = Lists.newArrayList();
                     companyUserList.add(loginUser);
-                    for (User user : companyUserList) {
+                    /*for (User user : companyUserList) {
                         workProjectNotifyService
                                 .save(UtilNotify
                                         .saveNotify(collectAccessoryInfo.getId(),
@@ -360,7 +360,7 @@ public class ProjectAccessoryService extends TreeService<ProjectAccessoryDao, Pr
                                                 "0",
                                                 "待通知",
                                                 "公司文件共享成功"));
-                    }
+                    }*/
                     break;
             }
         }

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -633,7 +633,9 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
             ruralProjectRecordsList.add(ruralProjectRecords);
         }
-        prefixStr = prefixStr.substring(0, prefixStr.length()-1);
+        if (StringUtils.isNotBlank(prefixStr)){
+            prefixStr = prefixStr.substring(0, prefixStr.length()-1);
+        }
         projectFilingBatch.setReportNumber(prefixStr);
         //获取归档人
         projectFilingBatch.setCreateBy(UserUtils.get(projectFilingBatch.getCreateBy().getId()));

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -228,7 +228,7 @@ public class ProjectFilingBatchController extends BaseController {
             List<RuralProjectRecords> ruralProjectRecordsList = new ArrayList<>();
             //获取详细信息
             projectFilingBatch = projectFilingBatchService.get(projectFilingBatch.getId());
-            List<ProjectFilingBatch> projectFilingBatches = projectFilingBatchService.findProjectIdByFiling(projectFilingBatch.getId());
+            List<ProjectFilingBatch> projectFilingBatches = projectFilingBatchService.getProjectFilingBatchRelationList(projectFilingBatch.getId());
             for (ProjectFilingBatch filingBatch : projectFilingBatches) {
                 RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
                 ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
@@ -263,7 +263,7 @@ public class ProjectFilingBatchController extends BaseController {
             List<RuralProjectRecords> ruralProjectRecordsList = new ArrayList<>();
             //获取详细信息
             projectFilingBatch = projectFilingBatchService.get(projectFilingBatch.getId());
-            List<ProjectFilingBatch> projectFilingBatches = projectFilingBatchService.findProjectIdByFiling(projectFilingBatch.getId());
+            List<ProjectFilingBatch> projectFilingBatches = projectFilingBatchService.getProjectFilingBatchRelationList(projectFilingBatch.getId());
             for (ProjectFilingBatch filingBatch : projectFilingBatches) {
                 RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
                 ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectPlanService.java

@@ -152,7 +152,7 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
         }
 
         //向接收人发起通知操作
-        String notifyStr = "项目【"+projectRecords.getProjectName()+"】项目计划制定完成";
+        /*String notifyStr = "项目【"+projectRecords.getProjectName()+"】项目计划制定完成";
         String titleStr = "项目【"+projectRecords.getProjectName()+"】项目计划制定完成";
         //Set转List
         List<String> masterIdList = new ArrayList<>(masterIdSet);
@@ -173,7 +173,7 @@ public class ProjectPlanService extends CrudService<ProjectPlanDao, ProjectPlanI
                                     "0",
                                     "待通知",
                                     ""));
-        }
+        }*/
 
         //项目计划附件信息
         for (WorkClientAttachment workClientAttachment : projectRecords.getWorkAttachments()){

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

@@ -1803,16 +1803,25 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			List<User> projectLeaders = dao.getProjectCreateUserAndChargeUser(info.getId());
 			//List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
 			for (User user: projectLeaders) {
-				workProjectNotifyService
-					.save(UtilNotify.saveNotify(info.getId(),
-							user,
-							info.getCompany().getId(),
-							titleStr,
-							notifyStr,
-							"94",
-							"0",
-							"待通知",
-							""));
+				//根据标题查询通知信息中是否存在未读的信息，有则进行更新并对重复数量进行+1操作
+				WorkProjectNotify byTitleAndUnread = workProjectNotifyService.getByTitleAndUnread(titleStr,user.getId());
+				if(null != byTitleAndUnread){
+					byTitleAndUnread.setExigency("1");
+					workProjectNotifyService.updateOverDueInfo(byTitleAndUnread);
+				}else{
+					workProjectNotifyService
+							.save(UtilNotify.saveNotify(info.getId(),
+									user,
+									info.getCompany().getId(),
+									titleStr,
+									notifyStr,
+									"94",
+									"0",
+									"待通知",
+									""));
+				}
+
+
 			}
 
 		}
@@ -2826,16 +2835,23 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			List<User> projectLeaders = dao.getProjectCreateUserAndChargeUser(info.getId());
 			//List<User> projectLeaders = workProjectUserDao.queryProjectUsers(info.getId(), "1");
 			for (User user: projectLeaders) {
-				workProjectNotifyService
-						.save(UtilNotify.saveNotify(info.getId(),
-								user,
-								info.getCompany().getId(),
-								titleStr,
-								notifyStr,
-								"94",
-								"0",
-								"待通知",
-								""));
+				//根据标题查询通知信息中是否存在未读的信息，有则进行更新并对重复数量进行+1操作
+				WorkProjectNotify byTitleAndUnread = workProjectNotifyService.getByTitleAndUnread(titleStr,user.getId());
+				if(null != byTitleAndUnread){
+					byTitleAndUnread.setExigency("1");
+					workProjectNotifyService.updateOverDueInfo(byTitleAndUnread);
+				}else{
+					workProjectNotifyService
+							.save(UtilNotify.saveNotify(info.getId(),
+									user,
+									info.getCompany().getId(),
+									titleStr,
+									notifyStr,
+									"94",
+									"0",
+									"待通知",
+									""));
+				}
 			}
 
 		}

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

@@ -604,12 +604,18 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 						if(null != fileSizeBytes){
 							Double fileSize = (double)fileSizeBytes/1024/1024;
 							info.setFileSize(String.format("%.2f", fileSize));
+							info.setFileSizeFlag("1");
 						}else{
 							info.setFileSize("");
 						}
 					}else{
-						Double fileSize = Double.valueOf(info.getFileSize())/1024/1024;
-						info.setFileSize(String.format("%.2f", fileSize));
+						if(StringUtils.isNotBlank(info.getFileSizeFlag()) && "1".equals(info.getFileSizeFlag())){
+
+						}else{
+							Double fileSize = Double.valueOf(info.getFileSize())/1024/1024;
+							info.setFileSize(String.format("%.2f", fileSize));
+							info.setFileSizeFlag("1");
+						}
 					}
 					if(info.getUrl().contains("/xg-qz")){
 						String url = info.getUrl().replace("/xg-qz","");

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientAttachment.java

@@ -31,6 +31,7 @@ public class WorkClientAttachment extends DataEntity<WorkClientAttachment> {
 	private String temporaryUrl;		// 附件地址(临时地址)
 	private String collectFlag;		// 收藏判定
 	private String fileSize;	//文件大小
+	private String fileSizeFlag;	//文件大小(已处理状态)
 	private String createName;	//创建人
 	private String sort;	//排序
 	private String description;	//说明
@@ -176,4 +177,12 @@ public class WorkClientAttachment extends DataEntity<WorkClientAttachment> {
 	public void setAttachmentIdList(List<String> attachmentIdList) {
 		this.attachmentIdList = attachmentIdList;
 	}
+
+	public String getFileSizeFlag() {
+		return fileSizeFlag;
+	}
+
+	public void setFileSizeFlag(String fileSizeFlag) {
+		this.fileSizeFlag = fileSizeFlag;
+	}
 }

src/main/java/com/jeeplus/modules/workprojectnotify/dao/WorkProjectNotifyDao.java

@@ -29,6 +29,13 @@ public interface WorkProjectNotifyDao extends CrudDao<WorkProjectNotify> {
      * @return
      */
     List<WorkProjectNotify> getByTitle(@Param("title") String title);
+
+    /**
+     * 根据标题查询通知信息中是否存在未读的信息(仅获取最近的一条)
+     * @param title
+     * @return
+     */
+    WorkProjectNotify getByTitleAndUnread(@Param("title") String title,@Param("userId")String userId);
     List<WorkProjectNotify> findListByAPP(WorkProjectNotify workProjectNotify);
 
     //更新阅读状态
@@ -45,6 +52,8 @@ public interface WorkProjectNotifyDao extends CrudDao<WorkProjectNotify> {
 
     int updateReadStateByNotifyRoleAndUser(WorkProjectNotify notify);
 
+    int updateOverDueInfo(WorkProjectNotify notify);
+
     WorkProjectNotify getByNotifyIdAndNotifyUser(@Param("notifyId") String notifyId, @Param("notifyUserId") String notifyUserId);
 
     /**

src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.workprojectnotify.entity;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.modules.sys.entity.User;
 
 import com.jeeplus.common.persistence.DataEntity;
@@ -10,6 +11,7 @@ import com.jeeplus.common.utils.excel.annotation.ExcelField;
 
 import javax.xml.crypto.Data;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 通知Entity
@@ -51,6 +53,9 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private String home;
 	private String createUserId;
 	private String createUserName;
+	private String exigency;	//紧急状态。0：非紧急；1：紧急
+	private Integer repetitionCount;//重复数量
+	private List<String> statusList = Lists.newArrayList();
 
 	public WorkProjectNotify() {
 		super();
@@ -234,4 +239,28 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	public void setCreateUserName(String createUserName) {
 		this.createUserName = createUserName;
 	}
+
+	public String getExigency() {
+		return exigency;
+	}
+
+	public void setExigency(String exigency) {
+		this.exigency = exigency;
+	}
+
+	public Integer getRepetitionCount() {
+		return repetitionCount;
+	}
+
+	public void setRepetitionCount(Integer repetitionCount) {
+		this.repetitionCount = repetitionCount;
+	}
+
+	public List<String> getStatusList() {
+		return statusList;
+	}
+
+	public void setStatusList(List<String> statusList) {
+		this.statusList = statusList;
+	}
 }

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

@@ -54,6 +54,14 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 	public List<WorkProjectNotify> getByTitle(String title) {
 		return dao.getByTitle(title);
 	}
+	/**
+	 * 根据标题查询通知信息中是否存在未读的信息(仅获取最近的一条)
+	 * @param title
+	 * @return
+	 */
+	public WorkProjectNotify getByTitleAndUnread(String title,String userId) {
+		return dao.getByTitleAndUnread(title,userId);
+	}
 
 	public List<WorkProjectNotify> findList(WorkProjectNotify workProjectNotify) {
 		//workProjectNotify.getSqlMap().put("dsf", dataScopeFilterOR(workProjectNotify.getCurrentUser(), "o", "u","s", MenuStatusEnum.PROJECT_NOTIFY.getValue()));
@@ -185,6 +193,11 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 			workProjectNotify.preUpdate();
 			dao.updateReadStateByNotifyRoleAndUser(workProjectNotify);
 	}
+	@Transactional(readOnly = false)
+	public void updateOverDueInfo(WorkProjectNotify workProjectNotify) {
+			workProjectNotify.preUpdate();
+			dao.updateOverDueInfo(workProjectNotify);
+	}
 
 	@Transactional(readOnly = false)
 	public int modifyDelflag(WorkProjectNotify workProjectNotify){

src/main/java/com/jeeplus/modules/workprojectnotify/util/UtilNotify.java

@@ -23,6 +23,10 @@ public class UtilNotify {
         workProjectNotify.setStatus(status);
         workProjectNotify.setNotifyRole(notifyRole);
         workProjectNotify.setRemarks(remarks);
+        if("94".equals(type)){
+            workProjectNotify.setExigency("1");
+            workProjectNotify.setRepetitionCount(1);
+        }
         return workProjectNotify;
     }
 
@@ -43,6 +47,10 @@ public class UtilNotify {
         workProjectNotify.setRemarks(remarks);
         workProjectNotify.setCreateBy(user);
         workProjectNotify.setUpdateBy(user);
+        if("94".equals(type)){
+            workProjectNotify.setExigency("1");
+            workProjectNotify.setRepetitionCount(1);
+        }
         return workProjectNotify;
     }
 }

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

@@ -589,6 +589,7 @@ public class WorkProjectNotifyController extends BaseController {
 			}
 		}
 		User user = UserUtils.getUser();
+		workProjectNotify.setCreateBy(user);
 		workProjectNotify.setUser(user);
 		workProjectNotify.setStatus("2");
 		workProjectNotify.setRemarks("待通知");

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

@@ -20,7 +20,8 @@
 		a.status AS "status",
 		a.kind AS "kind",
 		a.officeId AS "officeId",
-		count(a.content) AS "countNum"
+		a.exigency as "exigency",
+		a.repetition_count as "repetitionCount"
 	</sql>
 
 
@@ -66,6 +67,14 @@
 		WHERE a.title = #{title}
 	</select>
 
+	<select id="getByTitleAndUnread" resultType="WorkProjectNotify" >
+		SELECT
+		<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
+	</select>
+
 	<select id="getByNotifyIdAndNotifyUser" resultType="WorkProjectNotify">
 		SELECT <include refid="workProjectNotifyColumns"/>
 		FROM work_project_notify a
@@ -76,8 +85,6 @@
 	<select id="findList" resultType="WorkProjectNotify" >
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
-		,COUNT(*),a.title
-		-- 		,distinct a.title
 		FROM work_project_notify a
 		left join sys_user su on a.create_by = su.id
 		LEFT JOIN sys_user u ON u.id = a.create_by
@@ -144,13 +151,7 @@
 			</choose>
 		</where>
 
-		<if test="remarks !=null and remarks != '' and remarks == '待审批'">
-			GROUP BY a.content
-		</if>
-		<if test="remarks !=null and remarks != '' and remarks == '待通知'">
-			GROUP BY a.title
-		</if>
-		ORDER BY a.update_date DESC
+		ORDER BY a.exigency desc, a.update_date DESC
 		<choose>
 			<!--<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -168,13 +169,7 @@
 	</select>
 
 	<select id="queryCount" resultType="Integer">
-		SELECT
-		<if test="remarks !=null and remarks != '' and remarks == '待审批'">
-			count(distinct a.content)
-		</if>
-		<if test="remarks !=null and remarks != '' and remarks == '待通知'">
-			count(distinct a.title)
-		</if>
+		SELECT count(1)
 		FROM work_project_notify a
 		LEFT JOIN sys_user u ON u.id = a.create_by
 		LEFT JOIN sys_user su ON su.id = a.create_by
@@ -371,6 +366,12 @@
 			status,
 			kind,
 			officeId
+			<if test="exigency != null and exigency != ''">
+				,exigency
+			</if>
+			<if test="repetitionCount != null and repetitionCount != ''">
+				,repetition_count
+			</if>
 		) VALUES (
 					 #{id},
 					 #{createBy.id},
@@ -389,6 +390,12 @@
 					 #{status},
 					 #{kind},
 					 #{officeId}
+					<if test="exigency != null and exigency != ''">
+						,#{exigency}
+					</if>
+					<if test="repetitionCount != null and repetitionCount != ''">
+						,#{repetitionCount}
+					</if>
 				 )
 	</insert>
 
@@ -412,6 +419,12 @@
 		<if test="processInstanceId != null and processInstanceId != ''">
 			,process_instance_id = #{processInstanceId}
 		</if>
+		<if test="exigency != null and exigency != ''">
+			,exigency = #{exigency}
+		</if>
+		<if test="repetitionCount != null and repetitionCount != ''">
+			,repetition_count = #{repetitionCount}
+		</if>
 		WHERE id = #{id}
 	</update>
 	<update id="updateReadStateByNotifyIdAndNotifyUser">
@@ -438,6 +451,14 @@
 		WHERE notify_user = #{user.id}
 		  AND notify_role = #{notifyRole}
 	</update>
+	<update id="updateOverDueInfo">
+		UPDATE work_project_notify SET
+		   update_by = #{updateBy.id},
+		   update_date = #{updateDate},
+			exigency = #{exigency},
+			repetition_count = repetition_count+1
+		WHERE id = #{id}
+	</update>
 
 
 	<update id="updateDelflagByNotifyId">
@@ -528,15 +549,10 @@
 			<if test="endDate != null and endDate != ''">
 				AND a.create_date &lt;= #{endDate}
 			</if>
-			and a.create_by is not null
-
-			and a.process_instance_id in( select process_instance_id from work_activity_process
-			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and type=1)
-			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
-			group by process_instance_id)
+			and a.create_by =#{createBy.id}
+			and a.remarks != '[强制撤销]' and a.remarks != '待通知'
 
 		</where>
-		group by a.content
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -592,20 +608,10 @@
 			<if test="endDate != null and endDate != ''">
 				AND a.create_date &lt;= #{endDate}
 			</if>
-			and a.create_by is not null
-			and a.process_instance_id in( select process_instance_id from work_activity_process
-			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and type=1)
-			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
-			group by process_instance_id)
+
+			and a.create_by =#{createBy.id}
+			and a.remarks != '[强制撤销]' and a.remarks != '待通知'
 		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.create_date DESC
-			</otherwise>
-		</choose>
 	</select>
 
 	<delete id="deleteActivityProcess">
@@ -662,6 +668,7 @@
 			<if test="endDate != null and endDate != ''">
 				AND a.create_date &lt;= #{endDate}
 			</if>
+			and remarks = '待审批'
 		</where>
 		group by a.notify_id
 		<choose>
@@ -712,6 +719,7 @@
 			<if test="endDate != null and endDate != ''">
 				AND a.create_date &lt;= #{endDate}
 			</if>
+			and remarks = '待审批'
 		</where>
 		group by a.notify_id
 		<choose>

src/main/webapp/static/common/css/style.css

@@ -8798,7 +8798,7 @@ th .layui-table-cell{
 .bord-right > .bord-contents > .slimScrollDiv > ul > li > a> span,
 .bord-right > .bord-contents > ul > li > a> span{
     font-size: 14px;
-    height:64%;
+    height: 100%;
 }
 .bord-right > .bord-contents > .slimScrollDiv > ul > li > a> .bord-record,
 .bord-right > .bord-contents > ul > li > a> .bord-record{

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -420,6 +420,9 @@
 				<div class="nav-btns">
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
+						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:importB">
+							<table:importExcel url="${ctx}/ruralProject/electronicSeal/importB"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 
 					</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectMessageElectronicSealYCList.jsp

@@ -417,7 +417,9 @@
 				<div class="nav-btns">
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
-
+						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:importB">
+							<table:importExcel url="${ctx}/ruralProject/electronicSealYC/importB"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 
 					</div>

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

@@ -1231,10 +1231,17 @@
         </c:choose>
 
         elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}\">${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}</span>"+
-            <c:if test="${workProjectNotify.countNum> 1}">
-            "<span class= \"label label-danger\" >${workProjectNotify.countNum}</span>"+
-            </c:if>
-            "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +
+            <%--<c:if test="${workProjectNotify.repetitionCount> 1}">
+            "<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>
+                <c:otherwise>
+                    "<span class=\"bord-record\" title=\"${workProjectNotify.title}\">${workProjectNotify.title}</span>" +
+                </c:otherwise>
+            </c:choose>
             '<span class="bord-record-time">' + '<fmt:formatDate value="${workProjectNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></ a></li>');
         </c:if>
         </c:forEach>

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

@@ -564,7 +564,7 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">创建日期：</label>
+						<label class="layui-form-label">开始时间：</label>
 						<div class="layui-input-block">
 							<input id="startDate" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
 								   value="<fmt:formatDate value="${workProjectNotify.startDate}" pattern="yyyy-MM-dd"/>"/>
@@ -815,7 +815,7 @@
                         return "<span title='"+ d.submit +"'>" + d.submit + "</span>";
                     }}
                 ,{field:'status1', align:'center',title: '审批状态',width:100}
-                ,{field:'op',align:'center', title: '创建时间', width:140,templet:function(d){
+                ,{field:'op',align:'center', title: '开始时间', width:140,templet:function(d){
                         return "<span title='"+ d.date +"'>" + d.ymddate + "</span>";
                     }}
             ]]

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

@@ -153,7 +153,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">类型：</label>
 							<div class="layui-input-block">
-								<form:select id="type" path="type" class="form-control simple-select">
+								<form:select id="types" path="types" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>

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

@@ -153,7 +153,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">类型：</label>
 							<div class="layui-input-block">
-								<form:select id="type" path="type" class="form-control simple-select">
+								<form:select id="types" path="types" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getDictList('new_project_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
@@ -239,6 +239,17 @@
                                 "<span title=\""+ d.title +"\">"+ d.title +"</span>" +
                                 "</a>";
                         }
+                        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>";
+							}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>" +
+										"</a>";
+							}
+                        }
                         else if(d.remarks == "待归档")
                         {
                             return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"top.openTab('${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"','待归档',false)\">" +
@@ -297,6 +308,7 @@
                     ,"status1":"${fns:getDictLabel(workProjectNotify.status, 'project_notify_status', '')}"
                     ,"date":"<fmt:formatDate value="${workProjectNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"
                     ,"remarks":"${workProjectNotify.remarks}"
+                    ,"exigency":"${workProjectNotify.exigency}"
                 }
                 </c:forEach>
                 </c:if>