服务措施分析去掉入参的pid

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/CategoryAnalysisFormDTO.java

@@ -22,8 +22,7 @@ public class CategoryAnalysisFormDTO implements Serializable {
 
     @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class)
     private String orgId;
-    @NotBlank(message = "组织或网格的上级", groups = PageListAnalysisFormDTO.AddUserShowGroup.class)
+
-    private String pid;
     @NotBlank(message = "组织:agency,网格：grid", groups = AddUserShowGroup.class)
     private String orgType;
     @NotBlank(message = "起止日期不能为空,格式yyyyMMdd", groups = AddUserShowGroup.class)

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java

@@ -27,10 +27,9 @@ public class PageListAnalysisFormDTO implements Serializable {
     @NotNull(message = "每页数量不能为空", groups = AddUserInternalGroup.class)
     private Integer pageSize;
 
-    @NotBlank(message = "先选择组织或网格", groups = AddUserShowGroup.class)
+    @NotBlank(message = "先选择组织或网格不能为空", groups = AddUserShowGroup.class)
     private String orgId;
-    @NotBlank(message = "组织或网格的上级", groups = AddUserShowGroup.class)
+
-    private String pid;
     @NotBlank(message = "orgType=grid或者agency,不能为空", groups = AddUserInternalGroup.class)
     private String orgType;
 
@@ -49,4 +48,5 @@ public class PageListAnalysisFormDTO implements Serializable {
     private String gridPids;
 
     private Boolean pageFlag;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -47,11 +47,6 @@ import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.IcResiUserBriefDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.demand.*;
-import com.epmet.dto.result.demand.DemandRecResultDTO;
-import com.epmet.dto.result.demand.FinishResultDTO;
-import com.epmet.dto.result.demand.IcResiUserReportDemandRes;
-import com.epmet.dto.result.demand.ServiceStatDTO;
-import com.epmet.dto.result.demand.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -643,15 +638,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     @Override
     public PageData<DemandRecResultDTO> pageListAnalysis(PageListAnalysisFormDTO formDTO) {
         if("agency".equals(formDTO.getOrgType())){
-            if(NumConstant.ZERO_STR.equals(formDTO.getPid())){
+            //找到当前组织的所有上级，再拼接上自己
+            Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
+            if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById");
+            }
+            if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){
                 //当前传入的组织id=客户的根组织
                 formDTO.setGridPids(formDTO.getOrgId());
             }else{
-                //找到当前组织的所有上级，再拼接上自己
-                Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
-                if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById");
-                }
                 formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()));
             }
         }
@@ -754,15 +749,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         log.info("阶段性胜利1："+ JSON.toJSONString(legend));
         // 3、传进来的是组织id的话，查询出全路径
         if("agency".equals(formDTO.getOrgType())){
-            if(NumConstant.ZERO_STR.equals(formDTO.getPid())){
+            //找到当前组织的所有上级，再拼接上自己
+            Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
+            if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById");
+            }
+            if(NumConstant.ZERO_STR.equals(customerAgencyDTOResult.getData().getPid())){
                 //当前传入的组织id=客户的根组织
                 formDTO.setGridPids(formDTO.getOrgId());
             }else{
-                //找到当前组织的所有上级，再拼接上自己
-                Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
-                if(!customerAgencyDTOResult.success()||null==customerAgencyDTOResult.getData()){
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取组织信息异常govOrgOpenFeignClient.getAgencyById");
-                }
                 formDTO.setGridPids(customerAgencyDTOResult.getData().getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()));
             }
         }