God 6 months ago
parent
commit
93de581a27
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  2. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  4. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  5. 54
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  6. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  7. 1
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java
  8. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java
  9. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java
  10. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java
  11. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java
  12. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml
  13. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java
  14. 333
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -1512,15 +1512,13 @@
<select id="vehicleCollectionPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseChoiceVehicleVo">
SELECT bv.sid,
bvm.brandName,
bvm.vehicleAlias,
bvm.sid as carModelSid,
bv.vinNo,
bmc.carColor color,
bv.locationName location,
LEFT(bv.vinNo,8) as vinNo,
bv.costPrice as guidedPrice,
bv.priceDate,
bv.salesDate
bv.salesDate,
bv.solidDate
FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -67,6 +67,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeign;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
@ -154,6 +155,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private BaseTrailerModelService baseTrailerModelService;
@Autowired
private BaseVehinstallmodelService baseVehinstallmodelService;
@Autowired
private ScmCollectionRebateDistributionFeign scmCollectionRebateDistributionFeign;
public IPage<BaseVehicleVo> pagerListByOrgSidPath(PagerQuery<BaseVehicleQuery> pq) {
IPage<BaseVehicleQuery> page = PagerUtil.queryToPage(pq);
@ -3720,7 +3723,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.vinNo", params.getVinNo());
}
if (params.getVinNoList().size() > 0) {
List<String> vinNos = scmCollectionRebateDistributionFeign.selVinNo().getData();
if (vinNos.size() > 0) {
qw.notIn("bv.vinNo", vinNos);
}
if (params.getVinNoList().size() > 0){
qw.notIn("bv.vinNo", params.getVinNoList());
}
qw.apply(StringUtils.isNotBlank(params.getPriceDateStart()), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + params.getPriceDateStart() + "','%Y-%m-%d')").

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@ -1053,7 +1053,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
ResultBean<List<FinFundsApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(query.getBusinessSid());
@ -1065,6 +1064,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
variables.put("isAdj", false);
}
bv.setFormVariables(variables);
bv.setModelId(finFundsCarriedForwardApply.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<FinFundsApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinFundsApplyNodeVo.class)).collect(Collectors.toList());
@ -1075,7 +1075,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
ResultBean<List<FinFundsApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(query.getBusinessSid());
@ -1087,6 +1086,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
variables.put("isAdj", false);
}
bv.setFormVariables(variables);
bv.setModelId(finFundsCarriedForwardApply.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<FinFundsApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinFundsApplyNodeVo.class)).collect(Collectors.toList());
@ -1266,6 +1266,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
variables.put("isAdj", false);
}
bv.setFormVariables(variables);
bv.setModelId(finFundsCarriedForwardApply.getProcDefId());
bv.setOrgSidPath(finFundsCarriedForwardApply.getOrgSidPath());
if ("Activity_1kve61q".equals(bv.getTaskDefKey())) {
List<String> orgPathList = Arrays.asList(finFundsCarriedForwardApply.getOrgSidPath().split("/"));

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -49,7 +49,7 @@ public enum ProcDefEnum {
BASEDISPACKAGEAPPLY("优惠包申请流程", "process_ncifet6k:4:1747504"),
BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
BASETRAILEROUTAPPLY("挂车出库申请", "process_tkw6vhfw:1:1705004"),
FINFUNDSAPPLY("款项结转申请", "process_ypafrrvg:1:2257504"),
FINFUNDSAPPLY("款项结转申请", "process_ypafrrvg:2:15037504"),
BUSHANDOVER("交车确认", "process_e8feloik:6:2675004"),
LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),

54
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@ -672,17 +672,41 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
//根据销售订单sid查询是否有挂车或上装
List<BusSalesOrderMakeupDetailsVo> salesOrderMakeupDetailsVos = busSalesOrderMakeupFeign.selectTopByOrderSid(saleOrderSid).getData();
List<BusSalesOrderTrailerDetailsVo> salesOrderTrailerDetailsVos = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(saleOrderSid).getData();
if (salesOrderMakeupDetailsVos != null && salesOrderMakeupDetailsVos.size() > 0){
if (salesOrderMakeupDetailsVos != null && salesOrderMakeupDetailsVos.size() > 0) {
loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("上装");
if ("01".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())){
if ("01".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())) {
loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("0");
}else if ("02".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())){
} else if ("02".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())) {
loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("1");
}
}else if (salesOrderTrailerDetailsVos != null && salesOrderTrailerDetailsVos.size() > 0){
}
if (salesOrderTrailerDetailsVos != null && salesOrderTrailerDetailsVos.size() > 0) {
loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("挂车");
}
return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
}else {
String saleOrderSid = "";
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
if (loanHomevisitInvestigate == null) {
LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(sid);
saleOrderSid = loanHomevisitPrep.getSaleOrderSid();
} else {
saleOrderSid = loanHomevisitInvestigate.getSaleOrderSid();
}
//根据销售订单sid查询是否有挂车或上装
List<BusSalesOrderMakeupDetailsVo> salesOrderMakeupDetailsVos = busSalesOrderMakeupFeign.selectTopByOrderSid(saleOrderSid).getData();
List<BusSalesOrderTrailerDetailsVo> salesOrderTrailerDetailsVos = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(saleOrderSid).getData();
if (salesOrderMakeupDetailsVos != null && salesOrderMakeupDetailsVos.size() > 0) {
loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("上装");
if ("01".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())) {
loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("0");
} else if ("02".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())) {
loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("1");
}
}
if (salesOrderTrailerDetailsVos != null && salesOrderTrailerDetailsVos.size() > 0) {
loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("挂车");
}
}
//银行卡附件
List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
@ -773,12 +797,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateCustomerDto.setIsCompBuy(dto.getIsCompBuy());
loanHomevisitInvestigateCustomerDto.setConSetUpKey(dto.getConSetUpKey());
loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto);
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum())){
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum())) {
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(loanHomevisitInvestigateCustomerDto.getMainSid());
if (loanHomevisitInvestigate != null && StringUtils.isNotBlank(loanHomevisitInvestigate.getSaleOrderSid())){
if (loanHomevisitInvestigate != null && StringUtils.isNotBlank(loanHomevisitInvestigate.getSaleOrderSid())) {
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitInvestigate.getSaleOrderSid()).getData();
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(loanHomevisitInvestigateCustomerDto.getAccCompRegistNum(), busSalesOrder.getUseOrgSid()).getData();
if (finCompanyInvoicingDetailsVo == null){
if (finCompanyInvoicingDetailsVo == null) {
FinCompanyInvoicingDto finCompanyInvoicingDto = new FinCompanyInvoicingDto();
finCompanyInvoicingDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
finCompanyInvoicingDto.setName(loanHomevisitInvestigateCustomerDto.getAccCompName());
@ -1669,7 +1693,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
financeForm70.setValue("实际经营地址:" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress());
financeForm70.setSpanSize(2);
otherInfo.add(financeForm70);
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())){
if (StringUtils.isNotBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsCompBuy())) {
FinanceForm financeForm74 = new FinanceForm();
financeForm74.setValue("挂车或上装是否公司采购:是");
@ -2064,7 +2088,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateDetailsPCVo.setRemarks(loanHomevisitInvestigate.getRemarks());
//借款人
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid);
if (loanHomevisitInvestigateCustomerDetailsVo != null){
if (loanHomevisitInvestigateCustomerDetailsVo != null) {
loanHomevisitInvestigateDetailsPCVo.setIsConfirmRealBuyer(loanHomevisitInvestigateCustomerDetailsVo.getIsConfirmRealBuyer());
loanHomevisitInvestigateDetailsPCVo.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
loanHomevisitInvestigateDetailsPCVo.setBorrowerIdNumber(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
@ -2129,7 +2153,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomevisitInvestigateDetailsPCVo.setLoanHomevisitInvestigateOtherpeoDetailsPCVoList(loanHomevisitInvestigateOtherpeoDetailsPCVos);
//订单信息
LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
if (loanHomevisitInvestigateOrderDetailsVo != null){
if (loanHomevisitInvestigateOrderDetailsVo != null) {
loanHomevisitInvestigateDetailsPCVo.setCarConfirm(loanHomevisitInvestigateOrderDetailsVo.getCarConfirm());
loanHomevisitInvestigateDetailsPCVo.setCarRemarks(loanHomevisitInvestigateOrderDetailsVo.getCarRemarks());
loanHomevisitInvestigateDetailsPCVo.setFinConfirm(loanHomevisitInvestigateOrderDetailsVo.getFinConfirm());
@ -2139,14 +2163,14 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
//营运经历
LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
if (loanHomevisitInvestigateOperationsDetailsVo != null){
if (loanHomevisitInvestigateOperationsDetailsVo != null) {
loanHomevisitInvestigateDetailsPCVo.setIndustryYears(loanHomevisitInvestigateOperationsDetailsVo.getIndustryYears());
loanHomevisitInvestigateDetailsPCVo.setDriveProTypeValue(loanHomevisitInvestigateOperationsDetailsVo.getDriveProTypeValue());
loanHomevisitInvestigateDetailsPCVo.setBeforeOpeTypeValue(loanHomevisitInvestigateOperationsDetailsVo.getBeforeOpeTypeValue());
}
//运输信息
LoanHomevisitInvestigateTransportDetailsVo loanHomevisitInvestigateTransportDetailsVo = loanHomevisitInvestigateTransportService.selByMainSid(sid);
if (loanHomevisitInvestigateTransportDetailsVo != null){
if (loanHomevisitInvestigateTransportDetailsVo != null) {
loanHomevisitInvestigateDetailsPCVo.setTransportRoute(loanHomevisitInvestigateTransportDetailsVo.getTransportRoute());
loanHomevisitInvestigateDetailsPCVo.setTransportTypeValue(loanHomevisitInvestigateTransportDetailsVo.getTransportTypeValue());
loanHomevisitInvestigateDetailsPCVo.setTransportGoodsTrip(loanHomevisitInvestigateTransportDetailsVo.getTransportGoodsTrip());
@ -2164,7 +2188,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
//资产情况
LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
if (loanHomevisitInvestigatePropertyDetailsVo != null){
if (loanHomevisitInvestigatePropertyDetailsVo != null) {
loanHomevisitInvestigateDetailsPCVo.setIsRealEstate(loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate());
loanHomevisitInvestigateDetailsPCVo.setPropertyType(loanHomevisitInvestigatePropertyDetailsVo.getPropertyType());
loanHomevisitInvestigateDetailsPCVo.setRealLoanSituation(loanHomevisitInvestigatePropertyDetailsVo.getRealLoanSituation());
@ -2181,13 +2205,13 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean<String> selIsCompanyBuy(String orderSid, String borrowerSid) {
ResultBean rb = ResultBean.fireFail();
String isKp = baseMapper.selIsCompanyBuy(orderSid,borrowerSid);
String isKp = baseMapper.selIsCompanyBuy(orderSid, borrowerSid);
return rb.success().setData(isKp);
}
public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
ResultBean rb = ResultBean.fireFail();
String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid, borrowerSid);
return rb.success().setData(sid);
}

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@ -1560,13 +1560,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
map.put("trailerName1", "挂车:外廓尺寸-长" + data.get(0).getAppearanceSizeLong() + "m," + data.get(0).getTrailerTypeValue() + "。");
map.put("trailerNumAndPrice1", "数量:" + new BigDecimal(data.get(0).getTrailerCount()).multiply(num) + "台,单台成交价:" + data.get(0).getSingleFinalPrice() + "元。");
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(num);
//单台主车总价
BigDecimal dtTotalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(num);
//总数合计
BigDecimal totalPrice = dtTotalPrice.multiply(num);
BigDecimal totalPrice = gcPrice.add(zcPrice);
//车价总数合计
map.put("totalPrice", totalPrice.toString());
//车价合计大写
@ -1581,15 +1579,13 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
map.put("trailerName2", "挂车2:外廓尺寸-长" + data.get(1).getAppearanceSizeLong() + "m," + data.get(1).getTrailerTypeValue() + "。");
map.put("trailerNumAndPrice2", "数量:" + new BigDecimal(data.get(1).getTrailerCount()).multiply(num) + "台,单台成交价:" + data.get(1).getSingleFinalPrice() + "元。");
//单台主车对应挂车1总价
BigDecimal gc1Price = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
BigDecimal gc1Price = data.get(0).getSingleFinalPrice().multiply(num);
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(num);
//单台主车总价
BigDecimal dtTotalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(num);
//总数合计
BigDecimal totalPrice = dtTotalPrice.multiply(num);
BigDecimal totalPrice = gc1Price.add(gc2Price).add(zcPrice);
//车价合计
map.put("totalPrice", totalPrice.toString());
//车价合计大写

1
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java

@ -58,6 +58,7 @@ public class ScmCollectionRebateDistributionDto implements Dto {
private String sid; // sid
private String state;
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("备注")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java

@ -75,4 +75,9 @@ public interface ScmCollectionRebateDistributionFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("查询所有回款车架号")
@GetMapping("/selVinNo")
@ResponseBody
ResultBean<List<String>> selVinNo();
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java

@ -69,4 +69,9 @@ public class ScmCollectionRebateDistributionFeignFallback implements ScmCollecti
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatedistribution/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<List<String>> selVinNo() {
return null;
}
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java

@ -61,6 +61,9 @@ public class ScmCollectionRebateDistributionQuery implements Query {
private String subitDateStart;
private String subitDateEnd;
@ApiModelProperty("是否审核页面")
private Boolean isAuit;
private String userSid;
private String orgPath;
private String menuUrl;

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java

@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -56,6 +57,14 @@ public interface ScmCollectionRebateDistributionMapper extends BaseMapper<ScmCol
IPage<ScmCollectionRebateDistributionVo> selectPageVo(IPage<ScmCollectionRebateDistribution> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateDistribution> qw);
@Select("select * from scm_collection_rebate_distribution where collRebateSid = #{sid}")
ScmCollectionRebateDistributionDetailsVo fetchByCollRebate(String sid);
@Select("select vinNo from scm_collection_rebate_distribution_veh")
List<String> selVinNo();
@Update("update scm_collection_rebate_distribution set state = #{state} where sid = #{dtoSid}")
void updateState(@Param("dtoSid") String dtoSid,@Param("state") String state);
@Update("update scm_collection_rebate_distribution set state = #{state},subitDate = NOW() where sid = #{dtoSid}")
void updateStateAndSubmitDate(@Param("dtoSid") String dtoSid,@Param("state") String state);
int selectBySid(String join);
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml

@ -5,6 +5,7 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo">
SELECT
sd.sid,
CASE
sd.state
WHEN 0
@ -32,4 +33,11 @@
ON sd.useOrgSid = u.sid
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectBySid" resultType="int">
select count(*)
from scm_collection_rebate_distribution
where state != 0
and find_in_set(sid, #{list})
</select>
</mapper>

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java

@ -63,8 +63,6 @@ public class ScmCollectionRebateDistributionRest implements ScmCollectionRebateD
private ScmCollectionRebateDistributionService scmCollectionRebateDistributionService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmCollectionRebateDistributionVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateDistributionQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateDistributionVo> pv = scmCollectionRebateDistributionService.listPageVo(pq);
@ -72,25 +70,22 @@ public class ScmCollectionRebateDistributionRest implements ScmCollectionRebateD
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionRebateDistributionDto dto){
return scmCollectionRebateDistributionService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmCollectionRebateDistributionService.delBySids(sids);
return rb.success();
return scmCollectionRebateDistributionService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return scmCollectionRebateDistributionService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<List<String>> selVinNo() {
return scmCollectionRebateDistributionService.selVinNo();
}
}

333
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java

@ -72,155 +72,192 @@ import java.util.List;
@Service
public class ScmCollectionRebateDistributionService extends MybatisBaseService<ScmCollectionRebateDistributionMapper, ScmCollectionRebateDistribution> {
@Autowired
private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private ScmFileService scmFileService;
@Autowired
FileUploadComponent fileUploadComponent;
public PagerVo<ScmCollectionRebateDistributionVo> listPageVo(PagerQuery<ScmCollectionRebateDistributionQuery> pq) {
ScmCollectionRebateDistributionQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateDistribution> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("u.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("u.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("u.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("u.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("sd.createBySid", query.getUserSid());
} else {
PagerVo<ScmCollectionRebateDistributionVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<ScmCollectionRebateDistributionVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getCreateOrgName())){
qw.like("sd.createOrgName",query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())){
qw.like("sd.purchaseSystemName",query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getBrandName())){
qw.like("sd.brandName",query.getBrandName());
}
String subitDateStart = query.getSubitDateStart();
String subitDateEnd = query.getSubitDateEnd();
qw.apply(StringUtils.isNotBlank(subitDateStart), "date_format (sd.subitDate,'%Y-%m-%d') >= date_format('" + subitDateStart + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(subitDateEnd), "date_format (sd.subitDate,'%Y-%m-%d') <= date_format('" + subitDateEnd + "','%Y-%m-%d')"
);
IPage<ScmCollectionRebateDistribution> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateDistributionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateDistributionVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateDistributionDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateDistributionFile> urls = dto.getUrls();
List<ScmCollectionRebateDistributionVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(sid);
scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto);
}
}
for (ScmCollectionRebateDistributionFile url : urls) {
String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setFilePath(filePath);
scmFile.setLinkSid(sid);
scmFileService.save(scmFile);
}
return rb.success().setMsg("添加成功");
@Autowired
private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private ScmFileService scmFileService;
@Autowired
FileUploadComponent fileUploadComponent;
public PagerVo<ScmCollectionRebateDistributionVo> listPageVo(PagerQuery<ScmCollectionRebateDistributionQuery> pq) {
ScmCollectionRebateDistributionQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateDistribution> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("u.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("u.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("u.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("u.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("sd.createBySid", query.getUserSid());
} else {
PagerVo<ScmCollectionRebateDistributionVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<ScmCollectionRebateDistributionVo> p = new PagerVo<>();
return p;
}
}
if (query.getIsAuit()) {
qw.ne("sd.state", 0);
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("sd.state", query.getState());
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("sd.createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("sd.purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("sd.brandName", query.getBrandName());
}
String subitDateStart = query.getSubitDateStart();
String subitDateEnd = query.getSubitDateEnd();
qw.apply(StringUtils.isNotBlank(subitDateStart), "date_format (sd.subitDate,'%Y-%m-%d') >= date_format('" + subitDateStart + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(subitDateEnd), "date_format (sd.subitDate,'%Y-%m-%d') <= date_format('" + subitDateEnd + "','%Y-%m-%d')"
);
qw.groupBy("sd.sid");
IPage<ScmCollectionRebateDistribution> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateDistributionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateDistributionVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateDistributionDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateDistributionFile> urls = dto.getUrls();
List<ScmCollectionRebateDistributionVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
String state = dto.getState();
if ("0".equals(state)) {
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
if (scmCollectionRebateVehs != null) {
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(sid);
scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto);
}
}
for (ScmCollectionRebateDistributionFile url : urls) {
String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setFilePath(filePath);
scmFile.setLinkSid(sid);
scmFileService.save(scmFile);
}
return rb.success().setMsg("添加成功");
}
ScmCollectionRebateDistribution scmCollectionRebateDistribution = fetchBySid(dtoSid);
if (scmCollectionRebateDistribution == null) {
return rb.setMsg("该分配信息不存在");
}
this.updateByDto(dto);
scmCollectionRebateDistributionVehService.delByMainSid(dtoSid);
scmFileService.delByMainSid(dtoSid);
if (scmCollectionRebateVehs != null) {
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(dtoSid);
scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto);
}
}
for (ScmCollectionRebateDistributionFile url : urls) {
String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setFilePath(filePath);
scmFile.setLinkSid(dtoSid);
scmFileService.save(scmFile);
}
return rb.success().setMsg("修改成功");
} else if ("1".equals(state)) {
baseMapper.updateStateAndSubmitDate(dtoSid, state);
return rb.success().setMsg("提交成功");
} else if ("2".equals(state)) {
baseMapper.updateState(dtoSid, state);
return rb.success().setMsg("确认成功");
} else if ("3".equals(state)) {
baseMapper.updateState(dtoSid, state);
return rb.success().setMsg("退回成功");
}
ScmCollectionRebateDistribution scmCollectionRebateDistribution = fetchBySid(dtoSid);
if (scmCollectionRebateDistribution == null){
return rb.setMsg("该分配信息不存在");
}
this.updateByDto(dto);
scmCollectionRebateDistributionVehService.delByMainSid(dtoSid);
scmFileService.delByMainSid(dtoSid);
if (!scmCollectionRebateVehs.isEmpty()){
for (ScmCollectionRebateDistributionVehDto scmCollectionRebateVehDto : scmCollectionRebateVehs) {
scmCollectionRebateVehDto.setMainSid(dtoSid);
scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateVehDto);
}
}
for (ScmCollectionRebateDistributionFile url : urls) {
String filePath = url.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
ScmFile scmFile = new ScmFile();
scmFile.setFilePath(filePath);
scmFile.setLinkSid(dtoSid);
scmFileService.save(scmFile);
}
return rb.success().setMsg("修改成功");
}
public String insertByDto(ScmCollectionRebateDistributionDto dto){
ScmCollectionRebateDistribution entity = new ScmCollectionRebateDistribution();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(ScmCollectionRebateDistributionDto dto){
String dtoSid = dto.getSid();
return rb.success();
}
public String insertByDto(ScmCollectionRebateDistributionDto dto) {
ScmCollectionRebateDistribution entity = new ScmCollectionRebateDistribution();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(ScmCollectionRebateDistributionDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmCollectionRebateDistribution entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsVoBySid(String sid){
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDistribution entity = fetchBySid(sid);
ScmCollectionRebateDistributionDetailsVo vo = new ScmCollectionRebateDistributionDetailsVo();
BeanUtil.copyProperties(entity, vo);
List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateDistributionVehDetailsVos = scmCollectionRebateDistributionVehService.selByMainSid(sid);
vo.setScmCollectionRebateVehs(scmCollectionRebateDistributionVehDetailsVos);
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
List<ScmCollectionRebateDistributionFile> urls = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) {
ScmCollectionRebateDistributionFile scmCollectionRebateDistributionFile = new ScmCollectionRebateDistributionFile();
scmCollectionRebateDistributionFile.setUrl(fileUploadComponent.getUrlPrefix() + scmFileVo.getFilePath());
urls.add(scmCollectionRebateDistributionFile);
}
vo.setUrls(urls);
return rb.success().setData(vo);
}
}
ScmCollectionRebateDistribution entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateDistribution entity = fetchBySid(sid);
ScmCollectionRebateDistributionDetailsVo vo = new ScmCollectionRebateDistributionDetailsVo();
BeanUtil.copyProperties(entity, vo);
List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateDistributionVehDetailsVos = scmCollectionRebateDistributionVehService.selByMainSid(sid);
vo.setScmCollectionRebateVehs(scmCollectionRebateDistributionVehDetailsVos);
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
List<ScmCollectionRebateDistributionFile> urls = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) {
ScmCollectionRebateDistributionFile scmCollectionRebateDistributionFile = new ScmCollectionRebateDistributionFile();
scmCollectionRebateDistributionFile.setUrl(fileUploadComponent.getUrlPrefix() + scmFileVo.getFilePath());
urls.add(scmCollectionRebateDistributionFile);
}
vo.setUrls(urls);
return rb.success().setData(vo);
}
public ResultBean<List<String>> selVinNo() {
ResultBean rb = ResultBean.fireFail();
List<String> vinNos = baseMapper.selVinNo();
return rb.success().setData(vinNos);
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据,删除失败");
}
delBySids(sids);
return rb.success();
}
}
Loading…
Cancel
Save