修改投融bug

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * @date 2024-04-01
  */
 public interface FinancingInfoMapper extends BaseMapper<FinancingInfo> {
-   @UserEmpower(field = {"hph.regional_companies_code"},dealerField = {"hph.developer_code","hph.regional_companies_code"},fieldConditions = {"eq","in"},relationship = {"and"})
+   @UserEmpower(field = {"sta.regional_companies_code"},dealerField = {"sta.developer_code","sta.regional_companies_code"},fieldConditions = {"eq","in"},relationship = {"and"})
    List<Map<String,Object>> getStationFinancingInfoList(@Param(value = "params") Map<String,Object> params,@Param(value = "amosOrgCodes")List<String> amosOrgCodes);
 
 

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

@@ -4,7 +4,7 @@
 
 
     <select id="getStationFinancingInfoList" resultType="java.util.Map">
-        SELECT
+        SELECT sta.* FROM  (SELECT
         hph.sequence_nbr AS sequenceNbr,
         hph.peasant_household_no peasantHouseholdNo,
         hph.owners_name AS ownersName,
@@ -14,7 +14,9 @@
         (select count( hfro.sequence_nbr ) from  hygf_financing_rectification_order hfro where  hfro.peasant_household_id = hph.sequence_nbr  )orderNum,
         (select CONCAT_WS(',',instance_id,node_routing) instanceId FROM  hygf_financing_auditing  WHERE hygf_financing_auditing.peasant_household_id = hph.sequence_nbr ORDER BY rec_date desc limit 1) instanceId,
         hygf_unit_info.head_name responsibleUserName,
-        hygf_unit_info.head_phone  responsibleUserPhone
+        hygf_unit_info.head_phone  responsibleUserPhone,
+        hph.regional_companies_code,
+        hph.developer_code
         FROM
         `hygf_peasant_household` hph
         LEFT JOIN hygf_financing_info info ON info.peasant_household_id = hph.sequence_nbr
@@ -37,7 +39,8 @@
                 and info.status = #{params.status}
             </if>
         </where>
-        order by info.rec_date desc
+        ORDER BY
+        info.rec_date DESC ,hph.sequence_nbr ASC ) as sta
     </select>
     <select id="selectDataInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto">
         SELECT

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.FinancingAuditEnum;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
@@ -237,6 +238,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto,Finan
             LambdaQueryWrapper<FinancingInfo> info = new LambdaQueryWrapper<>();
             info.eq(FinancingInfo::getPeasantHouseholdId, financingAuditing.getPeasantHouseholdId());
             FinancingInfo financingInfo = this.getBaseMapper().selectOne(info);
+            if (params.containsKey("financingCompaniesSeq")){
+                financingInfo.setFinancingCompaniesSeq(Long.valueOf(params.get("financingCompaniesSeq").toString()));
+            }
             //标识对于整改待推送状态
             if (params.containsKey("isZG")) {
                 financingInfo.setStatus("整改待推送");

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

@@ -67,7 +67,7 @@ public class FinancingRectificationOrderServiceImpl extends BaseService<Financin
         FinancingInfoDto financingInfoDto = financingInfoServiceImpl.selectDataInfo(model.getPeasantHouseholdId());
 
 
-        if (model.getRectificationStatus().equals("整改完成")){
+        if (model.getRectificationStatus().equals("整改已完成")){
             financingInfoServiceImpl.execueFlow(MapBuilder.<String,Object>create().put("instanceId",financingInfoDto.getInstanceId()).put("approvalStatus","0").put("isZG","1").build());
         }else {
             financingInfoDto.setStatus(model.getRectificationStatus());