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/Enum/UploadStatusEnum.java

@@ -23,7 +23,7 @@ public enum UploadStatusEnum {
     public static UploadStatusEnum getNodeByCode(String code) {
         UploadStatusEnum anEnum = null;
         for (UploadStatusEnum type : UploadStatusEnum.values()) {
-            if (type.getCode() == code) {
+            if (type.getCode().equals(code) ) {
                 anEnum = type;
                 break;
             }

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 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.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.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -193,9 +196,9 @@ public class IcbcWithholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = " 聚富通代扣信息回盘文件获取",   notes = " 聚富通代扣信息回盘文件获取")
 	@GetMapping(value = "/updateWithholdStatus")
-	public void  updateWithholdStatus( ) throws Exception {
+	public ResponseModel  updateWithholdStatus( ) throws Exception {
 		icbcWithholdServiceImpl.updateWithholdStatus();
-
+		return CommonResponseNewUtil.success();
 	}
 
 	/**

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

@@ -42,10 +42,13 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -488,8 +491,8 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
                     //若失败 组装失败农户姓名及原因
                     String err ="";
                     for (ResultLinkField resultLinkField : resultLinkFields) {
-                        if (!resultLinkField.getErrMsg().contains("成功")){
-                            err  = err+ icbcWithholdRecords.get(Integer.valueOf(resultLinkField.getBillNo())).getCustName() + ":" + resultLinkField.getErrMsg() + ";";
+                        if (resultLinkField.getStatus().equals("1")){
+                            err  = err+ icbcWithholdRecords.get(Integer.valueOf(resultLinkField.getBillNo())-1).getCustName() + ":" + resultLinkField.getErrMsg() + ";";
                             isSuccess = false;
                         }
                     }
@@ -584,7 +587,7 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
     public void upIcbcWithholdRecordWithholdStatus() {
 
         LambdaQueryWrapper<IcbcWithholdRecord> wrapper = new LambdaQueryWrapper<>();
-        wrapper.isNull(IcbcWithholdRecord::getWithholdStatus);
+        wrapper.isNull(IcbcWithholdRecord::getWithholdStatus).or().eq(IcbcWithholdRecord::getWithholdStatus,"处理中");
         Set<String> batchNos = icbcWithholdRecordService.getBaseMapper().selectList(wrapper).stream()
                 .map(IcbcWithholdRecord::getBatchNo)
                 .collect(Collectors.toSet());;
@@ -608,7 +611,7 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
     //   bizContent.setBatchNo("20241216JO00400005");//批次号
         bizContent.setCorpCis("211590000183323");
    //     bizContent.setBillNo("1");//序号
-        bizContent.setTrxDate(DateUtils.getDateNowShortStr());//交易日期
+        bizContent.setTrxDate("2024-12-23");//交易日期
    //    bizContent.setBusiCode("14948822");
         bizContent.setCurPage("1");//查询页码
         request.setBizContent(bizContent);