Merge remote-tracking branch 'origin/master'

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<FinColl
                                 creditResult.setResultDetails(collectionDetailDtoListOne);
                                 creditResult.setRemarks("放款差额");
                                 creditResultService.pushOtherReceivableBill(creditResult);
-                                //推送单车返利管理
-                                ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
-                                List<ScmVehRebateVehDto> 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<FinColl
                                 if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
                                     all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
                                 }
-                                scmVehRebateDto.setCalculationStandard(all.toString());
+                                if(all.compareTo(BigDecimal.ZERO) > 0){
-                                scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
+                                    //推送单车返利管理
-                                scmVehRebateDto.setCalculationModeKey("002");
+                                    ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
-                                scmVehRebateDto.setCalculationModeValue("固定金额");
+                                    List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
-                                scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
+                                    ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
-                                scmVehRebateVehDto.setState("2");
+                                    scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
-                                scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
+                                    scmVehRebateDto.setRebateTypeKey("029");
-                                scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
+                                    scmVehRebateDto.setRebateTypeValue("金融贴息");
-                                scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
+                                    scmVehRebateDto.setRebateName("金融贴息");
-                                scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
+                                    scmVehRebateDto.setCalculationStandard(all.toString());
-                                scmVehRebateVehDto.setVehSid(baseVehicle.getSid());
+                                    scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
-                                scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+                                    scmVehRebateDto.setCalculationModeKey("002");
-                                scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
+                                    scmVehRebateDto.setCalculationModeValue("固定金额");
-                                scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
+                                    scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
-                                BigDecimal ll = BigDecimal.ZERO;
+                                    scmVehRebateVehDto.setState("2");
-                                if(loanSolutions.getActualDiscount() != null){
+                                    scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
-                                    ll = ll.add(loanSolutions.getActualDiscount());
+                                    scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
-                                }
+                                    scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
-                                if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+                                    scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
-                                    ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+                                    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<FinColl
                             creditResult.setResultDetails(collectionDetailDtoListOne);
                             creditResult.setRemarks("放款差额");
                             creditResultService.pushOtherReceivableBill(creditResult);
-                            //推送单车返利管理
-                            ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
-                            List<ScmVehRebateVehDto> 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 MybatisBaseService<FinColl
                             if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
                                 all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
                             }
-                            scmVehRebateDto.setCalculationStandard(all.toString());
+                            if(all.compareTo(BigDecimal.ZERO)>0){
-                            scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
+                                //推送单车返利管理
-                            scmVehRebateDto.setCalculationModeKey("002");
+                                ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
-                            scmVehRebateDto.setCalculationModeValue("固定金额");
+                                List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
-                            scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
+                                ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
-                            scmVehRebateVehDto.setState("2");
+                                scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid());
-                            scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
+                                scmVehRebateDto.setRebateTypeKey("029");
-                            scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
+                                scmVehRebateDto.setRebateTypeValue("金融贴息");
-                            scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
+                                scmVehRebateDto.setRebateName("金融贴息");
-                            scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
+
-                            scmVehRebateVehDto.setVehSid(baseVehicle.getSid());
+                                scmVehRebateDto.setCalculationStandard(all.toString());
-                            scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+                                scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
-                            scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
+                                scmVehRebateDto.setCalculationModeKey("002");
-                            scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
+                                scmVehRebateDto.setCalculationModeValue("固定金额");
-                            BigDecimal ll = BigDecimal.ZERO;
+                                scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath());
-                            if(loanSolutions.getActualDiscount() != null){
+                                scmVehRebateVehDto.setState("2");
-                                ll = ll.add(loanSolutions.getActualDiscount());
+                                scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
-                            }
+                                scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
-                            if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+                                scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
-                                ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+                                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);
                         }

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;
 }

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<UpdateFlowFieldVo> voResultBean = startProcess(bv);
         System.out.println("voResultBean{}" + voResultBean);
