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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -186,4 +187,10 @@ public class JgUseRegistrationDto extends BaseDto {
     @ApiModelProperty(value = "属地监管机构代码")
     private String orgBranchCode;
 
+    @ApiModelProperty("使用登记表url")
+    private String useRegistrationFormUrl;
+
+    @ApiModelProperty("使用登记表附件")
+    private String useRegistrationFormFile;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgVehicleInformationDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -250,4 +251,10 @@ public class JgVehicleInformationDto extends BaseDto {
 
     @ApiModelProperty(value = "作废原因")
     private String cancelReason;
+
+    @ApiModelProperty("使用登记表url")
+    private String useRegistrationFormUrl;
+
+    @ApiModelProperty("使用登记表附件")
+    private String useRegistrationFormFile;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -273,4 +273,16 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField("origin_project_contraption_ids")
     private String originProjectContraptionIds;
+
+    /**
+     * 使用登记表url
+     */
+    @TableField("use_registration_form_url")
+    private String useRegistrationFormUrl;
+
+    /**
+     * 使用登记表附件
+     */
+    @TableField("use_registration_form_file")
+    private String useRegistrationFormFile;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgVehicleInformation.java

@@ -429,4 +429,16 @@ public class JgVehicleInformation extends BaseEntity {
      */
     @TableField("cancel_reason")
     private String cancelReason;
+
+    /**
+     * 使用登记表url
+     */
+    @TableField("use_registration_form_url")
+    private String useRegistrationFormUrl;
+
+    /**
+     * 使用登记表附件
+     */
+    @TableField("use_registration_form_file")
+    private String useRegistrationFormFile;
 }

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

@@ -156,6 +156,7 @@ public class CommonServiceImpl implements ICommonService {
     private static final String ADMINISTRATION_UNIT = "行政审批局";
     // 业务通用发起——基本信息
     private static final String basic = "basic";
+    private static final String useRegFormUpload = "useRegFormUpload";
     private static final String HISTORY_EQU_TYPE = "historyEquType";
     private static final String SECOND = "second";
     // 业务通用发起——告知单详情
@@ -1224,6 +1225,7 @@ public class CommonServiceImpl implements ICommonService {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
         Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
         Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
+        Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload);
         Map<String, Object> provideMap = new HashMap<>();
 
         String type = (String) basicObj.get("type");
@@ -1262,6 +1264,7 @@ public class CommonServiceImpl implements ICommonService {
             if (submitType.equals("1")) {
                 jsonObject.put("submit", Boolean.TRUE);
             }
+            jsonObject.putAll(useRegFormUploadObj);
             // 判断是否为车用气瓶使用登记或者设备使用登记
             return "1".equals(businessScenarios) && CylinderTypeEnum.CYLINDER.getCode().equals(code) ?
                     jgVehicleInformationService.save(submitType, jsonObject) : jgUseRegistrationServiceImpl.save(jsonObject);

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

@@ -20,6 +20,7 @@ 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.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+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.biz.common.utils.SnowflakeIdUtil;
@@ -91,6 +92,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -607,6 +609,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 });
             }
             jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
+            Optional.ofNullable(map.get("useRegistrationFormFile"))
+                    .map(JSONObject::toJSONString)
+                    .ifPresent(jgUseRegistration::setUseRegistrationFormFile);
+            Optional.ofNullable(map.get("useRegistrationFormUrl"))
+                    .map(String::valueOf)
+                    .ifPresent(jgUseRegistration::setUseRegistrationFormUrl);
             if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
                 jgUseRegistration.setUseUnitCreditCode(null);
                 jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -881,7 +889,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 具体地址
             useRegistration.setUseAddress("陕西省" + fullAddress + map.get("address"));
             useRegistration.setOriginProjectContraptionIds((String) map.get("originProjectContraptionIds"));
-
+            // 使用登记表
+            Optional.ofNullable(map.get("useRegistrationFormFile"))
+                    .map(JSONObject::toJSONString)
+                    .ifPresent(useRegistration::setUseRegistrationFormFile);
+            Optional.ofNullable(map.get("useRegistrationFormUrl"))
+                    .map(String::valueOf)
+                    .ifPresent(useRegistration::setUseRegistrationFormUrl);
             // 新增或编辑保存
             if (StringUtils.isEmpty(useRegistration.getSequenceNbr())) {
                 ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
@@ -1496,6 +1510,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 }
             }
         } else {
+            //如果是特殊的历史设备需要更新安装信息
+            String dataSource = jsonObject.getString("DATA_SOURCE");
+            if("jg_his_black".equals(dataSource)){
+                this.historyEquUpdateInstallInfo(jsonObject);
+            }
             // 流程结束
             jgUseRegistration.setStatus(taskCode);
             jgUseRegistration.setNextExecuteUserIds("");
@@ -3832,6 +3851,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
             constructionInfo.setConstructionContractAttachment(ValidationUtil.isEmpty(map.get("installContractAttachment")) ? null : JSONObject.toJSONString(map.get("installContractAttachment")));
             constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
+            try {
+                constructionInfo.setUscDate(ValidationUtil.isEmpty(map.get("installStartDate")) ? null : DateUtils.dateParse((String) map.get("installStartDate"),DateUtils.DATE_PATTERN));
+            } catch (ParseException e) {
+                log.error(e.getMessage(),e);
+                throw new BadRequest("安装日期时间转化错误");
+            }
             idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
         }
     }