代扣优化项 付款管理增加批次号筛选

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

@@ -66,14 +66,14 @@ biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
 
 
 # ??????????
-dataRequstScheduled.jinlangyun=0 0/40 * * * *
-dataRequstScheduled.huawei=0 0/40 * * * *
-dataRequstScheduled.keshida=0 0/40 * * * *
+dataRequstScheduled.jinlangyun=0 0/40 8 * *
+dataRequstScheduled.huawei=0 0/40 8 * *
+dataRequstScheduled.keshida=0 0/40 8 * *
 
-dataRequstScheduled.Sunlight=0 0/40 * * * *
-dataRequstScheduled.GoodWe=0 0/40 * * * *
+dataRequstScheduled.Sunlight=0 0/40 8 * *
+dataRequstScheduled.GoodWe=0 0/40 8 * *
 
-dataRequstScheduled.Sofar=0 0/40 * * * *
+dataRequstScheduled.Sofar=0 0/20 * * * *
 
 # 碳银
 tanYin.api.apiUrl=https://userauth.tanwin.cn

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

@@ -17,7 +17,7 @@ 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 List<IcbcWithholdDto> queryForIcbcWithholdPage( String uploader, String uploadStartTime,  String uploadEndTime, String uploadStatus, String confirmator, String confirmationStartTime,  String confirmationEndTime,String desc, String withholdStatus,String batchNo);
 
     public  IcbcWithholdDto  queryForIcbcWithholdAoumont( 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/resources/mapper/mysql/IcbcWithholdMapper.xml

@@ -34,7 +34,9 @@
         <if test="confirmationEndTime != null and confirmationEndTime != ''">
             and confirmation_time   <![CDATA[<]]> #{confirmationEndTime}
         </if>
-
+        <if test="batchNo != null and batchNo != ''">
+                and batch_no   like concat ('%',#{batchNo},'%')
+        </if>
         </where>
         order by hygf_icbc_withhold.sequence_nbr desc
     </select>

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

@@ -123,9 +123,11 @@ public class IcbcWithholdController extends BaseController {
 	 														 @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) {
+	 														 @RequestParam(value = "desc",required = false) String desc,
+	 														 @RequestParam(value = "batchNo",required = false) String batchNo
+	) {
 
-	    return ResponseHelper.buildResponse(icbcWithholdServiceImpl.queryForIcbcWithholdPage(current,size,uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus));
+	    return ResponseHelper.buildResponse(icbcWithholdServiceImpl.queryForIcbcWithholdPage(current,size,uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus,batchNo));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -702,10 +702,10 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
     }
 
 
-    public Map<String, Object> queryForIcbcWithholdPage(int current, int size, String uploader, String uploadStartTime,  String uploadEndTime, String uploadStatus, String confirmator, String confirmationStartTime,  String confirmationEndTime,String desc,String withholdStatus) {
+    public Map<String, Object> queryForIcbcWithholdPage(int current, int size, String uploader, String uploadStartTime,  String uploadEndTime, String uploadStatus, String confirmator, String confirmationStartTime,  String confirmationEndTime,String desc,String withholdStatus,String batchNo) {
         Page<IcbcWithholdDto> page = new Page<>();
         PageHelper.startPage(current,size);
-        List<IcbcWithholdDto> icbcWithholdDtos = this.getBaseMapper().queryForIcbcWithholdPage(uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus);
+        List<IcbcWithholdDto> icbcWithholdDtos = this.getBaseMapper().queryForIcbcWithholdPage(uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus,batchNo);
         IcbcWithholdDto  dto= this.getBaseMapper().queryForIcbcWithholdAoumont(uploader,uploadStartTime,uploadEndTime,uploadStatus,confirmator,confirmationStartTime,confirmationEndTime,desc,withholdStatus);
         PageInfo<IcbcWithholdDto> pageInfo = new PageInfo<>(icbcWithholdDtos);
         page.setSize(pageInfo.getSize());
@@ -744,7 +744,7 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
         bizContent.setAppId(APP_ID);//平台商户标识
         bizContent.setOutVendorId("gxjr");//子商户编号
         bizContent.setProjectId("PJ140014023565102203");//缴费项目编号
-    //   bizContent.setBatchNo("20241216JO00400005");//批次号
+    //   bizContent.setBatchNo("0150220250108JO00400037");//批次号
         bizContent.setCorpCis("211590000183323");
    //     bizContent.setBillNo("1");//序号
         bizContent.setTrxDate(DateUtils.getDateNowShortStr());//交易日期