待办事项-我发起的存在审核按钮问题修改

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

@@ -185,6 +185,7 @@ import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
+import com.jeeplus.modules.workreimbursement.utils.HistoicFlowUtil;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workrelationship.service.WorkRelationshipService;
 import com.jeeplus.modules.workrepay.entity.WorkRepay;
@@ -437,6 +438,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private WorkReimbursementTypeService workReimbursementTypeService;
 	@Autowired
 	private RuralProjectMessageService ruralProjectMessageService;
+	@Autowired
+	private HistoicFlowUtil histoicFlowUtil;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -933,8 +936,9 @@ public class WorkProjectNotifyController extends BaseController {
 				}*/
 				UserUtils.pushMeIm("");
 			}
-
-			//workProjectNotify.setStatus("2");
+			if(workProjectNotify.getRemarks().contains("待通知")){
+				workProjectNotify.setStatus("2");
+			}
 			workProjectNotify.preUpdate();
 			workProjectNotifyService.save(workProjectNotify);
 			if (StringUtils.isNotBlank(workProjectNotify.getType())) {

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

@@ -44,6 +44,7 @@
 	<select id="get" resultType="WorkProjectNotify" >
 		SELECT 
 			<include refid="workProjectNotifyColumns"/>
+		,a.process_instance_id as "processInstanceId"
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
 		WHERE a.id = #{id}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -496,7 +496,7 @@
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"reportedAdd":<c:choose>
-                                <c:when test="${(projectRecords.reportedState == 0 || rojectRecords.reportedState == 6) && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+                                <c:when test="${(projectRecords.reportedState == 0 || projectRecords.reportedState == 6) && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
                             ,"reportedRecall":<c:choose>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -496,7 +496,7 @@
                             <c:otherwise>"0"</c:otherwise>
                             </c:choose>
 							,"reportedAdd":<c:choose>
-									<c:when test="${(projectRecords.reportedState == 0 || rojectRecords.reportedState == 6) && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
+									<c:when test="${(projectRecords.reportedState == 0 || projectRecords.reportedState == 6) && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id == projectRecords.createBy.id)}">"1"</c:when>
 							<c:otherwise>"0"</c:otherwise>
 							</c:choose>
 							,"reportedRecall":<c:choose>