20220919

合同管理-合同登记

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/domain/WorkContractInfo.java

@@ -73,6 +73,8 @@ public class WorkContractInfo extends BaseEntity {
      */
     private String contractFee;
 
+    private String fees;
+
     /**
      * 描述
      */
@@ -118,6 +120,8 @@ public class WorkContractInfo extends BaseEntity {
      */
     private String procInsId;
 
+    private String processDefinitionId;
+
     /**
      * 状态
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -22,6 +22,7 @@
 			a.contract_amount,
 			a.contract_opposite,
 			a.contract_fee,
+			a.fees,
 			a.describes,
 			a.contract_special,
 			a.remarks,
@@ -30,13 +31,15 @@
 			a.filed_no,
 			a.confirm_filed_no,
 			a.filed_remarks,
-			a.proc_ins_id,
+			b.ID_ as proc_ins_id,
+			a.process_definition_id,
 			a.status,
 			a.filed_type,
 			a.borrow_type
 		FROM
 			work_contract_info a
 			LEFT JOIN sys_user c ON a.create_by = c.id
+			LEFT JOIN act_ru_task b ON a.proc_ins_id = b.PROC_INST_ID_
 		${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
 	</select>
@@ -56,6 +59,7 @@
 			contract_amount,
 			contract_opposite,
 			contract_fee,
+			fees,
 			describes,
 			contract_special,
 			remarks,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workContract/service/dto/WorkContractInfoDto.java

@@ -69,6 +69,8 @@ public class WorkContractInfoDto extends BaseDTO {
      */
     private String contractFee;
 
+    private String fees;
+
     /**
      * 描述
      */

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -165,7 +165,7 @@ public class FlowableTaskController {
      */
     @PostMapping("start")
     public ResponseEntity start(@RequestBody  Flow flow)  {
-        String procInsId = flowTaskService.startProcess(flow.getProcDefKey(), flow.getBusinessTable(), flow.getBusinessId(), flow.getTitle());
+        String procInsId = flowTaskService.startProcess(flow.getProcDefKey(), flow.getBusinessTable(), flow.getBusinessId(), flow.getTitle(), flow.getProcDefId());
 
         //指定下一步处理人
         if(StringUtils.isNotBlank(flow.getAssignee ())){

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/FlowMapper.xml

@@ -5,6 +5,9 @@
 	<update id="updateProcInsIdByBusinessId">
 		UPDATE ${businessTable} SET
 			proc_ins_id = #{procInsId}
+		<if test="procDefId != null and procDefId != ''">
+			,process_definition_id = #{procDefId}
+		</if>
 		WHERE id = #{businessId}
 	</update>
 

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -349,9 +349,9 @@ public class FlowTaskService {
      * @param title         流程标题，显示在待办任务标题
      * @return 流程实例ID
      */
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title, String procDefId) {
         Map<String, Object> vars = Maps.newHashMap ();
-        return startProcess (procDefKey, businessTable, businessId, title, vars);
+        return startProcess (procDefKey, businessTable, businessId, title, vars, procDefId);
     }
 
     /**
@@ -365,7 +365,7 @@ public class FlowTaskService {
      * @return 流程实例ID
      */
     @SuppressWarnings("unused")
-    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map<String, Object> vars) {
+    public String startProcess(String procDefKey, String businessTable, String businessId, String title, Map<String, Object> vars, String procDefId) {
         //String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId())
         // 设置流程变量
         if (vars == null) {
@@ -395,6 +395,7 @@ public class FlowTaskService {
         act.setBusinessTable (businessTable);// 业务表名
         act.setBusinessId (businessId);  // 业务表ID
         act.setProcInsId (procIns.getId ());
+        act.setProcDefId(procDefId);
         act.setVars (vars);
         flowMapper.updateProcInsIdByBusinessId (act);
         return act.getProcInsId ();