已办驳回显示调整

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

@@ -129,4 +129,6 @@ public interface WorkProjectNotifyDao extends CrudDao<WorkProjectNotify> {
 
 
     void deleteByNotifyUser(@Param("content") String content,@Param("userId")String userId);
+
+    String getRemarksByProcInsId(WorkProjectNotify info);
 }

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

@@ -69,6 +69,15 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private String auditUserName; // 审核人name
 	private String belongProject; // 所属系统
 	private String pageFlag; // 回跳页面判定
+	private String reject; //判定已办中是否驳回
+
+	public String getReject() {
+		return reject;
+	}
+
+	public void setReject(String reject) {
+		this.reject = reject;
+	}
 
 	public WorkProjectNotify() {
 		super();

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -197,7 +198,8 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		page.setCountFlag(false);
 		workProjectNotify.setPage(page);
 		List<WorkProjectNotify> listByMine = dao.findReadList(workProjectNotify);
-		for (WorkProjectNotify info: listByMine) {
+		for (int i = 0; i < listByMine.size(); i++) {
+			WorkProjectNotify info = listByMine.get(i);
 			if(StringUtils.isNotBlank(info.getProcessInstanceId())){
 				String histoicFlow = histoicFlowUtil.histoicFlow(info.getProcessInstanceId());
 				if(StringUtils.isNotBlank(histoicFlow)){
@@ -206,6 +208,21 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 					info.setNotifyRole("已结束");
 				}
 			}
+			//根据流程id,创建人,创建时间查找流程中的审批意见
+			String remarks = dao.getRemarksByProcInsId(info);
+			if (StringUtils.isNotBlank(remarks)){
+				if (remarks.contains("驳回")){
+//				WorkProjectNotify next = listByMine.get(i + 1);
+					info.setReject("1");
+				}
+			}
+
+			//当标题中含有'重新申请'时,则获取到下一条数据,并赋值
+//			if (info.getTitle().contains("重新申请") && i + 1 < listByMine.size()) {
+//				WorkProjectNotify next = listByMine.get(i + 1);
+//				next.setReject("1");
+//			}
+
 			//如果记录中流程开始时间为空，则通过流程id查询该流程的开始时间
 			/*if(null == info.getWapCreateDate() && StringUtils.isNotBlank(info.getProcessInstanceId())){
 				WorkActivityProcess workActivityProcess = new WorkActivityProcess();

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

@@ -683,6 +683,7 @@
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
 		,a.wap_begin_date AS "wapCreateDate"
+		,a.process_instance_id AS "processInstanceId"
 		,a.wap_over_date AS "wapEndDate"
 		,su.name as "createUserName"
 		FROM work_project_notify a
@@ -994,4 +995,14 @@
 
 		) and content =#{content} and notify_user = #{userId}
 	</delete>
+	<select id="getRemarksByProcInsId" resultType="string">
+		SELECT remarks
+		FROM work_activity_process
+		WHERE process_instance_id = #{processInstanceId}
+		AND create_by = #{updateBy.id}
+		AND TIME(create_date) BETWEEN
+			TIME(DATE_SUB(#{updateDate}, INTERVAL 2 SECOND))
+			AND TIME(DATE_ADD(#{updateDate}, INTERVAL 2 SECOND))
+		AND remarks IS NOT NULL;
+	</select>
 </mapper>

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

@@ -570,7 +570,7 @@
                     ,"type1":"${fns:getDictLabel(workProjectNotify.type, 'project_notify_type', '')}"
                     ,"step":"${workProjectNotify.notifyRole}"
                     ,"title":"${workProjectNotify.title}"
-					<c:if test="${fn:contains(workProjectNotify.title, '驳回')}">
+					<c:if test="${workProjectNotify.reject == '1'}">
 					,"isreply":"1"
 					</c:if>
 					<c:if test="${fn:contains(workProjectNotify.title, '完成') || fn:contains(workProjectNotify.title, '通过')|| fn:contains(workProjectNotify.title, '成功')}">