Browse Source

更改

master
ligaode 1 month ago
parent
commit
7c0ca959c2
  1. 64
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustList.java
  2. 35
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustVo.java
  3. 32
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppVehicleVersionVo.java
  4. 14
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java
  5. 21
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java
  6. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java
  7. 14
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java
  8. 26
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDto.java
  9. 30
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java
  10. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java
  11. 37
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java
  12. 13
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
  13. 196
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
  14. 47
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  15. 36
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java
  16. 59
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml
  17. 130
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java
  18. 82
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleRest.java
  19. 179
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java
  20. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  21. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml
  22. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  23. 89
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
  24. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  25. 22
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java
  26. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java
  27. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml
  28. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java
  29. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java
  30. 32
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
  31. 165
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java
  32. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  33. 58
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustFeign.java
  34. 65
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustList.java
  35. 32
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVersionVo.java
  36. 35
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVo.java
  37. 44
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/flowable/CompanyAdjustDto.java
  38. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/flowable/CompanyAdjustQuery.java
  39. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/flowable/CompanyAdjustTaskQuery.java
  40. 61
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyAdjust/CompanyAdjustRest.java
  41. 184
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyAdjust/CompanyAdjustService.java

64
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustList.java

@ -0,0 +1,64 @@
package com.yxt.anrui.base.api.baseaccadjapply;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/8/25 11:29
* @Description
*/
@Data
public class AppCompanyAdjustList implements Vo {
private static final long serialVersionUID = 7979018402791508819L;
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("车型名称")
@JsonProperty("modelName")
private String vehicleAlias;
@ApiModelProperty("车架号")
@JsonProperty("vin")
private String vinNo;
@ApiModelProperty("销售指导价")
@JsonProperty("guidancePrice")
private String guidedPrice;
@ApiModelProperty("库存地点")
@JsonProperty("address")
private String inventoryLocationName;
@ApiModelProperty("内销价格")
@JsonProperty("domesticPrice")
private String witPinMoney;
@ApiModelProperty("运费")
@JsonProperty("fare")
private String freight;
@ApiModelProperty("运费承担方")
@JsonProperty("freightPayer")
private String freightUndertakerName;
@ApiModelProperty("备注")
private String remarks;
private AppVehicleVersionVo carDetailPage;
@ApiModelProperty("是否可编辑车架号")
private Boolean editVin;
@ApiModelProperty("是否可编辑销售指导价")
private Boolean editPrice;
}

35
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppCompanyAdjustVo.java

@ -0,0 +1,35 @@
package com.yxt.anrui.base.api.baseaccadjapply;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AppCompanyAdjustVo implements Vo {
private String sid;
private String userSid;
private String taskId;
private String procInsId;
@ApiModelProperty("调入分公司名称")
@JsonProperty("company2")
private String callInOrgName;
@ApiModelProperty("调出分公司名称")
@JsonProperty("company")
private String callOutOrgName;
@ApiModelProperty("调车类型key")
@JsonProperty("typeKey")
private String shuntingTypeKey;
@ApiModelProperty("调车类型")
@JsonProperty("type")
private String shuntingTypeValue;
private List<AppCompanyAdjustList> records = new ArrayList<>();
}

32
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/AppVehicleVersionVo.java

@ -0,0 +1,32 @@
package com.yxt.anrui.base.api.baseaccadjapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/8/26 10:51
* @Description
*/
@Data
public class AppVehicleVersionVo implements Vo {
private static final long serialVersionUID = -2662961586728421196L;
@ApiModelProperty("版本编码")
private Integer moduleVersion;
@ApiModelProperty("apk下载地址")
private String path;
@ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件")
private String type;
@ApiModelProperty("插件名称")
private String modulePluginName;
@ApiModelProperty("地址")
private String moduleAction;
private String json;
}

14
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java

@ -55,19 +55,19 @@ public class BaseAccadjApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请日期")
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("调账类型key")
@ApiModelProperty("调账类型key")
private String accadjTypeKey; // 调账类型key
@ApiModelProperty("调账类型value")
@ApiModelProperty("调账类型value")
private String accadjTypeValue; // 调账类型value
@ApiModelProperty("调出分公司sid")
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
@ApiModelProperty("调出分公司名称")
@ApiModelProperty("调出分公司名称")
private String callOutOrgName; // 调出分公司名称
@ApiModelProperty("调入分公司sid")
@ApiModelProperty("调入分公司sid")
private String callInOrgSid; // 调入分公司sid
@ApiModelProperty("调入分公司名称")
@ApiModelProperty("调入分公司名称")
private String callInOrgName; // 调入分公司名称
@ApiModelProperty("流程实例的sid")
private String instanceId; // 流程实例的sid

21
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java

@ -26,9 +26,8 @@
package com.yxt.anrui.base.api.baseaccadjapply;
import com.yxt.anrui.base.api.baseaccadjapply.flow.*;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyCompleteDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -37,23 +36,9 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-base(调账管理) <br/>
* File: BaseAccadjApplyFeign.java <br/>
* Class: com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyFeign <br/>
* Description: 调账申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-07 16:57:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "调账申请表")
@FeignClient(
contextId = "anrui-base-BaseAccadjApply",
@ -124,4 +109,8 @@ public interface BaseAccadjApplyFeign {
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody BaseAccAdjApplyTaskQuery query);
@ApiOperation(value = "移动端调车调账详情")
@PostMapping(value = "/getCompanyAdjust/{sid}")
ResultBean<AppCompanyAdjustVo> getCompanyAdjust(@PathVariable("sid") String sid);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java

@ -125,4 +125,9 @@ public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign {
public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) {
return null;
}
@Override
public ResultBean<AppCompanyAdjustVo> getCompanyAdjust(String sid) {
return null;
}
}

14
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@ -52,19 +52,19 @@ import java.math.BigDecimal;
public class BaseInternalPurchaseVehicle extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("内购申请sid")
@ApiModelProperty("内购申请sid")
private String mainSid; // 内购申请sid
@ApiModelProperty("车型sid")
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型别名")
@ApiModelProperty("车型别名")
private String vehicleAlias; // 车型别名
@ApiModelProperty("常用配置sid")
@ApiModelProperty("常用配置sid")
private String configSid; // 常用配置sid
@ApiModelProperty("常用配置名称")
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("运费")
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("库存地点sid")
private String inventoryLocationSid; // 库存地点sid

