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

车型查询返回修改及业务办理中关于流程报错注释

master
dimengzhe 3 years ago
parent
287605f7ca
commit
b21c7b1e52
10 changed files with 202 additions and 121 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. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListVo.java
  2. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  3. 44
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  4. 46
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  5. 142
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  6. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  7. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  8. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  9. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  10. 24
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListVo.java
View File

@ -91,4 +91,7 @@ public class AppModelConfigListVo implements Vo {
private String otherConfig;
@ApiModelProperty(value = "品牌sid：移动")
private String brandSid;
@ApiModelProperty(value = "车型配置关联sid")
private String vehModelConfigSid;
}

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
View File

@ -701,6 +701,7 @@
bvm.vehicleAlias as modelName,
bvm.brandName as brand,
bvm.carBrand as brandSid,
bvc.sid vehModelConfigSid,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid

44
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
View File

@ -104,8 +104,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getRearAxleRatio() + "/";
}
//空调
if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
/*if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
configName += "空调/";
}*/
if (StringUtils.isNotBlank(dto.getAirConditioner())) {
configName += dto.getAirConditioner() + "/";
}
//轮毂材质
if (StringUtils.isNotBlank(dto.getHubMaterial())) {
@ -124,8 +127,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getSeat() + "/";
}
//护轮罩
if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
/*if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
configName += "护轮罩/";
}*/
if (StringUtils.isNotBlank(dto.getTireCover())) {
configName += dto.getTireCover() + "/";
}
//鞍座
if (StringUtils.isNotBlank(dto.getSaddle())) {
@ -144,16 +150,19 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getConfiguringBao() + "/";
}
//独立热源
if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
/*if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
configName += "独立热源/";
}*/
if (StringUtils.isNotBlank(dto.getIndependentSources())) {
configName += dto.getIndependentSources() + "/";
}
//燃料箱
if (StringUtils.isNotBlank(dto.getFuelTank())) {
configName += dto.getFuelTank() + "/";
}
//多媒体
if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) {
configName += "多媒体/";
if (StringUtils.isNotBlank(dto.getMultimedia())) {
configName += dto.getMultimedia() + "/";
}
//货箱
if (StringUtils.isNotBlank(dto.getPackingCase())) {
@ -197,8 +206,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getCarColor() + "/";
}
//缓速器
if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) {
/*if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) {
configName += "缓速器/";
}*/
if (StringUtils.isNotBlank(dto.getSlowMachine())) {
configName += dto.getSlowMachine() + "/";
}
//后视镜
if (StringUtils.isNotBlank(dto.getRearViewMirror())) {
@ -217,8 +229,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getRearAxleRatio() + "/";
}
//空调
if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
/*if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
configName += "空调/";
}*/
if (StringUtils.isNotBlank(dto.getAirConditioner())) {
configName += dto.getAirConditioner() + "/";
}
//轮毂材质
if (StringUtils.isNotBlank(dto.getHubMaterial())) {
@ -237,8 +252,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getSeat() + "/";
}
//护轮罩
if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
/* if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
configName += "护轮罩/";
}*/
if (StringUtils.isNotBlank(dto.getTireCover())) {
configName += dto.getTireCover() + "/";
}
//鞍座
if (StringUtils.isNotBlank(dto.getSaddle())) {
@ -257,16 +275,22 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getConfiguringBao() + "/";
}
//独立热源
if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
/*if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
configName += "独立热源/";
}*/
if (StringUtils.isNotBlank(dto.getIndependentSources())) {
configName += dto.getIndependentSources() + "/";
}
//燃料箱
if (StringUtils.isNotBlank(dto.getFuelTank())) {
configName += dto.getFuelTank() + "/";
}
//多媒体
if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) {
/*if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) {
configName += "多媒体/";
}*/
if (StringUtils.isNotBlank(dto.getMultimedia())) {
configName += dto.getMultimedia() + "/";
}
//货箱
if (StringUtils.isNotBlank(dto.getPackingCase())) {

46
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
View File

@ -314,7 +314,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}*/
public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
for (BaseModelConfigListVo record : records) {
String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) && "有".equals(record.getSlowMachine()) ? ("缓速器" + "/") : "";
// String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) && "有".equals(record.getSlowMachine()) ? ("缓速器" + "/") : "";
String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) ? (record.getSlowMachine() + "/") : "";
String rearViewMirror = StringUtils.isNotBlank(record.getRearViewMirror()) ? (record.getRearViewMirror() + "/") : "";
@ -324,17 +325,20 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
String rearAxleRatio = StringUtils.isNotBlank(record.getRearAxleRatio()) ? (record.getRearAxleRatio() + "/") : "";
String airConditioner = StringUtils.isNotBlank(record.getAirConditioner()) && "有".equals(record.getAirConditioner()) ? ("空调" + "/") : "";
// String airConditioner = StringUtils.isNotBlank(record.getAirConditioner()) && "有".equals(record.getAirConditioner()) ? ("空调" + "/") : "";
String airConditioner = StringUtils.isNotBlank(record.getAirConditioner()) ? (record.getAirConditioner() + "/") : "";
String hubMaterial = StringUtils.isNotBlank(record.getHubMaterial()) ? (record.getHubMaterial() + "/") : "";
String baffleModel = StringUtils.isNotBlank(record.getBaffleModel()) && "有".equals(record.getBaffleModel()) ? ("导流罩" + "/") : "";
// String baffleModel = StringUtils.isNotBlank(record.getBaffleModel()) && "有".equals(record.getBaffleModel()) ? ("导流罩" + "/") : "";
String baffleModel = StringUtils.isNotBlank(record.getBaffleModel()) ? (record.getHubMaterial() + "/") : "";
String suspension = StringUtils.isNotBlank(record.getSuspension()) ? (record.getSuspension() + "/") : "";
String seat = StringUtils.isNotBlank(record.getSeat()) ? (record.getSeat() + "/") : "";
String tireCover = StringUtils.isNotBlank(record.getTireCover()) && "有".equals(record.getTireCover()) ? ("护轮罩" + "/") : "";
// String tireCover = StringUtils.isNotBlank(record.getTireCover()) && "有".equals(record.getTireCover()) ? ("护轮罩" + "/") : "";
String tireCover = StringUtils.isNotBlank(record.getTireCover()) ? (record.getTireCover() + "/") : "";
String saddle = StringUtils.isNotBlank(record.getSaddle()) ? (record.getSaddle() + "/") : "";
@ -344,11 +348,13 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
String configuringBao = StringUtils.isNotBlank(record.getConfiguringBao()) ? (record.getConfiguringBao() + "/") : "";
String independentSources = StringUtils.isNotBlank(record.getIndependentSources()) && "有".equals(record.getIndependentSources()) ? ("独立热源" + "/") : "";
// String independentSources = StringUtils.isNotBlank(record.getIndependentSources()) && "有".equals(record.getIndependentSources()) ? ("独立热源" + "/") : "";
String independentSources = StringUtils.isNotBlank(record.getIndependentSources()) ? (record.getIndependentSources() + "/") : "";
String fuelTank = StringUtils.isNotBlank(record.getFuelTank()) ? (record.getFuelTank() + "/") : "";
String multimedia = StringUtils.isNotBlank(record.getMultimedia()) && "有".equals(record.getMultimedia()) ? ("多媒体") : "";
// String multimedia = StringUtils.isNotBlank(record.getMultimedia()) && "有".equals(record.getMultimedia()) ? ("多媒体") : "";
String multimedia = StringUtils.isNotBlank(record.getMultimedia()) ? (record.getMultimedia() + "/") : "";
String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
@ -548,7 +554,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
String sid = moreConfigVo.getUseOrgSid();
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
moreConfigVo.setCompanyName(sysOrganization.getName());
if(StringUtils.isBlank(moreConfigVo.getProduceCarNum())){
if (StringUtils.isBlank(moreConfigVo.getProduceCarNum())) {
moreConfigVo.setProduceCarNum("0");
}
}
@ -626,9 +632,14 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
*/
public List<AppModelConfigListVo> addDonfigName(List<AppModelConfigListVo> appModelConfigListVos) {
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
//颜色
String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor())
? (appModelConfigListVo.getCarColor() + "/") : "";
//缓速器
// String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
// && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
&& "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
? (appModelConfigListVo.getSlowMachine() + "/") : "";
//后视镜
String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror())
? (appModelConfigListVo.getRearViewMirror() + "/") : "";
@ -643,13 +654,15 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
//空调
String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner())
&& "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
// && "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
? (appModelConfigListVo.getAirConditioner() + "/") : "";
String hubMaterial = StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial())
? (appModelConfigListVo.getHubMaterial() + "/") : "";
String baffleModel = StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel())
&& "有".equals(appModelConfigListVo.getBaffleModel()) ? ("导流罩" + "/") : "";
// && "有".equals(appModelConfigListVo.getBaffleModel()) ? ("导流罩" + "/") : "";
? (appModelConfigListVo.getBaffleModel() + "/") : "";
String suspension = StringUtils.isNotBlank(appModelConfigListVo.getSuspension())
? (appModelConfigListVo.getSuspension() + "/") : "";
@ -658,7 +671,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
? (appModelConfigListVo.getSeat() + "/") : "";
String tireCover = StringUtils.isNotBlank(appModelConfigListVo.getTireCover())
&& "有".equals(appModelConfigListVo.getTireCover()) ? ("护轮罩" + "/") : "";
// && "有".equals(appModelConfigListVo.getTireCover()) ? ("护轮罩" + "/") : "";
? (appModelConfigListVo.getTireCover() + "/") : "";
String saddle = StringUtils.isNotBlank(appModelConfigListVo.getSaddle())
? (appModelConfigListVo.getSaddle() + "/") : "";
@ -673,15 +687,17 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
? (appModelConfigListVo.getConfiguringBao() + "/") : "";
String independentSources = StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources())
&& "有".equals(appModelConfigListVo.getIndependentSources()) ? ("独立热源" + "/") : "";
// && "有".equals(appModelConfigListVo.getIndependentSources()) ? ("独立热源" + "/") : "";
? (appModelConfigListVo.getIndependentSources() + "/") : "";
String fuelTank = StringUtils.isNotBlank(appModelConfigListVo.getFuelTank())
? (appModelConfigListVo.getFuelTank() + "/") : "";
String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
&& "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
// && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
? (appModelConfigListVo.getMultimedia() + "/") : "";
String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
String configName = color + slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
appModelConfigListVo.setConfigName(configName);
}
@ -819,7 +835,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
String sid = moreConfigVo.getUseOrgSid();
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
moreConfigVo.setCompanyName(sysOrganization.getName());
if(StringUtils.isBlank(moreConfigVo.getProduceCarNum())){
if (StringUtils.isBlank(moreConfigVo.getProduceCarNum())) {
moreConfigVo.setProduceCarNum("0");
}
}

