Merge remote-tracking branch 'origin/dev_policy_service' into dev_policy_service

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java

@@ -32,7 +32,6 @@ public class IcPolicyPageFormDTO extends PageFormDTO implements Serializable {
      * 是否过期；1：已过期；0：未过期
      */
     private String expiredFlag;
-
     private String agencyId;
 
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java

@@ -1,16 +1,14 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
-import com.epmet.dto.form.resi.HeartResisByPolicyRulesFormDTO;
 import com.epmet.dto.IcPolicyRuleDTO;
 import com.epmet.dto.form.policy.IcPolicyFormDTO;
 import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
@@ -145,6 +143,18 @@ public class IcPolicyController {
         return new Result<PageData<IcPolicyDTO>>().ok(page);
     }
 
+    /**
+     * Desc: 政策列表下拉选
+     * @param tokenDto
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/21 09:48
+     */
+    @PostMapping("policyListSelect")
+    public Result<List<IcPolicyDTO>> policyListSelect(@LoginUser TokenDto tokenDto){
+        return new Result<List<IcPolicyDTO>>().ok(icPolicyService.policyListSelect(tokenDto.getUserId(),tokenDto.getCustomerId()));
+    }
+
     /**
      * 细则列表
      * @param customerId

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java

@@ -3,7 +3,6 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
-import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
 import com.epmet.entity.IcPolicyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -27,5 +26,9 @@ public interface IcPolicyDao extends BaseDao<IcPolicyEntity> {
      */
     List<IcPolicyItemResultDTO> selectItemList(@Param("customerId") String customerId, @Param("groupType") String groupType);
 
-    List<IcPolicyDTO> policyList(IcPolicyPageFormDTO formDTO);
+    List<IcPolicyDTO> policyList(@Param("customerId")String customerId,
+                                 @Param("agencyId")String agencyId,
+                                 @Param("title")String title,
+                                 @Param("content")String content,
+                                 @Param("expiredFlag")String expiredFlag);
 }

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

@@ -45,6 +45,14 @@ public interface IcPolicyService extends BaseService<IcPolicyEntity> {
      */
     PageData<IcPolicyDTO> policyList(IcPolicyPageFormDTO formDTO);
 
+    /**
+     * Desc: 政策列表下拉选
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/21 09:48
+     */
+    List<IcPolicyDTO> policyListSelect(String userId,String customerId);
+
     List<IcPolicyRuleDTO> ruleList(String customerId,String policyId);
 
     IcPolicyDTO policyDetail(String customerId,String policyId);

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

@@ -232,9 +232,8 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
         if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常");
         }
-        formDTO.setAgencyId(staffInfo.getAgencyId());
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
-        List<IcPolicyDTO> list = baseDao.policyList(formDTO);
+        List<IcPolicyDTO> list = baseDao.policyList(formDTO.getCustomerId(),staffInfo.getAgencyId(),formDTO.getTitle(),formDTO.getContent(),formDTO.getExpiredFlag());
         if (CollectionUtils.isNotEmpty(list)) {
             for (IcPolicyDTO icPolicyDTO : list) {
                 // 查询字典表
@@ -247,6 +246,15 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
         return new PageData<>(list, pageInfo.getTotal());
     }
 
+    @Override
+    public List<IcPolicyDTO> policyListSelect(String userId,String customerId) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId);
+        if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常");
+        }
+        return baseDao.policyList(customerId, staffInfo.getAgencyId(), null,null,null);
+    }
+
     @Override
     public List<IcPolicyRuleDTO> ruleList(String customerId, String policyId) {
         LambdaQueryWrapper<IcPolicyRuleEntity> wrapper = new LambdaQueryWrapper<>();

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml

@@ -43,7 +43,7 @@
         order by i.SORT asc
     </select>
 
-    <select id="policyList" parameterType="com.epmet.dto.form.policy.IcPolicyPageFormDTO" resultType="com.epmet.dto.IcPolicyDTO">
+    <select id="policyList" parameterType="map" resultType="com.epmet.dto.IcPolicyDTO">
         SELECT
             ip.id AS POLICY_ID,
             ip.ORG_ID,
@@ -69,11 +69,14 @@
         <if test="null != content and content != '' ">
             and ip.CONTENT like concat('%',#{content},'%')
         </if>
-        <if test="'1' == expiredFlag">
+        <if test="null != expiredFlag and expiredFlag != '' ">
-            and ip.END_DATE &lt; DATE_FORMAT(now(),'%Y-%m-%d')
+            and 1=1
-        </if>
+            <if test="expiredFlag == 1">
-        <if test="'0' == expiredFlag">
+                and ip.END_DATE &lt; DATE_FORMAT(now(),'%Y-%m-%d')
-            and ip.END_DATE &gt;= DATE_FORMAT(now(),'%Y-%m-%d')
+            </if>
+            <if test="expiredFlag == 0">
+                and ip.END_DATE &gt;= DATE_FORMAT(now(),'%Y-%m-%d')
+            </if>
         </if>
         order by ip.CREATED_TIME desc
      </select>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml

@@ -6,7 +6,7 @@
     <!-- 【服务管理】列表 -->
     <select id="serviceRecordV2List" resultType="com.epmet.dto.result.ServiceRecordV2ListResultDTO">
         SELECT
-            sr.ID AS serviceRecordId,
+            DISTINCT sr.ID AS serviceRecordId,
             sr.POLICY_ID,
             sr.SERVICE_NAME,
             sr.SERVICE_ORG_TYPE,
@@ -16,7 +16,7 @@
             sr.SERVICE_STATUS,
             IFNULL(sf.SERVICE_PEOPLE_NUMBER,0) AS servicePeopleNumber
         FROM ic_service_record_v2 sr
-        INNER JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0
+        left JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0
         INNER JOIN ic_service_scope_v2 ss ON ss.SERVICE_RECORD_ID = sr.ID AND ss.DEL_FLAG = '0'
         WHERE sr.DEL_FLAG = '0'
             AND ss.OBJECT_ID_PATH LIKE concat('%',#{orgId},'%')

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@@ -167,7 +167,7 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 			if (null == gridInfoCache || (null != gridInfoCache.getAbandonFlag() && NumConstant.ONE == gridInfoCache.getAbandonFlag())) {
 				result.setGridId(StrConstant.EPMETY_STR);
 				result.setCustomerId(StrConstant.EPMETY_STR);
-				logger.error(String.format("获取用户最近访问网格异常，网格可能被删除或者被弃用，参数%s",JSON.toJSONString(formDTO)));
+				logger.warn(String.format("获取用户最近访问网格异常，网格可能被删除或者被弃用，参数%s",JSON.toJSONString(formDTO)));
 				return result;
 			}
 			result.setGridId(userResult.getData().getGridId());