Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -97,8 +97,6 @@ public class JyjcInspectionResultModel extends BaseModel {
     private String inspectionTypeName;
 
     @ApiModelProperty(value = "报检日期")
-    @JsonFormat(pattern="yyyy-MM-dd")
-    @DateTimeFormat("yyyy-MM-dd")
     private Date applicationDate;
 
     @ApiModelProperty("检验结果方式")

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/JyjcInspectionResultServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
@@ -54,6 +55,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
 
     private static final String JYJC_SUBMIT_FILE_PREFIX = "JYJC_";
     private static final String JYJC_SUBMIT_KEY = "inspectResult";
+    private static final String JYJC_RESULT_STATUS = "2";
 
     @Autowired
     private IJyjcInspectionResultAttachmentService iJyjcInspectionResultAttachmentService;
@@ -125,6 +127,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             Object inspectors = jsonArray.stream().map(String::valueOf).collect(Collectors.joining(","));
             model.setInspector(String.valueOf(inspectors));
         }
+        model.setResultStatus(JYJC_RESULT_STATUS);
 
         // 更新结果主表
         updateWithModel(model);
@@ -206,6 +209,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         info.setSequenceCode(model.getEquipUnicode());
         info.setInspectOrgCode(model.getUseUnitCreditCode());
         info.setInspectReportNo(model.getResultNo());
+        info.setRecDate(new Date());
     }
 
     /**