From e5663b19d3a701fe9892a38781ff3955bbfb3516 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Wed, 26 Mar 2025 16:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinPaymentapplyService.java               |   2 +
 .../ScmApplyInboundQueryRest.java             | 105 ++++++++----------
 2 files changed, 47 insertions(+), 60 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
index 60ba3ef764..7e407f3201 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
@@ -669,6 +669,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             finPaymentrecordDto.setPayChannel(finPaymentapplyDetailVo.getCostTitleKey());
                             finPaymentrecordDto.setPayCostType("payCostType");
                         }
+                        finPaymentrecordDto.setFinDataType(0);
                         //款项详情
                         finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailVo.getCostTitleKey());
                         finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailVo.getCostTitleValue());
@@ -699,6 +700,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
                         List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
                         for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
+                            finPaymentrecordDto.setFinDataType(1);
                             //款项名称
                             finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey());
                             finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
index e924bf3b61..b6c7b76ba9 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java
@@ -34,77 +34,62 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-scm(车辆入库单查询) <br/>
- * File: ScmApplyInboundQueryFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest <br/>
- * Description: 车辆入库单查询. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-01-28 15:55:31 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆入库单查询")
-@RestController("com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest")
+@RestController
 @RequestMapping("v1/scmapplyinboundquery")
 public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
 
-	@Autowired
-	private ScmApplyInboundQueryService scmApplyInboundQueryService;
+    @Autowired
+    private ScmApplyInboundQueryService scmApplyInboundQueryService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmApplyInboundQueryVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQueryQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmApplyInboundQueryVo> pv = scmApplyInboundQueryService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmApplyInboundQueryVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQueryQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmApplyInboundQueryVo> pv = scmApplyInboundQueryService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
-		return rb.success().setData(sid);
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
+        return rb.success().setData(sid);
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		scmApplyInboundQueryService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        scmApplyInboundQueryService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean<PdfPath> createPdf(String cgrkdSid,String printerType) {
-		return scmApplyInboundQueryService.createPdf(cgrkdSid,printerType);
-	}
+    @Override
+    public ResultBean<PdfPath> createPdf(String cgrkdSid, String printerType) {
+        return scmApplyInboundQueryService.createPdf(cgrkdSid, printerType);
+    }
 
-	@Override
-	public ResultBean ctcgykd(String cgrkdSid) {
-		return scmApplyInboundQueryService.ctcgykd(cgrkdSid);
-	}
+    @Override
+    public ResultBean ctcgykd(String cgrkdSid) {
+        return scmApplyInboundQueryService.ctcgykd(cgrkdSid);
+    }
 
-	@Override
-	public ResultBean<Integer> fetchByApplicationCode(String applicationCode) {
-		return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode);
-	}
+    @Override
+    public ResultBean<Integer> fetchByApplicationCode(String applicationCode) {
+        return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode);
+    }
 }