commityixia

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -16,26 +18,13 @@ public class IcPolicyDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
+    private String policyId;
-     * 主键
-     */
-	private String id;
-
-    /**
-     * 客户id
-     */
-	private String customerId;
 
     /**
      * 政策创建人，所属组织id
      */
 	private String orgId;
 
-    /**
-     * AGENCY_ID的全路径，含agency_id
-     */
-	private String orgIdPath;
-
     /**
      * 政策级别，0市级；1区级；2街道级
      */
@@ -44,11 +33,13 @@ public class IcPolicyDTO implements Serializable {
     /**
      * 生效起止日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date startDate;
 
     /**
      * 截止日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date endDate;
 
     /**
@@ -61,34 +52,5 @@ public class IcPolicyDTO implements Serializable {
      */
 	private String content;
 
-    /**
-     * 删除标识 0.未删除 1.已删除
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
 
 }

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

@@ -0,0 +1,39 @@
+package com.epmet.dto.form.policy;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/19 15:36
+ */
+@Data
+public class IcPolicyPageFormDTO extends PageFormDTO implements Serializable {
+    /**
+     * 客户id
+     */
+    private String customerId;
+    private String staffId;
+
+    /**
+     * 政策标题
+     */
+    private String title;
+
+    /**
+     * 政策内容
+     */
+    private String content;
+
+    /**
+     * 是否过期；1：已过期；0：未过期
+     */
+    private String expiredFlag;
+
+    private String agencyId;
+
+}
+

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

@@ -1,11 +1,15 @@
 package com.epmet.controller;
 
 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.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
 import com.epmet.dto.form.policy.IcPolicyFormDTO;
+import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
 import com.epmet.service.IcPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -69,5 +73,20 @@ public class IcPolicyController {
         return new Result();
     }
 
+    /**
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("list")
+    public Result<PageData<IcPolicyDTO>> policyList(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class,PageFormDTO.AddUserShowGroup.class);
+        PageData<IcPolicyDTO> page = icPolicyService.policyList(formDTO);
+        return new Result<PageData<IcPolicyDTO>>().ok(page);
+    }
+
 
 }

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

@@ -1,7 +1,9 @@
 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;
@@ -24,4 +26,6 @@ public interface IcPolicyDao extends BaseDao<IcPolicyEntity> {
      * @return
      */
     List<IcPolicyItemResultDTO> selectItemList(@Param("customerId") String customerId, @Param("groupType") String groupType);
+
+    List<IcPolicyDTO> policyList(IcPolicyPageFormDTO formDTO);
 }

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

@@ -1,8 +1,11 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
 import com.epmet.dto.form.policy.IcPolicyFormDTO;
+import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
 import com.epmet.entity.IcPolicyEntity;
 
 import java.util.List;
@@ -29,4 +32,11 @@ public interface IcPolicyService extends BaseService<IcPolicyEntity> {
      * @param formDTO
      */
     void addOrUpdatePolicy(IcPolicyFormDTO formDTO);
+
+    /**
+     * 列表查询
+     * @param formDTO
+     * @return
+     */
+    PageData<IcPolicyDTO> policyList(IcPolicyPageFormDTO formDTO);
 }

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

@@ -7,16 +7,21 @@ import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.*;
 import com.epmet.dto.IcPolicyCategoryDTO;
+import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
 import com.epmet.dto.form.policy.IcPolicyFormDTO;
+import com.epmet.dto.form.policy.IcPolicyPageFormDTO;
 import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO;
 import com.epmet.dto.form.policy.IcPolicyRuleFormDTO;
 import com.epmet.entity.*;
 import com.epmet.service.IcPolicyService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -190,4 +195,23 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
         // 政策文件最多3个先不限制了吧，前端控制下
     }
 
+    /**
+     * 列表查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<IcPolicyDTO> policyList(IcPolicyPageFormDTO formDTO) {
+        // 设置所属组织
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        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);
+        PageInfo<IcPolicyDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }

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

@@ -42,4 +42,33 @@
           and i.GROUP_TYPE = #{groupType}
         order by i.SORT asc
     </select>
+
+    <select id="policyList" parameterType="com.epmet.dto.form.policy.IcPolicyPageFormDTO" resultType="com.epmet.dto.IcPolicyDTO">
+        SELECT
+            ip.id AS POLICY_ID,
+            ip.ORG_ID,
+            ip.POLICY_LEVEL,
+            ip.START_DATE,
+            ip.END_DATE,
+            ip.TITLE,
+            ip.CONTENT
+        FROM
+            ic_policy ip
+        WHERE
+            ip.DEL_FLAG = '0'
+          AND ip.CUSTOMER_ID = #{customerId}
+          AND ip.ORG_ID = #{agencyId}
+        <if test="null != title and title != '' ">
+            and ip.TITLE like concat('%',#{title},'%')
+        </if>
+        <if test="null != content and content != '' ">
+            and ip.CONTENT like concat('%',#{content},'%')
+        </if>
+        <if test="'1' != expiredFlag">
+            and ip.END_DATE &lt; now()
+        </if>
+        <if test="'0' != expiredFlag">
+            and ip.END_DATE &gt;= now()
+        </if>
+    </select>
 </mapper>