1.开通拆分方法后部分字段丢失

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
@@ -103,8 +102,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Value("classpath:/json/bizTypeInfo.json")
     private org.springframework.core.io.Resource bizTypeInfo;
 
-    @Autowired
-    private RedisUtils redisUtils;
 
     @Autowired
     private TzBaseEnterpriseInfoMapper enterpriseInfoMapper;
@@ -149,6 +146,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      */
     private final static String ZZXM_JYJC_DICT_KEY = "ZZXM_JYJC_ALL";
 
+    /**
+     * 编辑、工作台暂存逻辑
+     * @param model 对象
+     * @return JyjcOpeningApplicationModel
+     */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel saveOrUpdate(JyjcOpeningApplicationModel model) {
         if (model.getSequenceNbr() != null) {
@@ -173,10 +175,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return this.updateWithModel(model);
     }
 
+    /**
+     * 提交、保存并提交逻辑
+     * @param model 对象
+     * @return JyjcOpeningApplicationModel
+     */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel submitApplication(JyjcOpeningApplicationModel model) {
-        model.setApplyTime(new Date());
         String instanceId = model.getWorkflowProstanceId();
+        this.setDefaultFieldValue(model);
         if (StringUtils.isBlank(instanceId)) {
             // 未开启过工作流则进行开启 startProcess
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -199,17 +206,45 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             model.setNextTaskId(workflowResultDto.getNextTaskId());
             model.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
             // 首次提交时删除暂存的待办
-            taskModelService.deleteTaskModel(model.getSequenceNbr() + "");
+            this.deleteDraftTask(model);
             // 创建代办
             buildTask(model, workflowResultDto);
+            saveModel(model);
             // 缓存流程数据
             commonService.saveExecuteFlowData2Redis(workflowResultDto.getInstanceId(), this.buildInstanceRuntimeData(model));
-            return this.updateWithModel(model);
+            return model;
         } else {
             // 首次提交时删除暂存的待办
-            taskModelService.deleteTaskModel(model.getSequenceNbr() + "");
+            this.deleteDraftTask(model);
             // 存在流程，执行
             executeOneStep(model);
+            saveModel(model);
+            return model;
+        }
+    }
+
+    private void deleteDraftTask(JyjcOpeningApplicationModel model) {
+        if (model.getSequenceNbr() != null) {
+            taskModelService.deleteTaskModel(model.getSequenceNbr() + "");
+        }
+    }
+
+    private void setDefaultFieldValue(JyjcOpeningApplicationModel model) {
+        CompanyBo companyBo = commonService.getReginParamsOfCurrentUser().getCompany();
+        model.setApplyTime(new Date());
+        model.setUnitCode(companyBo.getCompanyCode());
+        model.setUnitCodeName(companyBo.getCompanyName());
+        if (model.getSequenceNbr() == null) {
+            model.setCreateUserId(RequestContext.getExeUserId());
+            List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
+            model.setApplicationSeq(codes.get(0));
+        }
+    }
+
+    private JyjcOpeningApplicationModel saveModel(JyjcOpeningApplicationModel model) {
+        if (model.getSequenceNbr() == null) {
+            return this.createWithModel(model);
+        } else {
             return this.updateWithModel(model);
         }
     }