存量合同2.0开发 接口补充

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HistoryPeasantHouseholdMapper.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.HistoryPeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HistoryPeasantHousehold;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,4 +17,5 @@ public interface HistoryPeasantHouseholdMapper extends BaseMapper<HistoryPeasant
 
  public HistoryPeasantHouseholdDto selectDataInfo(Long sequenceNbr);
 
+ List<HistoryPeasantHouseholdDto> queryForPage(List<String> sequenceNbrs, String ownersName, String province, String status);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoHistoryMapper.xml

@@ -10,7 +10,7 @@
         hhpf.sequence_nbr as sequenceNbr,
         hhpf.house_address houseAddress,
         hhpf.basic_grid_capacity basicGridCapacity,
-        IFNULL(hfih.status,'待推送') status,
+        hfih.status status,
         hfih.disbursement_money disbursementMoney,
         hfih.financing_companies_name financingCompaniesName,
         hfih.regional_companies_seq regionalCompaniesSeq

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HistoryPeasantHouseholdMapper.xml

@@ -5,4 +5,28 @@
     <select id="selectDataInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HistoryPeasantHouseholdDto">
         select * ,file_url as files from hygf_history_peasant_household where sequence_nbr = #{sequenceNbr}
     </select>
+    <select id="queryForPage"
+            resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HistoryPeasantHouseholdDto">
+
+        select  *, file_url as files from
+            hygf_history_peasant_household
+        <where>
+            <if test="ownersName != null and ownersName != ''">
+                hygf_history_peasant_household.owners_name like concat('%',#{ownersName},'%')
+            </if>
+            <if test="status != null and status != ''">
+                hygf_history_peasant_household.status = #{status}
+            </if>
+            <if test="province != null and province != ''">
+                hygf_history_peasant_household.province like concat('%',#{province},'%')
+            </if>
+            <if test="sequenceNbrs != null and sequenceNbrs.size() > 0">
+                hygf_history_peasant_household.sequence_nbr in
+            <foreach collection="sequenceNbrs" open="(" close=")" separator="," item="item">
+                    #{item}
+              </foreach>
+            </if>
+        </where>
+
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HistoryPeasantHouseholdServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -40,7 +41,12 @@ public class HistoryPeasantHouseholdServiceImpl extends BaseService<HistoryPeasa
      * 分页查询
      */
     public Page<HistoryPeasantHouseholdDto> queryForHistoryPeasantHouseholdPage(Page<HistoryPeasantHouseholdDto> page, @Condition(Operator.in) List<String> sequenceNbr,@Condition(Operator.like) String ownersName ,@Condition(Operator.like) String province,@Condition(Operator.eq) String status)   {
-        return this.queryForPage(page, null, false,sequenceNbr,ownersName,province,status);
+        List<HistoryPeasantHouseholdDto> historyPeasantHouseholdDtos = this.getBaseMapper().queryForPage(sequenceNbr, ownersName, province, status);
+        historyPeasantHouseholdDtos.forEach(e->{
+            e.setFileUrl(JSONArray.parseArray(e.getFiles()));
+        });
+
+        return this. queryForPage(page, null, false,sequenceNbr,ownersName,province,status);
     }
 
     /**