refactor(jg): 优化登记类型处理逻辑

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgNoticeToBeSubmitDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.RegTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
@@ -147,7 +148,7 @@ public class JgUseRegistrationController extends BaseController {
         Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {
             x.put("companyType", info.getCompany().getCompanyType());
-            x.put("regType", "1".equals(x.get("regType")) ? "历史登记": "2".equals(x.get("regType")) ? "特殊历史登记": "新增登记");
+            x.put("regType", RegTypeEnum.getNameByCode(String.valueOf(x.get("regType"))).orElse(RegTypeEnum.REGISTRATION_NEW.getName()));
             if ("8000".equals(String.valueOf(x.get("equListCode"))) && !ValidationUtil.isEmpty(x.get("projectContraptionId"))) {
                 x.put("canVoided", jgProjectContraptionMapper.countContraptionInUseTimesForDeleteByIntoManagement(Objects.toString(x.get("projectContraptionId"))) == 0);
             } else {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
-import com.yeejoin.amos.boot.module.jg.api.vo.JgVehicleInformationVo;
+import com.yeejoin.amos.boot.module.jg.api.enums.RegTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationServiceImpl;
 import io.swagger.annotations.Api;
@@ -154,7 +154,7 @@ public class JgVehicleInformationController extends BaseController {
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {
             x.put("companyType", info.getCompany().getCompanyType());
-            x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
+            x.put("regTypeDesc", RegTypeEnum.getNameByCode(String.valueOf(x.get("regType"))).orElse(RegTypeEnum.REGISTRATION_NEW.getName()));
             x.put("canVoided", Optional.ofNullable(x.get("useRegistrationCode"))
                     .map(jgVehicleInformationServiceImpl::countUseTimesForInvalid)
                     .orElse(true));

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

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RequestContextWrapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.RegTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandler;
@@ -435,11 +436,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
         }
         List<RegistrationVo> exportData = registrationMapper.queryRegistrationInIds(dto, client);
         for (RegistrationVo vo : exportData) {
-            if (vo.getRegType() == null) {
-                vo.setRegType("新增登记");
-            } else if (vo.getRegType().equals("1")) {
-                vo.setRegType("历史登记");
-            }
+            vo.setRegType(RegTypeEnum.getNameByCode(vo.getRegType()).orElse(RegTypeEnum.REGISTRATION_NEW.getName()));
         }
         ExcelUtil.createTemplate(response, "使用登记列表数据", "使用登记列表", exportData, RegistrationVo.class, null, false);
     }