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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
d679b708cc 94b2727662
commit
d37bce4c68
34 changed files with 929 additions and 633 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. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
  2. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  3. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
  4. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
  5. 31
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  6. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
  7. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppOrderInfoVo.java
  8. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppOrderInfoDto.java
  9. 23
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  10. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  11. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  12. 77
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  13. 514
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  14. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  15. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  16. 119
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  17. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  18. 69
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java
  19. 21
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java
  20. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java
  21. 12
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java
  22. 20
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyStateQuery.java
  23. 21
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanOtherRiskStateQuery.java
  24. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java
  25. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java
  26. 30
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml
  27. 28
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java
  28. 152
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java
  29. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java
  30. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java
  31. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java
  32. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
  33. 185
      工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl
  34. 179
      工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
View File

@ -135,7 +135,6 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
String orgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData();
qw.eq("useOrg", orgSid);
}
}
return qw;
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -1915,8 +1915,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
for (BaseVehicleOutVoExeclNew baseVehicleOutVoExeclNew : baseVehicleOutVoExeclNews) {
baseVehicleOutVoExeclNew.setRankNo(id);
String createOrgSid = baseVehicleOutVoExeclNew.getCreateOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
if (StringUtils.isNotBlank(createOrgSid)){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
}else {
baseVehicleOutVoExeclNew.setCreateOrgName("无");
}
id = id + 1;
//贴息
String concatNo = baseVehicleOutVoExeclNew.getConcatNo();

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
View File

@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basevehiclestate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import org.apache.ibatis.annotations.Mapper;
/**
@ -12,4 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
BaseVehicleState selectOnes(String busSid);
BusSalesOrder selevtByBusSid(String busSid);
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
View File

@ -6,4 +6,10 @@
from base_vehicle_state
where busSid = #{busSid} order by id desc limit 1
</select>
<select id="selevtByBusSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
select bo.* from anrui_buscenter.bus_sales_order bo
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
where bv.sid = #{busSid}
</select>
</mapper>

31
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
@ -93,6 +94,36 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
baseMapper.insert(baseVehicleState);
}else if (BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey().equals(operateType)) {
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
//认款办理确认以及结转审核通过的更新款项状态为1 已交清，否则为0
baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
baseMapper.insert(baseVehicleState);
}else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCTJ.getTypeKey().equals(operateType)){
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
//欠款提车提交后，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
baseVehicleState.setCarryVehicleState("2");
baseVehicleState.setFinState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_2.getStateKey());
BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
baseMapper.insert(baseVehicleState);
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
View File

@ -139,4 +139,7 @@ public class BusSalesOrder extends BaseEntity {
private String orgSidPath;
private String contractNo;
@ApiModelProperty("若无值，则为现车中有车架号或其他两种类型的，若有值，则为现车中不确定车架号的数量")
private String nowCarUnknownVinNum;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppOrderInfoVo.java
View File

@ -52,4 +52,7 @@ public class AppOrderInfoVo implements Vo {
@ApiModelProperty("公告型号是否可空：true，false必填")
private boolean publicModelNullable;
@ApiModelProperty("现车下不确定车架号的车辆数量")
private String nowCarUnknownVinNum;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppOrderInfoDto.java
View File

@ -40,4 +40,7 @@ public class AppOrderInfoDto implements Dto {
@ApiModelProperty("公告型号配置")
private String publicModelSon;
@ApiModelProperty("现车下不确定车架号的车辆数量")
private String nowCarUnknownVinNum;
}

23
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
View File

@ -99,10 +99,11 @@
<select id="selectVinNo" resultType="java.lang.String">
select RIGHT(bv.linkNo, 8)
from bus_delivered bd
left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
where bd.contractNo = #{contractId}
and bd.state = 0
from bus_sales_order_vehicle bv
left join bus_sales_order bo on bv.salesOrderSid = bo.sid
left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
where bo.contractNo = #{contractId}
and (bs.busState>=402)
and bv.linkSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
@ -118,14 +119,18 @@
</select>
<select id="selectByContractNoToVin" resultType="java.lang.String">
select busVinSid from bus_delivered where contractNo = #{contractId} and state = 0;
select bs.busSid from anrui_base.base_vehicle_state bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where bo.contractNo = #{contractId} and (bs.busState = '501' or bs.busState = '402')
<!-- select busVinSid from bus_delivered where contractNo = #{contractId} and state = 0;-->
</select>
<select id="selectByContractNoToVinSid" resultType="java.lang.String">
select bv.sid
from bus_delivered bd
left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
where bd.contractNo = #{contractNo}
from bus_sales_order_vehicle bv
left join bus_sales_order bo on bv.salesOrderSid = bo.sid
where bo.contractNo = #{contractNo}
and bv.linkSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
@ -133,7 +138,7 @@
</select>
<select id="selectNumByContractNo" resultType="int">
select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered bd on bd.sid = bddd.applySid
select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered_apply bd on bd.sid = bddd.applySid
where contractNo = #{contractId} and (bd.state =2 or bd.state = 3)
</select>
</mapper>

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -2167,11 +2167,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
if (trailerList.getData().getList().isEmpty()) {
if(trailerList.getData() != null){
if (trailerList.getData().getList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
}
}else{
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
}
//优惠包使用情况
List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
@ -2225,6 +2230,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.setMsg(String.join(",", vinNoList) + "已提交或已出库");
}
//判断是否存在优惠包超出的情况
int giveNumBySid = 0;
for (int i = 0; i < carList.size(); i++) {
AppCarListVo appCarListVo = carList.get(i);
List<BusDeliveredDetailsDiscountsVo> discountUse = appCarListVo.getDiscountUse();
@ -2234,6 +2240,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//根据discountSid查询已通过或已提交的申请的赠送套餐的数量
int count = busDeliveredDetailsDiscountService.selectGiveNumBySid(busDeliveredDetailsDiscountsVo.getDiscountSid());
int giveNum = count + busDeliveredDetailsDiscountsVo.getDiscountNum();
giveNumBySid = giveNumBySid+busDeliveredDetailsDiscountsVo.getDiscountNum();
if (busSalesOrderDiscount.getNum() < giveNum) {
return rb.setMsg("车辆赠送的优惠包已超出");
}
@ -2258,6 +2265,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (isTrue) {
//是否存在未赠送的套餐，如果存在则不允许提交
int num = baseMapper.selectNumByContractNo(dto.getContractId());
num = num+giveNumBySid;
int orderNum = busSalesOrderDiscountService.selectByContractNo(dto.getContractId());
if (orderNum > num) {
return rb.setMsg("本次出库为该订单最后一批出库，还存在未赠送的套餐，不允许提交");

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
View File

@ -62,7 +62,8 @@
bo.contractNo as contractId,
bo.staffName as saler,
bo.procDefId,
bo.procInstId
bo.procInstId,
if(length(bo.nodeState)>0,true,false) as showRePublishBtn
FROM bus_sales_order bo
left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid

77
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -465,7 +465,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
/*************************************************主车信息*****************************************************/
BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
if (busSalesOrderModelDetailsVo != null) {
//查询现车车辆
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
@ -1316,19 +1315,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> initBigDecimalOneList = new ArrayList<>();
//是否是现车//ToDo:促销政策
if ("1".equals(busSalesOrder.getType())) {
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
if (vehicleList.size() > 0) {
for (int i = 0; i < vehicleList.size(); i++) {
BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
//根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
List<String> stringList = listResultBean.getData();
initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
if (vehicleList.size() > 0) {
for (int i = 0; i < vehicleList.size(); i++) {
BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
//根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
List<String> stringList = listResultBean.getData();
initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
}
initBigDecimalOneList.add(initBigDecimalTwo.toString());
}
initBigDecimalOneList.add(initBigDecimalTwo.toString());
}
}
}
@ -1921,14 +1922,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
/*************再次发起按钮显示****************/
if (StringUtils.isNotBlank(pq.getParams().getType())) {
/* if (StringUtils.isNotBlank(pq.getParams().getType())) {
String type = pq.getParams().getType();
if (type.equals("2")) {
record.setShowRePublishBtn(true);
} else {
record.setShowRePublishBtn(false);
}
}
}*/
/**************************************/
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
if (commonContractVoResultBean.getData() != null) {
@ -2251,7 +2252,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String saleOrderSid = appInitModelQuery.getSalesOrderSid();
String customerSid = appInitModelQuery.getCustomerSid();
String userSid = appInitModelQuery.getUserSid();
// String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
if (busSalesOrder == null) {
return rb.setMsg("销售订单单据信息不存在");
@ -2407,14 +2407,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型：0现车、1采购订单、2排产
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
//类型为现车，查询该销售订单的现车车辆信息
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
orderInfo.setNowCarList(nowCarList);
boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap);
if (isCheck) {
orderInfo.setNotice("当前车型已经更新，请进行确认");
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){
orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum());
}else{
//类型为现车，查询该销售订单的现车车辆信息
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
orderInfo.setNowCarList(nowCarList);
boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap);
if (isCheck) {
orderInfo.setNotice("当前车型已经更新，请进行确认");
}
}
}
type = "0";
@ -3402,7 +3406,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//数据库中1为现车，2为采购订单，3为排产
if ("0".equals(modelInfo.getType())) {
//查询车架号
// List<String> vinList = busSalesOrderVehicleService.selectList(sid);
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
@ -3427,7 +3430,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else {
if ("1".equals(modelInfo.getType())) {
//查询采购订单编号
// List<String> stringList = busSalesVehicleOrderService.selectList(sid);
List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
//包含采购系统的采购订单编号
List<String> stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList());
@ -4779,7 +4781,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
updateFlowFiled(BeanUtil.beanToMap(ufVo));
/* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
AppOrderDetailsVo vo = resultBean.getData();*/
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrderOne.getType())) {
//更新已选择的车架号的状态为审批中
List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@ -4869,7 +4871,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
bv.setModelId(busSalesOrder.get().getProcDefId());
/* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
AppOrderDetailsVo vo = resultBean.getData();*/
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(busSalesOrderOne.getType())) {
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrderOne.getType())) {
//更新已选择的车架号的状态为审批中
List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@ -5153,13 +5155,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
//更新已选择的车架号的状态为销售订单锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
//更新已选择的车架号的状态为销售订单锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
}
}
//查询是否有合同，如果没有则生成合同
OrderContractQuery orderContractQuery = new OrderContractQuery();

