缴费记录PC接口

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPayRecordDetailDTO.java

@@ -43,9 +43,9 @@ public class IcPartyMemberPayRecordDetailDTO implements Serializable {
 	private String year;
 
     /**
-     * 缴费季度
+     * 缴费月份
      */
-	private String quarter;
+	private String month;
 
     /**
      * 缴费金额
@@ -82,4 +82,17 @@ public class IcPartyMemberPayRecordDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	// 姓名
+    private String name;
+    // 手机号
+    private String mobile;
+    // 身份证号
+    private String idCard;
+    // 所属党组织名称
+    private String orgName;
+    // 缴费次数
+    private String times;
+    // 备注
+    private String remark;
+
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberPayRecordDetailFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author wgf
+ * @Date 2022/05/17 19:49
+ */
+@NoArgsConstructor
+@Data
+public class IcPartyMemberPayRecordDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 4743261460276449408L;
+
+    private String orgId;
+    private String name;
+    private String mobile;
+    private String idCard;
+    private String year;
+    private String month;
+
+    private Integer pageNo;
+    private Integer pageSize;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPayRecordDetailController.java

@@ -12,6 +12,9 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.modules.partymember.excel.IcPartyMemberPayRecordDetailExcel;
 import com.epmet.modules.partymember.service.IcPartyMemberPayRecordDetailService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO;
+import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
+import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberPayRecordDetailFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,10 +38,12 @@ public class IcPartyMemberPayRecordDetailController {
 
     @RequestMapping("page")
     public Result<PageData<IcPartyMemberPayRecordDetailDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcPartyMemberPayRecordDetailDTO> page = icPartyMemberPayRecordDetailService.page(params);
+//        PageData<IcPartyMemberPayRecordDetailDTO> page = icPartyMemberPayRecordDetailService.page(params);
+        PageData<IcPartyMemberPayRecordDetailDTO> page = icPartyMemberPayRecordDetailService.getPhrasePage(params);
         return new Result<PageData<IcPartyMemberPayRecordDetailDTO>>().ok(page);
     }
 
+
     @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
     public Result<IcPartyMemberPayRecordDetailDTO> get(@PathVariable("id") String id){
         IcPartyMemberPayRecordDetailDTO data = icPartyMemberPayRecordDetailService.get(id);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPayRecordDetailDao.java

@@ -2,8 +2,13 @@ package com.epmet.modules.partymember.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.IcPartyMemberPayRecordDetailEntity;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO;
+import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberPayRecordDetailFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党员缴费记录明细表
  *
@@ -13,4 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcPartyMemberPayRecordDetailDao extends BaseDao<IcPartyMemberPayRecordDetailEntity> {
 
+    List<IcPartyMemberPayRecordDetailDTO> selectListInfo(Map<String, Object> params);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyMemberPayRecordDetailEntity.java

@@ -43,9 +43,9 @@ public class IcPartyMemberPayRecordDetailEntity extends BaseEpmetEntity {
 	private String year;
 
     /**
-     * 缴费季度
+     * 缴费月份
      */
-	private String quarter;
+	private String month;
 
     /**
      * 缴费金额

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPayRecordDetailService.java

@@ -4,6 +4,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.partymember.entity.IcPartyMemberPayRecordDetailEntity;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO;
+import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
+import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberPayRecordDetailFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -26,6 +29,14 @@ public interface IcPartyMemberPayRecordDetailService extends BaseService<IcParty
      */
     PageData<IcPartyMemberPayRecordDetailDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<IcPartyMemberPayRecordDetailDTO> getPhrasePage(Map<String, Object> params);
+
+
     /**
      * 默认查询
      *

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPayRecordDetailServiceImpl.java

@@ -1,16 +1,27 @@
 package com.epmet.modules.partymember.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.modules.partymember.dao.IcPartyMemberPayRecordDetailDao;
 import com.epmet.modules.partymember.entity.IcPartyMemberPayRecordDetailEntity;
+import com.epmet.modules.partymember.entity.IcPartymemberStyleCategoryDictEntity;
+import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.modules.partymember.redis.IcPartyMemberPayRecordDetailRedis;
 import com.epmet.modules.partymember.service.IcPartyMemberPayRecordDetailService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO;
+import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
+import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberPayRecordDetailFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +52,19 @@ public class IcPartyMemberPayRecordDetailServiceImpl extends BaseServiceImpl<IcP
         return getPageData(page, IcPartyMemberPayRecordDetailDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<IcPartyMemberPayRecordDetailDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<IcPartyMemberPayRecordDetailDTO> page = getPage(params);
+        List<IcPartyMemberPayRecordDetailDTO> list = baseDao.selectListInfo(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+
     @Override
     public List<IcPartyMemberPayRecordDetailDTO> list(Map<String, Object> params) {
         List<IcPartyMemberPayRecordDetailEntity> entityList = baseDao.selectList(getWrapper(params));

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml

@@ -9,7 +9,7 @@
         <result property="partyMemberId" column="PARTY_MEMBER_ID"/>
         <result property="recordId" column="RECORD_ID"/>
         <result property="year" column="YEAR"/>
-        <result property="quarter" column="QUARTER"/>
+        <result property="month" column="MONTH"/>
         <result property="money" column="MONEY"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
@@ -18,6 +18,46 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectListInfo"
+            resultType="com.epmet.resi.partymember.dto.partymember.IcPartyMemberPayRecordDetailDTO">
+        select
+            org.PARTY_ORG_NAME orgName,
+            pm.NAME,
+            pm.MOBILE,
+            pm.ID_CARD,
+            count(prd.ID) times,
+            sum(prd.MONEY) as money,
+            pm.REMARK
+        from ic_party_member_pay_record_detail prd
+        left join ic_party_member pm on pm.ID = prd.PARTY_MEMBER_ID
+        left join ic_party_org org on org.ID = pm.SSZB and org.DEL_FLAG = 0
+        where prd.DEL_FLAG = 0
+        and pm.DEL_FLAG = 0
+        <if test='name != "" and name != null'>
+            and pm.NAME like concat('%',#{name},'%')
+        </if>
+        <if test='mobile != "" and mobile != null'>
+            and pm.MOBILE like concat('%',#{mobile},'%')
+        </if>
+        <if test='idCard != "" and idCard != null'>
+            and pm.ID_CARD like concat('%',#{idCard},'%')
+        </if>
+        <if test='orgId != "" and orgId != null'>
+            and FIND_IN_SET(#{orgId},pm.ORG_PIDS)
+        </if>
+        <if test='year != "" and year != null'>
+            and prd.YEAR = #{year}
+        </if>
+        <if test='month != "" and month != null'>
+            and prd.MONTH = #{month}
+        </if>
+        <if test='year == "" or year == null'>
+            and prd.YEAR = DATE_FORMAT(NOW(),'%Y')
+            and prd.MONTH = DATE_FORMAT(NOW(),'%m')
+        </if>
+        group by prd.PARTY_MEMBER_ID
+        order by pm.SSZB,pm.CREATED_TIME desc
+    </select>
 
 
 </mapper>