142
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
View File

@ -328,42 +328,61 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
*/
public List<AppModelConfigListVo> addDonfigName(List<AppModelConfigListVo> appModelConfigListVos) {
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
? (appModelConfigListVo.getSlowMachine() + "/") : "";
String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror())
? (appModelConfigListVo.getRearViewMirror() + "/") : "";
String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireSize())
? (appModelConfigListVo.getTireSize() + "/") : "";
String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSpecification())
? (appModelConfigListVo.getSpecification() + "/") : "";
String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio())
? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
String airConditioner = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner())
// && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
? (appModelConfigListVo.getAirConditioner() + "/") : "";
String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial())
? (appModelConfigListVo.getHubMaterial() + "/") : "";
String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel())
// && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
? (appModelConfigListVo.getBaffleModel() + "/") : "";
String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSuspension())
? (appModelConfigListVo.getSuspension() + "/") : "";
String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSeat())
? (appModelConfigListVo.getSeat() + "/") : "";
String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireCover())
// && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
? (appModelConfigListVo.getTireCover() + "/") : "";
String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSaddle())
? (appModelConfigListVo.getSaddle() + "/") : "";
String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getWheelbase())
? (appModelConfigListVo.getWheelbase() + "/") : "";
String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBumper())
? (appModelConfigListVo.getBumper() + "/") : "";
String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao())
? (appModelConfigListVo.getConfiguringBao() + "/") : "";
String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources())
// && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
? (appModelConfigListVo.getIndependentSources() + "/") : "";
String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getFuelTank())
? (appModelConfigListVo.getFuelTank() + "/") : "";
String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
// && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
? (appModelConfigListVo.getMultimedia() + "/") : "";
String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
appModelConfigListVo.setConfigName(configName);
@ -500,42 +519,59 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
//缓速器
String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
// && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
? (appModelConfigListVo.getSlowMachine() + "/") : "";
String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror())
? (appModelConfigListVo.getRearViewMirror() + "/") : "";
String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
String tireSize = StringUtils.isNotBlank(appModelConfigListVo.getTireSize())
? (appModelConfigListVo.getTireSize() + "/") : "";
String tireSize = StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification())
? (appModelConfigListVo.getSpecification() + "/") : "";
String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio())
? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
//空调
String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
String hubMaterial = StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner())
// && "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
? (appModelConfigListVo.getAirConditioner() + "/") : "";
String hubMaterial = StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial())
? (appModelConfigListVo.getHubMaterial() + "/") : "";
//导流罩
String baffleModel = StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && "有".equals(appModelConfigListVo.getBaffleModel()) ? ("导流罩" + "/") : "";
String suspension = StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
String baffleModel = StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel())
// && "有".equals(appModelConfigListVo.getBaffleModel()) ? ("导流罩" + "/") : "";
? (appModelConfigListVo.getBaffleModel() + "/") : "";
String suspension = StringUtils.isNotBlank(appModelConfigListVo.getSuspension())
? (appModelConfigListVo.getSuspension() + "/") : "";
String seat = StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
//护轮罩
String tireCover = StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && "有".equals(appModelConfigListVo.getTireCover()) ? ("护轮罩" + "/") : "";
String saddle = StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
String wheelbase = StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
String bumper = StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
String configuringBao = StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
String independentSources = StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && "有".equals(appModelConfigListVo.getIndependentSources()) ? ("独立热源" + "/") : "";
String fuelTank = StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
String tireCover = StringUtils.isNotBlank(appModelConfigListVo.getTireCover())
// && "有".equals(appModelConfigListVo.getTireCover()) ? ("护轮罩" + "/") : "";
? (appModelConfigListVo.getTireCover() + "/") : "";
String saddle = StringUtils.isNotBlank(appModelConfigListVo.getSaddle())
? (appModelConfigListVo.getSaddle() + "/") : "";
String wheelbase = StringUtils.isNotBlank(appModelConfigListVo.getWheelbase())
? (appModelConfigListVo.getWheelbase() + "/") : "";
String bumper = StringUtils.isNotBlank(appModelConfigListVo.getBumper())
? (appModelConfigListVo.getBumper() + "/") : "";
String configuringBao = StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao())
? (appModelConfigListVo.getConfiguringBao() + "/") : "";
String independentSources = StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources())
// && "有".equals(appModelConfigListVo.getIndependentSources()) ? ("独立热源" + "/") : "";
? (appModelConfigListVo.getIndependentSources() + "/") : "";
String fuelTank = StringUtils.isNotBlank(appModelConfigListVo.getFuelTank())
? (appModelConfigListVo.getFuelTank() + "/") : "";
//多媒体
String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
// && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
? (appModelConfigListVo.getMultimedia() + "/") : "";
String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
vo.setConfig(configName);
@ -574,10 +610,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
sidList.removeAll(Collections.singleton(null));
if (!sidList.isEmpty()) {
List<String> siList = new ArrayList<>();
for (BaseVehomodelQuery q : sidList){
for (BaseVehomodelQuery q : sidList) {
String modelSid = q.getModelSid();
String configSid = q.getConfigSid();
BaseVehmodelConfig baseVehmodelConfig = baseMapper.selectSid(modelSid,configSid,query.getUseOrgSid());
BaseVehmodelConfig baseVehmodelConfig = baseMapper.selectSid(modelSid, configSid, query.getUseOrgSid());
siList.add(baseVehmodelConfig.getSid());
}
if (siList.size() > 0) {
@ -590,8 +626,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
if (StringUtils.isNotBlank(query.getConfigName())) {
qw.like("bmc.configName", query.getConfigName());
}
qw.eq("bvm.isDelete",0);
qw.eq("bmc.isDelete",0);
qw.eq("bvm.isDelete", 0);
qw.eq("bmc.isDelete", 0);
IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
PagerVo<BaseVehmodelConfigVos> p = PagerUtil.pageToVo(pagging, null);

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
View File

@ -28,10 +28,10 @@ package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply;
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.*;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixDto;
import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle;
import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto;
@ -39,23 +39,24 @@ import com.yxt.anrui.buscenter.biz.busginvoiceapplyvehicle.BusGinvoiceapplyVehic
import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui_buscenter(销售业务) <br/>
@ -326,7 +327,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
sysFormLinkDto.setNodeState(map.get("nodeState"));
sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ADVANCE_GINVOICEAPPLY.getCode());
sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
// sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
sysFormLinkFeign.save(sysFormLinkDto);
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -12,18 +12,16 @@ import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarry
import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -330,14 +328,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
sysFormLinkDto.setNodeState(map.get("nodeState"));
sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode());
sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
// sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
sysFormLinkFeign.save(sysFormLinkDto);
} else { //修改
Map<String, Object> updateMap = new HashMap<>();
updateMap.put("businessSid", sid);
updateMap.put("nodeState", map.get("nodeState"));
updateMap.put("taskDefKey", map.get("taskDefKey"));
updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
// updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
sysFormLinkFeign.updateFiled(updateMap);
}

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -58,7 +58,10 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.*;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -87,7 +90,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-buscenter(车辆订单) <br/>
@ -907,14 +909,14 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
sysFormLinkDto.setNodeState(map.get("nodeState"));
sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode());
sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
// sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
sysFormLinkFeign.save(sysFormLinkDto);
} else { // 更新
Map<String, Object> updateMap = new HashMap<>();
updateMap.put("businessSid", sid);
updateMap.put("nodeState", map.get("nodeState"));
updateMap.put("taskDefKey", map.get("taskDefKey"));
updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
// updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
sysFormLinkFeign.updateFiled(updateMap);
}
@ -1058,7 +1060,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
} else {
nodeState = ProcessStateEnum.FINISHED.getStateName();
taskDefKey = "Event_end";
paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
}
}
paramMap.put("nodeState", nodeState);
@ -1209,7 +1211,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
} else {
nodeState = ProcessStateEnum.FINISHED.getStateName();
taskDefKey = "Event_end";
paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
}
}
paramMap.put("nodeState", nodeState);
@ -1242,9 +1244,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("sid", businessSid);
if (incomingSourceRef.contains("start")) {
paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
// paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
paramMap.put("taskDefKey", taskDefKey);
paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
} else {
paramMap.put("nodeState", nodeState);
paramMap.put("taskDefKey", taskDefKey);
@ -1279,7 +1281,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
paramMap.put("nodeState", nodeState);
paramMap.put("taskDefKey", taskDefKey);
if (incomingSourceRef.contains("start")) {
paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
}
updateFlowFiled(paramMap);
return resultBean;
@ -1307,7 +1309,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
paramMap.put("sid", businessSid);
paramMap.put("nodeState", String.valueOf(resultBean.getData()));
paramMap.put("taskDefKey", "Event_end");
paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
updateFlowFiled(paramMap);
return resultBean;
}
@ -1361,7 +1363,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
} else {
nodeState = ProcessStateEnum.FINISHED.getStateName();
taskDefKey = "Event_end";
paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
}
}
paramMap.put("nodeState", nodeState);
@ -1402,7 +1404,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
} else {
nodeState = ProcessStateEnum.FINISHED.getStateName();
taskDefKey = "Event_end";
paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
}
}
paramMap.put("nodeState", nodeState);
@ -1437,9 +1439,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("sid", businessSid);
if (incomingSourceRef.contains("start")) {
paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
// paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
paramMap.put("taskDefKey", taskDefKey);
paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
} else {
paramMap.put("nodeState", nodeState);
paramMap.put("taskDefKey", taskDefKey);
@ -1476,7 +1478,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
paramMap.put("nodeState", nodeState);
paramMap.put("taskDefKey", taskDefKey);
if (incomingSourceRef.contains("start")) {
paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
}
updateFlowFiled(paramMap);
return resultBean;
@ -1506,7 +1508,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
paramMap.put("sid", businessSid);
paramMap.put("nodeState", String.valueOf(resultBean.getData()));
paramMap.put("taskDefKey", "Event_end");
paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
updateFlowFiled(paramMap);
return resultBean;

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

@ -883,7 +883,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
nodeState = ProcessStateEnum.FINISHED.getStateName();
taskDefKey = "Event_end";
taskId = variables.get("taskId").toString();
map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
// map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
//更新销售订单的状态为已通过的状态:审批通过2
//ToDo:
updateStateByBusinessSid(2, variables.get("businessSid").toString());
@ -979,7 +979,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
String inComingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
if (inComingSourceRef.contains("start")) {
nodeState = SysFormLinkFlowStateEnum.UNCOMMITTED.getState();
// nodeState = SysFormLinkFlowStateEnum.UNCOMMITTED.getState();
} else {
nodeState = nodeState;

24
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussealapply/BusSealApplyService.java
View File

@ -28,7 +28,10 @@ package com.yxt.anrui.buscenter.biz.bussealapply;
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.*;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.buscenter.api.bussealapply.*;
import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
import com.yxt.anrui.buscenter.biz.flow.FlowableService;
@ -36,21 +39,18 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -288,14 +288,14 @@ public class BusSealApplyService extends MybatisBaseService<BusSealApplyMapper,
sysFormLinkDto.setTaskDefKey(map.get("taskDefKey"));
sysFormLinkDto.setNodeState(map.get("nodeState"));
sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode());
sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
// sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode()));
sysFormLinkFeign.save(sysFormLinkDto);
} else { // 更新
Map<String, Object> updateMap = new HashMap<>();
updateMap.put("businessSid", sid);
updateMap.put("nodeState", map.get("nodeState"));
updateMap.put("taskDefKey", map.get("taskDefKey"));
updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
// updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode());
sysFormLinkFeign.updateFiled(updateMap);
}
}
@ -324,7 +324,7 @@ public class BusSealApplyService extends MybatisBaseService<BusSealApplyMapper,
} else {
nodeState = ProcessStateEnum.FINISHED.getStateName();
taskDefKey = "Event_end";
paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
}
}
paramMap.put("nodeState", nodeState);
@ -363,9 +363,9 @@ public class BusSealApplyService extends MybatisBaseService<BusSealApplyMapper,
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("sid", businessSid);
if (incomingSourceRef.contains("start")) {
paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
// paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState());
paramMap.put("taskDefKey", taskDefKey);
paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode());
} else {
paramMap.put("nodeState",nodeState );
paramMap.put("taskDefKey",taskDefKey );
@ -395,7 +395,7 @@ public class BusSealApplyService extends MybatisBaseService<BusSealApplyMapper,
paramMap.put("nodeState", nodeState);
paramMap.put("taskDefKey", taskDefKey);
if (incomingSourceRef.contains("start")) {
paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode());
}
updateFlowFiled(paramMap);
return resultBean;
@ -418,7 +418,7 @@ public class BusSealApplyService extends MybatisBaseService<BusSealApplyMapper,
paramMap.put("sid", businessSid);
paramMap.put("nodeState", String.valueOf(resultBean.getData()));
paramMap.put("taskDefKey", "Event_end");
paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
// paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode());
updateFlowFiled(paramMap);
return resultBean;
}

Write Preview
Loading…
Cancel
Save