修改市本级区划代码

hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java

@@ -27,7 +27,7 @@ public interface RegionConst {
     /**
      * 丽水行政区划编码
      */
-    String RC_LS = "331100";
+    String RC_HZ = "330100";
     //丽水开发区
     String LS_KF = "331118";
     String LS_KF_IRS = "331151";
@@ -65,7 +65,7 @@ public interface RegionConst {
     String QN = "331127";
     String LQ = "331181";
 
-    List<String> LS_ARR = Lists.newArrayList(RC_LS, LS_KF, LD, QT, JY, SC, SY, YH, QY, QN, LQ);
+    List<String> LS_ARR = Lists.newArrayList(RC_HZ, LS_KF, LD, QT, JY, SC, SY, YH, QY, QN, LQ);
 
     //----------------------------------------地区父级ID(缩写PID)---------------------------------------------------------
 

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java

@@ -128,7 +128,7 @@ public class StateMachineUtils {
      */
     public static boolean isCityProject(Project project) {
         String areaCode = project.getAreaCode();
-        if (areaCode.equals(RegionConst.RC_LS)) {
+        if (areaCode.equals(RegionConst.RC_HZ)) {
             return true;
         }
         return false;

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java

@@ -150,7 +150,7 @@ public class CockpitStatsHandler {
 
     private List<CockpitStatsVO.MapProjectsData> convertMapProjectsData(CockpitStats cockpitStats,Integer year) {
         List<CockpitStatsVO.MapProjectsData> mapProjectsDatas = Lists.newArrayList();
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY);
         regions = regions.stream().filter(r -> r.getRegionLevel() != 2).sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList());
 
         List<CockpitStats> cockpitStatsAll = cockpitStatsService.list(Wrappers.lambdaQuery(CockpitStats.class)
@@ -185,7 +185,7 @@ public class CockpitStatsHandler {
 
     private List<CockpitStatsVO.ExpertRegion> buidExpertRegionData(CockpitStats cockpitStats) {
         List<CockpitStatsVO.ExpertRegion> regionData = Lists.newArrayList();
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY);
         regions = regions.stream().filter(r -> r.getRegionLevel() != 2).sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList());
 
         List<CockpitStats> cs = cockpitStatsService.list();

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/ExpertStatisticsManage.java

@@ -172,7 +172,7 @@ public class ExpertStatisticsManage {
         Map<Long, ExpertUserFullInfo> expertMap = experts.stream().filter(e -> userSet.add(e.getUserId()))
                 .collect(Collectors.toMap(ExpertUserFullInfo::getUserId, e -> e));
 
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY)
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY)
                 .stream().filter(r -> r.getRegionLevel().equals(RegionConst.RL_COUNTY))
                 .sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList());
 

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/MeetingStatisticsManage.java

@@ -94,7 +94,7 @@ public class MeetingStatisticsManage {
                 .divide(BigDecimal.valueOf(reviewsTotal), RoundingMode.HALF_UP)));
 
         //各区域
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY)
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY)
                 .stream().filter(r -> r.getRegionLevel().equals(RegionConst.RL_COUNTY))
                 .sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList());
         List<DataDTO> regionMeetngs = Lists.newArrayList();

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java

@@ -37,7 +37,7 @@ public class ExpertDataScopeProviderImpl implements DataScopeProvider {
     public Optional<DataScopeDTO> findDataFieldProperty() {
         UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId());
         //所有 丽水市的code
-        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_LS,
+        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_HZ,
                 RegionConst.RL_CITY);
 
         DataScopeDTO ds = new DataScopeDTO();
@@ -52,7 +52,7 @@ public class ExpertDataScopeProviderImpl implements DataScopeProvider {
     public Optional<DataScopeDTO> findDataFieldProperty(Long userId) {
         UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId);
         //所有 丽水市的code
-        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_LS,
+        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_HZ,
                 RegionConst.RL_CITY);
 
         DataScopeDTO ds = new DataScopeDTO();

hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java

@@ -37,7 +37,7 @@ public class SuperAdminDataScopeProviderImpl implements DataScopeProvider {
     public Optional<DataScopeDTO> findDataFieldProperty() {
         UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId());
         //所有 丽水市的code
-        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_LS,
+        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_HZ,
                 RegionConst.RL_CITY);
 
         DataScopeDTO ds = new DataScopeDTO();