514
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -233,47 +233,51 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderModel.setModelConfig(modelAlias);
updateById(busSalesOrderModel);
}
//添加上装信息===========
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
if (details.getData() != null) {
String vehicleKey = details.getData().getVehicleType();
//除牵引外，其他类型的公告型号为必填项
if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){
if(StringUtils.isBlank(orderInfo.getPublicModelSid())){
return rb.setMsg("公告型号不能为空，如若不能选择请联系相关人员进行添加");
//现车下不确定车架号的车辆数量
String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum();
if(StringUtils.isBlank(nowCarUnknownVinNum)){
//添加上装信息===========
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
if (details.getData() != null) {
String vehicleKey = details.getData().getVehicleType();
//除牵引外，其他类型的公告型号为必填项
if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) {
if (StringUtils.isBlank(orderInfo.getPublicModelSid())) {
return rb.setMsg("公告型号不能为空，如若不能选择请联系相关人员进行添加");
}
}
}
//（是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启，且为必填）
if (BusSalesOrderConstantUtils.VehicleFunctions.DUMP.getCode().equals(vehicleKey) ||
BusSalesOrderConstantUtils.VehicleFunctions.TRUCK.getCode().equals(vehicleKey) ||
BusSalesOrderConstantUtils.VehicleFunctions.MIXER.getCode().equals(vehicleKey) ||
BusSalesOrderConstantUtils.VehicleFunctions.SPECIAL.getCode().equals(vehicleKey)) {
if (topSidList.size() > 0) {
String topSid = topSidList.get(0);
String topSidVin = "";
if ("0".equals(dto.getState())) {//现车
String topPrice = "";
for (int i = 0; i < nowCarList1.size(); i++) {
AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList1.get(i);
if(StringUtils.isNotBlank(appBusSalesOrderVehicleDto.getTopSid())){
//根据车架号和上装配置以及分公司sid查询上装价格
BaseVehinstall baseVehinstall = baseVehinstallFeign.selectOne(appBusSalesOrderVehicleDto.getLinkNo(),busSalesOrder.getUseOrgSid()).getData();
if(baseVehinstall != null){
topPrice = baseVehinstall.getGuidePrice();
//（是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启，且为必填）
if (BusSalesOrderConstantUtils.VehicleFunctions.DUMP.getCode().equals(vehicleKey) ||
BusSalesOrderConstantUtils.VehicleFunctions.TRUCK.getCode().equals(vehicleKey) ||
BusSalesOrderConstantUtils.VehicleFunctions.MIXER.getCode().equals(vehicleKey) ||
BusSalesOrderConstantUtils.VehicleFunctions.SPECIAL.getCode().equals(vehicleKey)) {
if (topSidList.size() > 0) {
String topSid = topSidList.get(0);
String topSidVin = "";
if ("0".equals(dto.getState())) {//现车
String topPrice = "";
for (int i = 0; i < nowCarList1.size(); i++) {
AppBusSalesOrderVehicleDto appBusSalesOrderVehicleDto = nowCarList1.get(i);
if (StringUtils.isNotBlank(appBusSalesOrderVehicleDto.getTopSid())) {
//根据车架号和上装配置以及分公司sid查询上装价格
BaseVehinstall baseVehinstall = baseVehinstallFeign.selectOne(appBusSalesOrderVehicleDto.getLinkNo(), busSalesOrder.getUseOrgSid()).getData();
if (baseVehinstall != null) {
topPrice = baseVehinstall.getGuidePrice();
}
}
}
}
//判断是否与之前的相同，若相同则不用修改，若不同，则需要删除上装信息，重新添加一条
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
List<String> stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (stringList.size() > 0) {
topSidVin = stringList.get(0);
}
if (StringUtils.isNotBlank(topSidVin)) {
if (!topSidVin.equals(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//判断是否与之前的相同，若相同则不用修改，若不同，则需要删除上装信息，重新添加一条
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
List<String> stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (stringList.size() > 0) {
topSidVin = stringList.get(0);
}
if (StringUtils.isNotBlank(topSidVin)) {
if (!topSidVin.equals(topSid)) {
szConfig(salesOrderSid,topSid,topPrice);
/* busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@ -298,7 +302,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
@ -318,11 +322,12 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
} else {
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(salesOrderSid);
if (busSalesOrderMakeupDetailsVo == null) {
//新增上装
busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
} else {
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(salesOrderSid);
if (busSalesOrderMakeupDetailsVo == null) {
szConfig(salesOrderSid,topSid,topPrice);
/* //新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
@ -346,7 +351,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
@ -366,13 +371,14 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
}
}
}
} else {
if (StringUtils.isNotBlank(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
} else {
if (StringUtils.isNotBlank(topSid)) {
szConfig(salesOrderSid,topSid,topPrice);
/* busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@ -397,7 +403,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
@ -417,11 +423,11 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
}
}
}
} else {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
} else {
/*busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@ -446,7 +452,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
@ -466,185 +472,188 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
}
if ("1".equals(dto.getState())) {//采购订单
List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
appReadyCarList.removeAll(Collections.singleton(null));
String topPrice = "";
for (int i = 0; i <readyCarList1.size(); i++) {
//根据采购订单查询上装的配置
AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList1.get(i);
BusVehicleApplySz busVehicleApplySz = busVehicleOrderFeign.selectApplySz(appBusSalesVehicleOrderDto.getLinkSid()).getData();
if(busVehicleApplySz != null){
topPrice = busVehicleApplySz.getGuidePrice();
busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
szConfig(salesOrderSid,topSid,topPrice);
}
}
if (!appReadyCarList.isEmpty()) {
List<String> stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (stringList.size() > 0) {
topSidVin = stringList.get(0);
if ("1".equals(dto.getState())) {//采购订单
List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid);
appReadyCarList.removeAll(Collections.singleton(null));
String topPrice = "";
for (int i = 0; i < readyCarList1.size(); i++) {
//根据采购订单查询上装的配置
AppBusSalesVehicleOrderDto appBusSalesVehicleOrderDto = readyCarList1.get(i);
BusVehicleApplySz busVehicleApplySz = busVehicleOrderFeign.selectApplySz(appBusSalesVehicleOrderDto.getLinkSid()).getData();
if (busVehicleApplySz != null) {
topPrice = busVehicleApplySz.getGuidePrice();
}
}
if (StringUtils.isNotBlank(topSidVin)) {
if (!topSidVin.equals(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
if (!appReadyCarList.isEmpty()) {
List<String> stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (stringList.size() > 0) {
topSidVin = stringList.get(0);
}
if (StringUtils.isNotBlank(topSidVin)) {
if (!topSidVin.equals(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
} else {
if (StringUtils.isNotBlank(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
} else {
if (StringUtils.isNotBlank(topSid)) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
} else {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if(StringUtils.isNotBlank(topPrice)){
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
} else {
//删除上装信息
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
busSalesOrderService.updateMakeUp1(salesOrderSid);
}
} else {
//删除上装信息
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
busSalesOrderService.updateMakeUp1(salesOrderSid);
}
} else {
//删除上装信息
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
busSalesOrderService.updateMakeUp1(salesOrderSid);
}
}
String state = dto.getState();
if ("2".equals(state)) {//需采购
//查询现车和采购订单是否有数据、若有数据，则查询topSid是否有值，若有值，则删除上装信息、若无值，则继续
@ -652,7 +661,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
vinList.removeAll(Collections.singleton(null));
if (vinList.size() > 0) {
List<String> topSidLists = vinList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if(topSidLists.size()>0){
if (topSidLists.size() > 0) {
//清除上装信息
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
}
@ -661,7 +670,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
orderList.removeAll(Collections.singleton(null));
if (vinList.size() > 0) {
List<String> topSidLists = orderList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if(topSidLists.size()>0){
if (topSidLists.size() > 0) {
//清除上装信息
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
}
@ -676,9 +685,17 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
int num = 0;
if ("0".equals(state)) {//现车
type = "1";
List<AppBusSalesOrderVehicleDto> nowCarList = orderInfo.getNowCarList();
busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid);
num = nowCarList.size();
if(StringUtils.isNotBlank(nowCarUnknownVinNum)){//不确定车架号
num = Integer.valueOf(nowCarUnknownVinNum).intValue();
busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
busSalesOrderService.updateById(busSalesOrder);
}else{
List<AppBusSalesOrderVehicleDto> nowCarList = orderInfo.getNowCarList();
busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid);
num = nowCarList.size();
}
}
if ("1".equals(state)) {//采购订单
List<AppBusSalesVehicleOrderDto> readyCarList = orderInfo.getReadyCarList();
@ -749,7 +766,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid, bigDecimalSum);
}
if("3".equals(type) || "2".equals(type)){
if ("3".equals(type) || "2".equals(type) || StringUtils.isNotBlank(nowCarUnknownVinNum)) {
for (int i = 0; i < num; i++) {
BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);
@ -759,6 +776,55 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
return rb.success();
}
public void szConfig(String salesOrderSid, String topSid, String topPrice) {
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
//新增上装
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
//上装名称
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
//委改方式
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
//委改厂
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
//外廓尺寸
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
//板材材质
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
//板材厚度
busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
//上装价格
if (StringUtils.isNotBlank(topPrice)) {
busSalesOrderMakeup.setTopPrice(new BigDecimal(topPrice));
}
//更多配置
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
//颜色
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
//篷布滑道
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
//冷藏冷机
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
//自卸液压盖板
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
//地板加热
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
busSalesOrderMakeup.setBuyTypeKey("01");
busSalesOrderMakeup.setBuyTypeValue("公司采购");
busSalesOrderMakeup.setIsMain(0);
busSalesOrderMakeupService.insert(busSalesOrderMakeup);
busSalesOrderService.updateMakeUp(salesOrderSid, "1");
}
/**
* 根据销售订单sid更新主车单台成交价
*

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
View File

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;

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

@ -50,6 +50,7 @@ import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;

119
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
View File

@ -72,6 +72,7 @@ import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@ -165,6 +166,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private FlowFeign flowFeign;
public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
FinFundsCarriedForwardApplyQuery query = pq.getParams();
@ -694,7 +697,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
@ -705,18 +708,31 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxyskxVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, appFinFundsCarriedForwardYXYSKXVo.getSid());
}
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
messageFlowableQuery.setMsgContent(finFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
FinFundsCarriedForwardApply finalFinFundsCarriedForwardApply = finFundsCarriedForwardApply;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
messageFlowableQuery.setMsgContent(finalFinFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
return voResultBean;
}
if (r == 2) {
@ -1213,7 +1229,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
}
if (bv.getTaskId().equals(finFundsCarriedForwardApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
@ -1231,18 +1247,31 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finFundsCarriedForwardApply.getProcDefId());
ufVo.setProcInsId(finFundsCarriedForwardApply.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
messageFlowableQuery.setMsgContent(finFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
FinFundsCarriedForwardApply finalFinFundsCarriedForwardApply = finFundsCarriedForwardApply;
Future future1 = pool.submit(() -> {
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finalFinFundsCarriedForwardApply.getProcDefId());
ufVo.setProcInsId(finalFinFundsCarriedForwardApply.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
messageFlowableQuery.setMsgContent(finalFinFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -1282,18 +1311,32 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
} else {
//极光推送
finFundsCarriedForwardApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finFundsCarriedForwardApply.getProcDefId());
ufVo.setProcInsId(finFundsCarriedForwardApply.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
messageFlowableQuery.setMsgContent(finFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
FinFundsCarriedForwardApply finalFinFundsCarriedForwardApply = finFundsCarriedForwardApply;
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(finalFinFundsCarriedForwardApply.getProcDefId());
ufVo.setProcInsId(finalFinFundsCarriedForwardApply.getProcInstSid());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("款项结转申请");
messageFlowableQuery.setMsgContent(finalFinFundsCarriedForwardApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("款项结转申请");
messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -1405,6 +1448,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzList.add(tzDto);
}
dataMap.put("saleDate", DateUtil.formatDate(new Date()));
dataMap.put("applyDept",data.getApplyDeptName());
dataMap.put("billNo", data.getBillNo());
dataMap.put("tzList", tzList);
dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
@ -1583,7 +1627,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
}
dataMap.put("saleDate", DateUtil.formatDate(new Date()));
dataMap.put("applyDept", data.getApplyDeptName());
dataMap.put("applyPeo", data.getCreateByName());
dataMap.put("billNo", data.getBillNo());
dataMap.put("tzList", tzList);
dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -402,7 +402,7 @@
fin_selected_receivables_detailed ferd
LEFT JOIN fin_collection_confirmation fcc
ON ferd.`collSid` = fcc.`sid`
JOIN
LEFT JOIN
(SELECT
ffc.busSid,
ffc.thisUseMoney
@ -451,7 +451,7 @@
fin_selected_receivables_detailed ferd
LEFT JOIN fin_funds_carried_forward_apply ffcfa
ON ferd.`collSid` = ffcfa.`sid`
JOIN
LEFT JOIN
(SELECT
ffc.busSid,
ffc.thisUseMoney

69
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java
View File

@ -0,0 +1,69 @@
package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/7/11
**/
@Data
public class LoanFinOtherPolicyDtos implements Dto {
private String sid;
@ApiModelProperty("资方名称")
private String bankShortName;
@ApiModelProperty("其他融名称（资方+产品类别+最高融资比例+期数）")
private String otherPolicyName;
@ApiModelProperty("资方sid")
private String bankSid;
@ApiModelProperty("主产品sid")
private String mainPolicySid;
@ApiModelProperty("适用销售部门sids(逗号分隔)")
private String useDeptSids;
@ApiModelProperty("适用销售部门名称(逗号分隔)")
private String useDeptNames;
@ApiModelProperty("适用销售部门List")
private List<UseDept> useDeptList = new ArrayList<>();
@ApiModelProperty("产品类别key")
private String productTypeKey;
@ApiModelProperty("产品类别value")
private String productTypeValue;
@ApiModelProperty("业务类型key")
private String busTypeKey;
@ApiModelProperty("业务类型value")
private String busTypeValue;
@ApiModelProperty("车辆大类key")
private String vehCategoryKey;
@ApiModelProperty("车辆大类value")
private String vehCategoryValue;
@ApiModelProperty("车辆功能key")
private String vehTypeKey;
@ApiModelProperty("车辆功能value")
private String vehTypeValue;
@ApiModelProperty("最高融资额比例（%）")
private String maxLoanRatio;
@ApiModelProperty("最高融资额")
private String maxLoanAmount;
@ApiModelProperty("期数")
private int period;
private String periodKey;
@ApiModelProperty("年利率（%）")
private String yearRatio;
@ApiModelProperty("有效期至")
private String validDateTo;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
}

21
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java
View File

@ -2,6 +2,9 @@ package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -30,6 +33,16 @@ public interface LoanFinOtherPolicyFeign {
@ResponseBody
public ResultBean<PagerVo<LoanFinOtherPolicyPageVo>> listPage(@RequestBody PagerQuery<LoanFinOtherPolicyQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody LoanFinOtherPolicyDtos dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@GetMapping("details")
@ApiOperation("详情")
ResultBean<LoanFinOtherPolicyVos> details(@RequestParam("sid") String sid);
@ -37,4 +50,12 @@ public interface LoanFinOtherPolicyFeign {
@GetMapping("selectList")
@ApiOperation("获取产品政策下其他融，或分公司下其他融")
ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("sid") String sid);
@ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启")
@PostMapping("setState")
ResultBean setState(@RequestBody LoanFinOtherPolicyStateQuery query);
@ApiOperation("风控状态禁用、启用:useState为1时走禁用，为0时走启用")
@PostMapping("setRiskState")
ResultBean setRiskState(@RequestBody LoanOtherRiskStateQuery query);
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java
View File

@ -18,11 +18,11 @@ public class LoanFinOtherPolicyPageVo implements Vo {
private String sid;
@ApiModelProperty("报备状态：1已报备，0未报备")
private int filingState;
private String filingState;
@ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态")
private int riskState;
private String riskState;
@ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态")
private int useSate;
private String useSate;
@ApiModelProperty("有效期至")
private String validDateTo;
@ApiModelProperty("创建组织名称")

12
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java
View File

@ -15,11 +15,13 @@ import java.math.BigDecimal;
public class LoanFinOtherPolicyQuery implements Query {
@ApiModelProperty("报备状态：1已报备，0未报备")
private int filingState;
private String filingState;
@ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态")
private int riskState;
private String riskState;
@ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态")
private int useSate;
private String useSate;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("业务类型value")
@ -35,7 +37,7 @@ public class LoanFinOtherPolicyQuery implements Query {
@ApiModelProperty("结束有效期至")
private String validEndDateTo;
@ApiModelProperty("期数")
private int period;
private String period;
@ApiModelProperty("年利率（%）")
private BigDecimal yearRatio;
private String yearRatio;
}

20
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyStateQuery.java
View File

@ -0,0 +1,20 @@
package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/7/11
**/
@Data
public class LoanFinOtherPolicyStateQuery {
@ApiModelProperty("sids")
private List<String> sidsList = new ArrayList<>();
@ApiModelProperty("useState为1时走停用，为0时走开启")
private String useState;
}

21
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanOtherRiskStateQuery.java
View File

@ -0,0 +1,21 @@
package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/7/11
**/
@Data
public class LoanOtherRiskStateQuery {
@ApiModelProperty("sids")
private List<String> sidsList = new ArrayList<>();
@ApiModelProperty("riskState为1时走禁用，为0时走启用")
private String riskState;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java
View File

@ -44,7 +44,7 @@ public interface LoanFinPolicyFeign {
ResultBean setRiskState(@RequestBody LoanRiskStateQuery query);
@ApiOperation("金融产品政策管理分页列表")
@PostMapping("pagerList")
@PostMapping("pager/base/v1/commoncontract/fetcist")
ResultBean<PagerVo<LoanFinPolicyVos>> pagerList(@RequestBody PagerQuery<LoanFinPolicyQuery> pagerQuery);
@ApiOperation("app金融产品资方常规")

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java
View File

@ -1,11 +1,13 @@
package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -29,4 +31,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
List<OtherPolicyVo> selectListOne(String sid);
List<OtherPolicyVo> selectListTwo(String useOrgSid);
IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
}

30
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml
View File

@ -44,4 +44,34 @@
and lfo.filingState = 2
and lfo.validDateTo > now()
</select>
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyPageVo">
SELECT sid,
CASE filingState
WHEN 1 THEN '已报备'
WHEN 2 THEN '报备中'
WHEN 0 THEN '未报备' END AS filingState,
CASE riskState
WHEN 1 THEN '禁用'
WHEN 0 THEN '正常'
END AS riskState,
CASE useSate
WHEN 1 THEN '停用'
WHEN 0 THEN '正常'
END AS useSate,
validDateTo,
createOrgName,
useDeptNames,
otherPolicyName,
busTypeValue,
vehCategoryValue,
vehTypeValue,
maxLoanAmount,
period,
yearRatio
FROM loan_fin_otherpolicy
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

28
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java
View File

@ -1,6 +1,9 @@
package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -26,7 +29,20 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
@Override
public ResultBean<PagerVo<LoanFinOtherPolicyPageVo>> listPage(PagerQuery<LoanFinOtherPolicyQuery> pq) {
return null;
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanFinOtherPolicyPageVo> pv = loanFinOtherPolicyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean save(LoanFinOtherPolicyDtos dto) {
return loanFinOtherPolicyService.saveOrUpdateDto(dto);
}
@Override
public ResultBean delBySids(String[] sids) {
loanFinOtherPolicyService.delBySids(sids);
return new ResultBean().success();
}
@Override
@ -38,4 +54,14 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
public ResultBean<List<OtherPolicyVo>> selectList(String orgPath, String userSid, String sid) {
return loanFinOtherPolicyService.selectList(orgPath,userSid,sid);
}
@Override
public ResultBean setState(LoanFinOtherPolicyStateQuery query) {
return loanFinOtherPolicyService.setState(query);
}
@Override
public ResultBean setRiskState(LoanOtherRiskStateQuery query) {
return loanFinOtherPolicyService.setRiskState(query);
}
}

152
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java
View File

@ -1,14 +1,27 @@
package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
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.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanRiskStateQuery;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.List;
@ -66,4 +79,135 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
return rb.success().setData(list);
}
public PagerVo<LoanFinOtherPolicyPageVo> listPageVo(PagerQuery<LoanFinOtherPolicyQuery> pq) {
LoanFinOtherPolicyQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
qw.eq("createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getFilingState())) {
qw.eq("filingState", query.getFilingState());
}
if (StringUtils.isNotBlank(query.getRiskState())) {
qw.eq("riskState", query.getRiskState());
}
if (StringUtils.isNotBlank(query.getUseSate())) {
qw.eq("useSate", query.getUseSate());
}
if (StringUtils.isNotBlank(query.getBusTypeValue())) {
qw.like("busTypeValue", query.getBusTypeValue());
}
if (StringUtils.isNotBlank(query.getVehCategoryValue())) {
qw.like("vehCategoryValue", query.getVehCategoryValue());
}
if (StringUtils.isNotBlank(query.getVehTypeValue())) {
qw.like("vehTypeValue", query.getVehTypeValue());
}
if (StringUtils.isNotBlank(query.getOtherPolicyName())) {
qw.like("otherPolicyName", query.getOtherPolicyName());
}
if (StringUtils.isNotBlank(query.getYearRatio())) {
qw.like("yearRatio", query.getYearRatio());
}
String validStartDateTo = query.getValidStartDateTo();
String validEndDateTo = query.getValidEndDateTo();
qw.apply(StringUtils.isNotEmpty(validStartDateTo), "date_format (validDateTo,'%Y-%m-%d') >= date_format('" + validStartDateTo + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(validEndDateTo), "date_format (validDateTo,'%Y-%m-%d') <= date_format('" + validEndDateTo + "','%Y-%m-%d')"
);
IPage<LoanFinOtherPolicy> page = PagerUtil.queryToPage(pq);
IPage<LoanFinOtherPolicyPageVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanFinOtherPolicyPageVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(LoanFinOtherPolicyDtos dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {//新增
this.insertByDto(dto);
return rb.success();
}
this.updateByDto(dto);
return rb.success();
}
public void insertByDto(LoanFinOtherPolicyDtos dto) {
List<UseDept> useDeptList = dto.getUseDeptList();
LoanFinOtherPolicy entity = new LoanFinOtherPolicy();
BeanUtil.copyProperties(dto, entity, "id", "sid");
String useDeptSid = "";
String useDeptName = "";
for (UseDept useDept : useDeptList) {
useDeptSid = useDeptSid + useDept.getDeptSid() + ",";
useDeptName = useDeptName + useDept.getDeptName() + ",";
}
entity.setOtherPolicyName(entity.getBankShortName() + entity.getProductTypeValue() + entity.getYearRatio() + entity.getPeriod());
entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
baseMapper.insert(entity);
}
public void updateByDto(LoanFinOtherPolicyDtos dto) {
String dtoSid = dto.getSid();
List<UseDept> useDeptList = dto.getUseDeptList();
if (StringUtils.isBlank(dtoSid)) {
return;
}
LoanFinOtherPolicy entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
String useDeptSid = "";
String useDeptName = "";
for (UseDept useDept : useDeptList) {
useDeptSid = useDeptSid + useDept.getDeptSid() + ",";
useDeptName = useDeptName + useDept.getDeptName() + ",";
}
entity.setOtherPolicyName(entity.getBankShortName() + entity.getProductTypeValue() + entity.getYearRatio() + entity.getPeriod());
entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
baseMapper.updateById(entity);
}
@Transactional(rollbackFor = Exception.class)
public ResultBean setState(LoanFinOtherPolicyStateQuery query) {
ResultBean rb = ResultBean.fireFail();
//ToDo:是否可以停用或开启，需补充条件
List<String> sidsList = query.getSidsList();
sidsList.removeAll(Collections.singleton(null));
if (sidsList.isEmpty()) {
return rb.setMsg("请选择数据");
}
String useState = query.getUseState();
for (String sid : sidsList) {
LoanFinOtherPolicy loanFinOtherPolicy = fetchBySid(sid);
if (loanFinOtherPolicy == null) {
return rb.setMsg("选择的其他融产品不存在");
}
loanFinOtherPolicy.setUseSate(Integer.valueOf(useState).intValue());
baseMapper.updateById(loanFinOtherPolicy);
}
return rb.success();
}
@Transactional(rollbackFor = Exception.class)
public ResultBean setRiskState(LoanOtherRiskStateQuery query) {
ResultBean rb = ResultBean.fireFail();
//ToDo:是否可以停用或开启，需补充条件
List<String> sidsList = query.getSidsList();
sidsList.removeAll(Collections.singleton(null));
if (sidsList.isEmpty()) {
return rb.setMsg("请选择数据");
}
String riskState = query.getRiskState();
for (String sid : sidsList) {
LoanFinOtherPolicy loanFinOtherPolicy = fetchBySid(sid);
if (loanFinOtherPolicy == null) {
return rb.setMsg("选择的其他融产品不存在");
}
loanFinOtherPolicy.setRiskState(Integer.valueOf(riskState).intValue());
baseMapper.updateById(loanFinOtherPolicy);
}
return rb.success();
}
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java
View File

@ -39,4 +39,6 @@ public class ModelDto implements Dto {
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java
View File

@ -47,4 +47,7 @@ public class OrderInfoDto implements Dto {
private String publicModelSid;
@ApiModelProperty("公告型号配置")
private String publicModelSon;
@ApiModelProperty("现车下不确定车架号的车辆数量")
private String nowCarUnknownVinNum;
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoVo.java
View File

@ -55,4 +55,8 @@ public class OrderInfoVo implements Vo {
@ApiModelProperty("公告型号是否可空：true，false必填")
private boolean publicModelNullable;
@ApiModelProperty("现车下不确定车架号的车辆数量")
private String nowCarUnknownVinNum;
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
View File

@ -673,7 +673,7 @@ public class AppBusSalesOrderService {
List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
flowOrderVo.setList(list);
}
if ("3".equals(busSalesOrder.getType())) {
if ("3".equals(busSalesOrder.getType()) || StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) {
flowOrderVo.setShow(true);
} else {
flowOrderVo.setShow(false);

185
工作内容需要的文档/单据模板/款项结转打印模板/jzsqjg.ftl
View File

@ -90,17 +90,13 @@
</w:tblCellMar>
</w:tblPr>
<w:tblGrid>
<w:gridCol w:w="1069"/>
<w:gridCol w:w="877"/>
<w:gridCol w:w="678"/>
<w:gridCol w:w="1050"/>
<w:gridCol w:w="218"/>
<w:gridCol w:w="1946"/>
<w:gridCol w:w="986"/>
<w:gridCol w:w="960"/>
<w:gridCol w:w="594"/>
<w:gridCol w:w="955"/>
<w:gridCol w:w="397"/>
<w:gridCol w:w="1946"/>
<w:gridCol w:w="1623"/>
<w:gridCol w:w="323"/>
<w:gridCol w:w="1946"/>
<w:gridCol w:w="1303"/>
<w:gridCol w:w="643"/>
<w:gridCol w:w="1951"/>
</w:tblGrid>
<w:tr>
@ -128,7 +124,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="11681" w:type="dxa"/>
<w:gridSpan w:val="12"/>
<w:gridSpan w:val="8"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -206,7 +202,7 @@
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="1069" w:type="dxa"/>
<w:tcW w:w="1946" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -261,8 +257,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1555" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcW w:w="1946" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -317,7 +312,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1050" w:type="dxa"/>
<w:tcW w:w="1623" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -356,104 +351,6 @@
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>申请部门：</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2164" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
<w:bottom w:val="nil"/>
<w:right w:val="nil"/>
</w:tcBorders>
<w:noWrap w:val="0"/>
<w:vAlign w:val="top"/>
</w:tcPr>
<w:p>
<w:pPr>
<w:keepNext w:val="0"/>
<w:keepLines w:val="0"/>
<w:pageBreakBefore w:val="0"/>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="0"/>
<w:autoSpaceDE/>
<w:autoSpaceDN/>
<w:bidi w:val="0"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="240" w:lineRule="auto"/>
<w:jc w:val="left"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>${applyDept!}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="986" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
<w:bottom w:val="nil"/>
<w:right w:val="nil"/>
</w:tcBorders>
<w:noWrap w:val="0"/>
<w:vAlign w:val="top"/>
</w:tcPr>
<w:p>
<w:pPr>
<w:keepNext w:val="0"/>
<w:keepLines w:val="0"/>
<w:pageBreakBefore w:val="0"/>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="0"/>
<w:autoSpaceDE/>
<w:autoSpaceDN/>
<w:bidi w:val="0"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="240" w:lineRule="auto"/>
<w:jc w:val="right"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
w:cs="宋体"/>
@ -464,24 +361,13 @@
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>申请人：</w:t>
<w:t>申请部门：</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1554" w:type="dxa"/>
<w:tcW w:w="2269" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="nil"/>
@ -531,13 +417,13 @@
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>${applyPeo!}</w:t>
<w:t>${applyDept!}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="955" w:type="dxa"/>
<w:tcW w:w="1303" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -592,7 +478,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2348" w:type="dxa"/>
<w:tcW w:w="2594" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="nil"/>
@ -670,7 +556,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -719,7 +604,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -768,6 +652,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -816,7 +701,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -865,7 +749,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -984,7 +868,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1030,7 +913,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1071,6 +953,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1111,7 +994,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1152,7 +1034,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1946" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1311,14 +1193,14 @@
xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
<Template>Normal.dotm</Template>
<Pages>1</Pages>
<Words>57</Words>
<Characters>164</Characters>
<Words>52</Words>
<Characters>148</Characters>
<Lines>0</Lines>
<Paragraphs>0</Paragraphs>
<TotalTime>2</TotalTime>
<ScaleCrop>false</ScaleCrop>
<LinksUpToDate>false</LinksUpToDate>
<CharactersWithSpaces>164</CharactersWithSpaces>
<CharactersWithSpaces>148</CharactersWithSpaces>
<Application>WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA</Application>
<DocSecurity>0</DocSecurity>
</Properties>
@ -1334,7 +1216,7 @@
<dcterms:created xsi:type="dcterms:W3CDTF">2014-10-29T12:08:00Z</dcterms:created>
<dc:creator>God</dc:creator>
<cp:lastModifiedBy>文档存本地丢失不负责</cp:lastModifiedBy>
<dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-27T03:16:23Z</dcterms:modified>
<dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-31T08:33:33Z</dcterms:modified>
</cp:coreProperties>
</pkg:xmlData>
</pkg:part>
@ -1347,7 +1229,7 @@
<vt:lpwstr>2052-11.1.0.14309</vt:lpwstr>
</property>
<property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="ICV">
<vt:lpwstr>2D380203F5044904B1BE9AE51DA87754_13</vt:lpwstr>
<vt:lpwstr>97A810377C06437C8F0D67126FFA892D_13</vt:lpwstr>
</property>
</Properties>
</pkg:xmlData>
@ -1863,6 +1745,7 @@
</w:docVars>
<w:rsids>
<w:rsidRoot w:val="00000000"/>
<w:rsid w:val="0078143C"/>
<w:rsid w:val="00DC7C1D"/>
<w:rsid w:val="024617F2"/>
<w:rsid w:val="02C941D1"/>
@ -1875,6 +1758,7 @@
<w:rsid w:val="09E87633"/>
<w:rsid w:val="0AEC3153"/>
<w:rsid w:val="0AF23507"/>
<w:rsid w:val="0B4D2391"/>
<w:rsid w:val="0BFA53FB"/>
<w:rsid w:val="0C55445D"/>
<w:rsid w:val="0C781EB3"/>
@ -1883,6 +1767,7 @@
<w:rsid w:val="0E741495"/>
<w:rsid w:val="0EA93835"/>
<w:rsid w:val="0F046CBD"/>
<w:rsid w:val="0FE12B5A"/>
<w:rsid w:val="0FF22FB9"/>
<w:rsid w:val="10480E2B"/>
<w:rsid w:val="108856CC"/>
@ -1893,6 +1778,7 @@
<w:rsid w:val="14587163"/>
<w:rsid w:val="15227E9D"/>
<w:rsid w:val="15593193"/>
<w:rsid w:val="16331C36"/>
<w:rsid w:val="17D42FA4"/>
<w:rsid w:val="18CA6DC6"/>
<w:rsid w:val="18CE20EA"/>
@ -1927,13 +1813,14 @@
<w:rsid w:val="283D06F2"/>
<w:rsid w:val="28890D09"/>
<w:rsid w:val="28BB61E6"/>
<w:rsid w:val="29DB01C2"/>
<w:rsid w:val="2B0D4CF3"/>
<w:rsid w:val="2CDE6947"/>
<w:rsid w:val="2D6D7CCB"/>
<w:rsid w:val="2DDD09AD"/>
<w:rsid w:val="2E840E29"/>
<w:rsid w:val="304545E8"/>
<w:rsid w:val="30C714A1"/>
<w:rsid w:val="31061FC9"/>
<w:rsid w:val="31615451"/>
<w:rsid w:val="31D4513D"/>
<w:rsid w:val="32BA143C"/>
@ -1956,18 +1843,16 @@
<w:rsid w:val="3D736C38"/>
<w:rsid w:val="3E0B0C1F"/>
<w:rsid w:val="3E1D0952"/>
<w:rsid w:val="3E502AD5"/>
<w:rsid w:val="3F290AD8"/>
<w:rsid w:val="3F4F215C"/>
<w:rsid w:val="3FA94B93"/>
<w:rsid w:val="3FD414E4"/>
<w:rsid w:val="41B8730F"/>
<w:rsid w:val="437E00E5"/>
<w:rsid w:val="43BF2BD7"/>
<w:rsid w:val="453C3DB3"/>
<w:rsid w:val="45ED50AE"/>
<w:rsid w:val="46AA2F9F"/>
<w:rsid w:val="46F04E55"/>
<w:rsid w:val="48873598"/>
<w:rsid w:val="47705F96"/>
<w:rsid w:val="49C64593"/>
<w:rsid w:val="4A203CA4"/>
<w:rsid w:val="4A3414FD"/>
@ -2006,6 +1891,7 @@
<w:rsid w:val="5CF1327E"/>
<w:rsid w:val="5D543F38"/>
<w:rsid w:val="5DC170F4"/>
<w:rsid w:val="5E9932C2"/>
<w:rsid w:val="5EE57C39"/>
<w:rsid w:val="5F957001"/>
<w:rsid w:val="5FF94923"/>
@ -2028,19 +1914,18 @@
<w:rsid w:val="6F767D3E"/>
<w:rsid w:val="727704D5"/>
<w:rsid w:val="73591E51"/>
<w:rsid w:val="73661E78"/>
<w:rsid w:val="738D38A8"/>
<w:rsid w:val="73B61051"/>
<w:rsid w:val="758D4034"/>
<w:rsid w:val="75A03D67"/>
<w:rsid w:val="78EF46BD"/>
<w:rsid w:val="793A3C69"/>
<w:rsid w:val="7997722F"/>
<w:rsid w:val="79BC0A44"/>
<w:rsid w:val="79C1605A"/>
<w:rsid w:val="79EA1A55"/>
<w:rsid w:val="79F503F9"/>
<w:rsid w:val="7A106FE1"/>
<w:rsid w:val="7A1E16FE"/>
<w:rsid w:val="7A523156"/>
<w:rsid w:val="7CCD4D16"/>
<w:rsid w:val="7D5453FC"/>
<w:rsid w:val="7D6C2781"/>

179
工作内容需要的文档/单据模板/款项结转打印模板/jzsqzks.ftl
View File

@ -87,17 +87,13 @@
</w:tblCellMar>
</w:tblPr>
<w:tblGrid>
<w:gridCol w:w="1165"/>
<w:gridCol w:w="785"/>
<w:gridCol w:w="974"/>
<w:gridCol w:w="976"/>
<w:gridCol w:w="170"/>
<w:gridCol w:w="1778"/>
<w:gridCol w:w="2"/>
<w:gridCol w:w="1043"/>
<w:gridCol w:w="907"/>
<w:gridCol w:w="972"/>
<w:gridCol w:w="978"/>
<w:gridCol w:w="1950"/>
<w:gridCol w:w="1950"/>
<w:gridCol w:w="1397"/>
<w:gridCol w:w="553"/>
<w:gridCol w:w="1950"/>
<w:gridCol w:w="1479"/>
<w:gridCol w:w="471"/>
<w:gridCol w:w="1950"/>
</w:tblGrid>
<w:tr>
@ -124,7 +120,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="11700" w:type="dxa"/>
<w:gridSpan w:val="12"/>
<w:gridSpan w:val="8"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -202,7 +198,7 @@
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="1165" w:type="dxa"/>
<w:tcW w:w="1950" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -257,8 +253,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1759" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcW w:w="1950" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -313,8 +308,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1146" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcW w:w="1397" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -353,104 +347,6 @@
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>申请部门：</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1778" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
<w:bottom w:val="nil"/>
<w:right w:val="nil"/>
</w:tcBorders>
<w:noWrap w:val="0"/>
<w:vAlign w:val="top"/>
</w:tcPr>
<w:p>
<w:pPr>
<w:keepNext w:val="0"/>
<w:keepLines w:val="0"/>
<w:pageBreakBefore w:val="0"/>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="0"/>
<w:autoSpaceDE/>
<w:autoSpaceDN/>
<w:bidi w:val="0"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="240" w:lineRule="auto"/>
<w:jc w:val="left"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>${applyDept!}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1045" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
<w:bottom w:val="nil"/>
<w:right w:val="nil"/>
</w:tcBorders>
<w:noWrap w:val="0"/>
<w:vAlign w:val="top"/>
</w:tcPr>
<w:p>
<w:pPr>
<w:keepNext w:val="0"/>
<w:keepLines w:val="0"/>
<w:pageBreakBefore w:val="0"/>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="0"/>
<w:autoSpaceDE/>
<w:autoSpaceDN/>
<w:bidi w:val="0"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="240" w:lineRule="auto"/>
<w:jc w:val="right"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:rFonts w:hint="default" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体"
w:cs="宋体"/>
@ -461,24 +357,13 @@
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>
<w:b w:val="0"/>
<w:bCs w:val="0"/>
<w:sz w:val="16"/>
<w:szCs w:val="16"/>
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>申请人：</w:t>
<w:t>申请部门：</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1879" w:type="dxa"/>
<w:tcW w:w="2503" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="nil"/>
@ -528,13 +413,13 @@
<w:vertAlign w:val="baseline"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>${applyPeo!}</w:t>
<w:t>${applyDept!}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="978" w:type="dxa"/>
<w:tcW w:w="1479" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -589,7 +474,8 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:tcW w:w="2421" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
@ -666,7 +552,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -715,7 +600,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -764,7 +648,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -813,7 +697,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:right w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -981,7 +864,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1027,7 +909,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1068,7 +949,7 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="3"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1109,7 +990,6 @@
<w:tc>
<w:tcPr>
<w:tcW w:w="1950" w:type="dxa"/>
<w:gridSpan w:val="2"/>
<w:tcBorders>
<w:left w:val="single" w:color="auto" w:sz="8" w:space="0"/>
<w:bottom w:val="single" w:color="auto" w:sz="8" w:space="0"/>
@ -1274,14 +1154,14 @@
xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
<Template>Normal.dotm</Template>
<Pages>1</Pages>
<Words>57</Words>
<Characters>164</Characters>
<Words>52</Words>
<Characters>148</Characters>
<Lines>0</Lines>
<Paragraphs>0</Paragraphs>
<TotalTime>1</TotalTime>
<ScaleCrop>false</ScaleCrop>
<LinksUpToDate>false</LinksUpToDate>
<CharactersWithSpaces>164</CharactersWithSpaces>
<CharactersWithSpaces>148</CharactersWithSpaces>
<Application>WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA</Application>
<DocSecurity>0</DocSecurity>
</Properties>
@ -1297,7 +1177,7 @@
<dcterms:created xsi:type="dcterms:W3CDTF">2014-10-29T12:08:00Z</dcterms:created>
<dc:creator>God</dc:creator>
<cp:lastModifiedBy>文档存本地丢失不负责</cp:lastModifiedBy>
<dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-27T03:17:59Z</dcterms:modified>
<dcterms:modified xsi:type="dcterms:W3CDTF">2023-07-31T08:35:25Z</dcterms:modified>
</cp:coreProperties>
</pkg:xmlData>
</pkg:part>
@ -1310,7 +1190,7 @@
<vt:lpwstr>2052-11.1.0.14309</vt:lpwstr>
</property>
<property fmtid="{D5CDD505-2E9C-101B-9397-08002B2CF9AE}" pid="3" name="ICV">
<vt:lpwstr>21863D8A3CFD4FDB924FD0A9161B1128_13</vt:lpwstr>
<vt:lpwstr>32E34B51FAB641798E823A5E057B5988_13</vt:lpwstr>
</property>
</Properties>
</pkg:xmlData>
@ -1702,6 +1582,7 @@
<w:rsid w:val="050D2A9B"/>
<w:rsid w:val="05BC770A"/>
<w:rsid w:val="06652463"/>
<w:rsid w:val="06AB256C"/>
<w:rsid w:val="099217C1"/>
<w:rsid w:val="09C556F2"/>
<w:rsid w:val="09E87633"/>
@ -1726,8 +1607,8 @@
<w:rsid w:val="13533D6F"/>
<w:rsid w:val="14587163"/>
<w:rsid w:val="15593193"/>
<w:rsid w:val="16EB2510"/>
<w:rsid w:val="17300E42"/>
<w:rsid w:val="17B84B86"/>
<w:rsid w:val="17D42FA4"/>
<w:rsid w:val="18CA6DC6"/>
<w:rsid w:val="18CE20EA"/>
@ -1745,7 +1626,6 @@
<w:rsid w:val="1F1840BF"/>
<w:rsid w:val="1F330EF8"/>
<w:rsid w:val="1F4924CA"/>
<w:rsid w:val="20607ACB"/>
<w:rsid w:val="20BE47F2"/>
<w:rsid w:val="212D426F"/>
<w:rsid w:val="21843C8D"/>
@ -1762,9 +1642,11 @@
<w:rsid w:val="2705317A"/>
<w:rsid w:val="27054F28"/>
<w:rsid w:val="27090EBD"/>
<w:rsid w:val="273A72C8"/>
<w:rsid w:val="283D06F2"/>
<w:rsid w:val="28890D09"/>
<w:rsid w:val="28BB61E6"/>
<w:rsid w:val="2AD72337"/>
<w:rsid w:val="2B0D4CF3"/>
<w:rsid w:val="2C58551B"/>
<w:rsid w:val="2CDE6947"/>
@ -1773,6 +1655,7 @@
<w:rsid w:val="2E840E29"/>
<w:rsid w:val="2EE52190"/>
<w:rsid w:val="2F8A2102"/>
<w:rsid w:val="2FC00586"/>
<w:rsid w:val="304545E8"/>
<w:rsid w:val="30FA3624"/>
<w:rsid w:val="31615451"/>
@ -1794,8 +1677,6 @@
<w:rsid w:val="3C137C90"/>
<w:rsid w:val="3C6F136A"/>
<w:rsid w:val="3D736C38"/>
<w:rsid w:val="3DCB6F17"/>
<w:rsid w:val="3DF15DAF"/>
<w:rsid w:val="3E0B0C1F"/>
<w:rsid w:val="3E1D0952"/>
<w:rsid w:val="41B8730F"/>
@ -1813,6 +1694,7 @@
<w:rsid w:val="4B257098"/>
<w:rsid w:val="4CB16E35"/>
<w:rsid w:val="4D0708F5"/>
<w:rsid w:val="4DA90454"/>
<w:rsid w:val="4E5403C0"/>
<w:rsid w:val="4E807407"/>
<w:rsid w:val="4F31425D"/>
@ -1862,7 +1744,6 @@
<w:rsid w:val="6D321474"/>
<w:rsid w:val="6D396CA7"/>
<w:rsid w:val="6D9E6B0A"/>
<w:rsid w:val="6F0926A9"/>
<w:rsid w:val="6F767D3E"/>
<w:rsid w:val="727704D5"/>
<w:rsid w:val="73591E51"/>

Write Preview
Loading…
Cancel
Save