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

@@ -257,4 +257,7 @@ public class JgVehicleInformationDto extends BaseDto {
 
     @ApiModelProperty("使用登记表附件")
     private String useRegistrationFormFile;
+
+    @ApiModelProperty("投入使用日期")
+    private String useDate;
 }

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

@@ -441,4 +441,10 @@ public class JgVehicleInformation extends BaseEntity {
      */
     @TableField("use_registration_form_file")
     private String useRegistrationFormFile;
+
+    /**
+     * 投入使用日期
+     */
+    @TableField("use_date")
+    private String useDate;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -278,4 +278,7 @@ public class JgVehicleInformationVo implements Serializable {
 
     @ApiModelProperty(value = "创建人名称")
     private String createUserName;
+
+    @ApiModelProperty(value = "投用日期")
+    private String useDate;
 }

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

@@ -977,6 +977,7 @@ public class DataHandlerServiceImpl {
     }
 
     public void initFormUrl() {
-        jgVehicleInformationService.initVehicleFormUrl();
+        jgVehicleInformationService.initFormUrl();
+        useRegistrationService.initFormUrl();
     }
 }

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

@@ -2112,6 +2112,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambda.eq(JgRegistrationHistory::getIsDelete, false);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+            jsonObject.put("createUserId", jgUseRegistration.getCreateUserId());
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
             jsonObject.put("status", jgUseRegistration.getStatus());
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
@@ -4333,4 +4334,34 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             re.put("jySeq",inspection.getSequenceNbr());
         }
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void initFormUrl() {
+        LambdaQueryWrapper<JgUseRegistration> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgUseRegistration::getIsDelete, false)
+                .isNull(JgUseRegistration::getUseRegistrationFormUrl)
+                .ne(JgUseRegistration::getStatus, "已作废")
+                .ne(JgUseRegistration::getRegType, "1");
+        List<JgUseRegistration> useRegistrations = this.list(queryWrapper);
+        if(CollUtil.isNotEmpty(useRegistrations)){
+            for (JgUseRegistration useRegistration : useRegistrations) {
+                Map<String, Object> detail = this.getDetail(null, useRegistration.getSequenceNbr());
+                String jsonString = JSONObject.toJSONString(detail);
+                JSONObject jsonObject = JSONObject.parseObject(jsonString);
+                FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId((String) detail.get("createUserId"));
+                jsonObject.put("userName",agencyUserModelFeignClientResult.getResult().getRealName());
+                String manageType = useRegistration.getManageType();
+                if(StringUtils.isEmpty(manageType)){
+                    manageType="set";
+                }
+                Map<String, Object> formUrlMap = commonService.getRegistrationFormUrl(manageType, jsonObject);
+                if(Objects.nonNull(formUrlMap)){
+                    LambdaUpdateWrapper<JgUseRegistration> wrapper = new LambdaUpdateWrapper<>();
+                    wrapper.set(JgUseRegistration::getUseRegistrationFormUrl,String.valueOf(formUrlMap.get("useRegistrationFormUrl")))
+                            .eq(JgUseRegistration::getSequenceNbr,useRegistration.getSequenceNbr());
+                    this.update(wrapper);
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

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

@@ -344,6 +344,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation);
             vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId());
             vehicleInformation.setRegDate(new Date());
+            vehicleInformation.setUseDate(Optional.ofNullable(String.valueOf(map.get("useDate"))).orElse(""));
             vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
             vehicleInformation.setGasNum(equipmentLists.size());
             BigDecimal totalVolume = equipmentLists.stream()
@@ -1057,7 +1058,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         useInfo.setProvince("610000");
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfo.setAddress(jgVehicleInformation.getUseUnitAddress());
-        useInfo.setUseDate(String.valueOf(map.get("useDate")));
+        useInfo.setUseDate(jgVehicleInformation.getUseDate());
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record"));
 
@@ -2375,7 +2376,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void initVehicleFormUrl() {
+    public void initFormUrl() {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         LambdaQueryWrapper<JgVehicleInformation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgVehicleInformation::getIsDelete, false)
@@ -2388,12 +2389,16 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 String jsonString = JSONObject.toJSONString(jgVehicleInformationVo);
                 JSONObject jsonObject = JSONObject.parseObject(jsonString);
                 jsonObject.put("userName",jgVehicleInformationVo.getCreateUserName());
-                Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", jsonObject);
-                if(Objects.nonNull(vehicle)){
-                    LambdaUpdateWrapper<JgVehicleInformation> wrapper = new LambdaUpdateWrapper<>();
-                    wrapper.set(JgVehicleInformation::getUseRegistrationFormUrl,String.valueOf(vehicle.get("useRegistrationFormUrl")))
-                            .eq(JgVehicleInformation::getSequenceNbr,jgVehicleInformationVo.getSequenceNbr());
-                    this.update(wrapper);
+                try {
+                    Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", jsonObject);
+                    if(Objects.nonNull(vehicle)){
+                        LambdaUpdateWrapper<JgVehicleInformation> wrapper = new LambdaUpdateWrapper<>();
+                        wrapper.set(JgVehicleInformation::getUseRegistrationFormUrl,String.valueOf(vehicle.get("useRegistrationFormUrl")))
+                                .eq(JgVehicleInformation::getSequenceNbr,vehicleInformation.getSequenceNbr());
+                        this.update(wrapper);
+                    }
+                }catch (BadRequest request){
+                    log.error(request.getMessage(),request);
                 }
             }
         }