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

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

@@ -79,7 +79,13 @@ public class HygfIcbcRecordExportDTO  {
      */
     @ExcelProperty(value = "扣款总金额（元）", index = 7)
     @ApiModelProperty (value = "扣款总金额")
-    private double paymentAmount;
+    private Double paymentAmount;
+    /**
+     * 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
+     */
+    @ExcelProperty(value = "最后扣款成功时间", index = 8)
+    @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/HygfIcbcWithholdRecordExportDTO.java

@@ -39,8 +39,8 @@ public class HygfIcbcWithholdRecordExportDTO {
     /**
      * 手机号码
      */
-    @ExcelProperty(value = "批次号", index = 2)
-    @ApiModelProperty (value = "批次号")
+    @ExcelProperty(value = "扣款批次号", index = 2)
+    @ApiModelProperty (value = "扣款批次号")
     private String batchNo;
 
     /**

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -76,6 +77,11 @@ public class IcbcWithholdDto  extends BaseDto {
 
  private String receiptFile;
 
+ @ApiModelProperty(value = "缴费开始时间")
+ private String paymentStartTime;
+ @ApiModelProperty(value = "缴费结束时间")
+ private String paymentEndTime;
+
  /**
   * 失败原因
   */

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

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

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

@@ -300,14 +300,16 @@
         ELSE '未开户'
         END
         ) AS openAccountStatus,
-        pa.paymentAmount AS paymentAmount
+        pa.paymentAmount AS paymentAmount,
+        MAX(pa.payTime) paymentTime
         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
+        SUM(iw.payment_amount) AS paymentAmount,
+        MAX(payment_time) as payTime
         FROM
         hygf_icbc_withhold_record iw
         WHERE
@@ -349,6 +351,6 @@
             </if>
         </where>
         GROUP BY
-        ph.amos_user_id, pa.paymentAmount;
+        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/IcbcWithholdRecordMapper.xml

@@ -161,6 +161,9 @@
             <if test="dto.amosUserId != null and dto.amosUserId != ''">
                 AND re.amos_user_id = #{dto.amosUserId}
             </if>
+            <if test="dto.show != null and dto.show != ''">
+                AND re.withhold_status in ('成功','失败')
+            </if>
             <if test="dto.batchNo != null and dto.batchNo != ''">
                 AND re.batch_no like concat('%',#{dto.batchNo},'%')
             </if>

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

@@ -172,10 +172,8 @@ public class IcbcWithholdController extends BaseController {
 	@ApiOperation(httpMethod = "POST",value = " 聚富通代扣信息文件生成",   notes = " 聚富通代扣信息文件生成")
 	@PostMapping(value = "/fileGeneration")
 	@Transactional
-	public ResponseModel fileGeneration(@RequestBody List<IcbcWithhold> models ) throws Exception {
-		for (IcbcWithhold model : models) {
+	public ResponseModel fileGeneration(@RequestBody IcbcWithhold model) throws Exception {
 			icbcWithholdServiceImpl.fileGeneration(model);
-		}
 		return CommonResponseNewUtil.success();
 	}
 
@@ -246,7 +244,7 @@ public class IcbcWithholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "批次明细信息下载",   notes = "批次明细信息下载")
 	@PostMapping(value = "/export")
-	public void downTemplate(HttpServletResponse response, @RequestBody IcbcWithhold model ) {
+	public void downTemplate(HttpServletResponse response, @RequestBody IcbcWithholdDto model ) {
 
 		icbcWithholdServiceImpl.exportData(response,model);
 	}

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

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

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

@@ -659,7 +659,9 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
         page.setTotal(pageInfo.getTotal());
         page.setRecords(icbcWithholdDtos);
         Map<String, Object> resultMap = BeanUtil.beanToMap(page);
-        resultMap.put("paymentAmountAll",dto.getPaymentAmount());
+        if (!Objects.isNull(dto)){
+            resultMap.put("paymentAmountAll",null ==dto.getPaymentAmount()?0:dto.getPaymentAmount());
+        }
         return resultMap;
 
     }
@@ -721,28 +723,38 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
 
 
 
-    public void exportData(HttpServletResponse response, IcbcWithhold icbcWithhold ){
+    public void exportData(HttpServletResponse response, IcbcWithholdDto icbcWithhold ){
 
+        String fileName = "付款记录明细";
         List<HygfIcbcWithholdRecordExportDTO> datas = new ArrayList<>();
         IcbcWithholdRecordDto dto = new IcbcWithholdRecordDto();
         if (StringUtils.isNotEmpty(icbcWithhold.getBatchNo())){
             dto.setBatchNo(icbcWithhold.getBatchNo());
+            fileName = icbcWithhold.getBatchNo()+"批次批扣明细记录";
+        }
+        if (StringUtils.isNotEmpty(icbcWithhold.getPaymentStartTime())){
+            dto.setPaymentStartTime(icbcWithhold.getPaymentStartTime());
+        }
+        if (StringUtils.isNotEmpty(icbcWithhold.getPaymentEndTime())){
+            dto.setPaymentEndTime(icbcWithhold.getPaymentEndTime());
         }
         if (StringUtils.isNotEmpty(icbcWithhold.getIcbcId())){
             dto.setAmosUserId(icbcWithhold.getIcbcId());
+            dto.setShow("1");
         }
         List<IcbcWithholdRecordDto>  dtos = icbcWithholdRecordMapper.exportData(dto);
-
-        for (IcbcWithholdRecordDto icbcWithholdRecordDto : dtos) {
-            HygfIcbcWithholdRecordExportDTO exportDTO = new HygfIcbcWithholdRecordExportDTO();
-            BeanUtil.copyProperties(icbcWithholdRecordDto,exportDTO);
-            exportDTO.setDesc(icbcWithholdRecordDto.getContentText());
-            exportDTO.setUploader(icbcWithholdRecordDto.getRecUserName());
-            datas.add(exportDTO);
+        if (CollectionUtil.isNotEmpty(dtos)) {
+
+            for (IcbcWithholdRecordDto icbcWithholdRecordDto : dtos) {
+                HygfIcbcWithholdRecordExportDTO exportDTO = new HygfIcbcWithholdRecordExportDTO();
+                BeanUtil.copyProperties(icbcWithholdRecordDto, exportDTO);
+                exportDTO.setDesc(icbcWithholdRecordDto.getContentText());
+                exportDTO.setUploader(icbcWithholdRecordDto.getRecUserName());
+                datas.add(exportDTO);
+            }
         }
-
         if (CollectionUtil.isNotEmpty(datas)){
-            ExcelUtil.createTemplate(response,"付款记录明细","付款记录明细",datas,HygfIcbcWithholdRecordExportDTO.class,null,false);
+            ExcelUtil.createTemplate(response,fileName,"付款记录明细",datas,HygfIcbcWithholdRecordExportDTO.class,null,false);
         }
     }