三维校验提交

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/entity/SubmitRecord.java

@@ -54,4 +54,7 @@ public class SubmitRecord {
 
     @TableField(exist = false)
     private String fileName;
+
+    @ApiModelProperty(value = "流程id")
+    private String processInstanceId;
 }

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/ModelItemService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tdc.api.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem;
 import com.yeejoin.amos.boot.module.tdc.api.entity.SubmitRecord;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -16,9 +17,9 @@ import java.util.Map;
 @Service
 public interface ModelItemService extends IService<ModelItem> {
 
-    SubmitRecord saveModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft);
+    SubmitRecord saveModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft,  ReginParams reginParams);
 
-    SubmitRecord editModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft, Long id, int examine);
+    SubmitRecord editModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft, Long id, int examine,  ReginParams reginParams);
 
     /**
      * 获取详情接口

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/ModelItemController.java

 package com.yeejoin.amos.boot.module.tdc.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tdc.api.entity.SubmitRecord;
 import com.yeejoin.amos.boot.module.tdc.api.service.ModelItemService;
@@ -36,14 +37,15 @@ public class ModelItemController extends BaseController {
     public ResponseModel<SubmitRecord> saveModelItem(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "draft") int draft, @RequestBody JSONObject jsonObject,
                                                      @RequestParam(value = "examine") int examine){
         AgencyUserModel userInfo = getUserInfo();
+        ReginParams reginParams = getSelectedOrgInfo();
         if (ObjectUtils.isEmpty(jsonObject)) {
             return null;
         }
         Object sequenceNbr = jsonObject.get("sequenceNbr");
         if (ObjectUtils.isEmpty(sequenceNbr) && ObjectUtils.isEmpty(id)) {
-            return ResponseHelper.buildResponse(modelItemService.saveModelItem(jsonObject, userInfo, draft));
+            return ResponseHelper.buildResponse(modelItemService.saveModelItem(jsonObject, userInfo, draft, reginParams));
         }
-        return ResponseHelper.buildResponse(modelItemService.editModelItem(jsonObject, userInfo, draft, id, examine));
+        return ResponseHelper.buildResponse(modelItemService.editModelItem(jsonObject, userInfo, draft, id, examine, reginParams));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/ModelItemServiceImpl.java

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.netflix.discovery.converters.Auto;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
+import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
 import com.yeejoin.amos.boot.module.tdc.api.entity.ModelItem;
 import com.yeejoin.amos.boot.module.tdc.api.entity.SubmitRecord;
@@ -16,6 +19,7 @@ import com.yeejoin.amos.boot.module.tdc.api.service.SyncMethodService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -46,13 +50,26 @@ public class ModelItemServiceImpl extends ServiceImpl<ModelItemMapper, ModelItem
     @Autowired
     ModelItemMapper modelItemMapper;
 
+    @Autowired
+    WorkflowExcuteServiceImpl workflowExcuteService;
+
+    @Value("${tdc.file.examine.work.flow.processDefinitionKey}")
+    private String processDefinitionKey;
+
     @Override
-    public SubmitRecord saveModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft) {
+    public SubmitRecord saveModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft,  ReginParams reginParams) {
         long start = System.currentTimeMillis();
         if (ObjectUtils.isEmpty(jsonObject)) {
             return null;
         }
         SubmitRecord submitRecord = new SubmitRecord();
+        // 开启工作流并执行一步
+        try {
+            String processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, "1");
+            submitRecord.setProcessInstanceId(processInstanceId);
+        } catch (Exception e) {
+            log.error("工作流启动失败" + e.getMessage());
+        }
         userInfo.getUserName();
 
         List<CompanyModel> company = userInfo.getCompanys();
@@ -120,19 +137,17 @@ public class ModelItemServiceImpl extends ServiceImpl<ModelItemMapper, ModelItem
     }
 
     @Override
-    public SubmitRecord editModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft, Long id, int examine) {
-
+    public SubmitRecord editModelItem(JSONObject jsonObject, AgencyUserModel userInfo, int draft, Long id, int examine,  ReginParams reginParams) {
         Long sequenceNbr = ObjectUtils.isEmpty(jsonObject.get("sequenceNbr")) ? null : Long.valueOf(String.valueOf(jsonObject.get("sequenceNbr")));
         String batchNo = UUID.randomUUID().toString();
         Long sequenceNbrId = ObjectUtils.isEmpty(sequenceNbr) ? id : sequenceNbr;
-
-//        SubmitRecord submitRecord = new SubmitRecord();
-//        submitRecord.setSequenceNbr(sequenceNbr);
-//        submitRecord.setBatchNo(batchNo);
-//        submitRecord.setDraft(draft);
-//        submitRecord.setExamine(examine);
-//        submitRecordService.updateById(submitRecord);
         SubmitRecord submitRecord = submitRecordService.updateById(sequenceNbrId, batchNo, draft, examine);
+        try {
+            workflowExcuteService.CompleteTask(submitRecord.getProcessInstanceId(), String.valueOf(examine), reginParams);
+        } catch (Exception e) {
+            throw new RuntimeException("没有执行权限");
+        }
+
         LambdaQueryWrapper<ModelItem> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ModelItem::getSubmitRecordId, sequenceNbrId);
         this.baseMapper.delete(wrapper);