From 1e1e52bdb000c2b2093ea9ba2059149b74be3da0 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sun, 8 Oct 2023 13:32:51 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicyFeign.java | 5 +++++ .../LoanFinOtherPolicyRest.java | 5 +++++ .../LoanFinOtherPolicyService.java | 17 +++++++++++++++ .../api/risk/solutions/SolutionsFeign.java | 7 ++++++- .../biz/risk/solutions/SolutionsRest.java | 5 +++++ .../biz/risk/solutions/SolutionsService.java | 21 +++++++++++++++++++ 6 files changed, 59 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 16dd8a349b..1b361a9f90 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -51,6 +51,11 @@ public interface LoanFinOtherPolicyFeign { @ApiOperation("获取产品政策下其他融，或分公司下其他融") ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period); + + @GetMapping("selectList2") + @ApiOperation("移动端产品政策下其他融") + ResultBean> selectList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period); + @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启") @PostMapping("setState") ResultBean setState(@RequestBody LoanFinOtherPolicyStateQuery query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java index 9bb9699b39..352e25cf57 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java @@ -54,6 +54,11 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign { return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name,modelSid ,period); } + @Override + public ResultBean> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + return loanFinOtherPolicyService.selectList2(orgPath,userSid,sid,name,modelSid ,period); + } + @Override public ResultBean setState(LoanFinOtherPolicyStateQuery query) { return loanFinOtherPolicyService.setState(query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java index 19f0396b46..519932c7e4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java @@ -109,6 +109,23 @@ public class LoanFinOtherPolicyService extends MybatisBaseService> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + ResultBean> rb = ResultBean.fireFail(); + if(StringUtils.isNotBlank(sid)){ + List list = baseMapper.selectListOne(sid, name); + list.removeAll(Collections.singleton(null)); + if (list.isEmpty()) { + return rb.success().setData(new ArrayList<>()); + } + return rb.success().setData(list); + }else{ + return rb.success().setData(new ArrayList<>()); + } + + + } public PagerVo listPageVo(PagerQuery pq) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java index d2bfee9d6a..5d46bb82a0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java @@ -45,11 +45,16 @@ public interface SolutionsFeign { @RequestParam(value = "name", required = false) String name, @RequestParam(value = "modelSid", required = false) String modelSid); - @ApiOperation("获取产品政策下其他融，或分公司下其他融") + @ApiOperation("获取分公司下其他融") @GetMapping("/selectOtherList") @ResponseBody ResultBean> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period); + @ApiOperation("获取产品政策下其他融") + @GetMapping("/selectOtherList2") + @ResponseBody + ResultBean> selectOtherList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period); + @ApiOperation("初始化金融方案2") @GetMapping("/selectDetailsVo2") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java index ec0c7abf5e..5ea951ac9a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java @@ -48,6 +48,11 @@ public class SolutionsRest implements SolutionsFeign { return solutionsService.selectOtherList(orgPath, userSid, sid, name,modelSid,period); } + @Override + public ResultBean> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + return solutionsService.selectOtherList2(orgPath, userSid, sid, name,modelSid,period); + } + @Override public ResultBean selectDetailsVo2(String busSid) { return solutionsService.selectDetailsVo2(busSid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java index 2cdb0499fe..d6314b11ef 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java @@ -132,4 +132,25 @@ public class SolutionsService { } return rb.success(); } + + public ResultBean> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) { + ResultBean> rb = ResultBean.fireFail(); + List listNew = new ArrayList<>(); + ResultBean> resultBean = loanFinOtherPolicyFeign.selectList2(orgPath, userSid, sid, name, modelSid, period); + if (resultBean.getData() != null && !resultBean.getData().isEmpty()) { + List list = resultBean.getData(); + list.removeAll(Collections.singleton(null)); + for (int i = 0; i < list.size(); i++) { + OtherPolicyVo policyVo = list.get(i); + OtherPolicyExtraVo extraVo = new OtherPolicyExtraVo(); + OtherPolicysVo policysVo = new OtherPolicysVo(); + policysVo.setId(policyVo.getSid()); + policysVo.setDictValue(policyVo.getName()); + BeanUtil.copyProperties(policyVo, extraVo); + policysVo.setExtra(extraVo); + listNew.add(policysVo); + } + } + return rb.success().setData(listNew); + } } From e84518acd2a21db7bcb132e1c401c2344876a9d1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sun, 8 Oct 2023 14:18:17 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehiclestate/BaseVehicleStateService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 94599736c7..e0a18c6552 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -100,14 +100,14 @@ public class BaseVehicleStateService extends MybatisBaseService Date: Sun, 8 Oct 2023 15:18:47 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 6b1b65c3f0..dde42b263d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1384,6 +1384,9 @@ public class LoanSolutionsService extends MybatisBaseService Date: Sun, 8 Oct 2023 16:02:53 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml index 34123f052f..65680b6555 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml @@ -54,7 +54,6 @@ bo.`staffName`, bo.`contractNo`, bb.`vehCount`, - bb.borrowerSid, bb.`borrowerName`, bb.`mobile`, bb.`bankName`, From 343c33a6adfd1507c13c84abdf8fa8a4427d161c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sun, 8 Oct 2023 16:04:50 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0Flowable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDistributorApplyService.java | 28 ++-------- .../flowable/api/flow2/FlowDelegateQuery.java | 24 +++++++++ .../anrui/flowable/api/flow2/FlowFeign.java | 7 ++- .../anrui/flowable/biz/flow2/FlowRest.java | 20 +++---- .../anrui/flowable/biz/flow2/FlowService.java | 54 +++++++++++++------ 5 files changed, 77 insertions(+), 56 deletions(-) create mode 100644 anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowDelegateQuery.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java index 21e4dcfc45..d5d8a0c95e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.base.biz.basedistributorapplyappendix.BaseDistributorApplyA import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.DelegateQuery; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -2031,32 +2032,9 @@ public class BaseDistributorApplyService extends MybatisBaseService userVoResultBean1 = sysUserFeign.fetchBySid(userSid); - String userName = ""; - if (userVoResultBean1.getData() != null) { - userName = userVoResultBean1.getData().getName(); - } - ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assignee); - ProcessCommentDto processCommentDto = new ProcessCommentDto(); - processCommentDto.setReviewerSid(userSid); - if (userVoResultBean2.getData() != null) { - String changeName = userVoResultBean2.getData().getName(); - processCommentDto.setReviewer(userName); - processCommentDto.setContent(userName + "加签给" + changeName + "：" + views); - } - processCommentDto.setTime(new Date()); - processCommentDto.setProcessId(instanceId); - processCommentFeign.save(processCommentDto); + flowFeign.delegate(delegateQuery); return rb.success(); } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowDelegateQuery.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowDelegateQuery.java new file mode 100644 index 0000000000..ae2df3df9a --- /dev/null +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowDelegateQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.flowable.api.flow2; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/8 15:58 + */ +@Data +public class FlowDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java index b866707dc7..e3831895ec 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java @@ -3,7 +3,6 @@ package com.yxt.anrui.flowable.api.flow2; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -41,4 +40,10 @@ public interface FlowFeign { @GetMapping(value = "/getMessageReminder") @ResponseBody ResultBean getMessageReminder(@RequestParam("proDefId") String proDefId, @RequestParam("proInstId") String proInstId); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody FlowDelegateQuery flowDelegateQuery); + + } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java index 958f97cd0b..9899225126 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java @@ -1,34 +1,21 @@ package com.yxt.anrui.flowable.biz.flow2; -import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; -import com.yxt.anrui.flowable.biz.process.ProcessService; -import com.yxt.anrui.flowable.feign.MessageFeign; -import com.yxt.anrui.flowable.feign.form.MessageFlowVo; -import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign; -import com.yxt.anrui.portal.api.sysflowcc.SysFlowccVo; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.portal.api.sysuser.UserByRolesAndOrgQuery; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.apache.tomcat.util.threads.ThreadPoolExecutor; -import org.flowable.engine.HistoryService; -import org.flowable.task.api.history.HistoricTaskInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -111,5 +98,10 @@ public class FlowRest implements FlowFeign { return flowService.getMessageReminder(proDefId,proInstId); } + @Override + public ResultBean delegate(FlowDelegateQuery flowDelegateQuery) { + return flowService.delegate(flowDelegateQuery); + } + } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index 771da577c9..995c8b075c 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java @@ -1,31 +1,27 @@ package com.yxt.anrui.flowable.biz.flow2; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.flowable.api.flow.Flowable; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; -import com.yxt.anrui.flowable.api.flowtask.FlowTask; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; +import com.yxt.anrui.flowable.api.flowtask.DelegateQuery; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; -import com.yxt.anrui.flowable.biz.flowtask.FlowTaskMapper; import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService; import com.yxt.anrui.flowable.biz.process.ExpressionCmd; import com.yxt.anrui.flowable.biz.process.ProcessService; import com.yxt.anrui.flowable.biz.processcomment.ProcessCommentService; import com.yxt.anrui.flowable.common.ProcessConstants; -import com.yxt.anrui.flowable.exception.CustomException; import com.yxt.anrui.flowable.feign.MessageFeign; import com.yxt.anrui.flowable.feign.form.MessageFlowVo; import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.flowable.utils.FlowableUtils; import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign; import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery; import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo; @@ -37,16 +33,10 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.*; -import org.flowable.bpmn.model.Process; -import org.flowable.common.engine.api.FlowableException; -import org.flowable.common.engine.api.FlowableObjectNotFoundException; import org.flowable.common.engine.impl.identity.Authentication; import org.flowable.engine.*; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.history.HistoricActivityInstance; import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.flowable.engine.repository.ProcessDefinition; -import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.DelegationState; import org.flowable.task.api.Task; @@ -711,8 +701,8 @@ public class FlowService extends MybatisBaseService { String assignee = (String) processVariables.get("assignee"); ResultBean stringResultBean = sysUserFeign.fetchBySid(assignee); String assigneeName = ""; - if(stringResultBean.getData() != null){ - assigneeName= stringResultBean.getData().getName(); + if (stringResultBean.getData() != null) { + assigneeName = stringResultBean.getData().getName(); } Map app = new HashMap<>(); @@ -722,7 +712,7 @@ public class FlowService extends MybatisBaseService { log.info("抄送方法-historicTaskInstance:{}", JSONObject.toJSONString(historicTaskInstance)); mfq.setAppMap(app); mfq.setBusinessSid(bv.getBusinessSid()); - mfq.setMsgContent(assigneeName+"抄送的流程审批,请查看"); + mfq.setMsgContent(assigneeName + "抄送的流程审批,请查看"); // act_re_procdef Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); log.info("抄送成功-process:{}", process); @@ -770,7 +760,39 @@ public class FlowService extends MybatisBaseService { public ResultBean getMessageReminder(String proDefId, String proInstId) { ResultBean rb = ResultBean.fireFail(); - FlowableMessageVo flowableMessageVo = baseMapper.getMessageReminder(proDefId,proInstId); + FlowableMessageVo flowableMessageVo = baseMapper.getMessageReminder(proDefId, proInstId); return rb.success().setData(flowableMessageVo); } + + public ResultBean delegate(FlowDelegateQuery flowDelegateQuery) { + ResultBean rb = ResultBean.fireFail(); + DelegateQuery delegateQuery = new DelegateQuery(); + BeanUtil.copyProperties(flowDelegateQuery, delegateQuery); + ResultBean delegate = flowTaskService.delegate(delegateQuery); + String userSid = flowDelegateQuery.getUserSid(); + String assignee = flowDelegateQuery.getAssignee(); + String instanceId = flowDelegateQuery.getInstanceId(); + String views = ""; + if (StringUtils.isNotBlank(flowDelegateQuery.getViews())) { + views = flowDelegateQuery.getViews(); + } + ResultBean userVoResultBean1 = sysUserFeign.fetchBySid(userSid); + String userName = ""; + if (userVoResultBean1.getData() != null) { + userName = userVoResultBean1.getData().getName(); + } + ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assignee); + ProcessCommentDto processCommentDto = new ProcessCommentDto(); + processCommentDto.setReviewerSid(userSid); + if (userVoResultBean2.getData() != null) { + String changeName = userVoResultBean2.getData().getName(); + processCommentDto.setReviewer(userName); + processCommentDto.setContent(userName + "加签给" + changeName + "：" + views); + } + processCommentDto.setTime(new Date()); + processCommentDto.setProcessId(instanceId); + processCommentService.saveOrUpdateDto(processCommentDto); + return rb.success(); + + } } From 2df55f9a016e5b820ed5e0f3754dc785802494ca Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sun, 8 Oct 2023 16:32:27 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml | 1 + .../biz/loanhomevisitprep/LoanHomevisitPrepService.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml index 65680b6555..6ad8f35b6a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml @@ -54,6 +54,7 @@ bo.`staffName`, bo.`contractNo`, bb.`vehCount`, + lp.saleOrderBorrowerSid AS borrowerSid, bb.`borrowerName`, bb.`mobile`, bb.`bankName`, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index f75f562ac9..0ed3f2c9e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -238,7 +238,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService Date: Sun, 8 Oct 2023 17:00:02 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractFeign.java | 4 ++++ .../BusSalesOrderLoancontractFeignFallback.java | 5 +++++ .../BusSalesOrderLoancontractMapper.java | 3 +++ .../BusSalesOrderLoancontractRest.java | 5 +++++ .../BusSalesOrderLoancontractService.java | 6 ++++++ .../LoanHomevisitFileexamineService.java | 14 ++++++++++++++ 6 files changed, 37 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index f6faeeffcc..4d27c37360 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -105,4 +105,8 @@ public interface BusSalesOrderLoancontractFeign { @ResponseBody ResultBean pushOtherReceivable(@RequestBody LoanOtherReceivablePush loanOtherReceivablePush); + @ApiOperation("根据销售订单sid查询") + @GetMapping("/fetchAllByOrderSid/{orderSid}") + @ResponseBody + public ResultBean> fetchAllByOrderSid(@PathVariable("orderSid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index 74995a131b..4b92d26632 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -99,4 +99,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) { return null; } + + @Override + public ResultBean> fetchAllByOrderSid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java index 0219dfeaba..591609fe62 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java @@ -77,4 +77,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper fetchAllByOrderSid(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index e2793ae99b..6dea79bca7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -128,4 +128,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) { return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush); } + + @Override + public ResultBean> fetchAllByOrderSid(String sid) { + return busSalesOrderLoancontractService.fetchAllByOrderSid(sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 9bef935fe8..9cd025cdbf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -479,4 +479,10 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService> fetchAllByOrderSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List busSalesOrderLoancontracts = baseMapper.fetchAllByOrderSid(sid); + return rb.success().setData(busSalesOrderLoancontracts); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java index b9160944cf..b1b1771c25 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java @@ -30,10 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto; import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo; @@ -42,6 +44,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvest import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto; +import com.yxt.anrui.riskcenter.biz.loancapitalcreditresult.LoanCapitalCreditResultService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; import com.yxt.common.base.config.component.FileUploadComponent; @@ -81,6 +84,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSid(dto.getSaleOrderSid()).getData(); + if (busSalesOrderLoancontracts != null){ + for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) { + LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto(); + loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid()); + loanCapitalCreditResultDto.setLoanContractSid(busSalesOrderLoancontract.getSid()); + loanCapitalCreditResultService.saveOrUpdateDto(loanCapitalCreditResultDto); + } + } } public void insertByDto(LoanHomevisitFileexamineDto dto) { From 98eb534fbd866d5625e6f92515f8534da863a71d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sun, 8 Oct 2023 17:09:00 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB=E5=B7=A5=E4=BD=9C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/biz/flow2/FlowService.java | 57 ++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index 995c8b075c..43fe4e3284 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java @@ -770,7 +770,7 @@ public class FlowService extends MybatisBaseService { BeanUtil.copyProperties(flowDelegateQuery, delegateQuery); ResultBean delegate = flowTaskService.delegate(delegateQuery); String userSid = flowDelegateQuery.getUserSid(); - String assignee = flowDelegateQuery.getAssignee(); + String assigneeSid = flowDelegateQuery.getAssignee(); String instanceId = flowDelegateQuery.getInstanceId(); String views = ""; if (StringUtils.isNotBlank(flowDelegateQuery.getViews())) { @@ -781,7 +781,7 @@ public class FlowService extends MybatisBaseService { if (userVoResultBean1.getData() != null) { userName = userVoResultBean1.getData().getName(); } - ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assignee); + ResultBean userVoResultBean2 = sysUserFeign.fetchBySid(assigneeSid); ProcessCommentDto processCommentDto = new ProcessCommentDto(); processCommentDto.setReviewerSid(userSid); if (userVoResultBean2.getData() != null) { @@ -792,6 +792,59 @@ public class FlowService extends MybatisBaseService { processCommentDto.setTime(new Date()); processCommentDto.setProcessId(instanceId); processCommentService.saveOrUpdateDto(processCommentDto); + //加签内容推送至待阅 + HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() + .includeProcessVariables().taskId(delegateQuery.getTaskId()).singleResult(); + if (historicTaskInstance == null) { + return rb.setMsg("分享失败！"); + } + MessageFlowVo messageFlowVo = new MessageFlowVo(); + String procDefId = historicTaskInstance.getProcessDefinitionId(); + String procInsId = historicTaskInstance.getProcessInstanceId(); + String nodeState = historicTaskInstance.getName(); + String taskDefKey = historicTaskInstance.getTaskDefinitionKey(); + messageFlowVo.setProcDefId(procDefId); + messageFlowVo.setTaskId(delegateQuery.getTaskId()); + messageFlowVo.setNodeState(nodeState); + messageFlowVo.setProcInsId(procInsId); + messageFlowVo.setTaskDefKey(taskDefKey); + Map processVariables = historicTaskInstance.getProcessVariables(); + MessageFlowableQuery mfq = new MessageFlowableQuery(); + mfq.setUfVo(messageFlowVo); + String createrOrgPath = (String) processVariables.get("createrOrgPath"); + if (historicTaskInstance == null) { + return rb.setMsg("分享失败！"); + } + // + String assignee = (String) processVariables.get("assignee"); + ResultBean stringResultBean = sysUserFeign.fetchBySid(assignee); + String assigneeName = ""; + if (stringResultBean.getData() != null) { + assigneeName = stringResultBean.getData().getName(); + } + + Map app = new HashMap<>(); + if (processVariables.get("app") != null) { + app = (Map) processVariables.get("app"); + } + mfq.setAppMap(app); + String businessSid = (String) processVariables.get("businessSid"); + mfq.setBusinessSid(businessSid); + mfq.setMsgContent(userName + "分享的流程审批,请查看"); +// act_re_procdef + Map process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); + + mfq.setModuleName(process.get("NAME_")); + if (processVariables.containsKey("orderNames")) { + mfq.setMsgTitle(processVariables.get("orderNames").toString()); + } else { + mfq.setMsgTitle(process.get("NAME_")); + } + mfq.setUserSids(assigneeSid); + mfq.setOrgPath(createrOrgPath); + mfq.setUserSid(assignee); + mfq.setApplicationName(assigneeName); + ResultBean resultBean = messageFeign.pushMessageShare(mfq); return rb.success(); } From 0dbf853065396d5b04803b974b0421fce3fc9016 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sun, 8 Oct 2023 17:19:09 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loansolutions/LoanSolutionsService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index dde42b263d..ce0df98397 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1803,12 +1803,17 @@ public class LoanSolutionsService extends MybatisBaseService Date: Mon, 9 Oct 2023 09:12:39 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusValcustFilingService.java | 252 +++++++++++++++--- .../FinBillApplication.java | 2 + .../FinBillApplicationDto.java | 2 + .../FinBillApplicationVo.java | 2 + .../FinFundsCarriedForwardApplyService.java | 2 + .../invoiced/BillApplicationIInfoDto.java | 2 + .../invoiced/BillApplicationIInfoVo.java | 2 + .../BillApplicationPageInfoQuery.java | 4 + .../invoiced/BillApplicationPageVo.java | 6 + .../autoservice/invoiced/InvoicedFeign.java | 10 + .../invoiced/InvoicedFeignFallback.java | 10 + .../api/autoservice/invoiced/SelBillGcVo.java | 16 ++ .../invoiced/SelBillVinNoPageVo.java | 30 +++ .../invoiced/SelBillVinNoQuery.java | 63 +++++ .../api/autoservice/invoiced/SelBillZcVo.java | 25 ++ .../autoservice/invoiced/InvoicedRest.java | 10 + .../autoservice/invoiced/InvoicedService.java | 48 +++- 17 files changed, 452 insertions(+), 34 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index a81c4dcb5a..4420df60e7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -457,37 +457,227 @@ public class BusValcustFilingService extends MybatisBaseService busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid()); + List busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid()); + for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { + int count = finVehicleInvoiceFeign.selectCountByVinSid(busBillVehicleVo.getVehSid()).getData(); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney()); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("主车"); + finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(busBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null) { + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + } else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } + finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid()).getData(); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); + } + } + if (busBillTrailerVos != null) { + for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) { + String gcVinNo = busBillTrailerVo.getGcVinNo(); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); + int count = finVehicleInvoiceFeign.selectCountByVinSid(baseTrailerDetailsVo.getSid()).getData(); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); + finVehicleInvoiceDto.setVIN(gcVinNo); + finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid()); + finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue()); + finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData(); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); + } + } + } + } else { + FinBillApplication finBillApplication = finBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData(); + List finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData(); + List finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData(); + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + int count = finVehicleInvoiceFeign.selectCountByVinSid(finBillVehicleVo.getVehSid()).getData(); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid()); + finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo()); + finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney()); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("主车"); + finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); + BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(finBillVehicleVo.getVehSid()).getData(); + if (busArrearsCarryVehicleApplyVo == null) { + finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); + } else { + finVehicleInvoiceDto.setBusinessStateKey("005"); + finVehicleInvoiceDto.setBusinessState("欠款提车"); + } + finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid()).getData(); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); + } + } + if (finBillTrailerVos != null) { + for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { + String gcVinNo = finBillTrailerVo.getGcVinNo(); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData(); + int count = finVehicleInvoiceFeign.selectCountByVinSid(baseTrailerDetailsVo.getSid()).getData(); + if (count == 0) { + FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto(); + finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName()); + finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo()); + finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName()); + finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid()); + finVehicleInvoiceDto.setVIN(gcVinNo); + finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey()); + finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue()); + finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney())); + finVehicleInvoiceDto.setBillingStateKey("001"); + finVehicleInvoiceDto.setBillingState("未开票"); + finVehicleInvoiceDto.setTransferStateKey("001"); + finVehicleInvoiceDto.setTransferState("未移交"); + finVehicleInvoiceDto.setVehicleType("挂车"); + finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid()); + finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName()); + finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid()); + finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey()); + finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue()); + finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid()).getData(); + if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) { + finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress()); + finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone()); + finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName()); + finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount()); + finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo()); + } else { + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData(); + finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile()); + finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber()); + } + finVehicleInvoiceDto.setIsTakeTicket("是"); + finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto); + } + } + } + } + }else { + String[] vinSids = busValcustFiling.getVinSid().split(","); + for (String vinSid : vinSids) { + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); + finUncollectedReceivablesDetailedDto.setCreateByName(busValcustFiling.getCreateByName()); + finUncollectedReceivablesDetailedDto.setCreateBySid(busValcustFiling.getCreateBySid()); + finUncollectedReceivablesDetailedDto.setContractNo(busValcustFiling.getContractNo()); + BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid()); + finUncollectedReceivablesDetailedDto.setCustomerSid(busSalesOrder.getCustomerSid()); + finUncollectedReceivablesDetailedDto.setCustomerName(busSalesOrder.getCustomerName()); + BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(vinSid).getData(); + finUncollectedReceivablesDetailedDto.setVIN(baseVehicle.getVinNo()); + finUncollectedReceivablesDetailedDto.setCustomerPhone(busSalesOrder.getMobile()); + finUncollectedReceivablesDetailedDto.setUseOrgSid(busValcustFiling.getUseOrgSid()); + finUncollectedReceivablesDetailedDto.setReceivablesName("加装配置手续费"); + finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(busValcustFiling.getSsMoney()); + finUncollectedReceivablesDetailedDto.setReveivableMoney(busValcustFiling.getSsMoney()); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busValcustFiling.getContractNo(), vinSid); + finUncollectedReceivablesDetailedDto.setOrgSidPath(busValcustFiling.getOrgSidPath()); + finUncollectedReceivablesDetailedDto.setBusVinSid(busSalesOrderVehicle.getSid()); + finUncollectedReceivablesDetailedDto.setPayTypeKey(busSalesOrder.getPayTypeKey()); + finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType()); + finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName()); + finUncollectedReceivablesDetailedDto.setKxState("01"); + finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid()); + finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName()); + finUncollectedReceivablesDetailedDto.setStaffName(busSalesOrder.getStaffName()); + SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData(); + finUncollectedReceivablesDetailedDto.setStaffUserSid(sysUserVo.getSid()); + finUncollectedReceivablesDetailedDto.setStaffDeptSid(busSalesOrder.getOrgSid()); + finUncollectedReceivablesDetailedDto.setStaffDeptName(busSalesOrder.getOrgName()); + finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); + } } } else { if ("1".equals(busValcustFiling.getBusSource())) { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index 3caa401182..b9df02a233 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -144,4 +144,6 @@ public class FinBillApplication extends BaseEntity { private String reason; @ApiModelProperty("欠款开票单据编号（欠款领票使用）") private String qkkpBillNo; + @ApiModelProperty("是否为单独新增") + private String showBtnStr; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index e05e5e7831..db7dba9ec8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -148,6 +148,8 @@ public class FinBillApplicationDto implements Dto { private String reason; @ApiModelProperty("欠款开票单据编号（欠款领票使用）") private String qkkpBillNo; + @ApiModelProperty("是否为单独新增") + private String showBtnStr; @ApiModelProperty("开票车辆信息") private List finBillVehicles; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java index 3b6799b8f8..66f436f5d1 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java @@ -103,4 +103,6 @@ public class FinBillApplicationVo implements Vo { private String orderSid; @ApiModelProperty("是否可以操作") private Boolean isCZ; + @ApiModelProperty("是否为单独新增") + private String showBtnStr; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 67c0d901cc..4d3decf32c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -862,6 +862,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService> getInvoicedApplyList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("手机端-删除开票申请") + @GetMapping("/deleteInvoice") + @ResponseBody + public ResultBean deleteInvoice(@RequestParam("sid") String sid); + + @ApiOperation("移动端-开票申请选择车辆") + @PostMapping("/getSelectVinsList") + @ResponseBody + public ResultBean> getSelectVinsList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("手机端-初始化 开票申请/详情") @GetMapping("/getInvoicedApply") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java index cc3ac4bfbf..7465251923 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeignFallback.java @@ -20,6 +20,16 @@ public class InvoicedFeignFallback implements InvoicedFeign { return null; } + @Override + public ResultBean deleteInvoice(String sid) { + return null; + } + + @Override + public ResultBean> getSelectVinsList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean getInvoicedApply(BillApplicationPageInfoQuery query) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java new file mode 100644 index 0000000000..14f235c951 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillGcVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.terminal.api.autoservice.invoiced; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class SelBillGcVo implements Vo { + + @ApiModelProperty("主车车架号") + private String vinNo; + @ApiModelProperty("挂车车架号") + private String gcVinNo; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java new file mode 100644 index 0000000000..aad8023e41 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.autoservice.invoiced; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class SelBillVinNoPageVo implements Vo { + + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + @ApiModelProperty("销售类型") + private String saleType; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("销售人员") + private String sellerName; + @ApiModelProperty("销售部门") + private String sellerDept; + @ApiModelProperty("开票单位") + private String invoicingUnit; + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("主车信息") + private List cars; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java new file mode 100644 index 0000000000..0693aa4ead --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.invoiced; + + +import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerDto.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto
+ * Description: 开票挂车信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class SelBillVinNoQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("已选车架号") + private List vins; + @ApiModelProperty("客户名称") + private String name; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java new file mode 100644 index 0000000000..51c131ca06 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.invoiced; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class SelBillZcVo implements Vo { + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("合格证状态key") + private String certificateStateKey; + @ApiModelProperty("合格证状态value") + private String certificateState; + @ApiModelProperty("主车合格证图片") + private List zcHgzImages; + + @ApiModelProperty("挂车信息") + private List finBillTrailers; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java index 29842f7b84..61f7fdab5c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedRest.java @@ -28,6 +28,16 @@ public class InvoicedRest implements InvoicedFeign { return invoicedService.getInvoicedApplyList(pagerQuery); } + @Override + public ResultBean deleteInvoice(String sid) { + return invoicedService.deleteInvoice(sid); + } + + @Override + public ResultBean> getSelectVinsList(PagerQuery pagerQuery) { + return invoicedService.getSelectVinsList(pagerQuery); + } + @Override public ResultBean getInvoicedApply(BillApplicationPageInfoQuery query) { return invoicedService.getInvoicedApply(query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 038740cc63..1c0fbd00d2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -32,8 +32,11 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.ItemEditTextInfo; import com.yxt.anrui.terminal.api.autoservice.invoiced.*; import com.yxt.anrui.terminal.api.autoservice.invoiced.flowable.*; @@ -64,6 +67,8 @@ public class InvoicedService { @Autowired private SysStaffOrgFeign sysStaffOrgFeign; @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired private BusSalesOrderFeign busSalesOrderFeign; @Autowired private BusBillApplicationFeign busBillApplicationFeign; @@ -106,8 +111,12 @@ public class InvoicedService { billApplicationPageVo.setNodeState(record.getNodeState()); if (record.getNodeState().equals("待提交")) { billApplicationPageVo.setShowUpData(true); + if (record.getShowBtnStr().equals("1")) { + billApplicationPageVo.setShowDelete(true); + } } else { billApplicationPageVo.setShowUpData(false); + billApplicationPageVo.setShowDelete(false); } billApplicationPageVo.setVinNo(record.getVinNo()); billApplicationPageVos.add(billApplicationPageVo); @@ -116,9 +125,21 @@ public class InvoicedService { return rb.success().setData(v); } + public ResultBean> getSelectVinsList(PagerQuery pagerQuery) { + return null; + } + public ResultBean getInvoicedApply(BillApplicationPageInfoQuery query) { ResultBean rb = ResultBean.fireFail(); BillApplicationIInfoVo vo = new BillApplicationIInfoVo(); + if (StringUtils.isBlank(query.getSid())){ + String userSid = query.getUserSid(); + String orgPath = query.getOrgPath(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); + vo.setPublishInfo(sysOrganizationVo.getName() + sysUserVo.getName()); + vo.setShowBtn(true); + } ResultBean resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid()); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -340,13 +361,13 @@ public class InvoicedService { if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { billApplicationIInfoVo.setIsCanEdit(false); billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(busSalesOrderIsDTKPJVo.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString()); } } else { billApplicationIInfoVo.setIsCanEdit(true); } - }else { + } else { billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId()); @@ -392,6 +413,11 @@ public class InvoicedService { FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + if (dto.getShowBtn()){ + finBillApplicationDto.setShowBtnStr("1"); + }else { + finBillApplicationDto.setShowBtnStr("0"); + } finBillApplicationDto.setUseOrgSid(useOrgSid); finBillApplicationDto.setCreateBySid(dto.getUserSid()); finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal()); @@ -571,7 +597,7 @@ public class InvoicedService { List invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同 List idCardImages = billApplicationIInfoDto.getIdCardImages();//证件 - if (idCardImages == null || idCardImages.size() == 0){ + if (idCardImages == null || idCardImages.size() == 0) { return new ResultBean().fail().setMsg("证件不能为空"); } List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 @@ -699,6 +725,12 @@ public class InvoicedService { public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) { ResultBean rb = ResultBean.fireFail(); + if (dto.getShowBtn()){ + List vinList = dto.getVinList(); + if (vinList == null || vinList.size() == 0){ + return rb.setMsg("车辆不能为空"); + } + } SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto(); BeanUtil.copyProperties(dto, submitBillApplicationDto, "carBuyContractImages"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); @@ -974,4 +1006,14 @@ public class InvoicedService { } return rb.success().setData(kpsqFlowListVo); } + + public ResultBean deleteInvoice(String sid) { + ResultBean rb = ResultBean.fireFail(); + String[] sids = {sid}; + ResultBean resultBean = finBillApplicationFeign.delBySids(sids); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } } From c7e1256343d538b41aa31880281e71d78e14ca85 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 9 Oct 2023 09:27:40 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E9=80=9A=E8=BF=87=E5=90=8E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9C=89=E5=85=B6=E4=BB=96=E8=9E=8D=E7=9A=84=E6=94=B9=E5=AE=8C?= =?UTF-8?q?=E5=B7=B2=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinPolicyRecordApplyService.java | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java index 658731c1e6..91604ad58a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java @@ -345,6 +345,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(policySid); + otherPolicyList.removeAll(Collections.singleton(null)); + if (!otherPolicyList.isEmpty()) { + for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) { + loanFinOtherPolicy.setFilingState(2); + loanFinOtherPolicyService.updateById(loanFinOtherPolicy); + } + } } } //==================================添加线程 @@ -422,6 +430,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(policySid); + otherPolicyList.removeAll(Collections.singleton(null)); + if (!otherPolicyList.isEmpty()) { + for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) { + loanFinOtherPolicy.setFilingState(1); + loanFinOtherPolicyService.updateById(loanFinOtherPolicy); + } + } } entity.setClosingDate(new Date()); //办结日期 @@ -546,7 +562,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - //终止任务后经销商备案状态改完未备案 + //终止任务后备案状态改完未备案 LoanFinPolicyRecordApply loanFinPolicyRecordApply = fetchBySid(query.getBusinessSid()); if (loanFinPolicyRecordApply.getNodeState().equals("终止")) { String policySids = loanFinPolicyRecordApply.getPolicySid(); @@ -556,6 +572,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(sid); + otherPolicyList.removeAll(Collections.singleton(null)); + if (!otherPolicyList.isEmpty()) { + for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) { + loanFinOtherPolicy.setFilingState(0); + loanFinOtherPolicyService.updateById(loanFinOtherPolicy); + } + } } } } @@ -571,7 +595,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - //终止任务后经销商备案状态改完未备案 + //终止任务后备案状态改完未备案 LoanFinPolicyRecordApply loanFinPolicyRecordApply = fetchBySid(query.getBusinessSid()); if (loanFinPolicyRecordApply.getNodeState().equals("终止")) { String policySids = loanFinPolicyRecordApply.getPolicySid(); @@ -581,6 +605,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService otherPolicyList = loanFinOtherPolicyService.fetchByMainSid(sid); + otherPolicyList.removeAll(Collections.singleton(null)); + if (!otherPolicyList.isEmpty()) { + for (LoanFinOtherPolicy loanFinOtherPolicy : otherPolicyList) { + loanFinOtherPolicy.setFilingState(0); + loanFinOtherPolicyService.updateById(loanFinOtherPolicy); + } + } } } } From fbce6ef9b90ca66c4df6c02f882e399af8ca9054 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 9 Oct 2023 09:32:48 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/api/common/BusSalesOrderConstantUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java index d4e538f6f8..f4da10eeb5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java @@ -251,7 +251,7 @@ public class BusSalesOrderConstantUtils { /** * 载货车 */ - TRUCK("005", "载货车"), + TRUCK("5", "载货车"), /** * 牵引车 */ From cb38c19184bdba697b3cb92730f97cfe73d732fd Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 9 Oct 2023 10:51:59 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 4d3decf32c..deae6dddfb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -883,7 +883,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService Date: Mon, 9 Oct 2023 12:00:22 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 8 ++++++++ .../BusSalesOrderBorrowerMapper.java | 2 ++ .../bussalesorderborrower/BusSalesOrderBorrowerMapper.xml | 7 +++++++ .../BusSalesOrderBorrowerService.java | 4 ++++ 4 files changed, 21 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 973cac4878..02f6b66a34 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -7510,7 +7510,15 @@ public class BusSalesOrderService extends MybatisBaseService + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index ba86493ff8..12eaec7aaa 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -308,4 +308,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService Date: Mon, 9 Oct 2023 13:31:54 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 02f6b66a34..41125462f2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -7516,7 +7516,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 9 Oct 2023 13:35:26 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/busvalcustfiling/BusValcustFilingService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 4420df60e7..f699278ed9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -444,6 +444,7 @@ public class BusValcustFilingService extends MybatisBaseService Date: Mon, 9 Oct 2023 15:17:24 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 12 ++++++++++++ .../BusSalesOrderBorrowerService.java | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 41125462f2..53a270c3fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -162,6 +162,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto; import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto; import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign; @@ -5617,6 +5618,11 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 9 Oct 2023 15:29:45 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E6=9F=A5=E7=9C=8B=E6=AC=BE=E7=A5=A8?= =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E4=BB=98=E6=AC=BE=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 0b089ca70f..91a4c35bce 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -267,7 +267,7 @@ co.collectionTypeValue, fs.subscriptionMoney as subscriptionMoneyAll, co.remarks, - fs.subscriptionDate, + co.collectionDate as subscriptionDate, co.collectionBankNum, co.receivingName, co.payerName, From 1db4659c42242b430908b2e71d3bfedb232f54d9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 9 Oct 2023 15:53:21 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractDto.java | 2 +- .../FinBillApplicationDetailsVo.java | 2 + .../FinBillApplicationFeign.java | 5 ++ .../FinBillApplicationFeignFallback.java | 5 ++ .../api/finbillapplication/PcSelBillGcVo.java | 14 ++++ .../PcSelBillVinNoPageVo.java | 64 +++++++++++++++++ .../PcSelBillVinNoQuery.java | 63 +++++++++++++++++ .../FinBillApplicationMapper.java | 3 + .../FinBillApplicationMapper.xml | 31 +++++++++ .../FinBillApplicationRest.java | 7 ++ .../FinBillApplicationService.java | 68 +++++++++++++++++++ .../LoanHomevisitPrepService.java | 4 +- .../autoservice/invoiced/InvoicedService.java | 17 ++++- 13 files changed, 281 insertions(+), 4 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java index 1a68c165b5..07c28d5d94 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractDto.java @@ -60,7 +60,7 @@ public class BusSalesOrderLoancontractDto implements Dto { @ApiModelProperty("台数") private Integer vehCount; @ApiModelProperty("消贷合同编号") - private String loanCotractNo; + private String loanContractNo; @ApiModelProperty("资方合同号") private String bankContractNo; @ApiModelProperty("资方名称") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index e81b2be615..eb680caee8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -158,6 +158,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple private String orgSidPath; @ApiModelProperty("是否显示价值客户") private Boolean showValueCustomer; + @ApiModelProperty("是否为单独新增") + private String showBtnStr; @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index 1abb596a19..cb41eb0bdb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -67,6 +67,11 @@ public interface FinBillApplicationFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("开票申请选择车辆") + @PostMapping("/getSelectVinsList") + @ResponseBody + public ResultBean> getSelectVinsList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("欠款开票分页列表") @PostMapping("/listPageQK") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 0765725a00..8dfe14c2e4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -60,6 +60,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign return rb.setMsg("接口anrui-fin/finbillapplication/listPage无法访问"); } + @Override + public ResultBean> getSelectVinsList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> listPageQK(PagerQuery pq) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java new file mode 100644 index 0000000000..fa45e531cf --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillGcVo.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PcSelBillGcVo implements Vo { + + @ApiModelProperty("主车车架号") + private String vinNo; + @ApiModelProperty("挂车车架号") + private String gcVinNo; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java new file mode 100644 index 0000000000..dc5a318ef6 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoPageVo.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class PcSelBillVinNoPageVo implements Vo { + + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("发起人sid") + private String userSid; + @ApiModelProperty("发起人名称") + private String userName; + @ApiModelProperty("发起人部门sid") + private String deptSid; + @ApiModelProperty("发起人部门名称") + private String deptName; + @ApiModelProperty("发起日期") + private String applyDate; + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + @ApiModelProperty("单台开票金额") + private String kpMoney; + @ApiModelProperty("销售类型key") + private String saleTypeKey; + @ApiModelProperty("销售类型") + private String saleType; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("销售人员sid") + private String staffSid; + @ApiModelProperty("销售人员") + private String sellerName; + @ApiModelProperty("销售部门sid") + private String staffDeptSid; + @ApiModelProperty("销售部门") + private String sellerDept; + @ApiModelProperty("开票单位") + private String invoicingUnit; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("合格证状态key") + private String certificateStateKey; + @ApiModelProperty("合格证状态value") + private String certificateState; + @ApiModelProperty("主车合格证图片") + private List zcHgzImages; + + @ApiModelProperty("挂车信息") + private List finBillTrailers; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java new file mode 100644 index 0000000000..1d7f4d2a24 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbillapplication; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerDto.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto
+ * Description: 开票挂车信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class PcSelBillVinNoQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("已选车架号") + private List vins; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("车架号") + private String vinNo; +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java index 7d47bac467..c1a3be6e3b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java @@ -60,6 +60,8 @@ public interface FinBillApplicationMapper extends BaseMapper IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage getSelectVinsList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from fin_bill_application") @@ -82,4 +84,5 @@ public interface FinBillApplicationMapper extends BaseMapper @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}") void updateZZ(String businessSid); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 69b62e476c..c6a40e22a3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -93,4 +93,35 @@ where qkkpBillNo = #{qkkpBillNo} ORDER BY createTime DESC LIMIT 1 + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index 1bb4bc8497..047b94b9a7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -76,6 +76,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { return rb.success().setData(pv); } + @Override + public ResultBean> getSelectVinsList(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finBillApplicationService.getSelectVinsList(pq); + return rb.success().setData(pv); + } + @Override public ResultBean> listPageQK(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 7c1f424da9..5fa31ecc42 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -388,6 +388,74 @@ public class FinBillApplicationService extends MybatisBaseService getSelectVinsList(PagerQuery pq) { + PcSelBillVinNoQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("bo.payTypeKey", "2"); + qw.eq("bs.busState", "401"); + qw.eq("bs.finState", "1"); + qw.eq("bs.carryInvoiceState", "0"); + qw.eq("bs.invoiceApplyState", "0"); + qw.eq("bo.useOrgSid", useOrgSid); + if (StringUtils.isNotBlank(query.getContractId())) { + qw.eq("bo.contractNo", query.getContractId()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("bo.customerName", query.getName()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.eq("bv.linkNo", query.getVinNo()); + } + if (query.getVins() != null && query.getVins().size() > 0) { + qw.notIn("bv.linkNo", query.getVins()); + } + //移动端条件 + if (StringUtils.isNotBlank(query.getName())) { + qw.and(wrapper -> wrapper.like("bo.contractNo", query.getName()).or().like("bo.customerName", query.getName())); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.getSelectVinsList(page, qw); + for (PcSelBillVinNoPageVo record : pagging.getRecords()) { + //开票单位 + if (StringUtils.isNotBlank(record.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid, record.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + record.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName()); + } + } + //主车合格证照片 + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(record.getVinSid()).getData(); + if (baseVehicleCertificateVo != null) { + List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + record.setZcHgzImages(clhgeImages); + } + //挂车信息 + TraliveredVo data = baseTrailerFeign.trailerList(record.getVinSid(), record.getContractId()).getData(); + List list = data.getList(); + List pcSelBillGcVos = new ArrayList<>(); + if (list != null && list.size() > 0){ + for (TrailerVo trailerVo : list) { + PcSelBillGcVo pcSelBillGcVo = new PcSelBillGcVo(); + pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo()); + pcSelBillGcVo.setVinNo(data.getVinNo()); + pcSelBillGcVos.add(pcSelBillGcVo); + } + } + record.setFinBillTrailers(pcSelBillGcVos); + record.setUserSid(query.getUserSid()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + record.setUserName(sysUserVo.getName()); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); + record.setDeptSid(sysOrganizationVo.getSid()); + record.setDeptName(sysOrganizationVo.getName()); + record.setApplyDate(DateUtil.formatDate(new Date())); + record.setUseOrgSid(useOrgSid); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean saveOrUpdateDto(FinBillApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index 0ed3f2c9e5..65df92309a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -243,7 +243,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService> getSelectVinsList(PagerQuery pagerQuery) { - return null; + ResultBean> rb = ResultBean.fireFail(); + SelBillVinNoQuery params = pagerQuery.getParams(); + FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery(); + finBillApplicationQuery.setCreateBySid(params.getUserSid()); + finBillApplicationQuery.setName(params.getName()); + finBillApplicationQuery.setOrgPath(params.getOrgPath()); + //finBillApplicationQuery.setType(params.getType()); + //finBillApplicationQuery.setMenuSid(params.getMenuSid()); + PagerQuery pcq = new PagerQuery<>(); + pcq.setParams(finBillApplicationQuery); + ResultBean> resultBean = finBillApplicationFeign.listPage(pcq); + List records = resultBean.getData().getRecords(); + List billApplicationPageVos = new ArrayList<>(); + PagerVo v = new PagerVo<>(); + v.setRecords(billApplicationPageVos); + return rb.success().setData(v); } public ResultBean getInvoicedApply(BillApplicationPageInfoQuery query) { From add5ae97ab9d07b50afa927ffca437c65c77c5be Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 9 Oct 2023 16:34:18 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesordervehicle/BusSalesOrderVehicleFeign.java | 4 ++-- .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java | 4 ++-- .../biz/bussalesordervehicle/BusSalesOrderVehicleRest.java | 4 ++-- .../biz/bussalesordervehicle/BusSalesOrderVehicleService.java | 4 ++-- .../fin/api/finbillapplication/PcSelBillVinNoPageVo.java | 4 ++++ .../fin/biz/finbillapplication/FinBillApplicationMapper.xml | 4 ++++ .../fin/biz/finbillapplication/FinBillApplicationService.java | 2 +- .../biz/loanhomevisitprep/LoanHomevisitPrepService.java | 4 ++-- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 3ae4e1b6f5..43a08586b7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -121,10 +121,10 @@ public interface BusSalesOrderVehicleFeign { @ResponseBody ResultBean> selectListByvinNo(@RequestParam("vinNo") String vinNo); - @ApiOperation("更新订单车辆的贷款人sid和消贷合同sid") + @ApiOperation("更新订单车辆的消贷合同sid") @PostMapping("/updateXDCon") @ResponseBody - ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("borrowerSid") String borrowerSid, @RequestParam("loanContractSid") String loanContractSid); + ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("loanContractSid") String loanContractSid); @ApiOperation("根据销售订单sid和车辆sid查询销售订单车辆信息") @PostMapping("/selectByOrderSidAndVehSid") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index e0635c5177..4b8ab03b97 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -144,8 +144,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectBySalesOrderSid(String saleOrderSid); - @Update("update bus_sales_order_vehicle set borrowerSid = #{borrowerSid},loanContractSid = #{loanContractSid} where sid = #{sid}") - void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid); + @Update("update bus_sales_order_vehicle set loanContractSid = #{loanContractSid} where sid = #{sid}") + void updateXDCon(@Param("sid") String sid, @Param("loanContractSid") String loanContractSid); BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 7135ad6d0a..c1ebefa03f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -129,8 +129,8 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { } @Override - public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) { - return busSalesOrderVehicleService.updateXDCon(sid, borrowerSid, loanContractSid); + public ResultBean updateXDCon(String sid, String loanContractSid) { + return busSalesOrderVehicleService.updateXDCon(sid, loanContractSid); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 55e88d4725..d41b501aa3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -568,9 +568,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService ${ew.sqlSegment} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 5fa31ecc42..834c003649 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -408,7 +408,7 @@ public class FinBillApplicationService extends MybatisBaseService 0) { - qw.notIn("bv.linkNo", query.getVins()); + qw.notIn("bv.linkSid", query.getVins()); } //移动端条件 if (StringUtils.isNotBlank(query.getName())) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index 65df92309a..fe58d2bc25 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -250,7 +250,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService Date: Tue, 10 Oct 2023 08:58:22 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basetrailer/BaseTrailerFeign.java | 4 ++- .../biz/basetrailer/BaseTrailerMapper.java | 3 ++ .../base/biz/basetrailer/BaseTrailerRest.java | 5 +++ .../biz/basetrailer/BaseTrailerService.java | 6 ++++ .../BusSalesOrderVehicleFeignFallback.java | 2 +- .../FinBillApplicationService.java | 31 ++++++++++++++----- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index 006001371d..65d0cb1763 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -139,5 +139,7 @@ public interface BaseTrailerFeign { @GetMapping("/fetchByGcVinNo/{gcVinNo}") ResultBean fetchByGcVinNo(@PathVariable("gcVinNo") String gcVinNo); - + @ApiOperation("根据挂车车架号和车辆sid获取一条记录") + @PostMapping("/fetchByGcVinNoAndVehSid") + ResultBean fetchByGcVinNoAndVehSid(@RequestParam("gcVinNo") String gcVinNo,@RequestParam("vehSid") String vehSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index e78eb360f7..466e99770e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java @@ -103,4 +103,7 @@ public interface BaseTrailerMapper extends BaseMapper { @Select("select * from base_trailer where vehSid = #{vehSid}") List getByVehSid(@Param("vehSid") String vehSid); + + @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid}") + BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index 25ea52e8ad..43b115e081 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java @@ -131,4 +131,9 @@ public class BaseTrailerRest implements BaseTrailerFeign { public ResultBean fetchByGcVinNo(String gcVinNo) { return baseTrailerService.fetchByGcVinNo(gcVinNo); } + + @Override + public ResultBean fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) { + return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo,vehSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 750e0e96bc..6a11c9ce17 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -943,4 +943,10 @@ public class BaseTrailerService extends MybatisBaseService baseTrailers = baseMapper.getByVehSid(vehSid); return rb.success().setData(baseTrailers); } + + public ResultBean fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) { + ResultBean rb = ResultBean.fireFail(); + BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo,vehSid); + return rb.success().setData(baseTrailerDetailsVo); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 4bcf7aa755..e07d8ede16 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -114,7 +114,7 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe } @Override - public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) { + public ResultBean updateXDCon(String sid, String loanContractSid) { return null; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 834c003649..2ec796c374 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -434,7 +434,7 @@ public class FinBillApplicationService extends MybatisBaseService list = data.getList(); List pcSelBillGcVos = new ArrayList<>(); - if (list != null && list.size() > 0){ + if (list != null && list.size() > 0) { for (TrailerVo trailerVo : list) { PcSelBillGcVo pcSelBillGcVo = new PcSelBillGcVo(); pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo()); @@ -483,12 +483,27 @@ public class FinBillApplicationService extends MybatisBaseService list = data.getList(); - for (TrailerVo trailerVo : list) { - FinBillTrailer finBillTrailer = new FinBillTrailer(); - finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo()); - finBillTrailer.setVinNo(finBillVehicleDto.getVinNo()); - finBillTrailer.setBillAppSid(finBillApplication.getSid()); - finBillTrailerService.save(finBillTrailer); + if (finBillTrailers != null && finBillTrailers.size() > 0) { + for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { + FinBillTrailer finBillTrailer = new FinBillTrailer(); + BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid"); + finBillTrailer.setBillAppSid(finBillApplication.getSid()); + if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) { + finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey()); + finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue()); + finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid()); + finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName()); + finBillTrailerService.save(finBillTrailer); + } + } + } else { + for (TrailerVo trailerVo : list) { + FinBillTrailer finBillTrailer = new FinBillTrailer(); + finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo()); + finBillTrailer.setVinNo(finBillVehicleDto.getVinNo()); + finBillTrailer.setBillAppSid(finBillApplication.getSid()); + finBillTrailerService.save(finBillTrailer); + } } } //附件信息 @@ -682,7 +697,7 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); List hgzImageUrls = new ArrayList<>(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { From bc5b63b4d5255acf13ef54d4c8988ad9bfa92fd3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 10 Oct 2023 09:00:58 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/api/basetrailer/BaseTrailerFeignFallback.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java index 605fb4282a..f2155fa2be 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java @@ -103,4 +103,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign { public ResultBean fetchByGcVinNo(String gcVinNo) { return null; } + + @Override + public ResultBean fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) { + return null; + } } \ No newline at end of file