Merge remote-tracking branch 'origin/developer' into developer

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

@@ -53,8 +53,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         hygf_peasant_household.project_address_name  as sequenceNbr,
         hygf_peasant_household.preparation_money_state preparationMoneyState,
         hygf_document_station.preparation_money_id as preparationMoneyId,
-        hygf_power_station.process_instance_id as instanceId
-        from
+        (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
         hygf_peasant_household
         LEFT JOIN hygf_document_station on  hygf_peasant_household.sequence_nbr =   hygf_document_station.station_id
         LEFT JOIN hygf_power_station on hygf_peasant_household.sequence_nbr = hygf_power_station.peasant_household_id
@@ -80,7 +79,6 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
 
 
         </where>
-
-
-    </select>
+        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

@@ -241,11 +241,16 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
         if (!CollectionUtils.isEmpty(financingInfos)) {
             FinancingInfo financingInfo = financingInfos.get(0);
-            financingInfo.setStatus("待推送");
-            financingInfo.setFinancingCompaniesCode(null);
-            financingInfo.setFinancingCompaniesSeq(null);
-            financingInfo.setFinancingCompaniesName(null);
-            this.updateById(financingInfo);
+
+            LambdaQueryWrapper<FinancingAuditing> wrapper = new LambdaQueryWrapper();
+            wrapper.eq(FinancingAuditing::getPeasantHouseholdId,financingInfo.getPeasantHouseholdId());
+            financingAuditingService.getBaseMapper().delete(wrapper);
+
+            LambdaQueryWrapper<FinancingRectificationOrder> wrapper1 = new LambdaQueryWrapper();
+            wrapper1.eq(FinancingRectificationOrder::getPeasantHouseholdId,financingInfo.getPeasantHouseholdId());
+            financingRectificationOrderService.getBaseMapper().delete(wrapper1);
+
+            this.deleteBySeq(financingInfo.getSequenceNbr());
         }
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application.properties

-spring.application.name=AMOS-JXIOP-BIGSCREEN-WJ
+spring.application.name=AMOS-JXIOP-BIGSCREEN-CZ
 server.servlet.context-path=/jxiop-bigscreen
 server.port=33300
 server.uri-encoding=UTF-8
@@ -86,4 +86,5 @@ moon.power.generation.cron=0 0/1 * * * ?
 year.power.generation.cron=0 0/1 * * * ?
 
 large.cron=0 0/5 * * * ?
+forecast.url=http://10.20.1.29:8095/offline/time-series/decomposition