设置多流程参数

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java

@@ -105,13 +105,16 @@ public class CmcProjectCommentController extends BaseController
             cmcProjectComment.setManageApprover(getLoginUser().getUserId());
             cmcProjectComment.setManageApprovalTime(new Date());
         }
-        CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
-        StringBuilder scApprover = new StringBuilder();
-        if (projectComment.getScApprover() == null)
-            scApprover.append(cmcProjectComment.getScApprover());
-        else
-            scApprover.append(projectComment.getScApprover()).append(",").append(cmcProjectComment.getScApprover());
-        cmcProjectComment.setScApprover(scApprover.toString());
+        if (cmcProjectComment.getScComment() != null) {
+            CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
+            StringBuilder scApprover = new StringBuilder();
+            if (projectComment.getScApprover() == null)
+                scApprover.append(cmcProjectComment.getScApprover());
+            else
+                scApprover.append(projectComment.getScApprover()).append(",").append(cmcProjectComment.getScApprover());
+            cmcProjectComment.setScApprover(scApprover.toString());
+            cmcProjectComment.setScApprovalTime(new Date());
+        }
         return toAjax(cmcProjectCommentService.updateCmcProjectComment(cmcProjectComment));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -138,7 +138,7 @@ public class CmcProjectController extends BaseController
                 cmcProjectWork.setScale(workArrObject.getString("scale"));
                 cmcProjectWork.setUnit(workArrObject.getString("unit"));
                 cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-                cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+                cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
                 cmcProjectWork.setRemark(workArrObject.getString("remark"));
                 cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
             }
@@ -152,7 +152,7 @@ public class CmcProjectController extends BaseController
             cmcProjectWork.setScale(workArrObject.getString("scale"));
             cmcProjectWork.setUnit(workArrObject.getString("unit"));
             cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-            cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+            cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
             cmcProjectWork.setRemark(workArrObject.getString("remark"));
             cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
         }
@@ -211,7 +211,7 @@ public class CmcProjectController extends BaseController
                     cmcProjectWork.setScale(workArrObject.getString("scale"));
                     cmcProjectWork.setUnit(workArrObject.getString("unit"));
                     cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-                    cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+                    cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
                     cmcProjectWork.setRemark(workArrObject.getString("remark"));
                     cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
                 }
@@ -226,7 +226,7 @@ public class CmcProjectController extends BaseController
                 cmcProjectWork.setScale(workArrObject.getString("scale"));
                 cmcProjectWork.setUnit(workArrObject.getString("unit"));
                 cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-                cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+                cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
                 cmcProjectWork.setRemark(workArrObject.getString("remark"));
                 cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
             }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallBudgetActivityExecutionListener.java

@@ -1,33 +1,18 @@
 package com.ruoyi.flowable.oa;
 
-import org.flowable.bpmn.model.CallActivity;
-import org.flowable.bpmn.model.ExtensionAttribute;
-import org.flowable.bpmn.model.ExtensionElement;
-import org.flowable.bpmn.model.IOParameter;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Map;
 
 @Component("CallBudgetActivityExecutionListener")
 public class CallBudgetActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
-        CallActivity callActivity = (CallActivity)delegateExecution.getCurrentFlowElement();
-        String initiator = null;
         Map<String, Object> variables = delegateExecution.getVariables();
-        System.out.println(variables);
         Authentication.setAuthenticatedUserId(variables.get("budgetInitiator").toString());
         delegateExecution.setVariable("approval", variables.get("budgetInitiator").toString());
-//        List<IOParameter> ioParameterList = callActivity.getInParameters();
-//        for (IOParameter ioParameter: ioParameterList) {
-//            String source = ioParameter.getSource();
-//            if (source.equals("initiator")) {
-//                delegateExecution.setVariable(source, variables.get("budgetInitiator").toString()); // 把子流程的发起人先给到父流程，然后用引擎的能力进行传递
-//            }
-//        }
     }
 }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSafeActivityExecutionListener.java

@@ -1,6 +1,5 @@
 package com.ruoyi.flowable.oa;
 
-import com.ruoyi.common.utils.SnowFlake;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
@@ -11,7 +10,6 @@ public class CallSafeActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
         Authentication.setAuthenticatedUserId("15");
-        delegateExecution.setVariable("safe_id", new SnowFlake().generateId());
-        delegateExecution.setVariable("approval", 15L);
+        delegateExecution.setVariable("approval", "15");
     }
 }

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallTechActivityExecutionListener.java

@@ -1,6 +1,5 @@
 package com.ruoyi.flowable.oa;
 
-import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.mapper.SysUserPostMapper;
 import org.flowable.common.engine.impl.identity.Authentication;
