11482-【CR】【投资系统】增加审批流程-bug

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TerminationServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.flowable.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
@@ -157,6 +158,7 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                     // todo 更改终止状态
                     tProjectPoolService.updateTProjectPoolByTerminationFlag(tProjectTermination.getProjectPoolId(),"1");//1是代表已发起终止申请
                     // todo 新增终止数据
+                    tProjectTermination.setCreateTime(DateUtils.getNowDate());
                     terminationMapper.insertTProjectTermination(tProjectTermination);
 
 
@@ -265,6 +267,7 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                 }
             }
             tProjectPoolService.updateTProjectPool(tProjectPool);
+            tProjectTermination.setUpdateTime(DateUtils.getNowDate());
             terminationMapper.updateTProjectTermination(tProjectTermination);
             activitiBaseInfoService.addActivitiBaseInfo(flow);
             //todo 短信

ruoyi-system/src/main/resources/mapper/invest/DecisionMapper.xml

@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t.ID_ AS 'taskId',
         t.NAME_ AS 'taskName',
         t.ASSIGNEE_ AS 'assignee',
-        ui.nick_name AS 'assigneeName',
+        GROUP_CONCAT(DISTINCT ui.nick_name SEPARATOR '\r\n') as 'assigneeName',
         t.TASK_DEF_KEY_ as 'taskDefKey',
         rp.DEPLOYMENT_ID_ AS 'deployId'
         from t_project_decision a

ruoyi-ui/src/views/project/approval/audit.vue

@@ -1885,7 +1885,7 @@ export default {
       if(this.formLXApply.taskDefKey==="meeting") {//发起会议节点
         this.formLXApply.listFile = this.fileListLXApply;
         this.meetingForm.listFile = this.fileList;
-        if (!this.formLXApply.participants) {
+        /*if (!this.formLXApply.participants) {
           this.$modal.msgError("请选择立项审批人!");
           return;
         }
@@ -1896,9 +1896,9 @@ export default {
               return;
             }
           })
-        }
+        }*/
       }else if(this.formLXApply.taskDefKey==="decision"){//会议投决
-        this.$refs["scoreForm"].validate((valid) => {
+        /*this.$refs["scoreForm"].validate((valid) => {
           if (!valid) {
             allValid = false;
             // 4. 评审表校验失败：切换标签 + 提示
@@ -1906,7 +1906,7 @@ export default {
             this.$message.error('项目立项评估评审表未填写完整，请检查！');
             return;
           }
-        })
+        })*/
       }else if(this.formLXApply.taskDefKey==="industryResearch"){//项目行研
         this.formLXApply.listFile = this.fileListIndustry;
         this.$refs["formLXApply"].validate((valid) => {

ruoyi-ui/src/views/project/approval/edit.vue

@@ -277,10 +277,17 @@ export default {
           that.formLXApply = response.data;
           setTimeout(() => {
             //that.$refs.fileItemLXApply.handleButton();
-            that.$refs.fileItemLXApply.fileList = [];
-            that.$refs.fileItemLXApply.getListFileBusinessId(
-              that.formLXApply.id
-            );
+            // that.$refs.fileItemLXApply.fileList = [];
+            // that.$refs.fileItemLXApply.getListFileBusinessId(
+            //   that.formLXApply.id
+            // );
+            //立项申请报告
+            this.$refs.fileItemLXApply.fileList = [];
+            this.$refs.fileItemLXApply.getListFileBusinessId(that.formLXApply.id,"10");
+            //其他附件
+            //this.$refs.otherFileItem.handleButton();
+            this.$refs.otherFileItem.fileList = [];
+            this.$refs.otherFileItem.getListFileBusinessId(that.formLXApply.id, "0");
           }, 300);
         }
       });

ruoyi-ui/src/views/project/decision/audit.vue

@@ -1694,7 +1694,7 @@ export default {
             //其他附件
             this.$refs.otherFileItem.handleButton();
             this.$refs.otherFileItem.fileList = [];
-            this.$refs.otherFileItem.getListFileBusinessId(that.formLXApply.id, "0");
+            this.$refs.otherFileItem.getListFileBusinessId(that.formTJApply.id, "0");
           }, 300);
         }
       });

ruoyi-ui/src/views/project/decision/edit.vue

@@ -289,10 +289,18 @@ export default {
           that.formTJApply = response.data;
           setTimeout(() => {
             //that.$refs.fileItemTJApply.handleButton();
-            that.$refs.fileItemTJApply.fileList = [];
-            that.$refs.fileItemTJApply.getListFileBusinessId(
-              that.formTJApply.id
-            );
+            // that.$refs.fileItemTJApply.fileList = [];
+            // that.$refs.fileItemTJApply.getListFileBusinessId(
+            //   that.formTJApply.id
+            // );
+            //项目投决附件
+            //this.$refs.fileItemTJApply.handleButton();
+            this.$refs.fileItemTJApply.fileList = [];
+            this.$refs.fileItemTJApply.getListFileBusinessId(that.formTJApply.id,"11");
+            //其他附件
+            //this.$refs.otherFileItem.handleButton();
+            this.$refs.otherFileItem.fileList = [];
+            this.$refs.otherFileItem.getListFileBusinessId(that.formTJApply.id, "0");
           }, 300);
         }
       });