1.自测修改报检提交bug

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcOpeningApplication.java

@@ -135,4 +135,10 @@ public class JyjcOpeningApplication extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 对接单位code
+     */
+    @TableField(value = "docking_unit_code")
+    private String dockingUnitCode;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/ResultTypeEnum.java

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author Administrator
+ */
+
+@AllArgsConstructor
+@Getter
+public enum ResultTypeEnum {
+    /**
+     * 集成方式
+     */
+    INPUT("录入","input"),
+    INTEGRATED("集成","integrated");
+
+    private String name;
+
+    private String code;
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Date;
@@ -162,7 +160,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String instanceId;
 
     public String getProcessInstanceId() {
-        return this.instanceId != null ?this.instanceId :this.processInstanceId;
+        return this.instanceId != null ? this.instanceId : this.processInstanceId;
     }
 
     public void setProcessInstanceId(String processInstanceId) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -128,4 +129,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty ("转办人")
     private String transferToUserIds;
+
+    @ApiModelProperty("对接单位code")
+    private String dockingUnitCode;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -72,6 +72,7 @@ public class JyjcInspectionApplicationController extends BaseController {
 			finallyJson.putAll(filePageDataObj);
 			model = finallyJson;
 		}
+        // operationType: 1-暂存
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		model.put("applicationUnitCode",selectedOrgInfo.getCompany().getCompanyCode());
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -59,7 +59,12 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JSONObject model) {
 		JyjcOpeningApplicationModel jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
-		BeanUtil.copyProperties(model.get("applyInfo"),jyjcOpeningApplicationModel);
+		// 兼容工作台暂存逻辑、编辑时报错逻辑
+		if (model.containsKey("applyInfo")) { // 工作台暂存逻辑
+			BeanUtil.copyProperties(model.get("applyInfo"), jyjcOpeningApplicationModel);
+		} else {                             // 详情保存逻辑
+			BeanUtil.copyProperties(model, jyjcOpeningApplicationModel);
+		}
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(jyjcOpeningApplicationModel, false));
 	}
 

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

@@ -218,7 +218,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 commonServiceImpl.buildTaskModel(list);
             }
         }
-        model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        model.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong((model.getStatus()))));
        return this.updateWithModel(model);
 
     }