Merge branch 'developer_bw' of…

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

@@ -14,5 +14,5 @@ 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);
+    public List<IcbcWithholdDto> queryForIcbcWithholdPage( String uploader, String uploadStartTime,  String uploadEndTime, String uploadStatus, String confirmator, String confirmationStartTime,  String confirmationEndTime,String desc, String withholdStatus);
 }

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

@@ -922,9 +922,11 @@ public class SFTPUtil {
                 if (!fileName.equals(".") && !fileName.equals("..")) { // 排除当前和上级目录条目
                     String fileContentAsString = getFileContentAsString(remotePath, fileName);
                     List<String> contents = Arrays.asList(fileContentAsString.split("\r\n"));
-                    for (String content : contents) {
-                        ResultLinkField resultLinkField = contentHandle(content);
-                        allJsonData.add(resultLinkField);
+                    if (null != contents && contents.size() > 0) {
+                        for (String content : contents) {
+                            ResultLinkField resultLinkField = contentHandle(content);
+                            allJsonData.add(resultLinkField);
+                        }
                     }
                 }
             }

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

@@ -161,7 +161,7 @@
     <select id="exportTotal" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordExportDTO">
         SELECT
         MAX(ph.owners_name) AS custName,
-        MAX(ph.telephone) AS idCard,
+        MAX(ph.telephone) AS phone,
         MAX(ph.id_card) AS idCard,
         MAX(ph.regional_companies_name) AS regionalCompaniesName,
         MAX(re.medium_id) AS mediumId,

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

@@ -19,11 +19,14 @@
           <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 uploader like concat('%',#{desc},'%')
+            and content like concat('%',#{desc},'%')
         </if>
         <if test="confirmationStartTime != null and confirmationStartTime != ''">
             and confirmation_time  > #{confirmationStartTime}

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

@@ -48,7 +48,7 @@ public class IcbcWithholdController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增 聚富通代扣信息表", notes = "新增 聚富通代扣信息表")
-	public ResponseModel save(@RequestBody IcbcWithhold model) {
+	public ResponseModel save(@RequestBody IcbcWithhold model) throws Exception {
 	       icbcWithholdServiceImpl.saveRecord(model);
 	    return CommonResponseNewUtil.success();
 	}
@@ -115,9 +115,10 @@ public class IcbcWithholdController extends BaseController {
 	 														 @RequestParam(value = "confirmator",required = false) String confirmator,
 	 														 @RequestParam(value = "confirmationStartTime",required = false) String confirmationStartTime,
 	 														 @RequestParam(value = "confirmationEndTime",required = false) String confirmationEndTime,
+	 														 @RequestParam(value = "withholdStatus",required = false) String withholdStatus,
 	 														 @RequestParam(value = "desc",required = false) String desc) {
 
-	    return ResponseHelper.buildResponse(icbcWithholdServiceImpl.queryForIcbcWithholdPage(current,size,uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc));
+	    return ResponseHelper.buildResponse(icbcWithholdServiceImpl.queryForIcbcWithholdPage(current,size,uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus));
 	}	/**
      * 列表分页查询
      *