@@ -14,7 +13,6 @@ public class CallTechActivityExecutionListener implements ExecutionListener {
     public void notify(DelegateExecution delegateExecution) {
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
         Authentication.setAuthenticatedUserId(userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
-        delegateExecution.setVariable("technical_id", new SnowFlake().generateId());
         delegateExecution.setVariable("approval", userPostMapper.selectDeptLeaderByDeptId("110").getUserId().toString());
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -88,11 +88,20 @@ public class CmcProject extends BaseEntity
     @Excel(name = "现场负责人")
     private Long siteLeader;
 
+    /** 组织交底文档 */
+    @Excel(name = "组织交底文档")
+    private String organizeDocument;
+
     /** 项目安排日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "项目安排日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date planTime;
 
+    /** 组织交底日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "组织交底日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date organizeTime;
+
     /** 进场时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "进场时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -237,6 +246,15 @@ public class CmcProject extends BaseEntity
     {
         return undertakingDept;
     }
+    public void setOrganizeDocument(String organizeDocument)
+    {
+        this.organizeDocument = organizeDocument;
+    }
+
+    public String getOrganizeDocument()
+    {
+        return organizeDocument;
+    }
     public void setUndertakingDeptName(String undertakingDeptName)
     {
         this.undertakingDeptName = undertakingDeptName;
@@ -273,6 +291,15 @@ public class CmcProject extends BaseEntity
     {
         return planTime;
     }
+    public void setOrganizeTime(Date organizeTime)
+    {
+        this.organizeTime = organizeTime;
+    }
+
+    public Date getOrganizeTime()
+    {
+        return organizeTime;
+    }
     public void setEntryTime(Date entryTime)
     {
         this.entryTime = entryTime;

oa-ui/src/views/flowable/form/borrowForm.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row>
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '借款审批'">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '借款申请'" clearable>
@@ -25,8 +25,14 @@
               }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
-          <el-form-item label="借款事由" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入借款事由" />
+          <el-form-item label="申请金额" prop="applyAmount">
+            <el-input v-model="form.applyAmount" placeholder="请输入申请金额" />
+          </el-form-item>
+          <el-form-item label="核准金额" prop="managerAmount">
+            <el-input v-model="form.managerAmount" placeholder="请输入核准金额" />
+          </el-form-item>
+          <el-form-item label="申请人说明" prop="applyReason">
+            <el-input v-model="form.applyReason" placeholder="请输入申请人说明" />
           </el-form-item>
           <el-form-item label="申请人" prop="user.nickName">
             {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
@@ -39,23 +45,34 @@
               placeholder="选择日期" :disabled="taskName != '借款申请'">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="申请金额" prop="applyAmount">
-            <el-input v-model="form.applyAmount" placeholder="请输入申请金额" />
-          </el-form-item>
-          <el-form-item label="核准金额" prop="managerAmount">
-            <el-input v-model="form.managerAmount" placeholder="请输入核准金额" />
-          </el-form-item>
+          <el-divider></el-divider>
           <el-form-item label="部门意见" prop="deptComment">
             <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
           </el-form-item>
-          <el-form-item label="部门审批人" prop="deptUserId">
-            <el-input v-model="form.deptUserId" placeholder="请输入部门审批人" />
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
+                <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
+                <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
+                  :disabled="true">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="项目部审批意见" prop="xmComment">
+            <el-input v-model="form.xmComment" placeholder="请输入项目部审批意见" />
           </el-form-item>
           <el-form-item label="项目部审批人" prop="xmUserId">
             <el-input v-model="form.xmUserId" placeholder="请输入项目部审批人" />
           </el-form-item>
-          <el-form-item label="项目部审批意见" prop="xmComment">
-            <el-input v-model="form.xmComment" placeholder="请输入项目部审批意见" />
+          <el-form-item label="项目部审批时间" prop="xmTime">
+            <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择项目部审批时间">
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="分管审批意见" prop="managerComment">
             <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
@@ -63,43 +80,33 @@
           <el-form-item label="分管审批人" prop="managerUserId">
             <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
           </el-form-item>
-          <el-form-item label="总经理审批人" prop="zjlUserId">
-            <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
-          </el-form-item>
-          <el-form-item label="总经理审批意见" prop="zjlComment">
-            <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
-          </el-form-item>
-          <el-form-item label="财务部经办人" prop="cwUserId">
-            <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
-          </el-form-item>
-          <el-form-item label="财务部支付备注" prop="cwComment">
-            <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
-          </el-form-item>
-          <el-form-item label="部门审批时间" prop="deptTime">
-            <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择部门审批时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="项目部审批时间" prop="xmTime">
-            <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择项目部审批时间">
-            </el-date-picker>
-          </el-form-item>
           <el-form-item label="分管审批时间" prop="managerTime">
             <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
               placeholder="请选择分管审批时间">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="总经理审批意见" prop="zjlComment">
+            <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
+          </el-form-item>
+          <el-form-item label="总经理审批人" prop="zjlUserId">
+            <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
+          </el-form-item>
           <el-form-item label="总经理审批时间" prop="zjlTime">
             <el-date-picker clearable v-model="form.zjlTime" type="date" value-format="yyyy-MM-dd"
               placeholder="请选择总经理审批时间">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="财务部经办人" prop="cwUserId">
+            <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
+          </el-form-item>
           <el-form-item label="借款支付时间" prop="lendTime">
             <el-date-picker clearable v-model="form.lendTime" type="date" value-format="yyyy-MM-dd"
               placeholder="请选择借款支付时间">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="财务部支付备注" prop="cwComment">
+            <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -347,7 +354,15 @@ export default {
       this.download('oa/borrow/export', {
         ...this.queryParams
       }, `borrow_${new Date().getTime()}.xlsx`)
-    }
+    },
+    showFormItem(name) {
+      let isShow = false;
+      if (name == '借款申请')
+        isShow = true;
+      else if (name == '部门审核')
+        isShow = true;
+      return isShow;
+    },
   }
 };
 </script>