Explorar el Código

尽职背调修改

dangzj hace 3 meses
padre
commit
3a5adcf252

+ 61 - 0
ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/DueTaskListener.java

@@ -0,0 +1,61 @@
+package com.ruoyi.flowable.listener;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.delegate.TaskListener;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 任务监听器
+ *
+ * create(创建):在任务被创建且所有的任务属性设置完成后才触发
+ * assignment(指派):在任务被分配给某个办理人之后触发
+ * complete(完成):在配置了监听器的上一个任务完成时触发
+ * delete(删除):在任务即将被删除前触发。请注意任务由completeTask正常完成时也会触发
+ *
+ * @author Tony
+ * @date 2021/4/20
+ */
+@Slf4j
+@Component
+public class DueTaskListener implements TaskListener{
+    private static ISysUserService sysUserService;
+    private static SysDeptMapper sysDeptMapper;
+    @Autowired
+    public void setSysUserService(ISysUserService sysUserService) {
+        DueTaskListener.sysUserService = sysUserService;
+    }
+    @Autowired
+    public void setSysDeptMapper(SysDeptMapper sysDeptMapper) {
+        DueTaskListener.sysDeptMapper = sysDeptMapper;
+    }
+    @Override
+    public void notify(DelegateTask delegateTask) {
+
+        log.info("任务监听器:{}", delegateTask);
+        // TODO  获取事件类型 delegateTask.getEventName(),可以通过监听器给任务执行人发送相应的通知消息
+        String eventName= delegateTask.getEventName();
+        String taskDefKey= delegateTask.getTaskDefinitionKey();
+        Object obj = delegateTask.getVariable("INITIATOR");
+        SysUser user = sysUserService.selectUserById((Long) obj);
+        String leader=sysDeptMapper.selectDeptLeader("投资部");
+        SysUser leaderUser=sysUserService.selectUserByUserName(leader);
+        if("deptLeader".equals(taskDefKey)) {//部门负责人、
+            //部门负责人
+            delegateTask.setAssignee(leaderUser.getUserId().toString());
+        }else if("confirm".equals(taskDefKey)){
+            //申请人本人确认
+            delegateTask.setAssignee(user.getUserId().toString());
+        }else if("president".equals(taskDefKey)){
+            //总裁室固定杨总
+            SysUser ylUser=sysUserService.selectUserByUserName("杨琳");
+            delegateTask.setAssignee(ylUser.getUserId().toString());
+        }
+
+    }
+
+}

+ 0 - 2
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TProjectInvestigateServiceImpl.java

@@ -232,8 +232,6 @@ public class TProjectInvestigateServiceImpl extends FlowServiceFactory implement
                 identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
                 formProperties.put("auditPass",tProjectInvestigate.isFlag()?true:false);
                 formProperties.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
-                String leader=sysDeptMapper.selectDeptLeader("投资部");
-                formProperties.put("MANAGER",sysUserService.selectUserByUserName(leader).getUserId());
                 pInst = runtimeService.startProcessInstanceById(pDefId, formProperties);
                 if(pInst!=null){
                     String nickName= SecurityUtils.getLoginUser().getUser().getNickName();

+ 3 - 3
ruoyi-ui/.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 
 # 若依管理系统/开发环境
 # 部署
-# VUE_APP_BASE_API = 'http://47.103.79.143:8091/dev-api'  
-# VUE_APP_BASE_API = '/dev-api'  
-VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = 'http://47.103.79.143:8091/dev-api'
+VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = '/prod-api'
 VUE_APP_CORPID = "ding4ab75ecd53106cde4ac5d6980864d335"
 # 投资部的部门id
 VUE_APP_DEPTID = '119'

+ 7 - 7
ruoyi-ui/src/views/invest/components/dueDiligenceList.vue

@@ -61,7 +61,7 @@
           width="360"
         >
           <template slot-scope="scope">
-            <!-- 
+            <!--
               v-show="scope.row.investigatePersonId.indexOf(user.userId) > -1" -->
             <!-- <el-button
               class="custom-blue-color"
@@ -260,9 +260,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDueForm" v-preventReClick
-          >确 定</el-button
-        >
+        <el-button type="warning" @click="submitDueForm(1)" v-preventReClick>暂 存</el-button>
+        <el-button type="primary" @click="submitDueForm(2)" v-preventReClick>提 交</el-button>
         <el-button @click="cancelDueForm">取 消</el-button>
       </div>
     </el-dialog>
@@ -718,8 +717,8 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        projectPoolId: null,
         projectName: null,
+        flag:null,
       },
       dueAllPeportList: [],
       dueRules1: {
@@ -1010,9 +1009,10 @@ export default {
       };
     },
     // 尽调申请-提交
-    submitDueForm() {
+    submitDueForm(flag) {
       this.$refs["dueForm"].validate((valid) => {
         if (valid) {
+          this.dueForm.flag = flag;
           this.dueForm.listFile = this.fileList;
           this.dueForm.investigateCost = this.dueForm.investigateCost
             .replace(/[^0-9.]/g, "")
@@ -1132,4 +1132,4 @@ export default {
     color: #333;
   }
 }
-</style>
+</style>

+ 23 - 24
ruoyi-ui/src/views/invest/pool/index4.vue

@@ -97,31 +97,30 @@
           v-hasPermi="['invest:pool:due']"
           >尽调申请</el-button
         >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          plain
-          :disabled="multiple"
-          type="primary"
-          size="mini"
-          icon="el-icon-document-checked"
-          @click="handleSelectData(10)"
-          >上传尽调报告</el-button
-        >
-      </el-col>
+      </el-col><!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          plain-->
+<!--          :disabled="multiple"-->
+<!--          type="primary"-->
+<!--          size="mini"-->
+<!--          icon="el-icon-document-checked"-->
+<!--          @click="handleSelectData(10)"-->
+<!--          >上传尽调报告</el-button-->
+<!--        >-->
+<!--      </el-col>-->
 
-      <el-col :span="1.5">
-        <el-button
-          :disabled="multiple"
-          plain
-          type="success"
-          size="mini"
-          icon="el-icon-setting"
-          v-hasPermi="['invest:pool:stage']"
-          @click="handleSelectData(3)"
-          >设置项目阶段</el-button
-        >
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          :disabled="multiple"-->
+<!--          plain-->
+<!--          type="success"-->
+<!--          size="mini"-->
+<!--          icon="el-icon-setting"-->
+<!--          v-hasPermi="['invest:pool:stage']"-->
+<!--          @click="handleSelectData(3)"-->
+<!--          >设置项目阶段</el-button-->
+<!--        >-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           @click="handleSelectData(4)"