-        return rb.success();
+        return voResultBean;
     }
 
     public ResultBean<UpdateFlowFieldVo> handleProsess(BusinessVariables bv) {

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<Flow4Mapper, Flowable> {
         List<String> approvers = (List<String>) variables.get("approvers");
         // 获取抄送人列表
         List<String> ccList = (List<String>) 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<List<SysUserVo>> listResultBean = sysUserFeign.fetchBySids(ccSids);
+            List<String> ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList());
+            // 将 List<String> 转换为逗号分隔的字符串
+            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<List<SysUserVo>> listResultBean = sysUserFeign.fetchBySids(ccSids);
-        List<String> ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList());
-        // 将 List<String> 转换为逗号分隔的字符串
-        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<Flow4Mapper, Flowable> {
         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());
+        if(flowCc != null){
-        StringBuilder userName = new StringBuilder(flowCc.getCcNames());
+            userSids = new StringBuilder(flowCc.getCcSids());
+            userName = new StringBuilder(flowCc.getCcNames());
+        }
 
         //抄送的业务逻辑
         MessageFlowableQuery mfq = new MessageFlowableQuery();

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<FlowApprover> {
     String selectApproverSid(@Param("businessSid") String businessSid, @Param("sortNo") Integer sortNo);
+
+    int insertApprover(FlowApprover flowApprover);
 }

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}
     </select>
+
+    <insert id="insertApprover">
+        insert into flow_approver
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            sid,
+            <if test="businessSid != null">
+                businessSid,
+            </if>
+            <if test="approverSid != null">
+                approverSid,
+            </if>
+            <if test="approverName != null">
+                approverName,
+            </if>
+            <if test="sortNo != null">
+                sortNo,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            UUID(),
+            <if test="businessSid != null">
+                #{businessSid},
+            </if>
+            <if test="approverSid != null">
+                #{approverSid},
+            </if>
+            <if test="approverName != null">
+                #{approverName},
+            </if>
+            <if test="sortNo != null">
+                #{sortNo},
+            </if>
+        </trim>
+    </insert>
 </mapper>

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<FlowApproverMapper,
                 flowApprover.setApproverSid(approverSid);
                 ResultBean<SysUserVo> 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);
     }
 }

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> {
     FlowCc selectByBusinessSid(String businessSid);
+
+    int insertFlowCc(FlowCc flowCc);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml

@@ -1,4 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.flowable.biz.flowcc.FlowCcMapper">
+    <select id="selectByBusinessSid" resultType="com.yxt.anrui.flowable.api.flowcc.FlowCc">
+        select *
+        from flow_cc
+        where businessSid = #{businessSid}
+    </select>
+
+    <insert id="insertFlowCc">
+        insert into flow_cc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            sid,
+            <if test="businessSid != null">
+                businessSid,
+            </if>
+            <if test="ccSids != null">
+                ccSids,
+            </if>
+            <if test="ccNames != null">
+                ccNames,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            UUID(),
+            <if test="businessSid != null">
+                #{businessSid},
+            </if>
+            <if test="ccSids != null">
+                #{ccSids},
+            </if>
+            <if test="ccNames != null">
+                #{ccNames},
+            </if>
+        </trim>
+    </insert>
 </mapper>

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<FlowCcMapper, FlowCc> {
     public FlowCc selectByBusinessSid(String businessSid) {
         return baseMapper.selectByBusinessSid(businessSid);
     }
+
+    public int insertFlowCc(FlowCc flowCc) {
+        return baseMapper.insertFlowCc(flowCc);
+    }
 }

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(家访准备) <br/>
- * File: LoanHomevisitPrepFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign <br/>
- * Description: 家访准备. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-08-09 15:47:52 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "家访准备")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanHomevisitPrep",

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<LoanDiffMapper, LoanDiff
                 creditResult.setResultDetails(collectionDetailDtoListOne);
                 creditResult.setRemarks("放款差额");
                 finKingDeeFeign.pushOtherReceivableBill(creditResult);
