commit

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolOpinionController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * 校工会意见
  */
 @IocBean
-@At("/platform/proposal/schoolOpinion")
+@At("/platform/proposal/schoolOpinionAudit")
 @Slf4j
 @Ok("json:full")
 @Api(tags = "提案-办理-校工会意见")

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalFeedBackInterceptor.java

@@ -1,15 +1,11 @@
 package com.budwk.app.zhgh.democratic.proposal.interceptor;
 
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.FlowInterceptor;
 import com.budwk.app.flow.engine.core.Execution;
 import com.budwk.app.flow.engine.core.ServiceContext;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.entity.ProcessTaskActor;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
@@ -27,9 +23,9 @@ public class ProposalFeedBackInterceptor implements FlowInterceptor {
     @Aop(TransAop.READ_COMMITTED)
     public void intercept(Execution execution) {
         Dao dao = ServiceContext.find(Dao.class);
-
         String feedback = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "feedback");
-        if (feedback.equals("DISSATISFIED")) {
+        String caseFilingResult = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult");
+        if (feedback.equals("DISSATISFIED") && !"NOT".equals(caseFilingResult)) {
             // 不满意
             List<ProcessTask> processTaskList = execution.getProcessTaskList();
             for (ProcessTask task : processTaskList) {

src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html

@@ -147,6 +147,7 @@ layout("/layouts/platform.html"){
                         processTaskId: row.taskId,
                         taskKey: row.taskKey,
                         taskName: row.taskName,
+                        tf_caseFilingResult: row.caseFilingResult,
                         instanceId: row.instanceId
                     }
                     this.$refs.proposalInfoRef.onOpen(row)