提交代码

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java

@@ -282,4 +282,7 @@ public class PeasantHousehold extends BaseEntity {
     @ApiModelProperty(value = "省份",example = "北京市")
     @TableField(exist = false)
     private String province;
+
+    @TableField(exist = false)
+    private String powerStationConstructionStatus;
 }

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

@@ -8,7 +8,8 @@
         hygf_peasant_household.*,
         hygf_peasant_household.sequence_nbr stationId,
         hygf_commercial.scale,
-        hygf_power_station_engineering_info.real_scale as realScale
+        hygf_power_station_engineering_info.real_scale as realScale,
+        hygf_work_order_power_station.power_station_construction_status as powerStationConstructionStatus
     FROM
         hygf_work_order_power_station
         LEFT JOIN hygf_peasant_household ON hygf_work_order_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr

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

@@ -693,6 +693,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
         {
             if(dto.getMediumId()!=null&&"二类卡".equals(dto.getType()))
             {
+                //并发处理
                 CompletableFuture<Void> fan = CompletableFuture.supplyAsync(() -> {
                     SettlementAccountBalanceQueryResponseV1 res= (SettlementAccountBalanceQueryResponseV1) this.balanceQuery(dto.getMediumId());
                     if(res.isSuccess())

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

@@ -108,8 +108,8 @@ public class StatisticsHomepageServiceImpl {
         List<String> workOrder = new ArrayList<>(Arrays.asList("未通过","施工资料上传","完工登记","经销商工程待审核","片区运营待审核","工程待审核","设计待审核","已完成","整改待审核" ,"待整改"));
         List<String> preparationMoneyKeys = new ArrayList<>(Arrays.asList("待发货","已收货","待收货"));
         List<String> desionKeys = new ArrayList<>(Arrays.asList("施工图已上传","典设图已上传"));
-        List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","审核中","已完成","未通过","整改待审核" ,"待整改"));
-        List<String> acceptanceKeys = new ArrayList<>(Arrays.asList("待提交","已完成","审核中","整改待审核","待整改","未通过"));
+        List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","片区运营待审核","设计待审核/工程待审核","设计待审核","工程待审核","已完成","未通过","整改待审核" ,"待整改"));
+        List<String> acceptanceKeys = new ArrayList<>(Arrays.asList("待提交","已完成","片区运营待审核","投融待审核/法务待审核","投融待审核","法务待审核","资产待审核","整改待审核","待整改","未通过"));
         List<String> financingKeys = new ArrayList<>(Arrays.asList("未通过","已放款","放款完成","已推送","待推送","待放款"));
         List<Map<String, Object>> list = new ArrayList<>();
         switch(type){
@@ -240,7 +240,7 @@ public class StatisticsHomepageServiceImpl {
                             iterator1.remove();
                         }
                     }
-                    maps.add(MapBuilder.<String, Object>create().put("statusText", "审核中").put("total", total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
+                   // maps.add(MapBuilder.<String, Object>create().put("statusText", "审核中").put("total", total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
                     differenceValue(maps,gridKeys);
                     resultMap.put("grid",maps);
                 }
@@ -261,7 +261,7 @@ public class StatisticsHomepageServiceImpl {
                             iterator2.remove();
                         }
                     }
-                    maps.add(MapBuilder.<String, Object>create().put("statusText","审核中").put("total",total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
+                    //maps.add(MapBuilder.<String, Object>create().put("statusText","审核中").put("total",total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
                     differenceValue(maps,acceptanceKeys);
                     resultMap.put("acceptance",maps);
                 }
@@ -622,8 +622,6 @@ public class StatisticsHomepageServiceImpl {
 
 
          }
-
-
          return resultMap;
 
     }

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

@@ -2095,7 +2095,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 				webConstuctionData.getWebConstuctionDataBaseInfo().setConstructionStatus(powerStationConstructionData.getConstructionStatus());
 			}
 		}
-		webConstuctionData.getWebConstuctionDataAttachment().setCommitFlow(false);
+		//webConstuctionData.getWebConstuctionDataAttachment().setCommitFlow(false);
 		return webConstuctionData;
 	}
 }
\ No newline at end of file