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

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/HouseholdPvApiServiceImpl.java

@@ -51,15 +51,25 @@ public class HouseholdPvApiServiceImpl extends BaseService<HouseholdPvApiDto, Ho
                         .eq("day_time", DateUtil.format(new Date(), "yyyy-MM-dd"))
                         .eq("hour", currentTime)
                         .eq("year_month", DateUtil.format(new Date(), "yyyy-MM")));
+        Long createdTime = System.currentTimeMillis();
+        boolean flag= false;
         if (ObjectUtils.isEmpty(tdHYGFStationDayGenerate)) {
             tdHYGFStationDayGenerate = new TdHYGFStationDayGenerate();
+
+             flag= true;
+        }else {
+            createdTime =  tdHYGFStationDayGenerate.getCreatedTime();
         }
         BeanUtils.copyProperties(tdHYGFStationMonthGenerate,tdHYGFStationDayGenerate);
         tdHYGFStationDayGenerate.setHour(currentTime);
         if (tdHYGFStationDayGenerate.getStationState().equals("离线")){
             tdHYGFStationDayGenerate.setGenerate(null);
         }
-        tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+        if (flag){
+            tdHYGFStationDayGenerate.setCreatedTime(System.currentTimeMillis());
+        }else {
+            tdHYGFStationDayGenerate.setCreatedTime(createdTime);
+        }
         TdHYGFStationDayGenerateMapper.insert(tdHYGFStationDayGenerate);
     }
 

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