-                //推送单车返利管理
-                ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
-                List<ScmVehRebateVehDto> 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());
+                if (all.compareTo(BigDecimal.ZERO) > 0) {
-                scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
+                    //推送单车返利管理
-                scmVehRebateDto.setCalculationModeKey("002");
+                    ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
-                scmVehRebateDto.setCalculationModeValue("固定金额");
+                    List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
-                scmVehRebateDto.setOrgPath(loanDiff.getOrgSidPath());
+                    ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
-                scmVehRebateVehDto.setState("2");
+                    scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid());
-                scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
+                    scmVehRebateDto.setRebateTypeKey("029");
-                scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
+                    scmVehRebateDto.setRebateTypeValue("金融贴息");
-                scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
+                    scmVehRebateDto.setRebateName("金融贴息");
-                scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
+                    scmVehRebateDto.setCalculationStandard(all.toString());
-                scmVehRebateVehDto.setVehSid(baseVehicle.getSid());
+                    scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
-                scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+                    scmVehRebateDto.setCalculationModeKey("002");
-                scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString());
+                    scmVehRebateDto.setCalculationModeValue("固定金额");
-                scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString());
+                    scmVehRebateDto.setOrgPath(loanDiff.getOrgSidPath());
-                BigDecimal ll = BigDecimal.ZERO;
+                    scmVehRebateVehDto.setState("2");
-                if(loanDiffDetails.getRealityDiscount() != null){
+                    scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid());
-                    ll = ll.add(loanDiffDetails.getRealityDiscount());
+                    scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName());
-                }
+                    scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid());
-                if(loanDiffDetails.getRealityOtherDiscount() != null){
+                    scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName());
-                    ll = ll.add(loanDiffDetails.getRealityOtherDiscount());
+                    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());
             }
         }

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;
 }

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;
 }

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
         <where>
             ${ew.sqlSegment}

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<String> 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) {
+            if (state != 0) {
-                return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除");
+                return rb.setMsg("请选择状态为未预提的记录删除");
             }
         }
         scmSpecialRebateService.delBySids(sids);

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<ScmSpecialRebate
         qw.orderByDesc("createTime");
         IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmSpecialRebateVo> 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<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -478,6 +489,15 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             } else {//上传状态：已上传
                 record.setUploadState("1");
             }
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
         }
         return scmSpecialRebateVoList;
     }

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
         <where>
@@ -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
         <where>

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) {
+            if (state != 0) {
-                return rb.setMsg("所选数据中包含已预提单车返利信息，无法删除");
+                return rb.setMsg("请选择状态为未预提的记录删除");
             }
         }
         scmVehRebateService.delBySids(sids);

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<ScmVehRebateMapper,
             if ("001".equals(record.getCalculationModeKey())) {
                 record.setCalculationStandard(record.getCalculationStandard() + "%");
             }
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
         }
         PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -449,6 +458,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             } else {//上传状态：已上传
                 record.setUploadState("1");
             }
+            if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
+                if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
+                    record.setSecondCheckState("是");
+                }else {
+                    record.setSecondCheckState("否");
+                }
+            }else {
+                record.setSecondCheckState("否");
+            }
         }
         return scmVehRebateVoList;
     }

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

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<AdPircarpulApplyDetailsVo> details(@PathVariable("sid") String sid
+	ResultBean<AdFrockallotApplyDetailsVo> 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);
 	}
 

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")

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 = "临时私车公用申请")

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 = "工装订制配发列表")

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<AdFrockallotDetail> {
 

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<AdFrockallotDetailMapper, AdFrockallotDetail> {
 

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(私车临时公用) <br/>
- * File: AdPircarpulApplyMapper.java <br/>
- * Class: com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper <br/>
- * Description: 临时私车公用申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AdPircarpulApplyMapper extends BaseMapper<AdPircarpulApply> {
 

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; // 费用明细
 
 }

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(私车临时公用) <br/>
- * File: AdPircarpulDetailMapper.java <br/>
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper <br/>
- * Description: 临时私车公用列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AdPircarpulDetailMapper extends BaseMapper<AdPircarpulDetail> {
 

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(私车临时公用) <br/>
- * File: AdPircarpulDetailService.java <br/>
- * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailService <br/>
- * Description: 临时私车公用列表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-20 09:42:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class AdPircarpulDetailService extends MybatisBaseService<AdPircarpulDetailMapper, AdPircarpulDetail> {
 

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 = "补卡申请")

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"),
+    WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_g4zmi6xc:1:17592504"),
-    WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_gmjrjghm:2:15792512"),
+    WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_w4rvfxuv:1:17592512"),
-    WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_kwd3cagu:3:15792508"),
+    WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_x0piy712:1:17592508"),
-    WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_gmjrjghm:3:15792516"),
+    WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_bqtvd42s:1:17592516"),
     WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"),
     WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"),
     WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"),