Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -2205,6 +2205,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 creditResult.setResultDetails(collectionDetailDtoListOne);
                                 creditResult.setRemarks("放款差额");
                                 creditResultService.pushOtherReceivableBill(creditResult);
+                                BigDecimal all = BigDecimal.ZERO;
+                                if(loanSolutions.getActualDiscount() != null){
+                                    all = all.add(loanSolutions.getActualDiscount());
+                                }
+                                if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+                                    all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+                                }
+                                if(all.compareTo(BigDecimal.ZERO) > 0){
                                     //推送单车返利管理
                                     ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
                                     List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
@@ -2213,13 +2221,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     scmVehRebateDto.setRebateTypeKey("029");
                                     scmVehRebateDto.setRebateTypeValue("金融贴息");
                                     scmVehRebateDto.setRebateName("金融贴息");
-                                BigDecimal all = BigDecimal.ZERO;
-                                if(loanSolutions.getActualDiscount() != null){
-                                    all = all.add(loanSolutions.getActualDiscount());
-                                }
-                                if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
-                                    all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
-                                }
                                     scmVehRebateDto.setCalculationStandard(all.toString());
                                     scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
                                     scmVehRebateDto.setCalculationModeKey("002");
@@ -2247,6 +2248,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     scmVehRebateVehDtos.add(scmVehRebateVehDto);
                                     scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
                                     scmVehRebateFeign.save(scmVehRebateDto);
+                                }
+
                                 finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString());
                                 finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
                             }
@@ -2374,6 +2377,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             creditResult.setResultDetails(collectionDetailDtoListOne);
                             creditResult.setRemarks("放款差额");
                             creditResultService.pushOtherReceivableBill(creditResult);
+                            BigDecimal all = BigDecimal.ZERO;
+                            if(loanSolutions.getActualDiscount() != null){
+                                all = all.add(loanSolutions.getActualDiscount());
+                            }
+                            if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
+                                all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
+                            }
+                            if(all.compareTo(BigDecimal.ZERO)>0){
                                 //推送单车返利管理
                                 ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
                                 List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
@@ -2382,13 +2393,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 scmVehRebateDto.setRebateTypeKey("029");
                                 scmVehRebateDto.setRebateTypeValue("金融贴息");
                                 scmVehRebateDto.setRebateName("金融贴息");
-                            BigDecimal all = BigDecimal.ZERO;
-                            if(loanSolutions.getActualDiscount() != null){
-                                all = all.add(loanSolutions.getActualDiscount());
-                            }
-                            if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){
-                                all = all.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
-                            }
+
                                 scmVehRebateDto.setCalculationStandard(all.toString());
                                 scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
                                 scmVehRebateDto.setCalculationModeKey("002");
@@ -2416,6 +2421,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 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;
@@ -60,9 +61,9 @@ public class Flow4Rest {
     ResultBean submit2() {
         ResultBean rb = ResultBean.fireFail();
         List<String> userIds = new ArrayList<>();
-        userIds.add("aaa");
-        userIds.add("bbb");
-        userIds.add("ccc");
+        userIds.add("1d85d1fe-e527-4ec5-a5e4-c37a76a36518");
+        userIds.add("64e289bc-80cd-487a-9498-5ae61e260f71");
+        userIds.add("7ffcd76a-4fa0-4c9c-87ca-a0c2116bb2ed");
 
         Map<String, Object> variables = new HashMap<>();
         variables.put("approvers", userIds);
@@ -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,11 +245,14 @@ 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());
@@ -259,7 +262,9 @@ public class Flow4Service extends MybatisBaseService<Flow4Mapper, Flowable> {
             flowCc.setBusinessSid(bv.getBusinessSid());
             flowCc.setCcSids(ccSids);
             flowCc.setCcNames(result);
-        flowCcService.insert(flowCc);
+            flowCcService.insertFlowCc(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());
-        StringBuilder userName = new StringBuilder(flowCc.getCcNames());
+        if(flowCc != null){
+            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,9 +39,9 @@ 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();

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-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@@ -421,6 +421,14 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                 creditResult.setResultDetails(collectionDetailDtoListOne);
                 creditResult.setRemarks("放款差额");
                 finKingDeeFeign.pushOtherReceivableBill(creditResult);
+                BigDecimal all = BigDecimal.ZERO;
+                if (loanDiffDetails.getRealityDiscount() != null) {
+                    all = all.add(loanDiffDetails.getRealityDiscount());
+                }
+                if (loanDiffDetails.getRealityOtherDiscount() != null) {
+                    all = all.add(loanDiffDetails.getRealityOtherDiscount());
+                }
+                if (all.compareTo(BigDecimal.ZERO) > 0) {
                     //推送单车返利管理
                     ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto();
                     List<ScmVehRebateVehDto> scmVehRebateVehDtos = new ArrayList<>();
@@ -429,13 +437,6 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     scmVehRebateDto.setRebateTypeKey("029");
                     scmVehRebateDto.setRebateTypeValue("金融贴息");
                     scmVehRebateDto.setRebateName("金融贴息");
-                BigDecimal all = BigDecimal.ZERO;
-                if(loanDiffDetails.getRealityDiscount() != null){
-                    all = all.add(loanDiffDetails.getRealityDiscount());
-                }
-                if(loanDiffDetails.getRealityOtherDiscount() != null){
-                    all = all.add(loanDiffDetails.getRealityOtherDiscount());
-                }
                     scmVehRebateDto.setCalculationStandard(all.toString());
                     scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
                     scmVehRebateDto.setCalculationModeKey("002");
@@ -463,6 +464,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     scmVehRebateVehDtos.add(scmVehRebateVehDto);
                     scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
                     scmVehRebateFeign.save(scmVehRebateDto);
+                }
+
                 int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString());
             }
         }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@@ -76,12 +76,12 @@
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
             <el-table-column label="其中待支付费用" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.expectTreatCost" @keyup.native="scope.row.expectTreatCost = getNumber(scope.row.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="其中抵顶费用" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder=""></el-input>
+                <el-input v-model="scope.row.expectSuppCost" @keyup.native="scope.row.expectSuppCost = getNumber(scope.row.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="抵顶费用说明" align="center" min-width="200">

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@@ -74,11 +74,11 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue

@@ -70,15 +70,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectItureCost" @keyup.native="formobj.expectItureCost = getNumber(formobj.expectItureCost, 2)" placeholder="" clearable /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectItureCost" @keyup.native="formobj.expectItureCost = getNumber(formobj.expectItureCost, 2)" placeholder="因组织行销活动而发生的实际支出费用" clearable /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectTreatCost" @keyup.native="formobj.expectTreatCost = getNumber(formobj.expectTreatCost, 2)" clearable placeholder="待支付的相关人员返利等" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.expectSuppCost" @keyup.native="formobj.expectSuppCost = getNumber(formobj.expectSuppCost, 2)" clearable placeholder="抵顶各种垫付款,例如垫付厂家人员房租" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>

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