Commit 5e3d6c0d authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.6.11' into MVP1.6.11

parents f1d136e6 2744762d
...@@ -41,7 +41,7 @@ public class TRiskMonitor extends BaseEntity { ...@@ -41,7 +41,7 @@ public class TRiskMonitor extends BaseEntity {
/** /**
* 结算主体名称 * 结算主体名称
*/ */
@ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目名称不能为空", maxLength = 50) @ExcelAttribute(name = "项目名称")
@ExcelProperty("项目名称") @ExcelProperty("项目名称")
@Schema(description = "项目名称") @Schema(description = "项目名称")
private String departName; private String departName;
...@@ -49,7 +49,7 @@ public class TRiskMonitor extends BaseEntity { ...@@ -49,7 +49,7 @@ public class TRiskMonitor extends BaseEntity {
/** /**
* 结算主体编码 * 结算主体编码
*/ */
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 32) @ExcelAttribute(name = "项目编码")
@NotBlank(message = "项目编码不能为空") @NotBlank(message = "项目编码不能为空")
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
@Schema(description = "项目编码") @Schema(description = "项目编码")
...@@ -58,9 +58,7 @@ public class TRiskMonitor extends BaseEntity { ...@@ -58,9 +58,7 @@ public class TRiskMonitor extends BaseEntity {
/** /**
* 项目状态:0正常 1停止服务 2 已冻结 * 项目状态:0正常 1停止服务 2 已冻结
*/ */
@ExcelAttribute(name = "项目状态", isNotEmpty = true, errorInfo = "项目状态不能为空", maxLength = 1) @ExcelAttribute(name = "项目状态")
@NotBlank(message = "项目状态:0正常 1停止服务 2 已冻结不能为空")
@Length(max = 1, message = "项目状态:0正常 1停止服务 2 已冻结不能超过1个字符")
@ExcelProperty("项目状态") @ExcelProperty("项目状态")
@Schema(description = "项目状态:0正常 1停止服务 2 已冻结") @Schema(description = "项目状态:0正常 1停止服务 2 已冻结")
private String stopFlag; private String stopFlag;
...@@ -68,8 +66,7 @@ public class TRiskMonitor extends BaseEntity { ...@@ -68,8 +66,7 @@ public class TRiskMonitor extends BaseEntity {
/** /**
* 二级指标归属 * 二级指标归属
*/ */
@ExcelAttribute(name = "二级指标归属", maxLength = 50) @ExcelAttribute(name = "二级指标归属")
@Length(max = 50, message = "二级指标归属不能超过50个字符")
@ExcelProperty("二级指标归属") @ExcelProperty("二级指标归属")
@Schema(description = "二级指标归属") @Schema(description = "二级指标归属")
private String secondIndicatorBelong; private String secondIndicatorBelong;
......
...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; ...@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author huyc * @author huyc
* @date 2024-05-23 10:24:12 * @date 2024-05-23 10:24:12
*/ */
@Log4j2
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping("/icbcQuery" ) @RequestMapping("/icbcQuery" )
...@@ -59,6 +61,7 @@ public class IcbcTransactionFlowQueryController { ...@@ -59,6 +61,7 @@ public class IcbcTransactionFlowQueryController {
@Inner @Inner
@PostMapping("/inner/newPage") @PostMapping("/inner/newPage")
public R getIcbcTransactionFlowInner() throws IcbcApiException { public R getIcbcTransactionFlowInner() throws IcbcApiException {
log.info("开始交易流水查询");
return icbcTransactionFlowQueryService.getIcbcTransactionFlowNew(); return icbcTransactionFlowQueryService.getIcbcTransactionFlowNew();
} }
......
...@@ -230,6 +230,16 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -230,6 +230,16 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 获取成功后根据流水号去重和根据借贷标志02筛选出所有数据 // 获取成功后根据流水号去重和根据借贷标志02筛选出所有数据
if (!flowRecordList.isEmpty()) { if (!flowRecordList.isEmpty()) {
log.info("获取当前账号下的流水--明细条数:" + flowRecordList.size());
for (MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 entry : flowRecordList) {
log.info("获取当前账号下的流水--来款单位:" + entry.getRecipName());
log.info("获取当前账号下的流水--交易类型:" + entry.getDrcrf());
log.info("获取当前账号下的流水--来款账户:" + entry.getRecipAccountNo());
log.info("获取当前账号下的流水--交易时间:" + entry.getBusiDate() + " "
+ entry.getBusiTime().replace(".",":"),DateUtil.DATETIME_PATTERN_MINUTE);
log.info("获取当前账号下的流水--流水号:" + entry.getOnlySequence());
}
// 获取当前账户下的入账记录:账号为key,账户下入账记录列表作为value // 获取当前账户下的入账记录:账号为key,账户下入账记录列表作为value
List<String> serioListByAccount = serioMapByAccount.get(account); List<String> serioListByAccount = serioMapByAccount.get(account);
if(serioListByAccount == null || serioListByAccount.isEmpty()){ if(serioListByAccount == null || serioListByAccount.isEmpty()){
...@@ -238,9 +248,11 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -238,9 +248,11 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 过滤出需要新增流水的数据 // 过滤出需要新增流水的数据
List<MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1> insertList = new ArrayList<>(); List<MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1> insertList = new ArrayList<>();
// 入账金额大于0再记录
for (MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 flowRecord : flowRecordList) { for (MybankEnterpriseTradeQhisdResponseV1.MybankEnterpriseTradeQhisdResponseRdV1 flowRecord : flowRecordList) {
if("2".equals(flowRecord.getDrcrf()) && !serioListByAccount.contains(flowRecord.getOnlySequence())){ if("2".equals(flowRecord.getDrcrf())
&& flowRecord.getCreditAmount() > 0
&& !serioListByAccount.contains(flowRecord.getOnlySequence())){
insertList.add(flowRecord); insertList.add(flowRecord);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment