投融资退回整改

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

@@ -46,11 +46,12 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         hygf_peasant_household.owners_name as ownersName,
         hygf_peasant_household.regional_companies_name as regionalCompaniesName,
         hygf_peasant_household.regional_companies_seq as regionalCompaniesSeq,
+        hygf_peasant_household.regional_companies_code ,
+        hygf_peasant_household.developer_code,
         hygf_peasant_household.developer_name as developerName,
         hygf_peasant_household.developer_id as developeId,
         hygf_peasant_household.sequence_nbr  as sequenceNbr,
         concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) as address,
-        hygf_peasant_household.project_address_name  as sequenceNbr,
         hygf_peasant_household.preparation_money_state preparationMoneyState,
         hygf_document_station.preparation_money_id as preparationMoneyId,
         (select instance_id from hygf_preparation_money_auditing where hygf_document_station.preparation_money_id = hygf_preparation_money_auditing.preparation_money_id limit 1) as instanceId        from
@@ -76,9 +77,8 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         <if test=" preparationMoneyState == 1 ">
             and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
-
-
         </where>
+        GROUP BY  hygf_peasant_household.sequence_nbr
         order by hygf_peasant_household.sequence_nbr DESC
 </select>
 </mapper>

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

@@ -282,6 +282,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             map.put("isFlag", params.get("isFlag"));
             if (params.get("isFlag").equals("1")) {
                 params.put("comments", "退回整改");
+                params.put("approvalStatus",params.getOrDefault("problemDescription",""));
             }
         } else {
             task.setResultCode("approvalStatus");