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

@@ -55,32 +55,30 @@ public class IcbcWithholdRecordDto extends BaseDto {
     /**
      * 开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败
      */
-    @ExcelProperty(value = "开户状态", index = 5)
-    @ApiModelProperty(value = "开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败")
+    @ExcelIgnore    @ApiModelProperty(value = "开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败")
     private String openAccountStatus;
 
     /**
      * 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
      */
-    @ExcelProperty(value = "协议状态", index = 6)
-    @ApiModelProperty(value = "协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认")
+    @ExcelIgnore    @ApiModelProperty(value = "协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认")
     private String protocolStatus;
 
 
-    @ExcelProperty(value = "协议状态", index = 7)
+    @ExcelProperty(value = "批次号", index = 5)
     @ApiModelProperty(value = "批次号")
     private String batchNo;
 
 
-    @ExcelProperty(value = "项目编号", index = 8)
+    @ExcelProperty(value = "项目编号", index = 6)
     @ApiModelProperty(value = "项目编号")
     private String projectId;
 
-    @ExcelProperty(value = "付款金额", index = 9)
+    @ExcelProperty(value = "付款金额(元)", index = 7)
     @ApiModelProperty(value = "付款金额")
     private double paymentAmount;
 
-    @ExcelProperty(value = "代扣状态", index = 10)
+    @ExcelProperty(value = "代扣状态", index = 8)
     @ApiModelProperty(value = "代扣状态")
     private String withholdStatus;
 
@@ -88,7 +86,7 @@ public class IcbcWithholdRecordDto extends BaseDto {
     @ApiModelProperty(value = "上传时间")
     private Date withholdTime;
 
-    @ExcelProperty(value = "缴费时间", index = 11)
+    @ExcelProperty(value = "缴费时间", index = 9)
     @ApiModelProperty(value = "缴费时间")
     private Date paymentTime;
 

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

@@ -121,7 +121,7 @@
                 AND re.amos_user_id = #{dto.amosUserId}
             </if>
             <if test="dto.batchNo != null and dto.batchNo != ''">
-                AND re.batch_no = #{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}

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

@@ -294,7 +294,8 @@ public class SurveyInformationServiceImpl
 			}
 			peasantHousehold
 					.setPermanentAddressName(permanentAddressName.substring(0, permanentAddressName.length() - 1));
-
+			powerStation.setProjectAddress(projectAddressName.substring(0, projectAddressName.length() - 1));
+			powerStationMapper.updateById(powerStation);
 			if (OPERATION_TYPE_SUBMIT.equals(operationType)) {
 				// peasantHousehold.setSurveyOrNot(1);
 			} else if (OPERATION_TYPE_APPLY.equals(operationType)) {