26
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehDto.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
@ -34,36 +33,23 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicinApplyeVehDto.java <br/>
* Class: com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto <br/>
* Description: 调车开票申请车辆表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-11 15:30:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "调车开票申请车辆表 数据传输对象", description = "调车开票申请车辆表 数据传输对象")
public class BaseShuntingInvoicinApplyeVehDto implements Dto {
private String sid; // sid
@ApiModelProperty("调车开票sid")
@ApiModelProperty("调车开票sid")
private String mainSid; // 调车开票sid
@ApiModelProperty("调车车辆表sid")
@ApiModelProperty("调车车辆表sid")
private String purchaseSid; // 调车车辆表sid
@ApiModelProperty("合格证")
@ApiModelProperty("合格证")
private String certificate; // 合格证
@ApiModelProperty("开票金额")
@ApiModelProperty("开票金额")
private BigDecimal invoicinMoney; // 开票金额
@ApiModelProperty("开票单位sid")
@ApiModelProperty("开票单位sid")
private String invoicinCompanySid; // 开票单位sid
@ApiModelProperty("开票单位名称")
@ApiModelProperty("开票单位名称")
private String invoicinCompanyName; // 开票单位名称
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid

30
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
import com.yxt.common.core.dto.Dto;
@ -35,19 +34,6 @@ import lombok.Data;
import java.util.List;
/**
* Project: anrui-base(调车开票) <br/>
* File: BaseShuntingInvoicingApplyDto.java <br/>
* Class: com.yxt.anrui.base.api.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyDto <br/>
* Description: 调车开票申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-11 15:30:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "调车开票申请表 数据传输对象", description = "调车开票申请表 数据传输对象")
public class BaseShuntingInvoicingApplyDto implements Dto {
@ -56,25 +42,25 @@ public class BaseShuntingInvoicingApplyDto implements Dto {
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("申请日期")
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("调车类型key")
private String shuntingTypeKey; // 调车类型key
@ApiModelProperty("调车类型value")
private String shuntingTypeValue; // 调车类型value
@ApiModelProperty("调出分公司sid")
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
@ApiModelProperty("调出分公司名称")
@ApiModelProperty("调出分公司名称")
private String callOutOrgName; // 调出分公司名称
@ApiModelProperty("调入分公司sid")
@ApiModelProperty("调入分公司sid")
private String callInOrgSid; // 调入分公司sid
@ApiModelProperty("调入分公司名称")
@ApiModelProperty("调入分公司名称")
private String callInOrgName; // 调入分公司名称
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("申请人组织路径")

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyFeign.java

@ -25,16 +25,11 @@
*********************************************************/
package com.yxt.anrui.base.api.baseshuntinginvoicingapply;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyByVehQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyCompleteDto;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -44,7 +39,6 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@Api(tags = "调车开票申请表")
@FeignClient(

37
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java

@ -26,53 +26,36 @@
package com.yxt.anrui.base.biz.baseaccadjapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyVo;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(调账管理) <br/>
* File: BaseAccadjApplyMapper.java <br/>
* Class: com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyMapper <br/>
* Description: 调账申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-07 16:57:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BaseAccadjApplyMapper extends BaseMapper<BaseAccadjApply> {
//@Update("update base_accadj_apply set name=#{msg} where id=#{id}")
//IPage<BaseAccadjApplyVo> voPage(IPage<BaseAccadjApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseAccadjApply> qw);
IPage<BaseAccadjApplyVo> selectPageVo(IPage<BaseAccadjApply> page, @Param(Constants.WRAPPER) Wrapper<BaseAccadjApply> qw);
List<BaseAccadjApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseAccadjApply> qw);
@Select("select * from base_accadj_apply")
List<BaseAccadjApplyVo> selectListVo();
IPage<BaseAccadjApplyVo> selectPageVo(IPage<BaseAccadjApply> page, @Param(Constants.WRAPPER) Wrapper<BaseAccadjApply> qw);
List<BaseAccadjApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseAccadjApply> qw);
IPage<BaseInternalPurchaseVehicleDetailsVo> fetchVeh(IPage<BaseInternalPurchaseVehicleDetailsVo> page, @Param(Constants.WRAPPER) Wrapper<BaseInternalPurchaseVehicleDetailsVo> qw);
@Select("select * from base_accadj_apply")
List<BaseAccadjApplyVo> selectListVo();
IPage<BaseInternalPurchaseVehicleDetailsVo> fetchVeh(IPage<BaseInternalPurchaseVehicleDetailsVo> page, @Param(Constants.WRAPPER) Wrapper<BaseInternalPurchaseVehicleDetailsVo> qw);
int updateFlowFiled(Map<String, Object> map);
int selectBySid(String join);
String selectNum(String bill);
AppCompanyAdjustVo getCompanyAdjust(String sid);
}

13
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@ -68,4 +68,17 @@
order by applyNo desc
limit 1
</select>
<select id="getCompanyAdjust" resultType="com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustVo">
select sid,
createBySid as userSid,
taskId,
procInstId as procInsId,
callInOrgName,
callOutOrgName,
accadjTypeKey,
accadjTypeValue
from base_accadj_apply
where sid = #{sid}
</select>
</mapper>

196
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@ -41,113 +41,105 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(调账管理) <br/>
* File: BaseAccadjApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyRest <br/>
* Description: 调账申请表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-07 16:57:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "调账申请表")
@RestController("com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyRest")
@RestController
@RequestMapping("v1/baseaccadjapply")
public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
@Autowired
private BaseAccadjApplyService baseAccadjApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseAccadjApplyVo>> listPage(@RequestBody PagerQuery<BaseAccadjApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseAccadjApplyVo> pv = baseAccadjApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseAccadjApplyDto dto){
return baseAccadjApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@Autowired
private BaseAccadjApplyService baseAccadjApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseAccadjApplyVo>> listPage(@RequestBody PagerQuery<BaseAccadjApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseAccadjApplyVo> pv = baseAccadjApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseAccadjApplyDto dto) {
return baseAccadjApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return baseAccadjApplyService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return baseAccadjApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return baseAccadjApplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
return baseAccadjApplyService.fetchVeh(pq);
}
@Override
public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
return baseAccadjApplyService.submitAccAdjApply(dto);
}
@Override
public ResultBean complete(BaseAccAdjApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.complete(bv,query.getBaseInternalPurchaseVehicles());
}
@Override
public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.InitiatorToAnswer(bv,query.getBaseInternalPurchaseVehicles());
}
@Override
public ResultBean companyToFinancialCenter(BaseAccAdjApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.companyToFinancialCenter(bv,query.getBaseInternalPurchaseVehicles());
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return baseAccadjApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return baseAccadjApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean taskReject(BaseAccAdjApplyTaskQuery query) {
return baseAccadjApplyService.taskReject(query);
}
@Override
public ResultBean revokeProcess(BaseAccAdjApplyTaskQuery query) {
return baseAccadjApplyService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) {
return baseAccadjApplyService.breakProcess(query);
}
public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
return baseAccadjApplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean<PagerVo<BaseInternalPurchaseVehicleDetailsVo>> fetchVeh(PagerQuery<BaseAccadjApplyByVehQuery> pq) {
return baseAccadjApplyService.fetchVeh(pq);
}
@Override
public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
return baseAccadjApplyService.submitAccAdjApply(dto);
}
@Override
public ResultBean complete(BaseAccAdjApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.complete(bv, query.getBaseInternalPurchaseVehicles());
}
@Override
public ResultBean InitiatorToAnswer(BaseAccAdjApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.InitiatorToAnswer(bv, query.getBaseInternalPurchaseVehicles());
}
@Override
public ResultBean companyToFinancialCenter(BaseAccAdjApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
return baseAccadjApplyService.companyToFinancialCenter(bv, query.getBaseInternalPurchaseVehicles());
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return baseAccadjApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return baseAccadjApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean taskReject(BaseAccAdjApplyTaskQuery query) {
return baseAccadjApplyService.taskReject(query);
}
@Override
public ResultBean revokeProcess(BaseAccAdjApplyTaskQuery query) {
return baseAccadjApplyService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(BaseAccAdjApplyTaskQuery query) {
return baseAccadjApplyService.breakProcess(query);
}
@Override
public ResultBean<AppCompanyAdjustVo> getCompanyAdjust(String sid) {
return baseAccadjApplyService.getCompanyAdjust(sid);
}
}

47
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseaccadjapply.*;
@ -36,6 +37,7 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseaccadjapply.AppVehicleVersionVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
@ -67,6 +69,8 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@ -128,6 +132,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired
private AppSubsetVersionFeign appSubsetVersionFeign;
public PagerVo<BaseAccadjApplyVo> listPageVo(PagerQuery<BaseAccadjApplyQuery> pq) {
BaseAccadjApplyQuery query = pq.getParams();
@ -329,6 +335,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//若有网关,则赋值网关中判断的字段。
Boolean i = false;
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = dto.getDetailsList();
@ -1088,4 +1097,42 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean<AppCompanyAdjustVo> getCompanyAdjust(String sid) {
ResultBean<AppCompanyAdjustVo> rb = ResultBean.fireFail();
AppCompanyAdjustVo vo = baseMapper.getCompanyAdjust(sid);
ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
AppSubVersionVo appSubVersionVo = resultBean.getData();
List<AppCompanyAdjustList> records = baseAccadjApplyeVehService.getListBySid(sid);
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
records.stream().forEach(appCompanyAdjustListVo -> {
AppVehicleVersionVo appVehicleVersionVo = new AppVehicleVersionVo();
String modelSid = appCompanyAdjustListVo.getModelSid();
String configSid = appCompanyAdjustListVo.getConfigSid();
Map<String, Object> map = new HashMap<>();
map.put("modelSid", modelSid);
map.put("configSid", configSid);
map.put("selectType", 0);
appSubVersionVo.setJson(JSONObject.toJSONString(map));
BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
appCompanyAdjustListVo.setCarDetailPage(appVehicleVersionVo);
if (StringUtils.isBlank(appCompanyAdjustListVo.getWitPinMoney())) {
appCompanyAdjustListVo.setWitPinMoney("-");
}
if (StringUtils.isBlank(appCompanyAdjustListVo.getFreight())) {
appCompanyAdjustListVo.setFreight("-");
}
if (StringUtils.isBlank(appCompanyAdjustListVo.getFreightUndertakerName())) {
appCompanyAdjustListVo.setFreightUndertakerName("-");
}
if (StringUtils.isBlank(appCompanyAdjustListVo.getRemarks())) {
appCompanyAdjustListVo.setRemarks("-");
}
});
}
vo.setRecords(records);
return rb.success().setData(vo);
}
}