@@ -282,8 +282,19 @@ public class SunlightServiceImpl implements SunlightService {
 				Map<String, String> map5 = sunlightDto.getTotal_income();
 				if (map5 != null && map5.get("unit") != null && !map5.get("unit").isEmpty()
 						&& !"--".equals(map5.get("value"))) {
-					jpStation.setCumulativeIncome(SunlightUtil.sy.get(String.valueOf(map5.get("unit")))
-							* Double.valueOf(String.valueOf(map5.get("value"))));// 累计收益
+					if (!map5.get("unit").equals("")){
+						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);
+					}
+
 				}
 
 			} catch (Exception e) {

amos-boot-data/amos-boot-data-housepvapi/src/main/resources/application-dev.properties

 ## DB properties hygf
 ## db1-production database
 spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db1.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+
+spring.db1.datasource.url=jdbc:kingbase8://39.98.224.23:54321/amos_openapi_47?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db1.datasource.username=root
-spring.db1.datasource.password=Yeejoin_1234
-spring.db1.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.db1.datasource.password=Yeejoin@2020
+spring.db1.datasource.driver-class-name=com.kingbase8.Driver
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:mysql://47.92.234.253:13306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:kingbase8://39.98.224.23:54321/amos_project_47?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
-spring.db2.datasource.password=Yeejoin_1234
-spring.db2.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.db2.datasource.password=Yeejoin@2020
+spring.db2.datasource.driver-class-name=com.kingbase8.Driver
 ## db3-taosiData
 spring.db3.datasource.type: com.alibaba.druid.pool.DruidDataSource
 spring.db3.datasource.url=jdbc:TAOS-RS://47.92.234.253:6041/house_pv_data?user=root&password=taosdata&characterEncoding=utf8

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordDTO.java

@@ -180,5 +180,9 @@ public class HygfIcbcRecordDTO  {
         private String realScale;
     }
     @ApiModelProperty (value = "代扣金额")
-    private double paymentAmount;
+    private Double paymentAmount;
+
+
+    @ApiModelProperty (value = "代扣时间")
+    private String  paymentTime;
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordExportDTO.java

@@ -56,7 +56,7 @@ public class HygfIcbcRecordExportDTO  {
     /**
      * 聚富通电子账户账号
      */
-    @ExcelProperty(value = "银行卡号", index = 4)
+    @ExcelProperty(value = "聚富通账户", index = 4)
     @ApiModelProperty (value = "聚富通电子账户账号")
     private String mediumId;
 
@@ -74,7 +74,12 @@ public class HygfIcbcRecordExportDTO  {
     @ApiModelProperty (value = "协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认")
     private String protocolStatus;
 
-
+    /**
+     * 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
+     */
+    @ExcelProperty(value = "扣款总金额（元）", index = 7)
+    @ApiModelProperty (value = "扣款总金额")
+    private double paymentAmount;
 
 
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordQueryDTO.java

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * <p>
  * ProjectName: amos-boot-zx-biz
@@ -44,4 +46,6 @@ public class HygfIcbcRecordQueryDTO {
     private Integer limit;
 
     private Integer offset;
+
+    private List<String> ids;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcWithholdRecordExportDTO.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * (hygf_icbc_record)实体类
+ *
+ * @author yangyang
+ * @description
+ * @since 2024-07-18 11:40:46
+ */
+@Data
+@NoArgsConstructor
+@ApiModel (value = "HygfIcbcRecordExportDTO", description = "聚富通钱包开户DTO")
+public class HygfIcbcWithholdRecordExportDTO {
+
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
+    @ExcelIgnore
+    protected Long sequenceNbr;
+    @ExcelProperty(value = "开户名", index = 0)
+    @ApiModelProperty (value = "开户名")
+    private String custName;
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "项目公司", index = 1)
+    @ApiModelProperty(value = "项目公司")
+    private String regionalCompaniesName;
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "批次号", index = 2)
+    @ApiModelProperty (value = "批次号")
+    private String batchNo;
+
+    /**
+     * 聚富通电子账户账号
+     */
+    @ExcelProperty(value = "聚富通账户", index = 3)
+    @ApiModelProperty (value = "聚富通电子账户账号")
+    private String mediumId;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "扣款金额", index = 4)
+    @ApiModelProperty (value = "扣款金额")
+    private double paymentAmount;
+
+    @ExcelProperty(value = "扣款状态", index = 5)
+    @ApiModelProperty (value = "扣款状态")
+    private String withholdStatus;
+
+    @ExcelProperty(value = "扣款时间", index = 6)
+    @ApiModelProperty (value = "扣款时间")
+    private Date paymentTime;
+
+    @ExcelProperty(value = "操作人", index = 7)
+    @ApiModelProperty (value = "操作人")
+    private String uploader;
+
+    @ExcelProperty(value = "说明", index =8)
+    @ApiModelProperty (value = "说明")
+    private String desc;
+
+
+
+
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/IcbcExcelDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="IcbcExcelDto", description=" 聚富通导出ExcelDto类")
+public class IcbcExcelDto {
+    @ApiModelProperty("选中的主键")
+    private List<String> sequenceNbrList;
+    @ApiModelProperty("上传人员")
+    private String uploader;
+    @ApiModelProperty("上传时间(开始时间)")
+    private String uploadStartTime;
+    @ApiModelProperty("上传时间(结束时间)")
+    private String uploadEndTime;
+    @ApiModelProperty("上传状态")
+    private String uploadStatus;
+    @ApiModelProperty("确认人员")
+    private String confirmator;
+    @ApiModelProperty("确认时间(开始时间)")
+    private String confirmationStartTime;
+    @ApiModelProperty("确认时间(结束时间)")
+    private String confirmationEndTime;
+    @ApiModelProperty("代扣状态")
+    private String withholdStatus;
+    @ApiModelProperty("说明")
+    private String desc;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/IcbcWithholdDto.java

@@ -83,4 +83,6 @@ public class IcbcWithholdDto  extends BaseDto {
     @ApiModelProperty(value = "付款信息")
     private List<HygfIcbcRecordDTO> recordDTOS;
 
+    private List<Long> ids;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/IcbcWithholdRecordDto.java

@@ -101,6 +101,8 @@ public class IcbcWithholdRecordDto extends BaseDto {
     private String outUserId;
     @ExcelIgnore
     private String amosUserId;
+    @ExcelIgnore
+    private String contentText;
 
     @ExcelIgnore
     private String regionalCompaniesCode;

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

@@ -114,7 +114,7 @@ public class IcbcWithhold extends BaseEntity {
     private String paymentErrorDesc;
 
     /**
-     * 户主icbcid
+     * 户主icbcid 弃用冗余  传递导出参数使用
      */
 	@TableField("icbc_id")
     private String icbcId;

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

@@ -101,6 +101,12 @@ public class IcbcWithholdRecord extends BaseEntity {
     private String regionalCompaniesName;
 
     /*
+     * 备注
+     * */
+    @TableField("content_text")
+    private String contentText;
+
+    /*
      *
      * */
     @TableField("phone")

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

@@ -29,7 +29,12 @@ public interface HygfIcbcRecordMapper extends BaseMapper<HygfIcbcRecord> {
 
     @UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<HygfIcbcRecordDTO> pageList(@Param ("param") HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO);
+    @UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
+    List<HygfIcbcRecordDTO> pageListSum(@Param ("param") HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO);
 
     @UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<HygfIcbcRecordExportDTO> exportTotal(String developerCode, String regionalCompaniesCode, String province, String city, String district);
+
+    @UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
+    List<HygfIcbcRecordExportDTO> paymentAmountExport(@Param ("param") HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO);
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.IcbcExcelDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.IcbcWithholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.IcbcWithhold;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiParam;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +18,10 @@ import java.util.List;
 public interface IcbcWithholdMapper extends BaseMapper<IcbcWithhold> {
 
     public List<IcbcWithholdDto> queryForIcbcWithholdPage( String uploader, String uploadStartTime,  String uploadEndTime, String uploadStatus, String confirmator, String confirmationStartTime,  String confirmationEndTime,String desc, String withholdStatus);
+
+    public  IcbcWithholdDto  queryForIcbcWithholdAoumont( String uploader, String uploadStartTime,  String uploadEndTime, String uploadStatus, String confirmator, String confirmationStartTime,  String confirmationEndTime,String desc, String withholdStatus);
+
+    List<IcbcWithholdDto> queryForIcbcWithhold(@Param("dto") IcbcExcelDto icbcExcelDto);
+
+    List<IcbcWithholdDto> queryForIcbcWithholdBySequenceNbrs(@Param("list") List<String> sequenceNbrList);
 }

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

@@ -18,4 +18,8 @@ import java.util.List;
 public interface IcbcWithholdRecordMapper extends BaseMapper<IcbcWithholdRecord> {
     @UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and",specific=false)
     List<IcbcWithholdRecordDto> exportTotal(String developerCode, String regionalCompaniesCode, String province, String city, String district, String year, String month, List<String> quarters, @Param("dto")IcbcWithholdRecordDto dto);
+
+
+    @UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and",specific=false)
+    List<IcbcWithholdRecordDto> exportData( @Param("dto")IcbcWithholdRecordDto dto);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/SFTPUtil.java

@@ -316,7 +316,7 @@ public class SFTPUtil {
 //        return success;
 //    }
 
-    public boolean downloadAndZipFiles(String remotePath, String filenamePattern, String localZipPath) {
+    public boolean downloadAndZipFiles(String remotePath, String filenamePattern, String localZipPath,Boolean flag) {
         boolean success = false;
         Path tempDir = null;
         try {
@@ -336,7 +336,10 @@ public class SFTPUtil {
                     downloadedFiles.add(localFilePath);
                 }
             }
-            disconnect();
+            if (flag){
+                disconnect();
+            }
+
             // 确保本地ZIP路径的父目录存在
             Path localZipFilePath = Paths.get(localZipPath);
             Path parentDir = localZipFilePath.getParent();

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

@@ -105,7 +105,9 @@
         icbc.medium_id,
         ph.rec_date,
         ph.regional_companies_name as regionalCompaniesName,
-        ph.regional_companies_code as regionalCompaniesCode
+        ph.regional_companies_code as regionalCompaniesCode,
+        wr.paymentAmount,
+        wr.payment_time as paymentTime
         FROM
         (
         SELECT
@@ -122,6 +124,7 @@
         FROM hygf_peasant_household GROUP BY amos_user_id
         ) ph
         LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
+        LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
         <where>
              ph.is_delete = 0
             <if test="param.custName != null and param.custName != ''">
@@ -158,6 +161,71 @@
         ph.rec_date DESC
     </select>
 
+    <select id="pageListSum" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO">
+        SELECT
+        icbc.sequence_nbr,
+        ifnull( icbc.cust_name, ph.owners_name ) AS custName,
+        ifnull( icbc.phone, ph.telephone ) AS phone,
+        ifnull( icbc.id_card, ph.id_card ) AS idCard,
+        ph.amos_user_id,
+        icbc.open_account_status,
+        icbc.out_user_id as outUserId,
+        icbc.protocol_status,
+        icbc.medium_id,
+        ph.rec_date,
+        ph.regional_companies_name as regionalCompaniesName,
+        ph.regional_companies_code as regionalCompaniesCode,
+        wr.paymentAmount,
+        wr.payment_time as paymentTime
+        FROM
+        (
+        SELECT
+        amos_user_id,
+        MAX(developer_code)  AS developer_code,
+        MAX(regional_companies_code ) AS regional_companies_code ,
+        MAX(is_delete) AS is_delete,
+		MAX(owners_name) AS owners_name,
+		MAX(telephone) AS telephone,
+		MAX(id_card) AS id_card,
+		MAX(regional_companies_name) AS regional_companies_name,
+		MAX(project_address) AS project_address,
+		MAX(rec_date)  AS rec_date
+        FROM hygf_peasant_household GROUP BY amos_user_id
+        ) ph
+        LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
+        LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
+        <where>
+             ph.is_delete = 0
+            <if test="param.custName != null and param.custName != ''">
+                AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR icbc.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
+            </if>
+            <if test="param.idCard != null and param.idCard != ''">
+                AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
+            </if>
+            <if test="param.phone != null and param.phone != ''">
+                AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
+            </if>
+            <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
+                AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+            </if>
+            <if test="param.addressName != null and param.addressName != ''">
+                AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
+            </if>
+            <if test="param != null">
+                <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
+                    <if test="param.openAccountStatus != '00'">
+                        AND icbc.open_account_status = #{param.openAccountStatus}
+                    </if>
+                    <if test="param.openAccountStatus == '00'">
+                        AND (icbc.open_account_status = #{param.openAccountStatus} OR icbc.open_account_status is null)
+                    </if>
+                </if>
+
+            </if>
+        </where>
+
+    </select>
+
     <select id="exportTotal" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordExportDTO">
         SELECT
         MAX(ph.owners_name) AS custName,
@@ -180,10 +248,13 @@
         '待短信确认' ELSE''
         END
         ) AS protocolStatus,
-        MAX( CASE re.open_account_status WHEN 02 THEN '开户成功' WHEN 03 THEN '开户失败' ELSE'未开户' END ) AS openAccountStatus
+        MAX( CASE re.open_account_status WHEN 02 THEN '开户成功' WHEN 03 THEN '开户失败' ELSE'未开户' END ) AS openAccountStatus,
+        SUM(iw.payment_amount)    as paymentAmount
         FROM
         `hygf_peasant_household` ph
         LEFT JOIN hygf_icbc_record re ON re.amos_user_id = ph.amos_user_id
+        LEFT JOIN hygf_icbc_withhold_record iw ON re.amos_user_id = iw.amos_user_id
+
         <where>
             <if test="developerCode != null and developerCode != ''">
                 AND ph.developer_code = #{developerCode}
@@ -204,4 +275,80 @@
         GROUP BY
         ph.amos_user_id
     </select>
+
+    <select id="paymentAmountExport" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordExportDTO">
+        SELECT
+        MAX(ph.owners_name) AS custName,
+        MAX(ph.telephone) AS phone,
+        MAX(ph.id_card) AS idCard,
+        MAX(ph.regional_companies_name) AS regionalCompaniesName,
+        MAX(re.medium_id) AS mediumId,
+        MAX(
+        CASE re.protocol_status
+        WHEN 0 THEN '未生效'
+        WHEN 1 THEN '已生效'
+        WHEN 2 THEN '过期'
+        WHEN 3 THEN '作废'
+        WHEN 4 THEN '待短信确认'
+        ELSE ''
+        END
+        ) AS protocolStatus,
+        MAX(
+        CASE re.open_account_status
+        WHEN '02' THEN '开户成功'
+        WHEN '03' THEN '开户失败'
+        ELSE '未开户'
+        END
+        ) AS openAccountStatus,
+        pa.paymentAmount AS paymentAmount
+        FROM
+        `hygf_peasant_household` ph
+        LEFT JOIN
+        hygf_icbc_record re ON re.amos_user_id = ph.amos_user_id
+        LEFT JOIN(   SELECT
+        iw.amos_user_id,
+        SUM(iw.payment_amount) AS paymentAmount
+        FROM
+        hygf_icbc_withhold_record iw
+        WHERE
+        iw.withhold_status = '成功'
+        GROUP BY
+        iw.amos_user_id) pa ON pa.amos_user_id = ph.amos_user_id
+        <where>
+            <if test="param.custName != null and param.custName != ''">
+                AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR re.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
+            </if>
+            <if test="param.idCard != null and param.idCard != ''">
+                AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
+            </if>
+            <if test="param.phone != null and param.phone != ''">
+                AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
+            </if>
+            <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
+                AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+            </if>
+            <if test="param.addressName != null and param.addressName != ''">
+                AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
+            </if>
+            <if test="param.ids != null and param.ids.size() > 0">
+                AND ph.amos_user_id in
+                <foreach collection="param.ids" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param != null">
+                <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
+                    <if test="param.openAccountStatus != '00'">
+                        AND re.open_account_status = #{param.openAccountStatus}
+                    </if>
+                    <if test="param.openAccountStatus == '00'">
+                        AND (re.open_account_status = #{param.openAccountStatus} OR re.open_account_status is null)
+                    </if>
+                </if>
+
+            </if>
+        </where>
+        GROUP BY
+        ph.amos_user_id, pa.paymentAmount;
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -39,4 +39,94 @@
         order by hygf_icbc_withhold.sequence_nbr desc
     </select>
 
+
+
+    <select id="queryForIcbcWithholdAoumont" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.IcbcWithholdDto">
+        select sum(payment_amount) paymentAmount
+        from hygf_icbc_withhold
+        <where>
+            is_delete = 0
+            <if test="uploader != null and uploader != ''">
+                and uploader like concat('%',#{uploader},'%')
+            </if>
+            <if test="uploadStartTime != null and uploadStartTime != ''">
+                and upload_time  > #{uploadStartTime}
+            </if>
+            <if test="uploadEndTime != null and uploadEndTime != ''">
+                and upload_time <![CDATA[<]]> #{uploadEndTime}
+            </if>
+            <if test="uploadStatus != null and uploadStatus != ''">
+                and upload_status  = #{uploadStatus}
+            </if>
+            <if test="withholdStatus != null and withholdStatus != ''">
+                and withhold_status  = #{withholdStatus}
+            </if>
+            <if test="confirmator != null and confirmator != ''">
+                and confirmator like concat('%',#{confirmator},'%')
+            </if>
+            <if test="desc != null and desc != ''">
+                and content like concat('%',#{desc},'%')
+            </if>
+            <if test="confirmationStartTime != null and confirmationStartTime != ''">
+                and confirmation_time  > #{confirmationStartTime}
+            </if>
+            <if test="confirmationEndTime != null and confirmationEndTime != ''">
+                and confirmation_time   <![CDATA[<]]> #{confirmationEndTime}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryForIcbcWithhold" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.IcbcWithholdDto">
+        select *,
+        content as desc
+        from hygf_icbc_withhold
+        <where>
+            is_delete = 0
+            <if test="dto.uploader != null and dto.uploader != ''">
+                and uploader like concat('%',#{dto.uploader},'%')
+            </if>
+            <if test="dto.uploadStartTime != null and dto.uploadStartTime != ''">
+                and upload_time  > #{dto.uploadStartTime}
+            </if>
+            <if test="dto.uploadEndTime != null and dto.uploadEndTime != ''">
+                and upload_time <![CDATA[<]]> #{dto.uploadEndTime}
+            </if>
+            <if test="dto.uploadStatus != null and dto.uploadStatus != ''">
+                and upload_status  = #{dto.uploadStatus}
+            </if>
+            <if test="dto.withholdStatus != null and dto.withholdStatus != ''">
+                and withhold_status  = #{dto.withholdStatus}
+            </if>
+            <if test="dto.confirmator != null and dto.confirmator != ''">
+                and confirmator like concat('%',#{dto.confirmator},'%')
+            </if>
+            <if test="dto.desc != null and dto.desc != ''">
+                and content like concat('%',#{dto.desc},'%')
+            </if>
+            <if test="dto.confirmationStartTime != null and dto.confirmationStartTime != ''">
+                and confirmation_time  > #{dto.confirmationStartTime}
+            </if>
+            <if test="dto.confirmationEndTime != null and dto.confirmationEndTime != ''">
+                and confirmation_time   <![CDATA[<]]> #{dto.confirmationEndTime}
+            </if>
+
+        </where>
+        order by hygf_icbc_withhold.sequence_nbr desc
+    </select>
+
+    <select id="queryForIcbcWithholdBySequenceNbrs"
+            resultType="com.yeejoin.amos.boot.module.hygf.api.dto.IcbcWithholdDto">
+        select *,
+        content as desc
+        from hygf_icbc_withhold
+        <where>
+            sequence_nbr in
+            <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </where>
+        order by hygf_icbc_withhold.sequence_nbr desc
+    </select>
+
 </mapper>

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

@@ -137,4 +137,45 @@
         ORDER BY
         re.rec_date DESC
     </select>
+    <select id="exportData" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.IcbcWithholdRecordDto">
+        SELECT
+        re.*
+        FROM
+        (
+        SELECT
+        amos_user_id,
+        MAX(developer_code)  AS developer_code,
+        MAX(regional_companies_code ) AS regional_companies_code ,
+        MAX(is_delete) AS is_delete,
+        MAX(owners_name) AS owners_name,
+        MAX(telephone) AS telephone,
+        MAX(id_card) AS id_card,
+        MAX(regional_companies_name) AS regional_companies_name,
+        MAX(project_address) AS project_address,
+        MAX(rec_date)  AS rec_date
+        FROM hygf_peasant_household GROUP BY amos_user_id
+        ) ph
+        LEFT JOIN hygf_icbc_withhold_record re ON ph.amos_user_id = re.amos_user_id
+        <where>
+            ph.is_delete = 0
+            <if test="dto.amosUserId != null and dto.amosUserId != ''">
+                AND re.amos_user_id = #{dto.amosUserId}
+            </if>
+            <if test="dto.batchNo != null and dto.batchNo != ''">
+                AND re.batch_no like concat('%',#{dto.batchNo},'%')
+            </if>
+            <if test="dto.withholdStatus != null and dto.withholdStatus != ''">
+                AND re.withhold_status = #{dto.withholdStatus}
+            </if>
+            <if test="dto.paymentStartTime != null and dto.paymentStartTime != ''">
+                AND re.payment_time > #{dto.paymentStartTime}
+            </if>
+            <if test="dto.paymentEndTime != null and dto.paymentEndTime != ''">
+                AND re.payment_time <![CDATA[<]]> #{dto.paymentEndTime}
+            </if>
+        </where>
+        ORDER BY
+        re.rec_date DESC
+    </select>
+
 </mapper>

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

@@ -50,9 +50,9 @@
         hjc.collector_sn_code,
         hjc.update_time,
         hjc.current_power,
-        CAST( (FLOOR(hjc.day_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as dayPowerGeneration,
-        CAST( (FLOOR(hjc.month_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as monthPowerGeneration,
-        CAST( (FLOOR(hjc.year_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as yearPowerGeneration,
+        ROUND(hjc.day_power_generation ,3) as dayPowerGeneration,
+        ROUND(hjc.month_power_generation ,3) as monthPowerGeneration,
+        ROUND(hjc.year_power_generation ,3) as yearPowerGeneration,
         hjc.brand,
         hjc.model,
         hjc.national_standard,
@@ -64,7 +64,7 @@
         hjc.AFCI_version,
         hjc.ID,
         hjc.capacity,
-        CAST( (FLOOR(hjc.total_power_generation/1000 * 1000) / 1000) AS DECIMAL(20, 3)) as totalPowerGeneration,
+        ROUND(hjc.total_power_generation/1000 ,3) as totalPowerGeneration,
         hjc.third_station_id,
         hjc.is_delete,
         hjc.third_code,

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

@@ -33,13 +33,13 @@
         `day_power_use` dayPowerUse,
         `month_power_use` monthPowerUse,
         `year_power_use` yearPowerUse,
-        CAST( (FLOOR(`real_time_power` * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
-        CAST( (FLOOR(`accumulated_power`/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
+        ROUND(`real_time_power` ,3) realTimePower,
+        ROUND(`accumulated_power`/1000 ,3) accumulatedPower,
         `state` ,
         `type`,
         `organizational_code` organizationalCode,
         `is_delete` isDelete,
-        CAST( (FLOOR(`day_generate` * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
+        ROUND(`day_generate` ,3) dayGenerate,
         `month_generate` monthGenerate,
         `year_generate` yearGenerate,
         `day_income` dayIncome,
@@ -93,20 +93,20 @@
 
 
         select
-        CAST( (FLOOR(sum(real_time_power) * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
-        CAST( (FLOOR(sum(capacity)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
-        CAST( (FLOOR(sum(day_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
-        CAST( (FLOOR(sum(month_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
-        CAST( (FLOOR(sum(year_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
-        CAST( (FLOOR(sum(accumulated_power)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
-        CAST( (FLOOR( sum(day_income) * 1000) / 1000) AS DECIMAL(20, 3)) dayIncome,
-        CAST( (FLOOR(sum(month_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) monthIncome,
-        CAST( (FLOOR(sum(year_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) yearIncome,
-        CAST( (FLOOR(sum(cumulative_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) cumulativeIncome,
-        CAST( (FLOOR(sum(day_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayPowerUse,
-        CAST( (FLOOR(sum(month_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthPowerUse,
-        CAST( (FLOOR(sum(year_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearPowerUse,
-        CAST( (FLOOR(sum(rated_power) * 1000) / 1000) AS DECIMAL(20, 3)) ratedPower,
+        ROUND(sum(real_time_power) ,3) realTimePower,
+        ROUND(sum(capacity)/1000 ,3) capacity,
+        ROUND(sum(day_generate)/1000 ,3) dayGenerate,
+        ROUND(sum(month_generate)/1000 ,3) monthGenerate,
+        ROUND(sum(year_generate)/1000 ,3) yearGenerate,
+        ROUND(sum(accumulated_power)/1000 ,3) accumulatedPower,
+        ROUND( sum(day_income) ,3) dayIncome,
+        ROUND(sum(month_income)/10000 ,3) monthIncome,
+        ROUND(sum(year_income)/10000 ,3) yearIncome,
+        ROUND(sum(cumulative_income)/10000 ,3) cumulativeIncome,
+        ROUND(sum(day_power_use)/1000 ,3) dayPowerUse,
+        ROUND(sum(month_power_use)/1000 ,3) monthPowerUse,
+        ROUND(sum(year_power_use)/1000 ,3) yearPowerUse,
+        ROUND(sum(rated_power) ,3) ratedPower,
         count(*) countBuiltNum
         from hygf_jp_station
         <where>
@@ -380,20 +380,20 @@
 
     <select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
         select
-        CAST( (FLOOR(sum(real_time_power) * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
-        CAST( (FLOOR(sum(capacity)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
-        CAST( (FLOOR(sum(day_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
-        CAST( (FLOOR(sum(month_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
-        CAST( (FLOOR(sum(year_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
-        CAST( (FLOOR(sum(accumulated_power)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
-        CAST( (FLOOR( sum(day_income) * 1000) / 1000) AS DECIMAL(20, 3)) dayIncome,
-        CAST( (FLOOR(sum(month_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) monthIncome,
-        CAST( (FLOOR(sum(year_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) yearIncome,
-        CAST( (FLOOR(sum(cumulative_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) cumulativeIncome,
-        CAST( (FLOOR(sum(day_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayPowerUse,
-        CAST( (FLOOR(sum(month_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthPowerUse,
-        CAST( (FLOOR(sum(year_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearPowerUse,
-        CAST( (FLOOR(sum(rated_power) * 1000) / 1000) AS DECIMAL(20, 3)) ratedPower,
+        ROUND(sum(real_time_power) ,3) realTimePower,
+        ROUND(sum(capacity)/1000 ,3) capacity,
+        ROUND(sum(day_generate)/1000 ,3) dayGenerate,
+        ROUND(sum(month_generate)/1000 ,3) monthGenerate,
+        ROUND(sum(year_generate)/1000 ,3) yearGenerate,
+        ROUND(sum(accumulated_power)/1000 ,3) accumulatedPower,
+        ROUND( sum(day_income) ,3) dayIncome,
+        ROUND(sum(month_income)/10000 ,3) monthIncome,
+        ROUND(sum(year_income)/10000 ,3) yearIncome,
+        ROUND(sum(cumulative_income)/10000 ,3) cumulativeIncome,
+        ROUND(sum(day_power_use)/1000 ,3) dayPowerUse,
+        ROUND(sum(month_power_use)/1000 ,3) monthPowerUse,
+        ROUND(sum(year_power_use)/1000 ,3) yearPowerUse,
+        ROUND(sum(rated_power) ,3) ratedPower,
         count(*) countBuiltNum
         from hygf_jp_station
         <where>
@@ -646,7 +646,7 @@
         hjs.regional_companies_code,
         hjs.amos_company_code,
         hjs.sn_code snCode,
-        CAST( (FLOOR(hjs.capacity * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
+        ROUND(hjs.capacity ,3) capacity,
         hjs.name ,
         hjs.code ,
         hjs.system_code systemCode,
@@ -668,15 +668,15 @@
         hjs.day_power_use dayPowerUse,
         hjs.month_power_use monthPowerUse,
         hjs.year_power_use yearPowerUse,
-        CAST( (FLOOR(hjs.real_time_power * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
-        CAST( (FLOOR(hjs.accumulated_power/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
+        ROUND(hjs.real_time_power ,3) realTimePower,
+        ROUND(hjs.accumulated_power/1000 ,3) accumulatedPower,
         hjs.state,
         hjs.type,
         hjs.organizational_code organizationalCode,
         hjs.is_delete isDelete,
-        CAST( (FLOOR(hjs.day_generate * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
-        CAST( (FLOOR(hjs.month_generate * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
-        CAST( (FLOOR(hjs.year_generate * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
+        ROUND(hjs.day_generate ,3) dayGenerate,
+        ROUND(hjs.month_generate ,3) monthGenerate,
+        ROUND(hjs.year_generate ,3) yearGenerate,
         hjs.day_income dayIncome,
         hjs.month_income monthIncome,
         hjs.year_income yearIncome,
@@ -684,7 +684,7 @@
         hjs.cumulative_income cumulativeIncome,
         hjs.email,
         hjs.rated_power ratedPower,
-        CAST( (FLOOR(hjs.day_generate/hjs.capacity * 1000) / 1000) AS DECIMAL(20, 3)) fullhour,
+        ROUND(hjs.day_generate/hjs.capacity ,3) fullhour,
         (select privilege_company.COMPANY_NAME from privilege_company where
         privilege_company.ORG_CODE=hjs.regional_companies_code) regionalCompaniesName,
         lc.nbqSnCode
@@ -760,11 +760,11 @@
     <!--    code参数为区域公司orgCode或经销商orgCode-->
 <!--    <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">-->
 <!--        SELECT COUNT(*)                    AS powerStationNumber,-->
-<!--               CAST( (FLOOR(SUM(capacity)/1000, 3)     AS totalCapacity,-->
-<!--               CAST( (FLOOR(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
-<!--               CAST( (FLOOR(SUM(rated_power), 3)  AS totalRatedPower,-->
-<!--               CAST( (FLOOR(SUM(real_time_power), 3)  AS totalRealTimePower,-->
-<!--               CAST( (FLOOR(SUM(day_income), 3)   AS totalDayIncome-->
+<!--               ROUND(SUM(capacity)/1000, 3)     AS totalCapacity,-->
+<!--               ROUND(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
+<!--               ROUND(SUM(rated_power), 3)  AS totalRatedPower,-->
+<!--               ROUND(SUM(real_time_power), 3)  AS totalRealTimePower,-->
+<!--               ROUND(SUM(day_income), 3)   AS totalDayIncome-->
 <!--        FROM hygf_jp_station hjs-->
 <!--        <where>-->
 <!--	        <if test="regionCode != null and regionCode !=''">-->
@@ -873,10 +873,10 @@
                 and amos_company_code = #{dto.amosCompanyCode}
             </if>
             <if test="dto.bindType == '未绑定'">
-                and (amos_company_code is null or regional_companies_code is null )
+                and (amos_company_code is null or regional_companies_code is null or amos_company_code='' or regional_companies_code='' )
             </if>
             <if test="dto.bindType == '已绑定'">
-                and (amos_company_code is  not null and regional_companies_code is  not null )
+                and (amos_company_code is  not null and regional_companies_code is  not null and amos_company_code!='' and regional_companies_code!='' )
             </if>
         </where>
         order by sequence_nbr DESC

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/HygfIcbcController.java

@@ -111,7 +111,7 @@ public class HygfIcbcController extends BaseController {
     @GetMapping (value = "/page")
     @ApiOperation (httpMethod = "GET", value = "聚富通电子钱包分页查询", notes = "聚富通电子钱包分页查询")
     @UserLimits
-    public ResponseModel<Page<HygfIcbcRecordDTO>> queryForPage(@ApiParam HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
+    public ResponseModel<Map<String, Object>> queryForPage(@ApiParam HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
         return ResponseHelper.buildResponse(hygfIcbcService.queryForPage(hygfIcbcRecordQueryDTO.getCurrent(), hygfIcbcRecordQueryDTO.getSize(), hygfIcbcRecordQueryDTO));
     }
 
@@ -150,4 +150,14 @@ public class HygfIcbcController extends BaseController {
 
         hygfIcbcService.exportData(response,developerCode,regionalCompaniesCode,province,city,district);
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "聚富通信息",   notes = "聚富通信息")
+    @GetMapping(value = "/exportExcel")
+    @UserLimits
+    public void exportData( HttpServletResponse response,HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
+
+        hygfIcbcService.exportExcel(response,hygfIcbcRecordQueryDTO);
+    }
 }

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

@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO;
+import com.yeejoin.amos.boot.module.hygf.api.dto.IcbcExcelDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.IcbcWithholdRecordDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.IcbcWithhold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.IcbcWithholdRecord;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -16,6 +18,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.IcbcWithholdServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -109,7 +113,7 @@ public class IcbcWithholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = " 聚富通代扣信息表分页查询",  notes = " 聚富通代扣信息表分页查询")
-	public ResponseModel<Page<IcbcWithholdDto>> queryForPage(@RequestParam(value = "current") int current,
+	public ResponseModel<Map<String, Object>> queryForPage(@RequestParam(value = "current") int current,
 															 @RequestParam(value = "size") int size,
 															 @RequestParam(value = "uploader",required = false) String uploader,
 	 														 @RequestParam(value = "uploadStartTime",required = false) String uploadStartTime,
@@ -122,7 +126,17 @@ public class IcbcWithholdController extends BaseController {
 	 														 @RequestParam(value = "desc",required = false) String desc) {
 
 	    return ResponseHelper.buildResponse(icbcWithholdServiceImpl.queryForIcbcWithholdPage(current,size,uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus));
-	}	/**
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/exportIcbcExcel")
+	@ApiOperation(httpMethod = "POST",value = " 导出IcbcExcel",  notes = " 导出IcbcExcel")
+	public ResponseModel<?> exportIcbcExcel(@RequestBody IcbcExcelDto icbcExcelDto, HttpServletResponse response) {
+		icbcWithholdServiceImpl.exportIcbcExcel(icbcExcelDto,response);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	/**
      * 列表分页查询
      *
 
@@ -157,9 +171,22 @@ public class IcbcWithholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = " 聚富通代扣信息文件生成",   notes = " 聚富通代扣信息文件生成")
 	@PostMapping(value = "/fileGeneration")
-	public ResponseModel fileGeneration(@RequestBody IcbcWithhold model ) throws Exception {
+	@Transactional
+	public ResponseModel fileGeneration(@RequestBody List<IcbcWithhold> models ) throws Exception {
+		for (IcbcWithhold model : models) {
+			icbcWithholdServiceImpl.fileGeneration(model);
+		}
+		return CommonResponseNewUtil.success();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = " 聚富通代扣信息文件生成",   notes = " 聚富通代扣信息文件生成")
+	@PostMapping(value = "/fileGenerations")
+	@Transactional
+	public ResponseModel fileGenerationS(@RequestBody IcbcWithholdDto model ) throws Exception {
+
+			icbcWithholdServiceImpl.fileGenerations(model.getIds());
 
-		icbcWithholdServiceImpl.fileGeneration(model);
 		return CommonResponseNewUtil.success();
 	}
 	/**
@@ -170,12 +197,22 @@ public class IcbcWithholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = " 聚富通代扣信息文件上传",   notes = " 聚富通代扣信息文件上传")
 	@GetMapping(value = "/sftpUploadAndUnzip")
-	public ResponseModel sftpUploadAndUnzip( String fileUrl,String batchNo ) throws Exception {
+	@Transactional
+	public ResponseModel sftpUploadAndUnzip(String fileUrl,String batchNo) throws Exception {
 		ReginParams reginParams = getSelectedOrgInfo();
 		icbcWithholdServiceImpl.sftpUploadAndUnzip(fileUrl,batchNo,reginParams.getUserModel().getRealName());
 		return CommonResponseNewUtil.success();
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = " 聚富通代扣信息文件批量上传",   notes = " 聚富通代扣信息文件批量上传")
+	@GetMapping(value = "/sftpUploadAndUnzipFiles")
+	@Transactional
+	public ResponseModel sftpUploadAndUnzipFiles(IcbcWithholdDto model) throws Exception {
+		ReginParams reginParams = getSelectedOrgInfo();
+		icbcWithholdServiceImpl.sftpUploadAndUnzipFiles(model.getIds(),reginParams.getUserModel().getRealName());
+		return CommonResponseNewUtil.success();
+	}
 	/**
 	 * 列表全部数据查询
 	 *
@@ -207,14 +244,14 @@ public class IcbcWithholdController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "POST",value = "批次人员信息下载",   notes = "批次人员信息下载")
+	@ApiOperation(httpMethod = "POST",value = "批次明细信息下载",   notes = "批次明细信息下载")
 	@PostMapping(value = "/export")
 	public void downTemplate(HttpServletResponse response, @RequestBody IcbcWithhold model ) {
 
 		icbcWithholdServiceImpl.exportData(response,model);
 	}
 	/**
-	 * 列表全部数据查询
+	 * 文件下载
 	 *
 	 * @return
 	 */

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

@@ -154,40 +154,6 @@ public class PeasantHouseholdWxController extends BaseController {
             throw new BadRequest("没有查询到注册的农户，请注册后在进行新增");
         }
         validatedPeasantHouseholdDto(peasantHouseholdDto);
-        peasantHouseholdDto.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo(peasantHouseholdDto.getRegionalCompaniesSeq()));
-        peasantHouseholdDto.setIsCertified(1);// 这里就实名认证
-        peasantHouseholdDto.setSurveyOrNot(0);
-        peasantHouseholdDto.setReview(0);
-        JSONArray regionName = getRegionName();
-        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
-        // 处理项目地址
-        String area = "";
-        if (peasantHouseholdDto.getProjectAddress() != null && peasantHouseholdDto.getProjectAddress().size() != 0) {
-            for (Integer reg : peasantHouseholdDto.getProjectAddress())
-                for (RegionModel re : list) {
-                    if (re.getRegionCode().equals(Integer.valueOf(reg))) {
-                        area = area + re.getRegionName() + "/";
-                    }
-                }
-            peasantHouseholdDto.setProjectAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
-            if ("1".equals(peasantHouseholdDto.getIsPermanent()) || "true".equals(peasantHouseholdDto.getIsPermanent())) {
-                peasantHouseholdDto.setPermanentAddress(peasantHouseholdDto.getProjectAddress());
-                peasantHouseholdDto.setPermanentAddressDetail(peasantHouseholdDto.getProjectAddressDetail());
-                peasantHouseholdDto.setPermanentAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
-            } else {
-                // 处理常住地址
-                String permanent = "";
-                if (peasantHouseholdDto.getPermanentAddress() != null && peasantHouseholdDto.getPermanentAddress().size() != 0) {
-                    for (Integer reg : peasantHouseholdDto.getPermanentAddress())
-                        for (RegionModel re : list) {
-                            if (re.getRegionCode().equals(Integer.valueOf(reg))) {
-                                permanent = permanent + re.getRegionName() + "/";
-                            }
-                        }
-                    peasantHouseholdDto.setPermanentAddressName(permanent.length() > 2 ? permanent.substring(0, permanent.length() - 1) : permanent);
-                }
-            }
-        }
         PeasantHouseholdDto result = peasantHouseholdServiceImpl.addNewPeasantHousehold(peasantHouseholdDto);
         return ResponseHelper.buildResponse("success");
 
@@ -202,51 +168,7 @@ public class PeasantHouseholdWxController extends BaseController {
             log.info("微信农户注册, 入参 => {}", mobileLoginParam);
             PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto();
             validatedPeasantHouseholdDto(model);
-            
-            log.info("校验通过生成平台账号");
-            //注册并登录 生成农户信息表数据
-            PeasantHouseholdWxDto peasantHouseholdWxDto = peasantHouseholdServiceImpl.registerAndLogin(mobileLoginParam);
-            peasantHousehold = peasantHouseholdWxDto.getPeasantHousehold();
-            
-            BeanDtoUtils.copyPropertiesAllNonNull(peasantHousehold, model);
-            log.info("生成农户属性");
-            model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
-            model.setIsCertified(1);// 这里就实名认证
-            model.setSurveyOrNot(0);
-            model.setReview(0);
-            JSONArray regionName = getRegionName();
-            List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
-            // 处理项目地址
-            String area = "";
-            if (model.getProjectAddress() != null && model.getProjectAddress().size() != 0) {
-                for (Integer reg : model.getProjectAddress())
-                    for (RegionModel re : list) {
-                        if (re.getRegionCode().equals(Integer.valueOf(reg))) {
-                            area = area + re.getRegionName() + "/";
-                        }
-                    }
-                model.setProjectAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
-                if ("1".equals(model.getIsPermanent()) || "true".equals(model.getIsPermanent())) {
-                    model.setPermanentAddress(model.getProjectAddress());
-                    model.setPermanentAddressDetail(model.getProjectAddressDetail());
-                    model.setPermanentAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
-                } else {
-                    // 处理常住地址
-                    String permanent = "";
-                    if (model.getPermanentAddress() != null && model.getPermanentAddress().size() != 0) {
-                        for (Integer reg : model.getPermanentAddress())
-                            for (RegionModel re : list) {
-                                if (re.getRegionCode().equals(Integer.valueOf(reg))) {
-                                    permanent = permanent + re.getRegionName() + "/";
-                                }
-                            }
-                        model.setPermanentAddressName(permanent.length() > 2 ? permanent.substring(0, permanent.length() - 1) : permanent);
-                    }
-                }
-            }
-            log.info("更新农户信息");
-            BeanDtoUtils.copyPropertiesAllNonNull(model, peasantHousehold);
-            PeasantHouseholdDto result = peasantHouseholdServiceImpl.savePeasantHousehold(model, null);
+            PeasantHouseholdWxDto peasantHouseholdWxDto = peasantHouseholdServiceImpl.savePeasantHousehold(model, mobileLoginParam,peasantHousehold);
             peasantHouseholdWxDto.setPeasantHousehold(peasantHousehold);
             return ResponseHelper.buildResponse(peasantHouseholdWxDto);
         } catch (Exception e) {
@@ -258,7 +180,7 @@ public class PeasantHouseholdWxController extends BaseController {
                 RequestContext.setAppKey("AMOS_STUDIO");
                 RequestContext.setProduct("AMOS_STUDIO_WEB");
                 RequestContext.setToken(requestContext.getToken());
-                Privilege.agencyUserClient.multDeleteUser(peasantHousehold.getAmosUserId(),true);
+                Privilege.agencyUserClient.multDeleteUser(peasantHousehold.getAmosUserId());
             }
             if (e instanceof BadRequest || e.getCause() instanceof BadRequest) {
                 throw new BadRequest(e.getMessage());

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

@@ -73,6 +73,7 @@ public class TestController extends BaseController {
         // 创建线程池
         ExecutorService executorService = Executors.newFixedThreadPool(5);
 
+
         // 提交不同的方法
         executorService.submit(this::dealKcTime);
         executorService.submit(this::dealDzhtqyTime);

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

@@ -506,7 +506,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 	public void wofkflowExcute(String instanceId, String approvalStatus, String comment, String taskKey) {
 		LambdaQueryWrapper<BasicGridAuditing> query = new LambdaQueryWrapper<>();
 		query.eq(BasicGridAuditing::getInstanceId, instanceId);
-		query.orderByDesc(BaseEntity::getRecDate);
+		query.orderByDesc(BaseEntity::getSequenceNbr);
 		query.last("limit 1");
 		BasicGridAuditing basicGridAuditing = basicGridAuditingService.getBaseMapper().selectOne(query);
 

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

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -191,6 +192,12 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 			request.setBizContent(bizContent);
 			// 调用工行 SDK，生成自动提交表单，将用户跳转到收方入驻页面
 			log.info("聚富通委托代扣签约同步开户页面接口V1, 入参 => {}", JSON.toJSONString(request));
+			//添加上送日志存储
+			HygfIcbcRequest hygfIcbcRequest = new HygfIcbcRequest();
+			hygfIcbcRequest.setPhase("请求");
+			hygfIcbcRequest.setContent(JSONObject.toJSONString(request));
+			hygfIcbcRequest.setRecDate(new Date());	
+			hygfIcbcRequestMapper.insert(hygfIcbcRequest);
 			String form = client.buildPostForm(request);
 			log.info("聚富通委托代扣签约同步开户页面接口V1, 响应 => {}", form);
 			resp.setHeader("Content-Type", "text/html;charset=" + IcbcConstants.CHARSET_UTF8);
@@ -448,16 +455,24 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 		return toModels(list);
 	}
 
-	public Page<HygfIcbcRecordDTO> queryForPage(int current, int size, HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
+	public Map<String, Object> queryForPage(int current, int size, HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
 		PageHelper.startPage(current, size);
 		List<HygfIcbcRecordDTO> list = hygfIcbcRecordMapper.pageList(hygfIcbcRecordQueryDTO);
+
+
+
 		PageInfo<HygfIcbcRecordDTO> page = new PageInfo(list);
 		Page<HygfIcbcRecordDTO> pagenew = new Page<>();
 		pagenew.setCurrent(current);
 		pagenew.setTotal(page.getTotal());
 		pagenew.setSize(size);
 		pagenew.setRecords(toModels(page.getList()));
-		return pagenew;
+		Map<String, Object> resultMap = BeanUtil.beanToMap(pagenew);
+		List<HygfIcbcRecordDTO> list1 = hygfIcbcRecordMapper.pageListSum(hygfIcbcRecordQueryDTO);
+		double sum = list1.stream().filter(e->null != e.getPaymentAmount()).mapToDouble(HygfIcbcRecordDTO::getPaymentAmount).sum();
+
+		resultMap.put("paymentAmountAll",sum);
+		return resultMap;
 
 //		======================================================統計錯誤=================================================================
 //		// PageHelper.startPage(current, size);
@@ -673,4 +688,11 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 
 	}
 
+
+	public void exportExcel(HttpServletResponse response, HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO){
+		List<HygfIcbcRecordExportDTO> hygfIcbcRecordExportDTOS = hygfIcbcRecordMapper.paymentAmountExport(hygfIcbcRecordQueryDTO);
+		if (CollectionUtil.isNotEmpty(hygfIcbcRecordExportDTOS)){
+			ExcelUtil.createTemplate(response,"聚富通信息","聚富通信息",hygfIcbcRecordExportDTOS, HygfIcbcRecordExportDTO.class,null,false);
+		}
+	}
 }
\ No newline at end of file

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

@@ -44,7 +44,7 @@ public class IcbcWithholdRecordServiceImpl extends BaseService<IcbcWithholdRecor
 
         Page<IcbcWithholdRecordDto> page = new Page<>();
         PageHelper.startPage(current,size);
-        List<IcbcWithholdRecordDto>  dtos = icbcWithholdRecordMapper.exportTotal(null, null, null, null, null,null,null,null,dto);
+        List<IcbcWithholdRecordDto>  dtos = icbcWithholdRecordMapper.exportData(dto);
 
         PageInfo<IcbcWithholdRecordDto> pageInfo = new PageInfo<>(dtos);
         page.setSize(pageInfo.getSize());

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

@@ -209,6 +209,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
             tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
+            tdHYGFInverterDayGenerate.setTotalPower(tdHYGFInverterDayGenerate.getTotalPower() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalPower())));
             tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
         });
 
@@ -295,6 +296,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
             tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
             tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
+            tdHYGFInverterDayGenerate.setTotalPower(tdHYGFInverterDayGenerate.getTotalPower() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalPower())));
         });
         return tdHYGFInverterDayGenerates;
     }

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

@@ -1077,6 +1077,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
     @Transactional(rollbackFor = Exception.class)
     public void updateCompanyCode(JpStationDto reviewDto) {
         if(Objects.nonNull(reviewDto.getSequenceNbr())){
+            if(StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode())){
+                reviewDto.setRegionalCompaniesCode(null);
+            }
+            if(StringUtils.isEmpty(reviewDto.getAmosCompanyCode())){
+                reviewDto.setAmosCompanyCode(null);
+            }
             LambdaUpdateWrapper<JpStation> wrapper = new LambdaUpdateWrapper<>();
             wrapper.set(JpStation::getRecDate,new Date())
                     .set(JpStation::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode())
@@ -1153,6 +1159,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
 
     public void updateBatchCompanyCode(JpStationBatchDto jpStationBatchDto) {
         if(CollectionUtil.isNotEmpty(jpStationBatchDto.getSequenceNbrList())){
+            if(StringUtils.isEmpty(jpStationBatchDto.getRegionalCompaniesCode())){
+                jpStationBatchDto.setRegionalCompaniesCode(null);
+            }
+            if(StringUtils.isEmpty(jpStationBatchDto.getAmosCompanyCode())){
+                jpStationBatchDto.setAmosCompanyCode(null);
+            }
             LambdaUpdateWrapper<JpStation> wrapper =   new LambdaUpdateWrapper<>();
             wrapper.set(JpStation::getRegionalCompaniesCode,jpStationBatchDto.getRegionalCompaniesCode())
                     .set(JpStation::getAmosCompanyCode,jpStationBatchDto.getAmosCompanyCode())

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
+import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -153,7 +154,50 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     private  UnitInfoServiceImpl unitInfoService;
 
     @Transactional(rollbackFor = Exception.class)
-    public PeasantHouseholdDto savePeasantHousehold(PeasantHouseholdDto model, AgencyUserModel userInfo) {
+    public PeasantHouseholdWxDto  savePeasantHousehold(PeasantHouseholdDto model, MobileLoginParamDto mobileLoginParam,PeasantHousehold household) {
+        log.info("校验通过生成平台账号");
+        //注册并登录 生成农户信息表数据
+        PeasantHouseholdWxDto peasantHouseholdWxDto = this.registerAndLogin(mobileLoginParam);
+
+        BeanDtoUtils.copyPropertiesAllNonNull(peasantHouseholdWxDto.getPeasantHousehold(), model);
+        log.info("生成农户属性");
+        model.setPeasantHouseholdNo(this.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
+        model.setIsCertified(1);// 这里就实名认证
+        model.setSurveyOrNot(0);
+        model.setReview(0);
+        JSONArray regionName = getRegionName();
+        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+        // 处理项目地址
+        String area = "";
+        if (model.getProjectAddress() != null && model.getProjectAddress().size() != 0) {
+            for (Integer reg : model.getProjectAddress())
+                for (RegionModel re : list) {
+                    if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+                        area = area + re.getRegionName() + "/";
+                    }
+                }
+            model.setProjectAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
+            if ("1".equals(model.getIsPermanent()) || "true".equals(model.getIsPermanent())) {
+                model.setPermanentAddress(model.getProjectAddress());
+                model.setPermanentAddressDetail(model.getProjectAddressDetail());
+                model.setPermanentAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
+            } else {
+                // 处理常住地址
+                String permanent = "";
+                if (model.getPermanentAddress() != null && model.getPermanentAddress().size() != 0) {
+                    for (Integer reg : model.getPermanentAddress())
+                        for (RegionModel re : list) {
+                            if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+                                permanent = permanent + re.getRegionName() + "/";
+                            }
+                        }
+                    model.setPermanentAddressName(permanent.length() > 2 ? permanent.substring(0, permanent.length() - 1) : permanent);
+                }
+            }
+        }
+        log.info("更新农户信息");
+        BeanDtoUtils.copyPropertiesAllNonNull(model, household);
+
         SurveyInformationDto surveyInformationDto = new SurveyInformationDto();
         surveyInformationDto.setSurveyNumber(this.getkcNo(model.getRegionalCompaniesSeq()));
         surveyInformationServiceImpl.createWithModel(surveyInformationDto);
@@ -215,7 +259,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
         ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同.getCode(),  householdContract.getSequenceNbr(),  householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
         toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
-        return model;
+        return peasantHouseholdWxDto;
     }
 
     public boolean deletePeasantHouseholdBySequenceNbr(Long sequenceNbr){
@@ -535,6 +579,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             PeasantHousehold peasantHousehold = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
             if (null == peasantHousehold) {
                 peasantHousehold = new PeasantHousehold();
+                BeanUtils.copyProperties(wxDTO.getPeasantHouseholdDto(),peasantHousehold);
                 peasantHousehold.setIsCertified(0);
                 peasantHousehold.setSurveyOrNot(0);
                 peasantHousehold.setReview(0);
@@ -947,7 +992,43 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         return this.getBaseMapper().selectList(queryWrapper);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public PeasantHouseholdDto addNewPeasantHousehold(PeasantHouseholdDto model) {
+        model.setPeasantHouseholdNo(this.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
+        model.setIsCertified(1);// 这里就实名认证
+        model.setSurveyOrNot(0);
+        model.setReview(0);
+        JSONArray regionName = getRegionName();
+        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+        // 处理项目地址
+        String area = "";
+        if (model.getProjectAddress() != null && model.getProjectAddress().size() != 0) {
+            for (Integer reg : model.getProjectAddress())
+                for (RegionModel re : list) {
+                    if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+                        area = area + re.getRegionName() + "/";
+                    }
+                }
+            model.setProjectAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
+            if ("1".equals(model.getIsPermanent()) || "true".equals(model.getIsPermanent())) {
+                model.setPermanentAddress(model.getProjectAddress());
+                model.setPermanentAddressDetail(model.getProjectAddressDetail());
+                model.setPermanentAddressName(area.length() > 2 ? area.substring(0, area.length() - 1) : area);
+            } else {
+                // 处理常住地址
+                String permanent = "";
+                if (model.getPermanentAddress() != null && model.getPermanentAddress().size() != 0) {
+                    for (Integer reg : model.getPermanentAddress())
+                        for (RegionModel re : list) {
+                            if (re.getRegionCode().equals(Integer.valueOf(reg))) {
+                                permanent = permanent + re.getRegionName() + "/";
+                            }
+                        }
+                    model.setPermanentAddressName(permanent.length() > 2 ? permanent.substring(0, permanent.length() - 1) : permanent);
+                }
+            }
+        }
+
         SurveyInformationDto surveyInformationDto = new SurveyInformationDto();
         surveyInformationDto.setSurveyNumber(this.getkcNo(model.getRegionalCompaniesSeq()));
         surveyInformationServiceImpl.createWithModel(surveyInformationDto);
@@ -1001,7 +1082,6 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.合同.getCode(),  householdContract.getSequenceNbr(),  householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
         toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
 
-
         return model;
     }
 

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" :

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/vo/IcbcExcelVO.java

+package com.yeejoin.amos.boot.module.hygf.biz.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "IcbcExcelVO", description = "聚富通管理ExcelVO")
+public class IcbcExcelVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "序号", width = 20, orderNum = "1")
+    private Integer index;
+
+    @ApiModelProperty(value = "扣款批次号")
+    @Excel(name = "扣款批次号", width = 50, orderNum = "2")
+    private String batchNo;
+
+    @ApiModelProperty(value = "代扣公司")
+    @Excel(name = "代扣公司", width = 50, orderNum = "3")
+    private String paymentTarget;
+
+    @ApiModelProperty(value = "批扣总金额(元)")
+    @Excel(name = "批扣总金额(元)", width = 30, orderNum = "4")
+    private String paymentAmount;
+
+    @ApiModelProperty(value = "操作人")
+    @Excel(name = "操作人", width = 30, orderNum = "5")
+    private String confirmator;
+
+    @ApiModelProperty(value = "操作时间")
+    @Excel(name = "操作时间", width = 50, orderNum = "6")
+    private String confirmationTime;
+
+    @ApiModelProperty(value = "说明")
+    @Excel(name = "说明", width = 50, orderNum = "7")
+    private String desc;
+
+    @ApiModelProperty(value = "上传状态")
+    @Excel(name = "上传状态", width = 30, orderNum = "8")
+    private String uploadStatus;
+
+    @ApiModelProperty(value = "上传人员")
+    @Excel(name = "上传人员", width = 30, orderNum = "9")
+    private String uploader;
+
+    @ApiModelProperty(value = "上传时间")
+    @Excel(name = "上传时间", width = 50, orderNum = "10")
+    private String uploadTime;
+
+    @ApiModelProperty(value = "代扣状态")
+    @Excel(name = "代扣状态", width = 30, orderNum = "11")
+    private String withholdStatus;
+
+    @ApiModelProperty(value = "失败原因")
+    @Excel(name = "失败原因", width = 50, orderNum = "12")
+    private String paymentErrorDesc;
+
+
+}

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

@@ -270,6 +270,7 @@ icbc.Withhold.sftpUserName=jrgf
 icbc.Withhold.sftpPort=8001
 icbc.Withhold.sftpIp=gw.open.icbc.com.cn
 withholdStatusCron=0,30 8-23 * * * ?
+withholdReceiptFileCron=0 0 23 * * ?
 ## 聚富通工行 生产环境配置
 #hygf.icbc.appId=11000000000000028870
 #hygf.icbc.corpNo=020240710000001169