代扣优化项 批量生成 批量上传 采集问题处理

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -200,8 +200,16 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 				} else {
 					jpStation.setMonthGenerate(golangStationDetail.getMonthenergy());
 				}
-				jpStation.setYearGenerate(golangStationDetail.getYearenergy() * GoLangConstant.mwhTokwh);
-				jpStation.setAccumulatedPower(golangStationDetail.getAllenergy() * GoLangConstant.mwhTokwh);
+				if (!golangStationDetail.getYearenergystr().toLowerCase().equals("kwh")) {
+					jpStation.setYearGenerate(golangStationDetail.getYearenergy() * GoLangConstant.mwhTokwh);
+				} else {
+					jpStation.setYearGenerate(golangStationDetail.getYearenergy());
+				}
+				if (!golangStationDetail.getAllenergystr().toLowerCase().equals("kwh")) {
+					jpStation.setAccumulatedPower(golangStationDetail.getAllenergy() * GoLangConstant.mwhTokwh);
+				} else {
+					jpStation.setAccumulatedPower(golangStationDetail.getAllenergy() );
+				}
 				jpStation.setDayIncome(golangStationDetail.getDayincome());
 				jpStation.setMonthIncome(golangStationDetail.getMonthincome());
 				jpStation.setYearIncome(golangStationDetail.getYearincome());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/SunlightServiceImpl.java

@@ -283,8 +283,14 @@ public class SunlightServiceImpl implements SunlightService {
 				if (map5 != null && map5.get("unit") != null && !map5.get("unit").isEmpty()
 						&& !"--".equals(map5.get("value"))) {
 					if (!map5.get("unit").equals("")){
-						jpStation.setCumulativeIncome(SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
-								* Double.valueOf(String.valueOf(map5.get("value"))));// 累计收益
+						try {
+							jpStation.setCumulativeIncome(SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
+									* Double.valueOf(String.valueOf(map5.get("value"))));// 累计收益
+						}catch (Exception e){
+							//此处出现异常 直接赋值0.0 异常原因基本为厂商赋值问题
+							jpStation.setCumulativeIncome(0.0);
+						}
+
 					}else {
 						jpStation.setCumulativeIncome(0.0);
 					}

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

@@ -279,7 +279,7 @@
         WHEN info.`status` = '审核通过' THEN
         '待放款'
         WHEN info.`status` = '待融资审核' THEN
-        '待审核'
+        '已推送'
         WHEN info.`status` = '审核不通过' or info.`status` = '重新验收' THEN
         '未通过'
         WHEN info.`status` = '放款完成' THEN

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/IcbcWithholdController.java

@@ -208,9 +208,9 @@ public class IcbcWithholdController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = " 聚富通代扣信息文件批量上传",   notes = " 聚富通代扣信息文件批量上传")
 	@GetMapping(value = "/sftpUploadAndUnzipFiles")
 	@Transactional
-	public ResponseModel sftpUploadAndUnzipFiles(List<Long> ids) throws Exception {
+	public ResponseModel sftpUploadAndUnzipFiles(IcbcWithholdDto model) throws Exception {
 		ReginParams reginParams = getSelectedOrgInfo();
-		icbcWithholdServiceImpl.sftpUploadAndUnzipFiles(ids,reginParams.getUserModel().getRealName());
+		icbcWithholdServiceImpl.sftpUploadAndUnzipFiles(model.getIds(),reginParams.getUserModel().getRealName());
 		return CommonResponseNewUtil.success();
 	}
 	/**

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

@@ -107,11 +107,11 @@ public class StatisticsHomepageServiceImpl {
         List<String> surveKeys = new ArrayList<>(Arrays.asList("未通过","未勘察","已完成(法务审核)","设计待审核","投融待审核","法务待审核"));
         List<String> contractKeys = new ArrayList<>(Arrays.asList("双方已签署","农户已签署","未签署","已作废"));
         List<String> workOrder = new ArrayList<>(Arrays.asList("未通过","施工资料上传","完工登记","经销商工程待审核","片区运营待审核","工程待审核","设计待审核","已完成","整改待审核" ,"待整改"));
-        List<String> preparationMoneyKeys = 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> financingKeys = new ArrayList<>(Arrays.asList("未通过","已放款","放款完成","待审核","待推送","待放款"));
+        List<String> financingKeys = new ArrayList<>(Arrays.asList("未通过","已放款","放款完成","已推送","待推送","待放款"));
         List<Map<String, Object>> list = new ArrayList<>();
         switch(type){
             case "surey" :