yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 4 months ago
parent
958708b8f6
commit
9c120371fe
9 changed files with 139 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java
  2. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
  3. 87
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  4. 16
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  5. 58
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
  6. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java
  7. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  8. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
  9. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java
View File

@ -17,9 +17,7 @@ public class FinPayGetNodeQuery implements Query {
private static final long serialVersionUID = -9047125733441286349L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
// @ApiModelProperty(value = "不确定是否需要前端传：还是有分支网关的时候传？？")
// private Map<String, Object> formVariables;
@ApiModelProperty(value = "业务sid")
private String businessSid;
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java
View File

@ -98,7 +98,7 @@ public class FinPaymentapplyRest implements FinPaymentapplyFeign {
public ResultBean complete(FinPayCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.FINPAYAPPLY.getProDefId());
bv.setModelId("");
return finPaymentapplyService.complete(bv);
}

87
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
View File

@ -394,6 +394,20 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
variables.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
}
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -528,8 +542,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
FinPaymentapply finPaymentapply = fetchBySid(bv.getBusinessSid());
bv.setModelId(finPaymentapply.getProcDefId());
if (bv.getTaskId().equals(finPaymentapply.getTaskId())) {
Map<String, Object> vaributes = new HashMap<>();
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
vaributes.put("isAdj", false);
} else {
vaributes.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
vaributes.put("isAdj", true);
} else {
vaributes.put("isAdj", false);
}
}
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
vaributes.put("app", appMap);
@ -661,7 +690,27 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
ResultBean<List<FinPayGetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINPAYAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//查询业务信息
FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
variables.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
}
bv.setModelId(finPaymentapply.getProcDefId());
bv.setFormVariables(variables);
//=======================================
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<FinPayGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinPayGetNodeVo.class)).collect(Collectors.toList());
@ -678,7 +727,27 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
ResultBean<List<FinPayGetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINPAYAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//查询业务信息
FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
variables.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
}
bv.setModelId(finPaymentapply.getProcDefId());
bv.setFormVariables(variables);
//=======================================
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<FinPayGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinPayGetNodeVo.class)).collect(Collectors.toList());
@ -713,6 +782,20 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
vaributes.put("app", appMap);
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
vaributes.put("isAdj", false);
} else {
vaributes.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
vaributes.put("isAdj", true);
} else {
vaributes.put("isAdj", false);
}
}
flowTaskVo.setValues(vaributes);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {

16
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -23,7 +23,7 @@ public enum ProcDefEnum {
// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"),
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
FINPAYAPPLY("付款申请", "process_gin2tntb:5:16412504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
@ -38,13 +38,13 @@ public enum ProcDefEnum {
QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:3:16227508"),
SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:3:16227504"),
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:3:16227516"),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:3:16227520"),
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:3:16227512"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:3:16227528"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:3:16227524"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:4:16412508"),
SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:4:16412512"),
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:4:16412520"),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:4:16412516"),
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:4:16412524"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:4:16412532"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:4:16412528"),
CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:4:1747504"),
BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),

58
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
View File

@ -64,59 +64,59 @@ public class ScmVehRebateDetailsVo implements Vo {
private Date createTime; // 创建日期
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("车型sid")
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String vehModelName; // 车型名称
@ApiModelProperty("车辆sid")
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("厂家结算价")
@ApiModelProperty("厂家结算价")
private String manufactorSettlementPrice; // 厂家结算价
@ApiModelProperty("运费")
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("返利类型key")
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("返利名称")
@ApiModelProperty("返利名称")
private String rebateName; // 返利名称
@ApiModelProperty("计算标准")
@ApiModelProperty("计算标准")
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("预提日期")
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("二次上传日期")
@ApiModelProperty("二次上传日期")
private String secondaryUploadDate; // 二次上传日期
@ApiModelProperty("二次上传金额")
@ApiModelProperty("二次上传金额")
private String secondaryUploadMoney; // 二次上传金额
@ApiModelProperty("待确定金额(动态)")
private String stayDetermineMoney;
@ApiModelProperty("待确定金额(常量)")
private String stayDetermineMoneyNew;
@ApiModelProperty("费用")
@ApiModelProperty("费用")
private String money; // 费用
@ApiModelProperty("是否调整")
@ApiModelProperty("是否调整")
private String isAdjustment; // 是否调整
@ApiModelProperty("调整金额")
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("计算方式key")
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ -160,13 +160,13 @@ public class ScmVehRebateDetailsVo implements Vo {
@ApiModelProperty("抵顶费用调整金额")
private BigDecimal suppAdjustmentMoney;
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("组织全路径")
private String orgPath;

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: anrui-scm(单车返利核对) <br/>
@ -51,6 +53,7 @@ import java.math.BigDecimal;
@ApiModel(value = "单车返利核对申请表_返利列表 视图数据对象", description = "单车返利核对申请表_返利列表 视图数据对象")
public class ScmVehrebateCheckapplydetailVo implements Vo {
private String sid;
@ApiModelProperty("单车返利sid")
private String vehRebateSid; // 单车返利sid
@ApiModelProperty("核对申请sid")
@ -127,7 +130,6 @@ public class ScmVehrebateCheckapplydetailVo implements Vo {
private String expectSuppRemark;
@ApiModelProperty("上装金额")
private BigDecimal topAmount;
@ApiModelProperty("一次待支付费用")
private BigDecimal onceTreatCost;
@ApiModelProperty("一次抵顶费用")
@ -145,4 +147,7 @@ public class ScmVehrebateCheckapplydetailVo implements Vo {
private String purchaseSystemSid;
@ApiModelProperty("采购系统")
private String purchaseSystemName;
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
View File

@ -319,6 +319,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
money = money.add(s.getSecondSuppCost());
}
s.setMoney(money.toString());
s.setSid(s.getVehRebateSid());
}
}
scmVehrebateCheckapplyDetailsVo.setScmVehrebateCheckapplydetailList(scmVehrebateCheckapplydetailVos);

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
View File

@ -70,7 +70,6 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper<ScmVehreb
List<ScmVehrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
@Select("select *,expectTreatCost + expectSuppCost as withholdCost from scm_vehrebate_checkapplydetail where mainSid = #{sid}")
List<ScmVehrebateCheckapplydetailVo> selByMainSid(String mainSid);
@Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{mainSid}")

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
View File

@ -60,4 +60,11 @@
WHERE svc.mainSid = #{sid}
GROUP BY svc.withholdingDate, svc.brandSid, svc.purchaseSystemSid
</select>
<select id="selByMainSid"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo">
select *, expectTreatCost + expectSuppCost as withholdCost
from scm_vehrebate_checkapplydetail
where mainSid = #{sid}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save