修改投融资bug

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

@@ -8,7 +8,7 @@
         hph.sequence_nbr AS sequenceNbr,
         hph.peasant_household_no peasantHouseholdNo,
         hph.owners_name AS ownersName,
-        hph.project_address_name AS projectAddress,
+        concat(hph.project_address_name,project_address_detail) AS projectAddress,
         hph.regional_companies_name AS regionalCompaniesName,
         IFNULL( info.`status`, '待推送' ) AS status,
         (select count( hfro.sequence_nbr ) from  hygf_financing_rectification_order hfro where  hfro.peasant_household_id = hph.sequence_nbr  )orderNum,
@@ -33,7 +33,7 @@
                 and info.status in ('待融资审核','审核通过','放款完成' ) and info.financing_companies_seq = #{params.financingCompaniesSeq}
             </if>
             <if test="params.type == 3 ">
-                and info.status in ('待整改')
+                and info.status in ('待整改','整改未完成')
             </if>
             <if test="params.status != null and params.status != ''">
                 and info.status = #{params.status}

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

@@ -266,7 +266,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
                     financingRectificationOrder.setCompleteDate(null);
                 }
                 financingRectificationOrder.setRectificationOrderCode(String.valueOf(new Date().getTime()));
-                financingRectificationOrder.setRectificationStatus("待整改");
+                financingRectificationOrder.setRectificationStatus("整改未完成");
                 financingRectificationOrder.setProblemDescription(params.getOrDefault("problemDescription", "").toString());
                 financingRectificationOrder.setPeasantHouseholdName(params.getOrDefault("peasantHouseholdName", "").toString());
                 financingRectificationOrder.setRectificationDescription(params.getOrDefault("rectificationDescription", "").toString());

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

@@ -672,10 +672,12 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
     @Override
     public List<PeasantHousehold> getInfoByIds(String ids) {
-        LambdaQueryWrapper<PeasantHousehold> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(BaseEntity::getSequenceNbr,Arrays.asList(ids.split(",")));
-        queryWrapper.eq(BaseEntity::getIsDelete,0);
-        return  this.getBaseMapper().selectList(queryWrapper);
+        QueryWrapper<PeasantHousehold> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("sequence_nbr ","owners_name" ,"concat(project_address_name,project_address_detail) as project_address_name");
+        queryWrapper.in("sequence_nbr",Arrays.asList(ids.split(",")));
+        queryWrapper.eq("is_delete",0);
+        List<PeasantHousehold> peasantHouseholds = this.getBaseMapper().selectList(queryWrapper);
+        return peasantHouseholds;
 
     }
 }
\ No newline at end of file