36
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.java

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustList;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -38,39 +39,20 @@ import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehVo;
import java.util.List;
/**
* Project: anrui-base(调账管理) <br/>
* File: BaseAccadjApplyeVehMapper.java <br/>
* Class: com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehMapper <br/>
* Description: 调账申请车辆关联表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-07 16:57:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BaseAccadjApplyeVehMapper extends BaseMapper<BaseAccadjApplyeVeh> {
//@Update("update base_accadj_applye_veh set name=#{msg} where id=#{id}")
//IPage<BaseAccadjApplyeVehVo> voPage(IPage<BaseAccadjApplyeVeh> page, @Param(Constants.WRAPPER) QueryWrapper<BaseAccadjApplyeVeh> qw);
IPage<BaseAccadjApplyeVehVo> selectPageVo(IPage<BaseAccadjApplyeVeh> page, @Param(Constants.WRAPPER) Wrapper<BaseAccadjApplyeVeh> qw);
List<BaseAccadjApplyeVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseAccadjApplyeVeh> qw);
@Select("select * from base_accadj_applye_veh")
List<BaseAccadjApplyeVehVo> selectListVo();
IPage<BaseAccadjApplyeVehVo> selectPageVo(IPage<BaseAccadjApplyeVeh> page, @Param(Constants.WRAPPER) Wrapper<BaseAccadjApplyeVeh> qw);
@Delete("delete from base_accadj_applye_veh where accadjSid = #{dtoSid}")
@Delete("delete from base_accadj_applye_veh where accadjSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select purchaseSid from base_accadj_applye_veh where accadjSid = #{sid1}")
List<String> fetchByMainSid(String sid1);
@Select("select purchaseSid from base_accadj_applye_veh where accadjSid = #{sid1}")
List<String> fetchByMainSid(String sid1);
List<String> fetchCallInBuyerOrgSidByMainSid(String sid);
List<String> fetchCallInBuyerOrgSidByMainSid(String sid);
List<String> fetchByAccSidAndCallOutOrgSid(@Param("sid") String sid,@Param("callOutOrgSid") String callOutOrgSid);
List<String> fetchByAccSidAndCallOutOrgSid(@Param("sid") String sid, @Param("callOutOrgSid") String callOutOrgSid);
List<AppCompanyAdjustList> getListBySid(String sid);
}

59
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehMapper.xml

@ -10,35 +10,46 @@
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehVo">
SELECT * FROM base_accadj_applye_veh
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchCallInBuyerOrgSidByMainSid" resultType="java.lang.String">
SELECT bipv.`callInBuyerOrgSid`
SELECT bipv.callInBuyerOrgSid
FROM base_internal_purchase_vehicle bipv
LEFT JOIN base_accadj_applye_veh baav
ON bipv.`sid` = baav.`purchaseSid`
LEFT JOIN base_accadj_apply baa
ON baa.`sid` = baav.`accadjSid`
WHERE baa.`sid` = #{sid}
GROUP BY bipv.`callInBuyerOrgSid`
LEFT JOIN base_accadj_applye_veh baav
ON bipv.sid = baav.purchaseSid
LEFT JOIN base_accadj_apply baa
ON baa.sid = baav.accadjSid
WHERE baa.sid = #{sid}
GROUP BY bipv.callInBuyerOrgSid
</select>
<select id="fetchByAccSidAndCallOutOrgSid" resultType="java.lang.String">
SELECT bv.`purchaseSystemSid`
SELECT bv.purchaseSystemSid
FROM base_internal_purchase_vehicle bipv
LEFT JOIN base_accadj_applye_veh baav
ON bipv.`sid` = baav.`purchaseSid`
LEFT JOIN base_accadj_apply baa
ON baa.`sid` = baav.`accadjSid`
LEFT JOIN base_vehicle bv
ON bv.`vinNo` = bipv.`vinNo`
WHERE baa.`sid` = #{sid}
AND bv.`createOrgSid` = #{callOutOrgSid}
GROUP BY bv.`purchaseSystemSid`
LEFT JOIN base_accadj_applye_veh baav
ON bipv.sid = baav.purchaseSid
LEFT JOIN base_accadj_apply baa
ON baa.sid = baav.accadjSid
LEFT JOIN base_vehicle bv
ON bv.vinNo = bipv.vinNo
WHERE baa.sid = #{sid}
AND bv.createOrgSid = #{callOutOrgSid}
GROUP BY bv.purchaseSystemSid
</select>
<select id="getListBySid" resultType="com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustList">
select pv.modelSid,
pv.configSid,
pv.vehicleAlias,
pv.vinNo,
pv.guidedPrice,
pv.inventoryLocationName,
pv.witPinMoney,
pv.freight,
pv.freightUndertakerName,
pv.remarks,
pv.sid
from base_accadj_applye_veh av
left join base_internal_purchase_vehicle pv
on av.purchaseSid = pv.sid
where av.accadjSid = #{sid}
</select>
</mapper>

130
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapplyeveh/BaseAccadjApplyeVehService.java

@ -28,99 +28,87 @@ package com.yxt.anrui.base.biz.baseaccadjapplyeveh;
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.baseaccadjapply.AppCompanyAdjustList;
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 com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehQuery;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehVo;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehDetailsVo;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVehFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(调账管理) <br/>
* File: BaseAccadjApplyeVehService.java <br/>
* Class: com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService <br/>
* Description: 调账申请车辆关联表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-07 16:57:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BaseAccadjApplyeVehService extends MybatisBaseService<BaseAccadjApplyeVehMapper, BaseAccadjApplyeVeh> {
private QueryWrapper<BaseAccadjApplyeVeh> createQueryWrapper(BaseAccadjApplyeVehQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseAccadjApplyeVeh> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseAccadjApplyeVehVo> listPageVo(PagerQuery<BaseAccadjApplyeVehQuery> pq) {
BaseAccadjApplyeVehQuery query = pq.getParams();
QueryWrapper<BaseAccadjApplyeVeh> qw = createQueryWrapper(query);
IPage<BaseAccadjApplyeVeh> page = PagerUtil.queryToPage(pq);
IPage<BaseAccadjApplyeVehVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseAccadjApplyeVehVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseAccadjApplyeVehDto dto){
private QueryWrapper<BaseAccadjApplyeVeh> createQueryWrapper(BaseAccadjApplyeVehQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseAccadjApplyeVeh> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseAccadjApplyeVehVo> listPageVo(PagerQuery<BaseAccadjApplyeVehQuery> pq) {
BaseAccadjApplyeVehQuery query = pq.getParams();
QueryWrapper<BaseAccadjApplyeVeh> qw = createQueryWrapper(query);
IPage<BaseAccadjApplyeVeh> page = PagerUtil.queryToPage(pq);
IPage<BaseAccadjApplyeVehVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseAccadjApplyeVehVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseAccadjApplyeVehDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseAccadjApplyeVehDto dto){
BaseAccadjApplyeVeh entity = new BaseAccadjApplyeVeh();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseAccadjApplyeVehDto dto){
String dtoSid = dto.getSid();
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseAccadjApplyeVehDto dto) {
BaseAccadjApplyeVeh entity = new BaseAccadjApplyeVeh();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseAccadjApplyeVehDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseAccadjApplyeVeh entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseAccadjApplyeVehDetailsVo fetchDetailsVoBySid(String sid){
BaseAccadjApplyeVeh entity = fetchBySid(sid);
BaseAccadjApplyeVehDetailsVo vo = new BaseAccadjApplyeVehDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
BaseAccadjApplyeVeh entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseAccadjApplyeVehDetailsVo fetchDetailsVoBySid(String sid) {
BaseAccadjApplyeVeh entity = fetchBySid(sid);
BaseAccadjApplyeVehDetailsVo vo = new BaseAccadjApplyeVehDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<String> fetchByMainSid(String sid1) {
return baseMapper.fetchByMainSid(sid1);
}
public List<String> fetchByMainSid(String sid1) {
return baseMapper.fetchByMainSid(sid1);
}
public List<String> fetchCallInBuyerOrgSidByMainSid(String sid) {
return baseMapper.fetchCallInBuyerOrgSidByMainSid(sid);
}
public List<String> fetchCallInBuyerOrgSidByMainSid(String sid) {
return baseMapper.fetchCallInBuyerOrgSidByMainSid(sid);
}
public List<String> fetchByAccSidAndCallOutOrgSid(String sid, String callOutOrgSid) {
return baseMapper.fetchByAccSidAndCallOutOrgSid(sid, callOutOrgSid);
}
public List<String> fetchByAccSidAndCallOutOrgSid(String sid, String callOutOrgSid) {
return baseMapper.fetchByAccSidAndCallOutOrgSid(sid,callOutOrgSid);
}
public List<AppCompanyAdjustList> getListBySid(String sid) {
return baseMapper.getListBySid(sid);
}
}

82
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleRest.java

@ -32,69 +32,53 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleQuery;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDto;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign;
/**
* Project: anrui-base(内申请管理) <br/>
* File: BaseInternalPurchaseVehicleFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleRest <br/>
* Description: 内购车辆表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-16 13:46:25 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "内购车辆表")
@RestController("com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleRest")
@RestController
@RequestMapping("v1/baseinternalpurchasevehicle")
public class BaseInternalPurchaseVehicleRest implements BaseInternalPurchaseVehicleFeign {
@Autowired
private BaseInternalPurchaseVehicleService baseInternalPurchaseVehicleService;
@Autowired
private BaseInternalPurchaseVehicleService baseInternalPurchaseVehicleService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseInternalPurchaseVehicleVo>> listPage(@RequestBody PagerQuery<BaseInternalPurchaseVehicleQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseInternalPurchaseVehicleVo> pv = baseInternalPurchaseVehicleService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseInternalPurchaseVehicleVo>> listPage(@RequestBody PagerQuery<BaseInternalPurchaseVehicleQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseInternalPurchaseVehicleVo> pv = baseInternalPurchaseVehicleService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseInternalPurchaseVehicleDto dto){
ResultBean rb = ResultBean.fireFail();
baseInternalPurchaseVehicleService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseInternalPurchaseVehicleDto dto) {
ResultBean rb = ResultBean.fireFail();
baseInternalPurchaseVehicleService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseInternalPurchaseVehicleService.delBySids(sids);
return rb.success();
}
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
baseInternalPurchaseVehicleService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseInternalPurchaseVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseInternalPurchaseVehicleDetailsVo vo = baseInternalPurchaseVehicleService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
public ResultBean<BaseInternalPurchaseVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
BaseInternalPurchaseVehicleDetailsVo vo = baseInternalPurchaseVehicleService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

179
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java

@ -37,109 +37,96 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-base(内申请管理) <br/>
* File: BaseInternalPurchaseVehicleService.java <br/>
* Class: com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService <br/>
* Description: 内购车辆表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-16 13:46:25 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BaseInternalPurchaseVehicleService extends MybatisBaseService<BaseInternalPurchaseVehicleMapper, BaseInternalPurchaseVehicle> {
private QueryWrapper<BaseInternalPurchaseVehicle> createQueryWrapper(BaseInternalPurchaseVehicleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseInternalPurchaseVehicle> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseInternalPurchaseVehicleVo> listPageVo(PagerQuery<BaseInternalPurchaseVehicleQuery> pq) {
BaseInternalPurchaseVehicleQuery query = pq.getParams();
QueryWrapper<BaseInternalPurchaseVehicle> qw = createQueryWrapper(query);
IPage<BaseInternalPurchaseVehicle> page = PagerUtil.queryToPage(pq);
IPage<BaseInternalPurchaseVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseInternalPurchaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseInternalPurchaseVehicleDto dto){
private QueryWrapper<BaseInternalPurchaseVehicle> createQueryWrapper(BaseInternalPurchaseVehicleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseInternalPurchaseVehicle> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseInternalPurchaseVehicleVo> listPageVo(PagerQuery<BaseInternalPurchaseVehicleQuery> pq) {
BaseInternalPurchaseVehicleQuery query = pq.getParams();
QueryWrapper<BaseInternalPurchaseVehicle> qw = createQueryWrapper(query);
IPage<BaseInternalPurchaseVehicle> page = PagerUtil.queryToPage(pq);
IPage<BaseInternalPurchaseVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseInternalPurchaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseInternalPurchaseVehicleDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseInternalPurchaseVehicleDto dto){
BaseInternalPurchaseVehicle entity = new BaseInternalPurchaseVehicle();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseInternalPurchaseVehicleDto dto){
String dtoSid = dto.getSid();
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseInternalPurchaseVehicleDto dto) {
BaseInternalPurchaseVehicle entity = new BaseInternalPurchaseVehicle();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseInternalPurchaseVehicleDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseInternalPurchaseVehicle entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseInternalPurchaseVehicleDetailsVo fetchDetailsVoBySid(String sid){
BaseInternalPurchaseVehicle entity = fetchBySid(sid);
BaseInternalPurchaseVehicleDetailsVo vo = new BaseInternalPurchaseVehicleDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public int delByMainSid(String dtoSid) {
return baseMapper.delByMainSid(dtoSid);
}
public List<BaseInternalPurchaseVehicleVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
public int updateVinNoBySid(String sid, String vinNo,String inventoryLocationSid,String inventoryLocationName) {
return baseMapper.updateVinNoBySid(sid,vinNo,inventoryLocationSid,inventoryLocationName);
}
public int updateGuidedPriceBySid(String sid, String guidedPrice) {
return baseMapper.updateGuidedPriceBySid(sid,guidedPrice);
}
public void updateIsAccadj(String purchaseSid,String isAccadj) {
baseMapper.updateIsAccadj(purchaseSid,isAccadj);
}
public void updateIsInvoicing(String purchaseSid, String isInvoicing) {
baseMapper.updateIsInvoicing(purchaseSid,isInvoicing);
}
public List<AppCompanyShuntingListVo> getListBySid(String sid) {
return baseMapper.getListBySid(sid);
}
public void updateWitPinMoneyBySid(String witPinMoney,String sid) {
baseMapper.updateWitPinMoneyBySid(witPinMoney,sid);
}
public List<BaseInternalPurchaseVehicle> fetchByAccSidAndCallInBuyerOrgSid(String sid, String s) {
return baseMapper.fetchByAccSidAndCallInBuyerOrgSid(sid,s);
}
public List<BaseVehicle> fetchByAccSidAndPurchaseSystemSid(String sid, String s) {
return baseMapper.fetchByAccSidAndPurchaseSystemSid(sid,s);
}
}
BaseInternalPurchaseVehicle entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseInternalPurchaseVehicleDetailsVo fetchDetailsVoBySid(String sid) {
BaseInternalPurchaseVehicle entity = fetchBySid(sid);
BaseInternalPurchaseVehicleDetailsVo vo = new BaseInternalPurchaseVehicleDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public int delByMainSid(String dtoSid) {
return baseMapper.delByMainSid(dtoSid);
}
public List<BaseInternalPurchaseVehicleVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
public int updateVinNoBySid(String sid, String vinNo, String inventoryLocationSid, String inventoryLocationName) {
return baseMapper.updateVinNoBySid(sid, vinNo, inventoryLocationSid, inventoryLocationName);
}
public int updateGuidedPriceBySid(String sid, String guidedPrice) {
return baseMapper.updateGuidedPriceBySid(sid, guidedPrice);
}
public void updateIsAccadj(String purchaseSid, String isAccadj) {
baseMapper.updateIsAccadj(purchaseSid, isAccadj);
}
public void updateIsInvoicing(String purchaseSid, String isInvoicing) {
baseMapper.updateIsInvoicing(purchaseSid, isInvoicing);
}
public List<AppCompanyShuntingListVo> getListBySid(String sid) {
return baseMapper.getListBySid(sid);
}
public void updateWitPinMoneyBySid(String witPinMoney, String sid) {
baseMapper.updateWitPinMoneyBySid(witPinMoney, sid);
}
public List<BaseInternalPurchaseVehicle> fetchByAccSidAndCallInBuyerOrgSid(String sid, String s) {
return baseMapper.fetchByAccSidAndCallInBuyerOrgSid(sid, s);
}
public List<BaseVehicle> fetchByAccSidAndPurchaseSystemSid(String sid, String s) {
return baseMapper.fetchByAccSidAndPurchaseSystemSid(sid, s);
}
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@ -273,6 +273,13 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
ResultBean rb = ResultBean.fireFail();
List<BaseShuntingInvoicinApplyeVehDto> baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs();
BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(dto.getSid());
for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVeh.getPurchaseSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData();
if (finCompanyInvoicingDetailsVo == null){
return rb.setMsg("调入分公司企业开票信息不存在");
}
}
int r = submitBusinessData(dto, baseShuntingInvoicingApply);
if (r == 3) {
return rb.setMsg("该申请不存在");

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@ -282,6 +282,6 @@
<select id="selectByVinNoAndCreateOrgSid"
resultType="com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate">
select * from base_vehicle_certificate WHERE vinNo like concat('%',#{vinNo},'%') and createOrgSid = #{createOrgSid}
select * from base_vehicle_certificate WHERE vinNo like concat('%',#{vinNo},'%') and createOrgSid = #{createOrgSid} limit 1
</select>
</mapper>

14
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -1795,28 +1795,28 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
int qtMoney = 0;
BigDecimal qtMoney = new BigDecimal("0");
if (StringUtils.isNotBlank(otherReceivableMoney)) {
qtMoney = Integer.parseInt(otherReceivableMoney);
qtMoney = new BigDecimal(otherReceivableMoney);
}
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
String serviceAmount = solutionsDetailsVo.getServiceAmount();
int fwfMoney = 0;
BigDecimal fwfMoney = new BigDecimal("0");
if (StringUtils.isNotBlank(serviceAmount)) {
fwfMoney = Integer.parseInt(serviceAmount);
fwfMoney = new BigDecimal(serviceAmount);
}
if (qtMoney > 0 && fwfMoney > 0) {
if (qtMoney.compareTo(BigDecimal.ZERO) == 1 && fwfMoney.compareTo(BigDecimal.ZERO) == 1) {
collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
collectionDetailDtoOne.setUseTo("YT017");
collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
collectionDetailDtoTwo.setUseTo("YT016");
collectionDetailDtoList.add(collectionDetailDtoOne);
collectionDetailDtoList.add(collectionDetailDtoTwo);
} else if (qtMoney > 0 && fwfMoney == 0) {
} else if (qtMoney.compareTo(BigDecimal.ZERO) == 1 && fwfMoney.compareTo(BigDecimal.ZERO) == 0) {
collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
collectionDetailDtoOne.setUseTo("YT017");
collectionDetailDtoList.add(collectionDetailDtoOne);
} else if (qtMoney == 0 && fwfMoney > 0) {
} else if (qtMoney.compareTo(BigDecimal.ZERO) == 0 && fwfMoney.compareTo(BigDecimal.ZERO) == 1) {
collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
collectionDetailDtoTwo.setUseTo("YT016");
collectionDetailDtoList.add(collectionDetailDtoTwo);

89
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java

@ -34,67 +34,52 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyRest <br/>
* Description: 车辆出库单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-12 08:54:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆出库单")
@RestController("com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyRest")
@RestController
@RequestMapping("v1/basevehicleoutapply")
public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
@Autowired
private BaseVehicleOutApplyService baseVehicleOutApplyService;
@Autowired
private BaseVehicleOutApplyService baseVehicleOutApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQueryNew> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleOutApplyVoNew> pv = baseVehicleOutApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseVehicleOutApplyVoNew>> listPage(@RequestBody PagerQuery<BaseVehicleOutApplyQueryNew> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleOutApplyVoNew> pv = baseVehicleOutApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto){
ResultBean rb = ResultBean.fireFail();
baseVehicleOutApplyService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseVehicleOutApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
baseVehicleOutApplyService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseVehicleOutApplyService.delBySids(sids);
return rb.success();
}
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
baseVehicleOutApplyService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
public ResultBean<BaseVehicleOutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<VehicleCustomerVo> selectSidByVinNo(String vinNo) {
return baseVehicleOutApplyService.selectSidByVinNo(vinNo);
}
@Override
public ResultBean<VehicleCustomerVo> selectSidByVinNo(String vinNo) {
return baseVehicleOutApplyService.selectSidByVinNo(vinNo);
}
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -217,7 +217,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
//出库类型
Integer isQktc = busArrearsCarryVehicleDetailsFeign.selByVinSidAndYBJ(vinSid).getData();
Integer isQkck = busDeliveredApplyFeign.selByVinSidAndYBJ(vinSid).getData();
if (isQktc != null || isQkck != null) {
if (isQktc != 0 || isQkck != 0) {
record.setCkType("欠款出库");
//欠款时长(天)
String saleDate = record.getSaleDate();

22
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java

@ -7,22 +7,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: bus(bus) <br/>
* File: BusArrearsCarryVehicleDetailsFeign.java <br/>
* Class: bus.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign <br/>
* Description: 欠款提车车辆信息表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-03-17 15:29:26 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "欠款提车车辆信息表")
@FeignClient(
contextId = "anrui-buscenter-BusArrearsCarryVehicleDetails",
@ -46,10 +32,10 @@ public interface BusArrearsCarryVehicleDetailsFeign {
@ApiOperation("车辆信息新增")
@PostMapping("/save")
public ResultBean save(@RequestBody BusArrearsCarryVehicleDetailsDto dto);
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BusArrearsCarryVehicleDetailsDto dto,@PathVariable("sid") String sid);
public ResultBean update(@RequestBody BusArrearsCarryVehicleDetailsDto dto, @PathVariable("sid") String sid);
@ApiOperation("删除记录")
@GetMapping("/del/{ids}")
@ -58,8 +44,8 @@ public interface BusArrearsCarryVehicleDetailsFeign {
@ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}")
public ResultBean<BusArrearsCarryVehicleDetailsVo> fetch(@PathVariable("id") String id);
@ApiOperation("获取一条记录")
@ApiOperation("获取一条记录")
@GetMapping("/fetchSid/{sid}")
public ResultBean<BusArrearsCarryVehicleDetailsVo> fetchSid(@PathVariable("sid") String sid);

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java

@ -11,23 +11,8 @@ import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: bus(bus) <br/>
* File: BusArrearsCarryVehicleDetailsMapper.java <br/>
* Class: bus.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsMapper <br/>
* Description: 欠款提车车辆信息表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-03-17 15:29:26 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrearsCarryVehicleDetails> {

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml

@ -51,8 +51,8 @@
SELECT COUNT(*)
FROM bus_arrears_carry_vehicle_details bacvd
LEFT JOIN bus_arrears_carry_vehicle_apply bacva
ON bacvd.`applySid` = bacva.`sid`
WHERE bacvd.`vinSid` = #{vinSid}
AND bacva.`nodeState` = '已办结'
ON bacvd.applySid = bacva.sid
WHERE bacvd.vinSid = #{vinSid}
AND bacva.nodeState = '已办结'
</select>
</mapper>

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java

@ -5,26 +5,11 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: bus(bus) <br/>
* File: BusArrearsCarryVehicleDetailsFeignFallback.java <br/>
* Class: bus.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsRest <br/>
* Description: 欠款提车车辆信息表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-03-17 15:29:26 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "欠款提车车辆信息表")
@RestController
@RequestMapping("v1/busarrearscarryvehicledetails")

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@ -14,25 +14,10 @@ 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.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.UUID;
/**
* Project: bus(bus) <br/>
* File: BusArrearsCarryVehicleDetailsService.java <br/>
* Class: bus.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService <br/>
* Description: 欠款提车车辆信息表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-03-17 15:29:26 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<BusArrearsCarryVehicleDetailsMapper, BusArrearsCarryVehicleDetails> {
public PagerVo<BusArrearsCarryVehicleDetails> listPage(PagerQuery<BusArrearsCarryVehicleDetailsQuery> pq) {

32
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java

@ -25,29 +25,13 @@
*********************************************************/
package com.yxt.anrui.fin.api.fincompanyinvoicing;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(公司开票信息管理) <br/>
* File: FinCompanyInvoicingVo.java <br/>
* Class: com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo <br/>
* Description: 公司开票信息管理 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-14 09:00:52 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "公司开票信息管理 视图数据详情", description = "公司开票信息管理 视图数据详情")
public class FinCompanyInvoicingDetailsVo implements Vo {
@ -56,21 +40,21 @@ public class FinCompanyInvoicingDetailsVo implements Vo {
@ApiModelProperty("1个人 2企业")
private String customTypeKey;
@ApiModelProperty("银行账号")
@ApiModelProperty("银行账号")
private String bankAccount; // 银行账号
@ApiModelProperty("开户行")
@ApiModelProperty("开户行")
private String bankName; // 开户行
@ApiModelProperty("名称")
@ApiModelProperty("名称")
private String name; // 名称
@ApiModelProperty("纳税人识别号")
@ApiModelProperty("纳税人识别号")
private String taxpayerNo; // 纳税人识别号
@ApiModelProperty("地址")
@ApiModelProperty("地址")
private String address; // 地址
@ApiModelProperty("电话")
@ApiModelProperty("电话")
private String phone; // 电话
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid; // 采购系统sid

165
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.riskcenter.biz.loanpreloancreditapply;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVos;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -40,90 +39,90 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("v1/loanpreloancreditapply")
public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign {
@Autowired
private LoanPreloanCreditApplyService loanPreloanCreditApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanPreloanCreditApplyVo> pv = loanPreloanCreditApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("金融内勤审核列表")
@PostMapping("/finStaffProcess")
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> finStaffProcess(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanPreloanCreditApplyVo> pv = loanPreloanCreditApplyService.finStaffProcess(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody LoanPreloanCreditApplyDto dto){
return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("提交保存")
@Override
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.submitSave(dto);
}
@Override
public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.finStaffConfirm(dto);
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return loanPreloanCreditApplyService.submitCompanyRisk(dto);
}
@Override
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
return loanPreloanCreditApplyService.submitCapitalRisk(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@Autowired
private LoanPreloanCreditApplyService loanPreloanCreditApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> listPage(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanPreloanCreditApplyVo> pv = loanPreloanCreditApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("金融内勤审核列表")
@PostMapping("/finStaffProcess")
public ResultBean<PagerVo<LoanPreloanCreditApplyVo>> finStaffProcess(@RequestBody PagerQuery<LoanPreloanCreditApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanPreloanCreditApplyVo> pv = loanPreloanCreditApplyService.finStaffProcess(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("提交保存")
@Override
public ResultBean submitSave(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.submitSave(dto);
}
@Override
public ResultBean finStaffConfirm(LoanPreloanCreditApplyDto dto) {
return loanPreloanCreditApplyService.finStaffConfirm(dto);
}
@Override
public ResultBean submitCompanyRisk(LoanSubmitCompanyRiskDto dto) {
return loanPreloanCreditApplyService.submitCompanyRisk(dto);
}
@Override
public ResultBean submitCapitalRisk(LoanSubmitCapitalRiskDto dto) {
return loanPreloanCreditApplyService.submitCapitalRisk(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return loanPreloanCreditApplyService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return loanPreloanCreditApplyService.delAll(sids);
}
@Override
public ResultBean delBySid(String sid) {
return loanPreloanCreditApplyService.delBySid(sid);
}
@Override
public ResultBean delBySid(String sid) {
return loanPreloanCreditApplyService.delBySid(sid);
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<LoanPreloanCreditApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
LoanPreloanCreditApplyDetailsVo vo = loanPreloanCreditApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PagerVo<LoanPreloanVo>> getOrderLoanPagerList(PagerQuery<LoanPreloanQuery> pagerQuery) {
ResultBean<PagerVo<LoanPreloanVo>> rb = ResultBean.fireFail();
PagerVo<LoanPreloanVo> pv = loanPreloanCreditApplyService.getOrderLoanPagerList(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean<LoanOrderPreloanVo> judgeIsLoan(String sid) {
return loanPreloanCreditApplyService.judgeIsLoan(sid);
}
@Override
public ResultBean<LoanPreloanCreditApply> selectByCustSid(String customerSid) {
return loanPreloanCreditApplyService.selectByCustSid(customerSid);
}
public ResultBean<LoanPreloanCreditApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
LoanPreloanCreditApplyDetailsVo vo = loanPreloanCreditApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PagerVo<LoanPreloanVo>> getOrderLoanPagerList(PagerQuery<LoanPreloanQuery> pagerQuery) {
ResultBean<PagerVo<LoanPreloanVo>> rb = ResultBean.fireFail();
PagerVo<LoanPreloanVo> pv = loanPreloanCreditApplyService.getOrderLoanPagerList(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean<LoanOrderPreloanVo> judgeIsLoan(String sid) {
return loanPreloanCreditApplyService.judgeIsLoan(sid);
}
@Override
public ResultBean<LoanPreloanCreditApply> selectByCustSid(String customerSid) {
return loanPreloanCreditApplyService.selectByCustSid(customerSid);
}
}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@ -81,7 +81,7 @@
sve.departureDate as dispatchedDate,
sve.inspection as inspectedName,
sve.inspectionDate as inspectedDate,
sve.inspectionResult as `state`,
sve.inspectionResult as state,
sve.remarks,
sve.address as location,
sve.addressCode,
@ -124,12 +124,13 @@
COUNT(*)
FROM
scm_vehicle_examine se
LEFT JOIN anrui_base.`base_vehicle` bv
LEFT JOIN anrui_base.base_vehicle bv
ON bv.vinNo = se.vinNo
WHERE se.vinNo LIKE CONCAT('%', #{vinNo}, '%')
AND se.useOrgSid = #{orgPath}
AND se.inspectionResult = '2'
AND bv.vehicleState != '0004'
AND bv.useOrgSid = #{orgPath}
AND bv.isDelete = 0
</select>
</mapper>

58
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustFeign.java

@ -0,0 +1,58 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustDto;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustQuery;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingVo;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingTaskQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
@Api(tags = "分公司调车调账")
@FeignClient(
contextId = "anrui-terminal-CompanyAdjust",
name = "anrui-terminal",
path = "/v1/companyAdjust")
public interface CompanyAdjustFeign {
@ApiOperation("分公司调车调账详情")
@GetMapping("/getCompanyAdjust/{sid}")
@ResponseBody
ResultBean<CompanyAdjustVo> getCompanyAdjust(@PathVariable("sid") String sid);
@ApiOperation("办理")
@PutMapping("/complete")
@ResponseBody
ResultBean complete(@RequestBody CompanyAdjustDto dto);
@ApiOperation("办理-分公司跨分公司")
@PutMapping("/InitiatorToAnswer")
@ResponseBody
ResultBean InitiatorToAnswer(@RequestBody CompanyAdjustDto dto);
@ApiOperation("驳回")
@PutMapping("/reject")
@ResponseBody
ResultBean reject(@RequestBody CompanyAdjustTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/revokeProcess")
@ResponseBody
ResultBean revokeProcess(@RequestBody CompanyAdjustTaskQuery query);
@ApiOperation("终止")
@PutMapping("/breakProcess")
@ResponseBody
ResultBean breakProcess(@RequestBody CompanyAdjustTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap CompanyAdjustQuery query);
}

65
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustList.java

@ -0,0 +1,65 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShutingVersionVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/8/25 11:29
* @Description
*/
@Data
public class CompanyAdjustList implements Vo {
private static final long serialVersionUID = 7979018402791508819L;
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("车型名称")
@JsonProperty("modelName")
private String vehicleAlias;
@ApiModelProperty("车架号")
@JsonProperty("vin")
private String vinNo;
@ApiModelProperty("销售指导价")
@JsonProperty("guidancePrice")
private String guidedPrice;
@ApiModelProperty("库存地点")
@JsonProperty("address")
private String inventoryLocationName;
@ApiModelProperty("内销价格")
@JsonProperty("domesticPrice")
private String witPinMoney;
@ApiModelProperty("运费")
@JsonProperty("fare")
private String freight;
@ApiModelProperty("运费承担方")
@JsonProperty("freightPayer")
private String freightUndertakerName;
@ApiModelProperty("备注")
private String remarks;
private CompanyAdjustVersionVo carDetailPage;
@ApiModelProperty("是否可编辑车架号")
private Boolean editVin;
@ApiModelProperty("是否可编辑销售指导价")
private Boolean editPrice;
}

32
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVersionVo.java

@ -0,0 +1,32 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/8/26 20:23
* @Description
*/
@Data
public class CompanyAdjustVersionVo implements Vo {
private static final long serialVersionUID = -1626902109690426737L;
@ApiModelProperty("版本编码")
private Integer moduleVersion;
@ApiModelProperty("apk下载地址")
private String path;
@ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件")
private String type;
@ApiModelProperty("插件名称")
private String modulePluginName;
@ApiModelProperty("地址")
private String moduleAction;
private String json;
}

35
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/CompanyAdjustVo.java

@ -0,0 +1,35 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class CompanyAdjustVo implements Vo {
private String sid;
private String userSid;
private String taskId;
private String procInsId;
@ApiModelProperty("调入分公司名称")
@JsonProperty("company2")
private String buyerOrgName;
@ApiModelProperty("调出分公司名称")
@JsonProperty("company")
private String sellerOrgName;
@ApiModelProperty("调车类型key")
@JsonProperty("typeKey")
private String shuntingTypeKey;
@ApiModelProperty("调车类型")
@JsonProperty("type")
private String shuntingTypeValue;
private List<CompanyAdjustList> records = new ArrayList<>();
}

44
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/flowable/CompanyAdjustDto.java

@ -0,0 +1,44 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/25 11:43
* @Description
*/
@Data
public class CompanyAdjustDto implements Dto {
private static final long serialVersionUID = -1526555701754422925L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@JsonProperty("procInsId")
@NotBlank(message = "参数错误:procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
@NotBlank(message = "参数错误:comment")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
private String json;
private String orgPath;
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/flowable/CompanyAdjustQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Author dimengzhe
* @Date 2022/8/25 11:48
* @Description
*/
@Data
public class CompanyAdjustQuery implements Query {
private static final long serialVersionUID = 5168595226107955454L;
@ApiModelProperty(value = "节点key")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误:next")
private Integer next;
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyAdjust/flowable/CompanyAdjustTaskQuery.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/25 11:47
* @Description
*/
@Data
public class CompanyAdjustTaskQuery implements Query {
private static final long serialVersionUID = -8199630188033418050L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
@JsonProperty("procInsId")
private String instanceId;
}

61
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyAdjust/CompanyAdjustRest.java

@ -0,0 +1,61 @@
package com.yxt.anrui.terminal.biz.supplychain.companyAdjust;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.CompanyAdjustFeign;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.CompanyAdjustVo;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustDto;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustQuery;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingFeign;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingVo;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery;
import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingTaskQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@Api(tags = "分公司间调车调账")
@Controller
@RequestMapping("/v1/companyAdjust")
public class CompanyAdjustRest implements CompanyAdjustFeign {
@Autowired
private CompanyAdjustService companyAdjustService;
@Override
public ResultBean<CompanyAdjustVo> getCompanyAdjust(String sid) {
return companyAdjustService.getCompanyAdjust(sid);
}
@Override
public ResultBean complete(CompanyAdjustDto dto) {
return companyAdjustService.complete(dto);
}
@Override
public ResultBean InitiatorToAnswer(CompanyAdjustDto dto) {
return companyAdjustService.InitiatorToAnswer(dto);
}
@Override
public ResultBean reject(CompanyAdjustTaskQuery query) {
return companyAdjustService.reject(query);
}
@Override
public ResultBean revokeProcess(CompanyAdjustTaskQuery query) {
return companyAdjustService.revokeProcess(query);
}
@Override
public ResultBean breakProcess(CompanyAdjustTaskQuery query) {
return companyAdjustService.breakProcess(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(CompanyAdjustQuery query) {
return companyAdjustService.getFlowOperateTitle(query);
}
}

184
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyAdjust/CompanyAdjustService.java

@ -0,0 +1,184 @@
package com.yxt.anrui.terminal.biz.supplychain.companyAdjust;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.yxt.anrui.base.api.baseaccadjapply.AppCompanyAdjustVo;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDetailsVo;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyFeign;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.CompanyAdjustVo;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustDto;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustQuery;
import com.yxt.anrui.terminal.api.supplychain.companyAdjust.flowable.CompanyAdjustTaskQuery;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/8/25 11:32
* @Description
*/
@Service
public class CompanyAdjustService {
@Autowired
private BaseAccadjApplyFeign baseAccadjApplyFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<CompanyAdjustVo> getCompanyAdjust(String sid) {
ResultBean<CompanyAdjustVo> rb = ResultBean.fireFail();
ResultBean<AppCompanyAdjustVo> resultBean = baseAccadjApplyFeign.getCompanyAdjust(sid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
CompanyAdjustVo companyAdjustVo = new CompanyAdjustVo();
AppCompanyAdjustVo vo = resultBean.getData();
BeanUtil.copyProperties(vo, companyAdjustVo);
return rb.success().setData(companyAdjustVo);
}
public ResultBean complete(CompanyAdjustDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseAccAdjApplyCompleteDto baseAccAdjApplyCompleteDto = new BaseAccAdjApplyCompleteDto();
BeanUtil.copyProperties(dto, baseAccAdjApplyCompleteDto);
String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(orgPath)) {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
baseAccAdjApplyCompleteDto.setOrgSidPath(orgSidPath);
} else {
baseAccAdjApplyCompleteDto.setOrgSidPath(orgPath);
}
BaseAccadjApplyDetailsVo data = baseAccadjApplyFeign.fetchDetailsBySid(dto.getBusinessSid()).getData();
baseAccAdjApplyCompleteDto.setBaseInternalPurchaseVehicles(data.getBaseInternalPurchaseVehicles());
ResultBean resultBean = baseAccadjApplyFeign.complete(baseAccAdjApplyCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean InitiatorToAnswer(CompanyAdjustDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseAccAdjApplyCompleteDto baseAccAdjApplyCompleteDto = new BaseAccAdjApplyCompleteDto();
BeanUtil.copyProperties(dto, baseAccAdjApplyCompleteDto);
Map<String, Object> map = new HashMap<>();
String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(orgPath)) {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
baseAccAdjApplyCompleteDto.setOrgSidPath(orgSidPath);
} else {
baseAccAdjApplyCompleteDto.setOrgSidPath(orgPath);
}
BaseAccadjApplyDetailsVo data = baseAccadjApplyFeign.fetchDetailsBySid(dto.getBusinessSid()).getData();
baseAccAdjApplyCompleteDto.setBaseInternalPurchaseVehicles(data.getBaseInternalPurchaseVehicles());
baseAccAdjApplyCompleteDto.setFormVariables(map);
ResultBean resultBean = baseAccadjApplyFeign.InitiatorToAnswer(baseAccAdjApplyCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean reject(CompanyAdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
BaseAccAdjApplyTaskQuery baseAccAdjApplyTaskQuery = new BaseAccAdjApplyTaskQuery();
BeanUtil.copyProperties(query, baseAccAdjApplyTaskQuery);
ResultBean resultBean = baseAccadjApplyFeign.taskReject(baseAccAdjApplyTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean revokeProcess(CompanyAdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
BaseAccAdjApplyTaskQuery baseAccAdjApplyTaskQuery = new BaseAccAdjApplyTaskQuery();
BeanUtil.copyProperties(query, baseAccAdjApplyTaskQuery);
ResultBean resultBean = baseAccadjApplyFeign.revokeProcess(baseAccAdjApplyTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean breakProcess(CompanyAdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
BaseAccAdjApplyTaskQuery baseAccAdjApplyTaskQuery = new BaseAccAdjApplyTaskQuery();
BeanUtil.copyProperties(query, baseAccAdjApplyTaskQuery);
ResultBean resultBean = baseAccadjApplyFeign.breakProcess(baseAccAdjApplyTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean<String> getFlowOperateTitle(CompanyAdjustQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
GetNodeQuery getNodeQuery = new GetNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = baseAccadjApplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<GetNodeVo>> getNextNodesForSubmit = baseAccadjApplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
}
Loading…
Cancel
Save