user_advice添加pids和allparentname字段

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserAdviceDTO.java

@@ -53,6 +53,16 @@ public class UserAdviceDTO implements Serializable {
      */
 	private String agencyId;
 
+    /**
+     * 组织pids
+     */
+    private String agencyPids;
+
+    /**
+     * 组织parent name
+     */
+    private String agencyAllParentName;
+
     /**
      * 组织名
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java

@@ -53,6 +53,16 @@ public class UserAdviceEntity extends BaseEpmetEntity {
      */
 	private String agencyId;
 
+	/**
+	 * 组织pids
+	 */
+	private String agencyPids;
+
+	/**
+	 * 组织parent name
+	 */
+	private String agencyAllParentName;
+
     /**
      * 组织名
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java

@@ -43,6 +43,12 @@ public class UserAdviceExcel {
     @Excel(name = "组织ID")
     private String agencyId;
 
+    @Excel(name = "组织PIDs")
+    private String agencyPids;
+
+    @Excel(name = "组织ParentName")
+    private String agencyAllParentName;
+
     @Excel(name = "组织名")
     private String agencyName;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java

@@ -202,6 +202,10 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         AdviceDetailResultDTO adviceDetailResultDTO = new AdviceDetailResultDTO();
         BeanUtils.copyProperties(userAdviceEntity, adviceDetailResultDTO);
         adviceDetailResultDTO.setAdviceId(userAdviceEntity.getId());
+        //如果parentName不为空，拼接agencyName
+        if (StringUtils.isNotBlank(userAdviceEntity.getAgencyAllParentName())){
+            adviceDetailResultDTO.setAgencyName(userAdviceEntity.getAgencyAllParentName()+"-"+userAdviceEntity.getAgencyName());
+        }
         //拼接建议类型
         if (!"*".equals(userAdviceEntity.getAdviceType())) {
             StringBuilder type = new StringBuilder();
@@ -248,6 +252,8 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
 
         //wrapper
         QueryWrapper<UserAdviceEntity> wrapper = new QueryWrapper<>();
+        //del_flag
+        wrapper.eq("DEL_FLAG","0");
         //客户Id
         wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), "CUSTOMER_ID", dto.getCustomerId());
         //是否回复
@@ -258,14 +264,19 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
             wrapper.eq("REPLY_USER_ID", "");
             wrapper.eq("REPLY_CONTENT", "");
         }
-        // 组织id
-        wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()), "AGENCY_ID", dto.getAgencyId());
         //建议类型
         wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType());
         //开始时间
         wrapper.ge(dto.getStartTime() != null, "CREATED_TIME", dto.getStartTime());
         //结束时间
         wrapper.le(dto.getEndTime() != null, "CREATED_TIME", dto.getEndTime());
+        // 组织id
+        if (StringUtils.isNotBlank(dto.getAgencyId())){
+            wrapper.and(wrapper1 ->wrapper1.eq("AGENCY_ID", dto.getAgencyId())
+                   .or()
+                   .like("AGENCY_PIDS", dto.getAgencyId()));
+        }
+
 
         IPage<UserAdviceEntity> result = baseDao.selectPage(page, wrapper);
 
@@ -341,6 +352,8 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
             Result<CustomerAgencyDTO> agencyById = govOrgOpenFeignClient.getAgencyById(gridInfoResultDTOResult.getData().getParentAgencyId());
             if (agencyById.success()){
                 userAdviceDTO.setAgencyName(agencyById.getData().getAllParentName());
+                userAdviceDTO.setAgencyAllParentName(agencyById.getData().getAllParentName());
+                userAdviceDTO.setAgencyPids(agencyById.getData().getPids());
             }else {
                 logger.error("agencyId:{},获取组织详情失败",gridInfoResultDTOResult.getData().getParentAgencyId());
             }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.7__add_useradvice.sql

@@ -3,6 +3,8 @@ CREATE TABLE `user_advice` (
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
   `CUSTOMER_NAME` varchar(64) NOT NULL COMMENT '客户名',
   `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织ID',
+  `AGENCY_PIDS` varchar(1024) NOT NULL COMMENT '组织PIDs',
+  `AGENCY_ALL_PARENT_NAME` varchar(1024) COMMENT '组织parent name',
   `AGENCY_NAME` varchar(64) NOT NULL COMMENT '组织名',
   `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID',
   `GRID_NAME` varchar(64) NOT NULL COMMENT '网格名',

epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml

@@ -8,6 +8,8 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="customerName" column="CUSTOMER_NAME"/>
         <result property="agencyId" column="AGENCY_ID"/>
+        <result property="agencyPids" column="AGENCY_PIDS"/>
+        <result property="agencyAllParentName" column="AGENCY_ALL_PARENT_NAME"/>
         <result property="agencyName" column="AGENCY_NAME"/>
         <result property="gridId" column="GRID_ID"/>
         <result property="gridName" column="GRID_NAME"/>