@@ -52,7 +52,7 @@ public class SuperAdminDataScopeProviderImpl implements DataScopeProvider {
     public Optional<DataScopeDTO> findDataFieldProperty(Long userId) {
         UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId);
         //所有 丽水市的code
-        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_LS,
+        Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(RegionConst.RC_HZ,
                 RegionConst.RL_CITY);
 
         DataScopeDTO ds = new DataScopeDTO();

hz-pm-api/src/main/java/com/hz/pm/api/gov/manage/GovProjectCollectionManage.java

@@ -718,7 +718,7 @@ public class GovProjectCollectionManage {
             saveBase.setBaseAreaCode(baseAreaCode);
             saveBase.setBaseAreaName(regionCacheHelper.getRegionName(user.getRegionCode(), RegionConst.RL_COUNTY));
         }
-        saveBase.setAreaCode(RegionConst.RC_LS);
+        saveBase.setAreaCode(RegionConst.RC_HZ);
         saveBase.setBizTime(LocalDateTime.now());
         saveBase.setUpdateBy(user.getUsername());
         saveBase.setUpdateOn(LocalDateTime.now());
@@ -752,7 +752,7 @@ public class GovProjectCollectionManage {
                 saveApply.setBaseProjDuration(convertMonth(saveApply.getBaseProjStartTime(),
                         saveApply.getBaseProjEndTime()));
             }
-            saveApply.setAreaCode(RegionConst.RC_LS);
+            saveApply.setAreaCode(RegionConst.RC_HZ);
             saveApply.setBizTime(LocalDateTime.now());
             saveApply.setUpdateBy(user.getUsername());
             saveApply.setUpdateOn(LocalDateTime.now());
@@ -778,7 +778,7 @@ public class GovProjectCollectionManage {
                 saveApprove.setTongTime(LocalDateTime.now());
             }
             saveApprove.setBizTime(LocalDateTime.now());
-            saveApprove.setAreaCode(RegionConst.RC_LS);
+            saveApprove.setAreaCode(RegionConst.RC_HZ);
             saveApprove.setUpdateBy(user.getUsername());
             saveApprove.setUpdateOn(LocalDateTime.now());
             if (approveService.saveOrUpdate(saveApprove)) {
@@ -806,7 +806,7 @@ public class GovProjectCollectionManage {
             } else {
                 saveCimplement.setTongTime(LocalDateTime.now());
             }
-            saveCimplement.setAreaCode(RegionConst.RC_LS);
+            saveCimplement.setAreaCode(RegionConst.RC_HZ);
             saveCimplement.setBizTime(LocalDateTime.now());
             saveCimplement.setUpdateBy(user.getUsername());
             saveCimplement.setUpdateOn(LocalDateTime.now());
@@ -838,7 +838,7 @@ public class GovProjectCollectionManage {
             if (Objects.nonNull(saveBase.getAreaCode())) {
                 saveMimplement.setAreaCode(saveBase.getAreaCode());
             }
-            saveMimplement.setAreaCode(RegionConst.RC_LS);
+            saveMimplement.setAreaCode(RegionConst.RC_HZ);
             saveMimplement.setBizTime(LocalDateTime.now());
             saveMimplement.setUpdateBy(user.getUsername());
             saveMimplement.setUpdateOn(LocalDateTime.now());
@@ -865,7 +865,7 @@ public class GovProjectCollectionManage {
                 GovBizProjectProcure saveProcure = BeanUtil.copyProperties(procure, GovBizProjectProcure.class);
                 saveProcure.setBaseProjId(finalBaseProjId);
                 saveProcure.setId(null);
-                saveProcure.setAreaCode(RegionConst.RC_LS);
+                saveProcure.setAreaCode(RegionConst.RC_HZ);
                 saveProcure.setTongTime(LocalDateTime.now());
                 saveProcure.setBizTime(LocalDateTime.now());
                 saveProcure.setUpdateBy(finalUser.getUsername());
@@ -928,7 +928,7 @@ public class GovProjectCollectionManage {
             saveBase.setTongTime(LocalDateTime.now());
             saveBase.setBaseAreaName(regionCacheHelper.getRegionName(user.getRegionCode(), RegionConst.RL_COUNTY));
         }
-        saveBase.setAreaCode(RegionConst.RC_LS);
+        saveBase.setAreaCode(RegionConst.RC_HZ);
         saveBase.setBizTime(LocalDateTime.now());
         saveBase.setUpdateBy(user.getUsername());
         saveBase.setUpdateOn(LocalDateTime.now());
@@ -962,7 +962,7 @@ public class GovProjectCollectionManage {
                 saveApply.setBaseProjDuration(convertMonth(saveApply.getBaseProjStartTime(),
                         saveApply.getBaseProjEndTime()));
             }
-            saveApply.setAreaCode(RegionConst.RC_LS);
+            saveApply.setAreaCode(RegionConst.RC_HZ);
             saveApply.setBizTime(LocalDateTime.now());
             saveApply.setUpdateBy(user.getUsername());
             saveApply.setUpdateOn(LocalDateTime.now());
@@ -988,7 +988,7 @@ public class GovProjectCollectionManage {
                 saveApprove.setTongTime(LocalDateTime.now());
             }
             saveApprove.setBizTime(LocalDateTime.now());
-            saveApprove.setAreaCode(RegionConst.RC_LS);
+            saveApprove.setAreaCode(RegionConst.RC_HZ);
             saveApprove.setUpdateBy(user.getUsername());
             saveApprove.setUpdateOn(LocalDateTime.now());
             if (approveService.saveOrUpdate(saveApprove)) {
@@ -1016,7 +1016,7 @@ public class GovProjectCollectionManage {
             } else {
                 saveCimplement.setTongTime(LocalDateTime.now());
             }
-            saveCimplement.setAreaCode(RegionConst.RC_LS);
+            saveCimplement.setAreaCode(RegionConst.RC_HZ);
             saveCimplement.setBizTime(LocalDateTime.now());
             saveCimplement.setUpdateBy(user.getUsername());
             saveCimplement.setUpdateOn(LocalDateTime.now());
@@ -1048,7 +1048,7 @@ public class GovProjectCollectionManage {
             if (Objects.nonNull(saveBase.getAreaCode())) {
                 saveMimplement.setAreaCode(saveBase.getAreaCode());
             }
-            saveMimplement.setAreaCode(RegionConst.RC_LS);
+            saveMimplement.setAreaCode(RegionConst.RC_HZ);
             saveMimplement.setBizTime(LocalDateTime.now());
             saveMimplement.setUpdateBy(user.getUsername());
             saveMimplement.setUpdateOn(LocalDateTime.now());
@@ -1075,7 +1075,7 @@ public class GovProjectCollectionManage {
                 GovBizProjectProcure saveProcure = BeanUtil.copyProperties(procure, GovBizProjectProcure.class);
                 saveProcure.setBaseProjId(finalBaseProjId);
                 saveProcure.setId(null);
-                saveProcure.setAreaCode(RegionConst.RC_LS);
+                saveProcure.setAreaCode(RegionConst.RC_HZ);
                 saveProcure.setTongTime(LocalDateTime.now());
                 saveProcure.setBizTime(LocalDateTime.now());
                 saveProcure.setUpdateBy(finalUser.getUsername());
@@ -1208,7 +1208,7 @@ public class GovProjectCollectionManage {
         draft.setBaseProjId(baseProjId);
         draft.setBaseProjName(baseProjName);
         draft.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE);
-        draft.setAreaCode(RegionConst.RC_LS);
+        draft.setAreaCode(RegionConst.RC_HZ);
         draft.setBizTime(LocalDateTime.now());
         draft.setUpdateBy(user.getUsername());
         draft.setUpdateOn(LocalDateTime.now());
@@ -1305,7 +1305,7 @@ public class GovProjectCollectionManage {
         draft.setBaseProjId(baseProjId);
         draft.setBaseProjName(baseProjName);
         draft.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE);
-        draft.setAreaCode(RegionConst.RC_LS);
+        draft.setAreaCode(RegionConst.RC_HZ);
         draft.setBizTime(LocalDateTime.now());
         draft.setUpdateBy(user.getUsername());
         draft.setUpdateOn(LocalDateTime.now());

hz-pm-api/src/main/java/com/hz/pm/api/gov/utils/ProjectConvertUtil.java

@@ -79,7 +79,7 @@ public class ProjectConvertUtil {
         GovBizProjectBaseinfoVO baseinfo = new GovBizProjectBaseinfoVO();
         baseinfo.setBaseProjId(project.getProjectCode());
         baseinfo.setBaseProjName(project.getProjectName());
-        baseinfo.setAreaCode(RegionConst.RC_LS);
+        baseinfo.setAreaCode(RegionConst.RC_HZ);
         baseinfo.setBaseAreaCode(project.getAreaCode() + RegionConst.NINE_CODE_LAST);
         baseinfo.setBaseAreaName(project.getArea());
         baseinfo.setBaseBuildDeprt(project.getBuildOrgName());
@@ -113,7 +113,7 @@ public class ProjectConvertUtil {
         GovBizProjectApplyVO apply = new GovBizProjectApplyVO();
 //        apply.setBaseProjId(project.getProjectCode());
         apply.setBaseProjName(project.getProjectName());
-        apply.setAreaCode(RegionConst.RC_LS);
+        apply.setAreaCode(RegionConst.RC_HZ);
         apply.setBaseHistorProjId(project.getBaseHistorProjId());
         apply.setBaseBasisEstablish(project.getBaseBasisEstablish());
         List<ProjectApplicationVO> projectApplications = project.getProjectApplications();
@@ -211,7 +211,7 @@ public class ProjectConvertUtil {
         if(Objects.nonNull(file)){
             approve.setApprovalFile(JSON.toJSONString(Lists.newArrayList(file)));
         }
-        approve.setAreaCode(RegionConst.RC_LS);
+        approve.setAreaCode(RegionConst.RC_HZ);
         approve.setDeleted(Boolean.FALSE);
         approve.setBaseDevelopCode(project.getDevelopCode());
         approve.setBaseExpertTotalMoney(project.getProposeTotalInvest());
@@ -252,7 +252,7 @@ public class ProjectConvertUtil {
 //        cim.setBaseProjId(project.getProjectCode());
         cim.setBaseProjName(project.getProjectName());
         cim.setBaseEngineerPostpoFile(project.getSupportingMaterialsFile());
-        cim.setAreaCode(RegionConst.RC_LS);
+        cim.setAreaCode(RegionConst.RC_HZ);
         cim.setDeleted(Boolean.FALSE);
         cim.setBaseDevelopCode(project.getDevelopCode());
         //总结报告
@@ -282,7 +282,7 @@ public class ProjectConvertUtil {
 //        mim.setBaseProjId(project.getProjectCode());
         mim.setBaseProjName(project.getProjectName());
         mim.setBaseEngineerPostpoFile(project.getSupportingMaterialsFile());
-        mim.setAreaCode(RegionConst.RC_LS);
+        mim.setAreaCode(RegionConst.RC_HZ);
         mim.setDeleted(Boolean.FALSE);
         mim.setBaseDevelopCode(project.getDevelopCode());
         //监理总结报告
@@ -319,7 +319,7 @@ public class ProjectConvertUtil {
             return purchases.stream().map(p -> {
                 GovBizProjectProcureVO purchase = new GovBizProjectProcureVO();
                 purchase.setBaseProjName(project.getProjectName());
-                purchase.setAreaCode(RegionConst.RC_LS);
+                purchase.setAreaCode(RegionConst.RC_HZ);
                 purchase.setDeleted(Boolean.FALSE);
                 purchase.setBaseBidName(p.getBidName());
                 purchase.setBasePurchasingAgencies(p.getAgency());

hz-pm-api/src/main/java/com/hz/pm/api/irs/manage/AppIrsManage.java

@@ -266,7 +266,7 @@ public class AppIrsManage {
      * @return
      */
     private String convertAreaCode(String areaCode) {
-        if (RegionConst.RC_LS.equals(areaCode) || RegionConst.LS_KF.equals(areaCode)) {
+        if (RegionConst.RC_HZ.equals(areaCode) || RegionConst.LS_KF.equals(areaCode)) {
             return RegionConst.RC_LS_SBJ_IRS;
         }
         return areaCode;

hz-pm-api/src/main/java/com/hz/pm/api/portrait/manage/TagManage.java

@@ -93,7 +93,7 @@ public class TagManage {
         }else if(user.getRegionAdmin()){
             //如果是区域管理员
             log.info(user.getUsername() + " 是区管,可以看本区域" + user.getRegionCode() + "标签");
-            if(!RegionConst.RC_LS.equals(user.getRegionCode())){
+            if(!RegionConst.RC_HZ.equals(user.getRegionCode())){
                 //非市本级的区管 只可以看自己区域的
                 query.eq(Tag::getAreaCode,user.getRegionCode());
             }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -201,7 +201,7 @@ public class DefaultDeclaredProjectManage {
         orgMap.put(OrgTypeEnum.TARGET_LABEL.name(),orgInfoDTO);
 
         //如果有上级条线主管单位 并且 不是市本级
-        if(!RegionConst.RC_LS.equals(project.getAreaCode()) &&
+        if(!RegionConst.RC_HZ.equals(project.getAreaCode()) &&
                 CommonEnum.YES.getCode().equals(project.getIsHigherSuperOrg())){
             OrgInfoDTO parentLineOrgInfoDto = new OrgInfoDTO();
             parentLineOrgInfoDto.setOrganizationCode(project.getHigherSuperOrgCode());
@@ -271,7 +271,7 @@ public class DefaultDeclaredProjectManage {
         orgMap.put(OrgTypeEnum.TARGET_LABEL.name(),orgInfoDTO);
 
         //如果有上级条线主管单位 并且 不是市本级
-        if(!RegionConst.RC_LS.equals(project.getAreaCode()) &&
+        if(!RegionConst.RC_HZ.equals(project.getAreaCode()) &&
                 CommonEnum.YES.getCode().equals(project.getIsHigherSuperOrg())){
             OrgInfoDTO parentLineOrgInfoDto = new OrgInfoDTO();
             parentLineOrgInfoDto.setOrganizationCode(project.getHigherSuperOrgCode());

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ReviewChecklistManage.java

@@ -73,7 +73,7 @@ public class ReviewChecklistManage {
         //建设方案提交后的状态
         query.ge(Project::getStatus, ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode())
                 .ne(Project::getStatus, ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode())
-                .eq(Project::getAreaCode, RegionConst.RC_LS);
+                .eq(Project::getAreaCode, RegionConst.RC_HZ);
         UserInfoDetails user = LoginUserUtil.loginUserDetail();
         buildReviewCheckPermission(query, user);
 
@@ -186,7 +186,7 @@ public class ReviewChecklistManage {
             return userDto;
         }
 
-        if (!regionCode.equals(RegionConst.RC_LS) || StringUtils.isBlank(employeeCode)) {
+        if (!regionCode.equals(RegionConst.RC_HZ) || StringUtils.isBlank(employeeCode)) {
             log.info("当前操作人 不是市本级 或者没有钉钉工号 :{},{},{}", user.getUsername(),
                     user.getRegionCode(), user.getEmployeeCode());
             query.eq(Project::getId, 0L);

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/ContractSaveDTO.java

@@ -17,11 +17,9 @@ import java.util.List;
  * @Author PoffyZhang
  */
 @Data
-@ApiModel(value = "合同对象", description = "")
+@ApiModel(value = "合同对象")
 public class ContractSaveDTO {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty("项目ID")
     @NotNull(message = "项目ID不能为空")
     private Long projectId;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Contract.java

@@ -18,11 +18,9 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("nd_contract")
-@ApiModel(value = "合同对象", description = "")
+@ApiModel(value = "合同对象")
 public class Contract {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty("主键")
     @TableId(type = IdType.AUTO)
     private Long id;
@@ -71,4 +69,5 @@ public class Contract {
 
     @ApiModelProperty("项目编号")
     private String projectCode;
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/PaymentPlan.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("nd_payment_plan")
-@ApiModel(value = "PaymentPlan", description = "")
+@ApiModel(value = "PaymentPlan")
 public class PaymentPlan {
 
     private static final long serialVersionUID = 1L;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/utils/GenerateProjectCodeUtil.java

@@ -78,7 +78,7 @@ public class GenerateProjectCodeUtil {
         VUtils.isTrue(Objects.isNull(baseinfo)).throwMessage("没有项目基本信息 无法生成项目编号!");
         VUtils.isTrue(Objects.isNull(apply)).throwMessage("没有项目申报信息 无法生成项目编号!");
 
-        String areaCode = (StringUtils.isNotBlank(baseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode() : RegionConst.RC_LS + BizConst.NINE_AREA_CODE_LAST);
+        String areaCode = (StringUtils.isNotBlank(baseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode() : RegionConst.RC_HZ + BizConst.NINE_AREA_CODE_LAST);
         // 获取建设年度 (10-13)
         String year = Objects.nonNull(apply.getBaseProjSetYear()) ? apply.getBaseProjSetYear()
                 : String.valueOf(LocalDateTime.now().getYear());
@@ -101,7 +101,7 @@ public class GenerateProjectCodeUtil {
         VUtils.isTrue(Objects.isNull(baseinfo)).throwMessage("没有项目基本信息 无法生成项目编号!");
         VUtils.isTrue(Objects.isNull(apply)).throwMessage("没有项目申报信息 无法生成项目编号!");
 
-        String areaCode = (StringUtils.isNotBlank(baseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode() : RegionConst.RC_LS + BizConst.NINE_AREA_CODE_LAST);
+        String areaCode = (StringUtils.isNotBlank(baseinfo.getBaseAreaCode()) ? baseinfo.getBaseAreaCode() : RegionConst.RC_HZ + BizConst.NINE_AREA_CODE_LAST);
         // 获取建设年度 (10-13)
         String year = Objects.nonNull(apply.getBaseProjSetYear()) ? apply.getBaseProjSetYear()
                 : String.valueOf(LocalDateTime.now().getYear());

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java

@@ -1358,7 +1358,7 @@ public class ProjectLibManage {
                 break;
             case REGION_MANAGER:
                 //区域管理员 看到自己区域的项目 如果是市本级 就看全市的
-                if (RegionConst.RC_LS.equals(user.getRegionCode())) {
+                if (RegionConst.RC_HZ.equals(user.getRegionCode())) {
                     Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(user.getRegionCode(),
                             RegionConst.RL_CITY);
                     query.in(Project::getAreaCode, regionCodes);
@@ -1402,7 +1402,7 @@ public class ProjectLibManage {
                 break;
             case REGION_MANAGER:
                 //区域管理员 看到自己区域的项目 如果是市本级 就看全市的
-                if (RegionConst.RC_LS.equals(user.getRegionCode())) {
+                if (RegionConst.RC_HZ.equals(user.getRegionCode())) {
                     Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(user.getRegionCode(),
                             RegionConst.RL_CITY);
                     req.setRegionCodes(regionCodes);

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectRenewalFundManage.java

@@ -622,7 +622,7 @@ public class ProjectRenewalFundManage {
                 break;
             case REGION_MANAGER:
                 //区域管理员 看到自己区域的项目 如果是市本级 就看全市的
-                if (RegionConst.RC_LS.equals(user.getRegionCode())) {
+                if (RegionConst.RC_HZ.equals(user.getRegionCode())) {
                     Collection<String> regionCodes = regionCacheHelper.listChildRegionCodeList(user.getRegionCode(),
                             RegionConst.RL_CITY);
                     req.setRegionCodes(regionCodes);

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/ProjectApplication.java

@@ -18,7 +18,7 @@ import lombok.Data;
  * @since 2023-02-05
  */
 @TableName("nd_project_application")
-@ApiModel(value = "NdProjectApplication对象", description = "")
+@ApiModel(value = "NdProjectApplication对象")
 @Data
 public class ProjectApplication implements Serializable {
 

hz-pm-api/src/main/java/com/hz/pm/api/safety/manage/SafetyRiskManage.java

@@ -92,7 +92,7 @@ public class SafetyRiskManage {
         } else if (user.getRegionAdmin()) {
             //如果是区域管理员
             log.info(user.getUsername() + " 是区管,可以看本区域" + user.getRegionCode() + "项目");
-            if (!RegionConst.RC_LS.equals(user.getRegionCode())) {
+            if (!RegionConst.RC_HZ.equals(user.getRegionCode())) {
                 //不是丽水市本级的话 就只看 自己区域的
                 query.eq(Project::getAreaCode, user.getRegionCode());
             }

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/CheckProvincialReviewResultTask.java

@@ -63,7 +63,7 @@ public class CheckProvincialReviewResultTask {
                             .eq(Project::getStage, ProjectStatusEnum.NOT_APPROVED.getCode())
                             .eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode())
                             .ge(Project::getDeclareAmount, ProjectDeclareConst.Number.DECLARE_AMOUNT_JUDGEMENT)
-                            .eq(Project::getAreaCode, RegionConst.RC_LS)
+                            .eq(Project::getAreaCode, RegionConst.RC_HZ)
                             .eq(Project::getNewest,Boolean.TRUE)
                     .orderByAsc(Project::getCreateOn));
 

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/CockpitStatsStatisticsTask.java

@@ -149,7 +149,7 @@ public class CockpitStatsStatisticsTask {
                     DashboardConstant.CockpitStats.TOTAL,year));
         }
 
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY);
         regions = regions.stream().filter(r -> r.getRegionLevel() != RegionConst.RL_CITY).collect(Collectors.toList());
         for(RegionDTO regionDto :  regions){
             res.add(statisticsData(regionDto.getRegionCode(),regionDto.getRegionName(),

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/InitProcessTask.java

@@ -54,7 +54,7 @@ public class InitProcessTask {
             StopWatch stopWatch = new StopWatch();
             stopWatch.start();
             // 1.查出丽水市下的 区县 分别去初始化 表单和流程配置数据
-            List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
+            List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY);
 
             if (CollUtil.isEmpty(regions)) {
                 throw new BizException("丽水地区数据为空 任务结束!");

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/task/ProjectStatusFlowTask.java

@@ -46,7 +46,6 @@ public class ProjectStatusFlowTask {
 
     @Scheduled(cron = "0 */1 * * * ?")
     public void statusFlow() throws UnknownHostException {
-        //
         if (HOST_NAME.equals(InetAddress.getLocalHost().getHostName())) {
             //1. 定时取 项目暂存表的数据 去进行状态继续流转
             List<ProjectStaging> stagingList = projectStagingService.list(Wrappers.lambdaQuery(ProjectStaging.class)

hz-pm-api/src/main/java/com/hz/pm/api/sys/manage/MenuManage.java

@@ -85,7 +85,7 @@ public class MenuManage {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         //1.查出丽水市下的 区县 分别去初始化 表单和流程配置数据
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY);
 
         if(CollUtil.isEmpty(regions)){
             throw new BizException("丽水地区数据为空 任务结束!");

hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java

@@ -64,7 +64,7 @@ public class ResUserDetailVO {
     //是否是市级单位
     public Boolean getIsMunicipalOrg(){
         //如果是丽水市本级的code 就是
-        if(RegionConst.RC_LS.equals(this.regionCode)){
+        if(RegionConst.RC_HZ.equals(this.regionCode)){
             return Boolean.TRUE;
         }
         return Boolean.FALSE;

hz-pm-api/src/main/java/com/hz/pm/api/user/security/model/UserInfoDetails.java

@@ -174,7 +174,7 @@ public class UserInfoDetails extends AbstractLoginUser implements UserDetails {
 
     public Boolean getIsMunicipalOrg() {
         //如果是丽水市本级的code 就是
-        if (RegionConst.RC_LS.equals(this.regionCode)) {
+        if (RegionConst.RC_HZ.equals(this.regionCode)) {
             return Boolean.TRUE;
         }
         return Boolean.FALSE;

hz-pm-api/src/test/java/com/hz/pm/api/provincial/Test.java

@@ -121,7 +121,7 @@ public class Test extends AppTests{//
                 .eq(Project::getStage, ProjectStatusEnum.NOT_APPROVED.getCode())
                 .eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode())
                 .ge(Project::getDeclareAmount, ProjectDeclareConst.Number.DECLARE_AMOUNT_JUDGEMENT)
-                .eq(Project::getAreaCode, RegionConst.RC_LS)
+                .eq(Project::getAreaCode, RegionConst.RC_HZ)
                 .orderByAsc(Project::getCreateOn));
 
         log.info("需要去查询省级联审结果的项目 size:{}",projectList.size());

hz-pm-api/src/test/java/com/hz/pm/api/sys/processDef/ProcessDefTest.java

@@ -59,7 +59,7 @@ public class ProcessDefTest extends AppTests {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         //1.查出丽水市下的 区县 分别去初始化 表单和流程配置数据
-        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY);
+        List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_HZ, RegionConst.RL_CITY);
 
         if(CollUtil.isEmpty(regions)){
             throw new BizException("丽水地区数据为空 任务结束!");