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

@@ -146,6 +146,9 @@ public class JgMaintainNoticeDto extends BaseDto {
     @ApiModelProperty(value = "维修类型（1一般维修，2重点维修）")
     private String maintainType;
 
+    @ApiModelProperty(value = "维修类型（1一般维修，2重点维修）")
+    private String maintainTypeDesc;
+
     @ApiModelProperty(value = "是否已报检")
     private String isInspected;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TzsServiceFeignClient.java

@@ -36,7 +36,7 @@ public interface TzsServiceFeignClient {
 
     /**
      * 申请单编号生成
-     * @param type type
+     * @param type 参考ApplicationFormTypeEnum中的枚举
      * @param batchSize batchSize
      * @return List
      */
@@ -45,17 +45,17 @@ public interface TzsServiceFeignClient {
                                                      @RequestParam("batchSize") int batchSize);
 
     /**
-     * 申请单编号生成
-     * @param key
-     * @return String
+     * 生成设备注册编码
+     * @param key 16位
+     * @return 生成设备注册编码(20位)
      */
     @RequestMapping(value = "/generate-code/deviceRegistrationCode", method = RequestMethod.POST)
     ResponseModel<String> deviceRegistrationCode(@RequestParam("key") String key);
 
     /**
-     * 申请单编号生成
-     * @param key
-     * @return String
+     * 使用登记证生成
+     * @param key 起11陕C
+     * @return 生成使用登记证编号(13位，起11陕C00001(23))
      */
     @RequestMapping(value = "/generate-code/useRegistrationCode", method = RequestMethod.POST)
     ResponseModel<String> useRegistrationCode(@RequestParam("key") String key);

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

@@ -7,6 +7,8 @@ import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 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;
@@ -15,7 +17,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.MaintainTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
@@ -217,6 +218,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
 
+    @Autowired
+    IDataDictionaryService dataDictionaryService;
     /**
      * 分页查询
      *
@@ -227,8 +230,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
      */
     @Override
     public Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, String type, ReginParams reginParams) {
-        String orgCode;
-        orgCode = reginParams.getCompany().getCompanyCode();
+        String orgCode = reginParams.getCompany().getCompanyCode();
+        List<DataDictionary> dictionaries = dataDictionaryService.getByType("WXLX");
         Page<JgMaintainNotice> noticePage = jgMaintainNoticeMapper.queryForPage(page, model, type, orgCode);
         Page<JgMaintainNoticeDto> noticeDtoPage = new Page<>();
         BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");
@@ -240,8 +243,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 noticeDto.setNoticeStatusDesc(noticeStatusDesc);
             }
             if (Objects.nonNull(notice.getMaintainType())) {
-                String maintainType = MaintainTypeEnum.getNameByType(Long.valueOf(notice.getMaintainType()));
-                noticeDto.setMaintainType(maintainType);
+                noticeDto.setMaintainTypeDesc(dictionaries.stream().filter(d -> notice.getMaintainType().equals(d.getCode())).map(DataDictionary::getName).collect(Collectors.joining()));
             }
             noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCityName() + notice.getStreetName() + notice.getAddress());
             return noticeDto;
@@ -409,7 +411,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     instanceIdList.add(jsonObject.getString("id"));
                 }
             } catch (Exception e) {
-                log.error("JgMaintainNoticeServiceImpl.saveNotice发起流程失败",e);
+                log.error("JgMaintainNoticeServiceImpl.saveNotice发起流程失败", e);
                 throw new RuntimeException(e);
             }
         }