From 3456050b12c5e1f906fc87c50e3b0cf88e20e755 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 21 Feb 2025 10:52:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/flowapprover/FlowApprover.java | 2 +- .../anrui/flowable/biz/flow4/Flow4Rest.java | 3 +- .../flowable/biz/flow4/Flow4Service.java | 42 +++++++++++-------- .../biz/flowapprover/FlowApproverMapper.java | 2 + .../biz/flowapprover/FlowApproverMapper.xml | 34 +++++++++++++++ .../biz/flowapprover/FlowApproverService.java | 6 +-- .../flowable/biz/flowcc/FlowCcMapper.java | 2 + .../flowable/biz/flowcc/FlowCcMapper.xml | 33 +++++++++++++++ .../flowable/biz/flowcc/FlowCcService.java | 4 ++ doc/databases/flowable.sql | 2 +- 10 files changed, 107 insertions(+), 23 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java index 7378438c5a..d111bd2c1c 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java @@ -19,5 +19,5 @@ public class FlowApprover extends BaseEntity { @ApiModelProperty("审批人sid") private String approverSid; @ApiModelProperty("审批人名称") - private String approvalName; + private String approverName; } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java index 5cd998feeb..658a5b531d 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java @@ -4,6 +4,7 @@ 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.flowcc.FlowCc; import com.yxt.anrui.flowable.biz.flow2.FlowRest; import com.yxt.anrui.flowable.feign.form.MessageFlowVo; import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery; @@ -73,7 +74,7 @@ public class Flow4Rest { //启动流程 ResultBean voResultBean = startProcess(bv); System.out.println("voResultBean{}" + voResultBean); - return rb.success(); + return voResultBean; } public ResultBean handleProsess(BusinessVariables bv) { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java index 41c6389c4a..e576886108 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java @@ -245,21 +245,26 @@ public class Flow4Service extends MybatisBaseService { List approvers = (List) variables.get("approvers"); // 获取抄送人列表 List ccList = (List) variables.get("ccList"); + if (approvers != null) { + FlowApproverDto flowApproverDto = new FlowApproverDto(); + flowApproverDto.setBusinessSid(bv.getBusinessSid()); + flowApproverDto.setApproverSidList(approvers); + ResultBean resultBean = flowApproverService.saveFlowApprover(flowApproverDto); + } + + if (ccList != null) { + String ccSids = String.join(",", ccList); + ResultBean> listResultBean = sysUserFeign.fetchBySids(ccSids); + List ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList()); + // 将 List 转换为逗号分隔的字符串 + String result = String.join(",", ccNameList); + FlowCc flowCc = new FlowCc(); + flowCc.setBusinessSid(bv.getBusinessSid()); + flowCc.setCcSids(ccSids); + flowCc.setCcNames(result); + flowCcService.insertFlowCc(flowCc); + } - FlowApproverDto flowApproverDto = new FlowApproverDto(); - flowApproverDto.setBusinessSid(bv.getBusinessSid()); - flowApproverDto.setApproverSidList(approvers); - ResultBean resultBean = flowApproverService.saveFlowApprover(flowApproverDto); - String ccSids = String.join(",", ccList); - ResultBean> listResultBean = sysUserFeign.fetchBySids(ccSids); - List ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList()); - // 将 List 转换为逗号分隔的字符串 - String result = String.join(",", ccNameList); - FlowCc flowCc = new FlowCc(); - flowCc.setBusinessSid(bv.getBusinessSid()); - flowCc.setCcSids(ccSids); - flowCc.setCcNames(result); - flowCcService.insert(flowCc); } /** @@ -355,10 +360,13 @@ public class Flow4Service extends MybatisBaseService { UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); BeanUtil.copyProperties(uff1, uff); uff.setTaskDefKey(taskDefKey); - + StringBuilder userSids = new StringBuilder(); + StringBuilder userName = new StringBuilder(); FlowCc flowCc = flowCcService.selectByBusinessSid(bv.getBusinessSid()); - StringBuilder userSids = new StringBuilder(flowCc.getCcSids()); - StringBuilder userName = new StringBuilder(flowCc.getCcNames()); + if(flowCc != null){ + userSids = new StringBuilder(flowCc.getCcSids()); + userName = new StringBuilder(flowCc.getCcNames()); + } //抄送的业务逻辑 MessageFlowableQuery mfq = new MessageFlowableQuery(); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java index 6149af4ece..e712aeff93 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java @@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface FlowApproverMapper extends BaseMapper { String selectApproverSid(@Param("businessSid") String businessSid, @Param("sortNo") Integer sortNo); + + int insertApprover(FlowApprover flowApprover); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml index 223f2ea762..71963306b9 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml @@ -7,4 +7,38 @@ where businessSid = #{businessSid} and sortNo = #{sortNo} + + + insert into flow_approver + + sid, + + businessSid, + + + approverSid, + + + approverName, + + + sortNo, + + + + UUID(), + + #{businessSid}, + + + #{approverSid}, + + + #{approverName}, + + + #{sortNo}, + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java index 41364483fe..7d5127d362 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java @@ -39,15 +39,15 @@ public class FlowApproverService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(approverSid); SysUserVo sysUser = sysUserVoResultBean.getData(); - flowApprover.setApprovalName(sysUser.getName()); + flowApprover.setApproverName(sysUser.getName()); flowApprover.setSortNo(sortNo); - baseMapper.insert(flowApprover); + baseMapper.insertApprover(flowApprover); } } return rb.success(); } public String selectApproverSid(String businessSid, Integer sortNo) { - return baseMapper.selectApproverSid(businessSid,sortNo); + return baseMapper.selectApproverSid(businessSid, sortNo); } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java index 5aabe3925a..3306cea860 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java @@ -13,4 +13,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface FlowCcMapper extends BaseMapper { FlowCc selectByBusinessSid(String businessSid); + + int insertFlowCc(FlowCc flowCc); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml index 7d0742116e..46dcb001f4 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml @@ -1,4 +1,37 @@ + + + + insert into flow_cc + + sid, + + businessSid, + + + ccSids, + + + ccNames, + + + + UUID(), + + #{businessSid}, + + + #{ccSids}, + + + #{ccNames}, + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java index 8ca47a60a3..8cdecd1f70 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java @@ -16,4 +16,8 @@ public class FlowCcService extends MybatisBaseService { public FlowCc selectByBusinessSid(String businessSid) { return baseMapper.selectByBusinessSid(businessSid); } + + public int insertFlowCc(FlowCc flowCc) { + return baseMapper.insertFlowCc(flowCc); + } } diff --git a/doc/databases/flowable.sql b/doc/databases/flowable.sql index fb3468a781..9fb5ca796a 100644 --- a/doc/databases/flowable.sql +++ b/doc/databases/flowable.sql @@ -15,7 +15,7 @@ CREATE TABLE `flow_approver` `businessSid` varchar(64) DEFAULT NULL COMMENT '申请sid', `sortNo` int(32) DEFAULT NULL COMMENT '序号', `approverSid` varchar(64) DEFAULT NULL COMMENT '审批人sid', - `approvalName` varchar(64) DEFAULT NULL COMMENT '审批人名称', + `approverName` varchar(64) DEFAULT NULL COMMENT '审批人名称', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB From d2495fea6c2360b49293f38fc8df5ccca4236fc8 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 21 Feb 2025 11:33:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9=E6=9D=A1=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=A4=A7=E4=BA=8E0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 143 +++++++++--------- .../biz/loandiff/LoanDiffService.java | 75 ++++----- 2 files changed, 114 insertions(+), 104 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 995492918a..8dea604160 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -2205,14 +2205,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>(); - ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); - scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); - scmVehRebateDto.setRebateTypeKey("029"); - scmVehRebateDto.setRebateTypeValue("金融贴息"); - scmVehRebateDto.setRebateName("金融贴息"); BigDecimal all = BigDecimal.ZERO; if(loanSolutions.getActualDiscount() != null){ all = all.add(loanSolutions.getActualDiscount()); @@ -2220,33 +2212,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0){ + //推送单车返利管理 + ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); + List scmVehRebateVehDtos = new ArrayList<>(); + ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); + scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); + scmVehRebateDto.setRebateTypeKey("029"); + scmVehRebateDto.setRebateTypeValue("金融贴息"); + scmVehRebateDto.setRebateName("金融贴息"); + scmVehRebateDto.setCalculationStandard(all.toString()); + scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); + scmVehRebateDto.setCalculationModeKey("002"); + scmVehRebateDto.setCalculationModeValue("固定金额"); + scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath()); + scmVehRebateVehDto.setState("2"); + scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); + scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); + scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); + scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); + scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); + scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); + scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); + BigDecimal ll = BigDecimal.ZERO; + if(loanSolutions.getActualDiscount() != null){ + ll = ll.add(loanSolutions.getActualDiscount()); + } + if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){ + ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount()); + } + scmVehRebateVehDto.setEstimateRebate(ll.toString()); + scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + scmVehRebateVehDtos.add(scmVehRebateVehDto); + scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); + scmVehRebateFeign.save(scmVehRebateDto); } - scmVehRebateVehDto.setEstimateRebate(ll.toString()); - scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); - scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); - scmVehRebateVehDtos.add(scmVehRebateVehDto); - scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); - scmVehRebateFeign.save(scmVehRebateDto); + finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString()); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); } @@ -2374,14 +2377,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>(); - ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); - scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); - scmVehRebateDto.setRebateTypeKey("029"); - scmVehRebateDto.setRebateTypeValue("金融贴息"); - scmVehRebateDto.setRebateName("金融贴息"); BigDecimal all = BigDecimal.ZERO; if(loanSolutions.getActualDiscount() != null){ all = all.add(loanSolutions.getActualDiscount()); @@ -2389,33 +2384,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + //推送单车返利管理 + ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); + List scmVehRebateVehDtos = new ArrayList<>(); + ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); + scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); + scmVehRebateDto.setRebateTypeKey("029"); + scmVehRebateDto.setRebateTypeValue("金融贴息"); + scmVehRebateDto.setRebateName("金融贴息"); + + scmVehRebateDto.setCalculationStandard(all.toString()); + scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); + scmVehRebateDto.setCalculationModeKey("002"); + scmVehRebateDto.setCalculationModeValue("固定金额"); + scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath()); + scmVehRebateVehDto.setState("2"); + scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); + scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); + scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); + scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); + scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); + scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); + scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); + BigDecimal ll = BigDecimal.ZERO; + if(loanSolutions.getActualDiscount() != null){ + ll = ll.add(loanSolutions.getActualDiscount()); + } + if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){ + ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount()); + } + scmVehRebateVehDto.setEstimateRebate(ll.toString()); + scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + scmVehRebateVehDtos.add(scmVehRebateVehDto); + scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); + scmVehRebateFeign.save(scmVehRebateDto); } - scmVehRebateVehDto.setEstimateRebate(ll.toString()); - scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); - scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); - scmVehRebateVehDtos.add(scmVehRebateVehDto); - scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); - scmVehRebateFeign.save(scmVehRebateDto); + finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString()); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java index b21c11ccc0..93542496ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java @@ -421,48 +421,51 @@ public class LoanDiffService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>(); - ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); - scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid()); - scmVehRebateDto.setRebateTypeKey("029"); - scmVehRebateDto.setRebateTypeValue("金融贴息"); - scmVehRebateDto.setRebateName("金融贴息"); BigDecimal all = BigDecimal.ZERO; - if(loanDiffDetails.getRealityDiscount() != null){ + if (loanDiffDetails.getRealityDiscount() != null) { all = all.add(loanDiffDetails.getRealityDiscount()); } - if(loanDiffDetails.getRealityOtherDiscount() != null){ + if (loanDiffDetails.getRealityOtherDiscount() != null) { all = all.add(loanDiffDetails.getRealityOtherDiscount()); } - scmVehRebateDto.setCalculationStandard(all.toString()); - scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); - scmVehRebateDto.setCalculationModeKey("002"); - scmVehRebateDto.setCalculationModeValue("固定金额"); - scmVehRebateDto.setOrgPath(loanDiff.getOrgSidPath()); - scmVehRebateVehDto.setState("2"); - scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); - scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); - scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); - scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); - scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); - scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); - scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); - scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); - BigDecimal ll = BigDecimal.ZERO; - if(loanDiffDetails.getRealityDiscount() != null){ - ll = ll.add(loanDiffDetails.getRealityDiscount()); - } - if(loanDiffDetails.getRealityOtherDiscount() != null){ - ll = ll.add(loanDiffDetails.getRealityOtherDiscount()); + if (all.compareTo(BigDecimal.ZERO) > 0) { + //推送单车返利管理 + ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); + List scmVehRebateVehDtos = new ArrayList<>(); + ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); + scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid()); + scmVehRebateDto.setRebateTypeKey("029"); + scmVehRebateDto.setRebateTypeValue("金融贴息"); + scmVehRebateDto.setRebateName("金融贴息"); + scmVehRebateDto.setCalculationStandard(all.toString()); + scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); + scmVehRebateDto.setCalculationModeKey("002"); + scmVehRebateDto.setCalculationModeValue("固定金额"); + scmVehRebateDto.setOrgPath(loanDiff.getOrgSidPath()); + scmVehRebateVehDto.setState("2"); + scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); + scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); + scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); + scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); + scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); + scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); + scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); + BigDecimal ll = BigDecimal.ZERO; + if (loanDiffDetails.getRealityDiscount() != null) { + ll = ll.add(loanDiffDetails.getRealityDiscount()); + } + if (loanDiffDetails.getRealityOtherDiscount() != null) { + ll = ll.add(loanDiffDetails.getRealityOtherDiscount()); + } + scmVehRebateVehDto.setEstimateRebate(ll.toString()); + scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + scmVehRebateVehDtos.add(scmVehRebateVehDto); + scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); + scmVehRebateFeign.save(scmVehRebateDto); } - scmVehRebateVehDto.setEstimateRebate(ll.toString()); - scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); - scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); - scmVehRebateVehDtos.add(scmVehRebateVehDto); - scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); - scmVehRebateFeign.save(scmVehRebateDto); + int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString()); } } From e1d99518fd58194dc4ea43eabac37abf9a86ed8a Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 21 Feb 2025 15:40:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitPrepFeign.java | 15 --------- .../ScmSpecialRebateRest.java | 11 ++----- .../biz/scmvehrebate/ScmVehRebateRest.java | 4 +-- .../anrui/oa/api/AdFrockallotApplyRest.java | 19 ++--------- .../anrui/oa/api/AdFrockallotDetailRest.java | 15 --------- .../anrui/oa/api/AdPircarpulApplyRest.java | 7 ---- .../AdFrockallotDetail.java | 2 +- .../AdFrockallotDetailMapper.java | 10 ------ .../AdFrockallotDetailService.java | 19 ----------- .../AdPircarpulApplyMapper.java | 23 ------------- .../adpircarpuldetail/AdPircarpulDetail.java | 32 +++++++++---------- .../AdPircarpulDetailMapper.java | 22 ------------- .../AdPircarpulDetailService.java | 31 ------------------ .../anrui/oa/biz/oamendapply/OaMendApply.java | 8 ----- .../wms/feign/flowable/flow/ProcDefEnum.java | 10 +++--- 15 files changed, 29 insertions(+), 199 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java index 5131ef579c..4c582d2bc0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitprep/LoanHomevisitPrepFeign.java @@ -33,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - -/** - * Project: anrui-riskcenter(家访准备)
- * File: LoanHomevisitPrepFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign
- * Description: 家访准备.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-08-09 15:47:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "家访准备") @FeignClient( contextId = "anrui-riskcenter-LoanHomevisitPrep", diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index 48a6b5ee59..76b2194658 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -115,17 +115,10 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); for (String sid : sids) { - List stringList = scmSpecialRebateWithService.fetchBySpecialReBateSid(sid); - for (String s : stringList) { - ScmSpecialRebateWithApply scmSpecialRebateWithApply = scmSpecialRebateWithApplyService.fetchBySid(s); - if (!scmSpecialRebateWithApply.getNodeState().equals("待提交")) { - return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除"); - } - } ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(sid); Integer state = scmSpecialRebate.getState(); - if (state == 1) { - return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除"); + if (state != 0) { + return rb.setMsg("请选择状态为未预提的记录删除"); } } scmSpecialRebateService.delBySids(sids); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 6ebeda8fa2..a61f072aaa 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -197,8 +197,8 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { for (String sid : sids) { ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(sid); Integer state = scmVehRebate.getState(); - if (state == 1) { - return rb.setMsg("所选数据中包含已预提单车返利信息，无法删除"); + if (state != 0) { + return rb.setMsg("请选择状态为未预提的记录删除"); } } scmVehRebateService.delBySids(sids); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java index cf3a0d025a..ecc67f3b5d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java @@ -26,29 +26,16 @@ package com.yxt.anrui.oa.api; import com.yxt.anrui.oa.biz.adfrockallotapply.*; -import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo; import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDto; -import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyVo; import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; - -import java.util.List; -import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApply; -import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyQuery; -import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyVo; -import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDetailsVo; -import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDto; -import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyFeign; - import javax.validation.Valid; @Api(tags = "工装订制配发申请") @@ -80,20 +67,20 @@ public class AdFrockallotApplyRest { @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody AdPircarpulApplyDto dto) { + public ResultBean save(@RequestBody AdFrockallotApplyDto dto) { return adFrockallotApplyService.saveOrUpdateDto(dto); } @ApiOperation("详情") @GetMapping("/details/{sid}") - ResultBean details(@PathVariable("sid") String sid + ResultBean details(@PathVariable("sid") String sid , @RequestParam(value = "application", required = false) String application) { return adFrockallotApplyService.details(sid,application); } @ApiOperation("提交审批流程") @PostMapping("/submit") - public ResultBean submit(@RequestBody AdPircarpulApplyDto dto) { + public ResultBean submit(@RequestBody AdFrockallotApplyDto dto) { return adFrockallotApplyService.submit(dto); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java index c6fff4a48e..16dcf0b126 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java @@ -25,24 +25,9 @@ *********************************************************/ package com.yxt.anrui.oa.api; -import com.yxt.anrui.oa.biz.adfrockallotdetail.*; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailQuery; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDetailsVo; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDto; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailFeign; - - @Api(tags = "工装订制配发列表") @RestController @RequestMapping("v1/adfrockallotdetail") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java index d895ef0830..0e49cab1e7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java @@ -25,23 +25,16 @@ *********************************************************/ package com.yxt.anrui.oa.api; -import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo; -import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDto; -import com.yxt.anrui.oa.biz.adleasehostapply.adPircarpulApplyService; -import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyVo; import com.yxt.anrui.oa.biz.adpircarpulapply.*; import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; - import javax.validation.Valid; @Api(tags = "临时私车公用申请") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java index 80f0f6fe85..da53734b1f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java @@ -30,7 +30,7 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - +import java.math.BigDecimal; @Data @ApiModel(value = "工装订制配发列表", description = "工装订制配发列表") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java index ca5cb73c69..87a0c03244 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java @@ -25,21 +25,11 @@ *********************************************************/ package com.yxt.anrui.oa.biz.adfrockallotdetail; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetail; -import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo; - import java.util.List; - @Mapper public interface AdFrockallotDetailMapper extends BaseMapper { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java index 6ac1817752..8454db38bb 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java @@ -26,30 +26,11 @@ package com.yxt.anrui.oa.biz.adfrockallotdetail; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetail; -import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailDto; -import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailQuery; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDetailsVo; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDto; -import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailFeign; - import org.springframework.stereotype.Service; - import java.util.Collections; import java.util.List; - @Service public class AdFrockallotDetailService extends MybatisBaseService { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java index c0eb75ee34..1dc74326b9 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java @@ -25,32 +25,9 @@ *********************************************************/ package com.yxt.anrui.oa.biz.adpircarpulapply; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApply; -import com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo; -import java.util.List; - -/** - * Project: yxt-oa(私车临时公用)
- * File: AdPircarpulApplyMapper.java
- * Class: com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper
- * Description: 临时私车公用申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 09:42:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface AdPircarpulApplyMapper extends BaseMapper { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java index 062f12d806..7bfe84f057 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java @@ -30,7 +30,7 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - +import java.math.BigDecimal; @Data @ApiModel(value = "临时私车公用列表", description = "临时私车公用列表") @@ -38,35 +38,35 @@ import lombok.Data; public class AdPircarpulDetail extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("申请sid") + @ApiModelProperty("申请sid") private String mainSid; // 申请sid - @ApiModelProperty("人员sid") + @ApiModelProperty("人员sid") private String userSid; // 人员sid - @ApiModelProperty("人员姓名") + @ApiModelProperty("人员姓名") private String userName; // 人员姓名 - @ApiModelProperty("部门sid") + @ApiModelProperty("部门sid") private String deptSid; // 部门sid - @ApiModelProperty("部门名称") + @ApiModelProperty("部门名称") private String deptName; // 部门名称 - @ApiModelProperty("岗位sid") + @ApiModelProperty("岗位sid") private String postSid; // 岗位sid - @ApiModelProperty("岗位名称") + @ApiModelProperty("岗位名称") private String postName; // 岗位名称 - @ApiModelProperty("用车事由") + @ApiModelProperty("用车事由") private String reasonsForUsingVehicles; // 用车事由 - @ApiModelProperty("计划出发地址") + @ApiModelProperty("计划出发地址") private String departureAddress; // 计划出发地址 - @ApiModelProperty("目的地地址") + @ApiModelProperty("目的地地址") private String destinationAddress; // 目的地地址 - @ApiModelProperty("计划出发时间") + @ApiModelProperty("计划出发时间") private String departureTime; // 计划出发时间 - @ApiModelProperty("计划返回时间") + @ApiModelProperty("计划返回时间") private String returnTime; // 计划返回时间 - @ApiModelProperty("车牌号") + @ApiModelProperty("车牌号") private String plateNumber; // 车牌号 - @ApiModelProperty("预计费用") + @ApiModelProperty("预计费用") private BigDecimal expectCost; // 预计费用 - @ApiModelProperty("费用明细") + @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java index ef614b36d3..089f127964 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java @@ -25,33 +25,11 @@ *********************************************************/ package com.yxt.anrui.oa.biz.adpircarpuldetail; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetail; -import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetail; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo; - import java.util.List; -/** - * Project: yxt-oa(私车临时公用)
- * File: AdPircarpulDetailMapper.java
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper
- * Description: 临时私车公用列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 09:42:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface AdPircarpulDetailMapper extends BaseMapper { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java index ca8ed81fd9..6a1c4df5a6 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java @@ -26,42 +26,11 @@ package com.yxt.anrui.oa.biz.adpircarpuldetail; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetail; -import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailDto; -import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetail; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailQuery; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDetailsVo; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDto; -import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailFeign; - import org.springframework.stereotype.Service; - import java.util.Collections; import java.util.List; -/** - * Project: yxt-oa(私车临时公用)
- * File: AdPircarpulDetailService.java
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailService
- * Description: 临时私车公用列表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 09:42:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class AdPircarpulDetailService extends MybatisBaseService { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java index 6bd07c59b6..bf6d93d15c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java @@ -25,19 +25,11 @@ *********************************************************/ package com.yxt.anrui.oa.biz.oamendapply; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.common.core.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.util.Date; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.data.annotation.Transient; - @Data @ApiModel(value = "补卡申请", description = "补卡申请") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java index ba000270da..2b409e7093 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java @@ -8,13 +8,13 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"), - WMSOLDINVENCHECKREPORT("旧件盘点报告审批", "process_wtab67fj:1:14197600"), + WMSOLDINVENCHECKREPORT("旧件盘点报告审批", "process_chyb7xug:1:17592520"), WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"), WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"), - WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_kwd3cagu:2:15792504"), - WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_gmjrjghm:2:15792512"), - WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_kwd3cagu:3:15792508"), - WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_gmjrjghm:3:15792516"), + WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_g4zmi6xc:1:17592504"), + WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_w4rvfxuv:1:17592512"), + WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_x0piy712:1:17592508"), + WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_bqtvd42s:1:17592516"), WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"), WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"), WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"), From 5ee7c1c3f7cc78662e8c607cb0958d3c865339f4 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 21 Feb 2025 16:55:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmspecialrebate/ScmSpecialRebateVo.java | 4 ++++ .../scm/api/scmvehrebate/ScmVehRebateVo.java | 4 ++++ .../ScmSpecialRebateMapper.xml | 3 ++- .../ScmSpecialRebateService.java | 20 +++++++++++++++++++ .../biz/scmvehrebate/ScmVehRebateMapper.xml | 6 ++++-- .../biz/scmvehrebate/ScmVehRebateService.java | 18 +++++++++++++++++ 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index 85ca827c7d..3412216bf9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java @@ -138,4 +138,8 @@ public class ScmSpecialRebateVo implements Vo { private String secondSuppRemark; @ApiModelProperty("上传状态(0未上传、1已上传)") private String uploadState; + @ApiModelProperty("未上传金额") + private BigDecimal notUploadMoney; + @ApiModelProperty("二次核对状态") + private String secondCheckState; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index e702fe1cba..0b2dc2272e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -154,4 +154,8 @@ public class ScmVehRebateVo implements Vo { private String purchaseSystemName; @ApiModelProperty("上装金额") private BigDecimal topAmount; + @ApiModelProperty("未上传金额") + private BigDecimal notUploadMoney; + @ApiModelProperty("二次核对状态") + private String secondCheckState; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index 8633e675aa..c3099044a7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -7,7 +7,8 @@ SELECT *, expectItureCost + expectTreatCost + expectSuppCost AS expectCost, expectItureCost + expectTreatCost + expectSuppCost AS withholdCost, - onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money + onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money, + estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney FROM scm_special_rebate ${ew.sqlSegment} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index ddc2291cb0..746376cc3c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -159,6 +159,17 @@ public class ScmSpecialRebateService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmSpecialRebateVo record : pagging.getRecords()) { + if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){ + if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){ + record.setSecondCheckState("是"); + }else { + record.setSecondCheckState("否"); + } + }else { + record.setSecondCheckState("否"); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -478,6 +489,15 @@ public class ScmSpecialRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())){ + record.setSecondCheckState("是"); + }else { + record.setSecondCheckState("否"); + } + }else { + record.setSecondCheckState("否"); + } } return scmSpecialRebateVoList; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index 11e3da7487..54614a9361 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -9,7 +9,8 @@ sid AS vehRebateSid, expectTreatCost + expectSuppCost AS expectCost, expectTreatCost + expectSuppCost AS withholdCost, - onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money + onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, + estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney FROM scm_veh_rebate @@ -138,7 +139,8 @@ sid AS vehRebateSid, expectTreatCost + expectSuppCost AS expectCost, expectTreatCost + expectSuppCost AS withholdCost, - onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money + onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money, + estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney AS notUploadMoney FROM scm_veh_rebate diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index d69c46d683..55e6affce7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -161,6 +161,15 @@ public class ScmVehRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())){ + record.setSecondCheckState("是"); + }else { + record.setSecondCheckState("否"); + } + }else { + record.setSecondCheckState("否"); + } } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; @@ -449,6 +458,15 @@ public class ScmVehRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())){ + record.setSecondCheckState("是"); + }else { + record.setSecondCheckState("否"); + } + }else { + record.setSecondCheckState("否"); + } } return scmVehRebateVoList; }