diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManPayQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManPayQuery.java new file mode 100644 index 0000000000..c0efad1d07 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManPayQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.base.api.basemanufacturerbank; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/9 10:11 + * @Description + */ +@Data +public class BaseManPayQuery implements Query { + private static final long serialVersionUID = 1674811728094269348L; + + private String useOrgSid; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManPayVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManPayVo.java new file mode 100644 index 0000000000..7ceb16ed80 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManPayVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.basemanufacturerbank; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/9 10:12 + * @Description + */ +@Data +public class BaseManPayVo implements Vo { + private static final long serialVersionUID = -4726735870987018408L; + + @ApiModelProperty("厂家销售通路") + private String accountName; + + @ApiModelProperty("开户行") + private String depositBank; + + @ApiModelProperty("收款银行账号") + private String bankAccount; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java index 9a4d143791..678a5e4d1b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java @@ -4,6 +4,7 @@ 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.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -51,4 +52,8 @@ public interface BaseManufacturerBankFeign { @ApiOperation("未售买断获取厂家销售通路") @GetMapping("/actualList/{useOrgSid}") ResultBean> actualList(@PathVariable("useOrgSid") String useOrgSid); + + @ApiOperation("付款申请获取厂家销售通路") + @GetMapping("/payList") + ResultBean> payList(@SpringQueryMap BaseManPayQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java index 977f815ad6..4bae844e53 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java @@ -35,4 +35,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe public ResultBean> actualList(String useOrgSid) { return null; } + + @Override + public ResultBean> payList(BaseManPayQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java index 3af05e9e4b..741349726e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java @@ -16,12 +16,34 @@ import java.util.List; public class PayBaseVehicleQuery implements Query { private static final long serialVersionUID = 8939482367294270164L; - @ApiModelProperty(value = "已选择的车辆的sid") - private List sidList = new ArrayList<>(); + @ApiModelProperty(value = "品牌") + private String brandSid; + @ApiModelProperty(value = "功能") + private String vehicleType; + @ApiModelProperty(value = "系列") + private String productLine; + @ApiModelProperty(value = "变速箱") + private String gearboxType; + @ApiModelProperty(value = "驱动") + private String driveForm; + @ApiModelProperty(value = "排放标准") + private String emissionStandard; + @ApiModelProperty(value = "马力") + private String power; + @ApiModelProperty(value = "燃料") + private String fuelType; + @ApiModelProperty(value = "版本") + private String vehicleVersion; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "快捷检索车型") + private String modelName; - @ApiModelProperty(value = "车架号") - private String vinNo; + @ApiModelProperty(value = "已选择的车辆的sid") + private List vinSidList = new ArrayList<>(); @ApiModelProperty(value = "用户sid") private String userSid; + @ApiModelProperty(value = "orgSid") + private String orgSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java index e38e522573..8782e4ff81 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.base.api.basevehicle; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,17 +14,46 @@ import lombok.Data; @Data public class PayBaseVehicleVo implements Vo { private static final long serialVersionUID = 8935506131970564858L; - - @ApiModelProperty("车型名称") - private String modelName; - @ApiModelProperty("车型sid") + private String sid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "车型sid") private String modelSid; - @ApiModelProperty("配置sid") - private String configSid; - @ApiModelProperty("车辆sid") - private String vehSid; - @ApiModelProperty("车架号") + @ApiModelProperty(value = "车架号") private String vinNo; - @ApiModelProperty("厂家结算价") - private String costPrice; + @ApiModelProperty(value = "颜色") + private String color; + @ApiModelProperty(value = "存放地点") + private String location; + @ApiModelProperty(value = "存放地点sid") + private String locationSid; + @ApiModelProperty(value = "销售指导价") + @JsonSerialize(using = ToStringSerializer.class) + private String guidedPrice; + + @ApiModelProperty(value = "常用配置") + private String configName; + @ApiModelProperty(value = "常用配置sid") + private String configSid; + @ApiModelProperty(value = "入库日期") + private String priceDate; + + @ApiModelProperty(value = "入库价：厂家结算价") + @JsonSerialize(using = ToStringSerializer.class) + private String priced; + + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty("库龄") + private int dayNum; + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java index 862966e94c..e5a8bca9b6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java @@ -92,6 +92,11 @@ public interface CommonAppendixFeign { public ResultBean getAppAppendix(@RequestParam("linkSid") String linkSid, @RequestParam(value = "attachType", required = false) String attachType); + @ApiOperation("手机端查询多个附件") + @GetMapping("/getAppAppendixList") + public ResultBean> getAppAppendixList(@RequestParam("linkSid") String linkSid, + @RequestParam(value = "attachType", required = false) String attachType); + @ApiOperation("手机端查询担保人文件附件") @GetMapping("/getAppGuarantorList") public ResultBean> getAppGuarantorList(@RequestParam("linkSid") String linkSid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java index 6840a31215..61f55d80cc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java @@ -101,6 +101,11 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign { return rb.setMsg("接口anrui-base/commonappendix/getAppAppendix无法访问"); } + @Override + public ResultBean> getAppAppendixList(String linkSid, String attachType) { + return null; + } + @Override public ResultBean getAppGuarantorList(String linkSid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index 6a5e21fb30..96808c33b2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -44,6 +44,9 @@ public enum CommonAttachTypeEnum { INVOICE_KPXXQRS("0003_3", "开票信息确认书"), WITNESS("0004", "跟进记录的材料"), ADVANCE_GIN("0005", "提前开票附件"), + ADVANCE_KHKPSQS("0005_1", "客户开票申请书"), + ADVANCE_CLDJHT("0005_2", "车辆登记合同"), + ADVANCE_KPXXQRS("0005_3", "开票信息确认书"), CUSTOMER_FILE("0006", "客户资料附件"), ARREARS("0007", "欠款提车附件"), SCENESIGN("0008", "现场签署附件"), diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index 3da867f9eb..5022e91be4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; @@ -64,4 +65,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); List selectBankByApplySid(String createOrgSid); + + List payList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 6b114f7579..4eff4667f5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -30,8 +30,7 @@ @@ -74,14 +73,28 @@ bmb.depositBank, bmb.bankAccount from base_manufacturer_bank bmb - left join base_manufacturer bm on bmb.manufacturerSid = bm.sid + left join base_manufacturer bm on bmb.manufacturerSid = bm.sid where bmb.isDelete = 0 AND bm.useOrg = #{useOrgSid} and bmb.dueBankKey = #{code} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java index fe55f0bd9f..b5e37c4d1b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java @@ -83,5 +83,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { return rb.success().setData(voList); } + @Override + public ResultBean> payList(BaseManPayQuery query) { + ResultBean> rb = ResultBean.fireFail(); + List voList = baseManufacturerBankService.payList(query); + return rb.success().setData(voList); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index bfe248a796..4ca6bc4dda 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java @@ -1,9 +1,8 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; +import com.yxt.anrui.base.api.basemanufacturerbank.*; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; +import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @@ -77,4 +76,10 @@ public class BaseManufacturerBankService extends MybatisBaseService selectBankByApplySid(String createOrgSid) { return baseMapper.selectBankByApplySid(createOrgSid); } + + public List payList(BaseManPayQuery query) { + String useOrgSid = query.getUseOrgSid(); + String code = DictCommonEnum.dueBank.HK_TYPE.getCode(); + return baseMapper.payList(useOrgSid,code); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 99a94b21b5..572b63a71d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1184,7 +1184,36 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index 00088e42f9..ec3e8ceb14 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -233,4 +233,8 @@ public class BaseVehicleBrandService extends MybatisBaseService selectManSidByOrgSid(String orgSid) { return baseMapper.selectManSidByOrgSid(orgSid); } + + public String selectShortName(String modelSid) { + return baseMapper.selectShortName(modelSid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 1905c6577c..b953d254f6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -11,6 +11,8 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -39,6 +41,8 @@ public class BaseVehicleOutService extends MybatisBaseService fEntityList = new ArrayList<>(); SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); //单价 + fEntity.setFPrice(dto.getPrice()); //物料编码 //批号 //仓库id + ResultBean voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); + fEntity.setFStockID(voResultBean.getData().getWarehouseCode()); //销售折让 + if (StringUtils.isNotBlank(dto.getSalesAllowance())) { + fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance()); + } + //返利金额 + fEntity.setF_PAEZ_Decimal(dto.getRebateMoneyOne()); //备注 + if (StringUtils.isNotBlank(dto.getRebateMoneyOne())) { + if (StringUtils.isBlank(dto.getRebateMoneyTwo())) { + fEntity.setFEntrynote(new BigDecimal(dto.getRebateMoneyOne()).add(new BigDecimal(dto.getRebateMoneyTwo())).toString()); + } else { + fEntity.setFEntrynote(dto.getRebateMoneyOne()); + } + } else { + if (StringUtils.isBlank(dto.getRebateMoneyTwo())) { + fEntity.setFEntrynote(dto.getRebateMoneyTwo()); + } + } fEntityList.add(fEntity); if (fEntityList.size() > 0) { salOutStock.setFEntity(fEntityList); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java index 425686218e..98e228cd7e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java @@ -161,6 +161,12 @@ public class CommonAppendixRest implements CommonAppendixFeign { return new ResultBean().success().setData(vo); } + @Override + public ResultBean> getAppAppendixList(String linkSid, String attachType) { + List vos = commonAppendixService.getAppAppendixList(linkSid, attachType); + return new ResultBean>().success().setData(vos); + } + @Override public ResultBean> getAppGuarantorList(String linkSid) { return new ResultBean>().success().setData(commonAppendixService.getAppGuarantorList(linkSid)); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java index ff38b69e4b..d6a9b5f49e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java @@ -210,6 +210,12 @@ public class CommonAppendixService extends MybatisBaseService getAppAppendixList(String linkSid, String attachType) { + List list = baseMapper.selectByLinkSid(linkSid, attachType); + return list; + } + /** * 手机端查询担保人文件附件 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index d3a1a5309c..23753ca173 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,10 +18,8 @@ import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; -import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.CommonContractEnum; import com.yxt.anrui.base.common.utils.Rule; -import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign; @@ -1322,7 +1321,7 @@ public class CommonContractService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); - String orgCode = resultBean1.getData().getOrgCode(); - BillNo b = new BillNo(); +// String orgCode = resultBean1.getData().getOrgCode(); + String orgCode = resultBean1.getData().getOrgAbbre(); + //根据车型sid查询品牌简称 + String brandCode = baseVehicleBrandService.selectShortName(modelSid); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + String bill = brandCode+orgCode+date; + /* BillNo b = new BillNo(); b.setOrgCode(orgCode); b.setBillType(BillTypeEnum.XSDD.getBillType()); - String bill = Rule.getBill(b); + String bill = Rule.getBill(b);*/ int i = baseMapper.selectNum(bill); String billNo = Rule.getBillNo(bill, i); return billNo; @@ -1656,7 +1660,7 @@ public class CommonContractService extends MybatisBaseService getContractByBusSid(String sid) { ResultBean rb = ResultBean.fireFail(); CommonContract commonContract = baseMapper.getContractByBusSid(sid); - if(commonContract == null){ + if (commonContract == null) { return rb.setData(new CommonContract()); } return rb.success().setData(commonContract); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AdCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AdCarListVo.java new file mode 100644 index 0000000000..1583315a6c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AdCarListVo.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AdCarListVo implements Vo { + private static final long serialVersionUID = -1495695891564098295L; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("成交价") + private String price; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java new file mode 100644 index 0000000000..ebf89d8e54 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppAdvanceInvoiceDto implements Dto { + private static final long serialVersionUID = 4381514282343908312L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同id") + private String contractNo; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + private String applyDate; + @ApiModelProperty("车辆列表") + private List carList; + @ApiModelProperty("欠款金额") + private String arrearsMoney; + @ApiModelProperty("车型") + private String carModel; + @ApiModelProperty("开票信息确认书") + private List confirmFile; + @ApiModelProperty("客户开票申请书") + private List applyFile; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("手写原因") + private String otherReasons; + @ApiModelProperty("承诺回款日期") + private String returnedMoneyDate; + @ApiModelProperty("车辆登记合同") + private List registerFile; + @ApiModelProperty("提前开票原因 0手写 1选择") + private String advGinReasonValue; + @ApiModelProperty("提前开票原因 0手写 1选择") + private String advGinReasonKey; + @ApiModelProperty("选择原因") + private String reasonChoose; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("流程实列id") + private String procInsId; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java new file mode 100644 index 0000000000..22f26769ff --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java @@ -0,0 +1,52 @@ +package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppAdvanceInvoiceInfoVo implements Vo { + private static final long serialVersionUID = 1498350342194981549L; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同id") + private String contractNo; + @ApiModelProperty("客户") + private String customerName; + @ApiModelProperty("申请日期") + private String applyDate; + @ApiModelProperty("车辆列表") + private List carList; + @ApiModelProperty("欠款金额") + private String arrearsMoney; + @ApiModelProperty("车型") + private String carModel; + @ApiModelProperty("开票信息确认书") + private List confirmFile; + @ApiModelProperty("客户开票申请书") + private List applyFile; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("手写原因") + private String otherReasons; + @ApiModelProperty("承诺回款日期") + private String returnedMoneyDate; + @ApiModelProperty("车辆登记合同") + private List registerFile; + @ApiModelProperty("提前开票原因 0手写 1选择") + private String advGinReasonValue; + @ApiModelProperty("提前开票原因 0手写 1选择") + private String advGinReasonKey; + @ApiModelProperty("选择原因") + private String reasonChoose; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("流程实列id") + private String procInsId; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java new file mode 100644 index 0000000000..35cf986974 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageVo.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppAdvanceInvoicePageVo implements Vo { + private static final long serialVersionUID = 1414719057186977899L; + + @ApiModelProperty("合同sid") + private String contractSid; + + @ApiModelProperty("合同状态") + private String contractType; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("欠款金额") + private String arrearsMoney; + + @ApiModelProperty("承诺汇款日期") + private String returnedMoneyDate; + + @ApiModelProperty("申请人") + private String applyName; + + @ApiModelProperty("数量") + private String num; + + @ApiModelProperty("原因") + private String otherReasons; + + @ApiModelProperty("创建日期") + private String applyDate; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("是否显示办理按钮") + private Boolean showUpdateBtn; + + @ApiModelProperty("是否显示删除按钮") + private Boolean showDeleteBtn; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceQuery.java new file mode 100644 index 0000000000..acecbf36ae --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.buscenter.api.busadvanceginvoiceapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppAdvanceInvoiceQuery implements Query { + private static final long serialVersionUID = 7668511398241906995L; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("客户名称字段 合同编号字段") + private String name; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java index 3ebdb67e24..b0eff5f184 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java @@ -73,4 +73,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity { private String advGinReasonValue; // 提前开票原因value @ApiModelProperty("其他原因") private String otherReasons; // 其他原因 + @ApiModelProperty("流程状态") + private String nodeState; // 其他原因 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java index a94d81be09..b085521ebb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java @@ -90,4 +90,27 @@ public interface BusAdvanceGinvoiceapplyFeign { @PostMapping("/submitAdvanceGinvoiceaapply") public ResultBean submitAdvanceGinvoiceaapply(@RequestBody @Valid BusAdvanceGinvoiceapplyDto dto); + /*************************************************APP提前开票接口***************************************************/ + + + @ApiOperation("手机端-获取提前开票列表") + @PostMapping("/getAdvanceInvoiceList") + @ResponseBody + ResultBean> getAdvanceInvoiceList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端-初始化提前开票申请") + @GetMapping("/initAdvanceInvoice/{contractSid}") + @ResponseBody + public ResultBean initAdvanceInvoice(@PathVariable("contractSid") String contractSid); + + @ApiOperation("移动端-保存提前开票申请") + @PostMapping("/saveAdvanceInvoice") + @ResponseBody + public ResultBean saveAdvanceInvoice(@Valid @RequestBody AppAdvanceInvoiceDto dto); + + @ApiOperation("手机端-删除提前开票") + @GetMapping("/deleteAdvanceInvoice/{contractSid}") + @ResponseBody + public ResultBean deleteAdvanceInvoice(@PathVariable("contractSid") String contractSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java index 138cbc5be8..9c7f0f8053 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeignFallback.java @@ -80,4 +80,24 @@ public class BusAdvanceGinvoiceapplyFeignFallback implements BusAdvanceGinvoicea return null; } + @Override + public ResultBean> getAdvanceInvoiceList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean initAdvanceInvoice(String contractSid) { + return null; + } + + @Override + public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) { + return null; + } + + @Override + public ResultBean deleteAdvanceInvoice(String contractSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java new file mode 100644 index 0000000000..55d08af161 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class AppArrearsCarryVehiclePageVo implements Vo { + + @ApiModelProperty("车辆sid") + private String vehicleSid; + + @ApiModelProperty("车架号") + @JsonProperty("VINNo") + private String VINNo; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("客户sid") + private String customerSid; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("车型名称") + private String modelName; + + @ApiModelProperty("车型Sid") + private String modelSid; + + @ApiModelProperty("成交价") + private BigDecimal dealMoney; + + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String applyDate; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java new file mode 100644 index 0000000000..a37c735a3f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppArrearsCarryVehicleQuery implements Query { + private static final long serialVersionUID = 6131516750203771743L; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("客户名称 合同编号") + private String name; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java index c8ac07756e..b82d54b24d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java @@ -63,4 +63,7 @@ public class BusArrearsCarryVehicleApply extends BaseEntity { @ApiModelProperty("累计欠款金额") private BigDecimal cumulativeArrearsMoney; + + @ApiModelProperty("流程状态") + private String nodeState; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index d4eaacbde7..1082e8b4de 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -1,5 +1,7 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery; import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleDto; import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleQuery; import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleVo; @@ -70,5 +72,14 @@ public interface BusArrearsCarryVehicleApplyFeign { @ApiOperation("欠款提车单附件保存接口") @PostMapping("/saveArrearsAppendix") public ResultBean saveArrearsAppendix(@RequestBody List dto); + + @ApiOperation("手机端-获取提前开票列表") + @PostMapping("/getArrearsTakeCarList") + @ResponseBody + ResultBean> getArrearsTakeCarList(@RequestBody PagerQuery pagerQuery); -} \ No newline at end of file + @ApiOperation("手机端-删除欠款提车") + @GetMapping("/deleteArrearsTakeCar/{contractSid}") + @ResponseBody + public ResultBean deleteArrearsTakeCar(@PathVariable("contractSid") String contractSid); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 1a1cbf00d2..a5d4df8e5e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -1,5 +1,7 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,4 +71,15 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry public ResultBean saveArrearsAppendix(List dto) { return null; } + + @Override + public ResultBean> getArrearsTakeCarList(PagerQuery pagerQuery) { + return null; + } + + + @Override + public ResultBean deleteArrearsTakeCar(String contractSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java index 053ace950d..5f9156568f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java @@ -26,15 +26,14 @@ package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply; 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.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyDetailsVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; -import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyVo; import java.util.List; @@ -54,15 +53,17 @@ import java.util.List; @Mapper public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper { - //@Update("update bus_advance_ginvoiceapply set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_advance_ginvoiceapply") - List selectListVo(); + //@Update("update bus_advance_ginvoiceapply set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_advance_ginvoiceapply") + List selectListVo(); BusAdvanceGinvoiceapplyDetailsVo fetchAllBySid(String sid); + + IPage getAdvanceInvoiceList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml index d2db91a7f6..fa96b1ba7d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.xml @@ -1,41 +1,58 @@ - - - - - + + + - + + + SELECT contractNo, + customerName, + applyDate, + carModel, + arrearsMoney, + returnedMoneyDate, + advGinReasonKey, + advGinReasonValue, + otherReasons, + remarks + FROM bus_advance_ginvoiceapply + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java index 175e5d6abe..1027397e7b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyRest.java @@ -25,7 +25,9 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; +import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -54,48 +56,70 @@ import java.util.List; @RequestMapping("/busadvanceginvoiceapply") public class BusAdvanceGinvoiceapplyRest implements BusAdvanceGinvoiceapplyFeign { - @Autowired - private BusAdvanceGinvoiceapplyService busAdvanceGinvoiceapplyService; + @Autowired + private BusAdvanceGinvoiceapplyService busAdvanceGinvoiceapplyService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busAdvanceGinvoiceapplyService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busAdvanceGinvoiceapplyService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody BusAdvanceGinvoiceapplyDto dto){ - return busAdvanceGinvoiceapplyService.saveAll(dto); - } + @Override + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody BusAdvanceGinvoiceapplyDto dto) { + return busAdvanceGinvoiceapplyService.saveAll(dto); + } - @Override - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusAdvanceGinvoiceapplyDto dto, @PathVariable("sid") String sid){ - return busAdvanceGinvoiceapplyService.updateAllBySid(dto,sid); - } + @Override + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody BusAdvanceGinvoiceapplyDto dto, @PathVariable("sid") String sid) { + return busAdvanceGinvoiceapplyService.updateAllBySid(dto, sid); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return busAdvanceGinvoiceapplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return busAdvanceGinvoiceapplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid){ - return busAdvanceGinvoiceapplyService.fetchAllBySid(sid); - } + public ResultBean fetchBySid(@PathVariable("sid") String sid) { + return busAdvanceGinvoiceapplyService.fetchAllBySid(sid); + } - @Override - public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) { - return busAdvanceGinvoiceapplyService.submitAdvanceGinvoiceaapply(dto); - } + @Override + public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) { + return busAdvanceGinvoiceapplyService.submitAdvanceGinvoiceaapply(dto); + } + + @Override + public ResultBean> getAdvanceInvoiceList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + IPage iPage = busAdvanceGinvoiceapplyService.getAdvanceInvoiceList(pagerQuery); + return rb.success().setData(iPage); + } + + @Override + public ResultBean initAdvanceInvoice(String contractSid) { + return busAdvanceGinvoiceapplyService.initAdvanceInvoice(contractSid); + } + + @Override + public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) { + return busAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto); + } + + @Override + public ResultBean deleteAdvanceInvoice(String contractSid) { + return busAdvanceGinvoiceapplyService.deleteAdvanceInvoice(contractSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index f3e988254c..3a2ca26f9d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -28,10 +28,13 @@ package com.yxt.anrui.buscenter.biz.busadvanceginvoiceapply; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; +import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery; +import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto; @@ -43,6 +46,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -50,6 +54,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.apache.http.nio.pool.NIOConnFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -74,261 +79,386 @@ import java.util.Map; @Service public class BusAdvanceGinvoiceapplyService extends MybatisBaseService { - @Autowired - private SysFormLinkFeign sysFormLinkFeign; - @Autowired - private FlowableService flowableService; - @Autowired - private BusGinvoiceapplyVehicleService busGinvoiceapplyVehicleService; - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - private CommonAppendixFeign commonAppendixFeign; - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysFormLinkFeign sysFormLinkFeign; + @Autowired + private FlowableService flowableService; + @Autowired + private BusGinvoiceapplyVehicleService busGinvoiceapplyVehicleService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private CommonAppendixFeign commonAppendixFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; - public PagerVo listPage(PagerQuery pq) { - BusAdvanceGinvoiceapplyQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BusAdvanceGinvoiceapplyQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(BusAdvanceGinvoiceapplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + public PagerVo listPage(PagerQuery pq) { + BusAdvanceGinvoiceapplyQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("contractNo", query.getContractNo()); - } - if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.like("customerName", query.getCustomerName()); - } - if (StringUtils.isNotBlank(query.getApplyName())) { - qw.like("applyName", query.getApplyName()); - } - String applyStartDate = query.getApplyStartDate(); - String applyEndDate = query.getApplyEndDate(); - qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" - ); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusAdvanceGinvoiceapplyQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - if (records.size() != 0){ - for (BusAdvanceGinvoiceapplyVo record : records) { - String advGinReasonValue = record.getAdvGinReasonValue(); - if (advGinReasonValue.equals("其它")){ - record.setReasons(record.getOtherReasons()); - }else { - record.setReasons(advGinReasonValue); - } - } - } - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BusAdvanceGinvoiceapplyQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusAdvanceGinvoiceapplyDto dto){ - BusAdvanceGinvoiceapply entity = new BusAdvanceGinvoiceapply(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusAdvanceGinvoiceapplyVo fetchByIdVo(String id){ - BusAdvanceGinvoiceapply entity = this.fetchById(id); - BusAdvanceGinvoiceapplyVo vo = new BusAdvanceGinvoiceapplyVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + public List listAll(BusAdvanceGinvoiceapplyQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } - public ResultBean saveAll(BusAdvanceGinvoiceapplyDto dto) { - ResultBean rb = ResultBean.fireFail(); - List busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos(); - BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply(); - dto.fillEntity(busAdvanceGinvoiceapply); - busAdvanceGinvoiceapply.setNum(busGinvoiceapplyVehicleDtos.size()); - boolean save = this.save(busAdvanceGinvoiceapply); - if (!save){ - return rb.setMsg("保存失败"); - } - if (busGinvoiceapplyVehicleDtos.size() > 0){ - for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) { - BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); - busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle); - busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid()); - busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle); - } - } - List commonAppendixVos = dto.getCommonAppendixDtos(); - if (commonAppendixVos.size() > 0){ - for (CommonAppendixDto commonAppendixDto : commonAppendixVos) { - String filePath = commonAppendixDto.getFilePath(); - if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - commonAppendixDto.setLinkSid(busAdvanceGinvoiceapply.getSid()); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setName(dto.getName()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType()); - com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); - BeanUtil.copyProperties(commonAppendixDto,commonAppendixDto1); - commonAppendixFeign.save(commonAppendixDto1); - } - } - return rb.success().setMsg("保存成功"); - } + private QueryWrapper createQueryWrapper(BusAdvanceGinvoiceapplyQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); - public ResultBean delAll(String[] sids) { - ResultBean rb = ResultBean.fireFail(); - this.delBySids(sids); - for (String sid : sids) { - busGinvoiceapplyVehicleService.delByAdvGinSid(sid); - } - return rb.success().setMsg("删除成功"); - } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getApplyName())) { + qw.like("applyName", query.getApplyName()); + } + String applyStartDate = query.getApplyStartDate(); + String applyEndDate = query.getApplyEndDate(); + qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" + ); + return qw; + } - public ResultBean fetchAllBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BusAdvanceGinvoiceapplyDetailsVo busAdvanceGinvoiceapplyDetailsVo = baseMapper.fetchAllBySid(sid); - List busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(sid); - busAdvanceGinvoiceapplyDetailsVo.setBusGinvoiceapplyVehicleDetailsVos(busGinvoiceapplyVehicleDetailsVos); - ResultBean> listResultBean = commonAppendixFeign.selByLinkSid(sid); - List commonAppendixVos = listResultBean.getData(); - ArrayList commonAppendixVos1 = new ArrayList<>(); - com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo commonAppendixVo1 = new com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo(); - if (commonAppendixVos.size() > 0){ - for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { - BeanUtil.copyProperties(commonAppendixVo,commonAppendixVo1); - commonAppendixVos1.add(commonAppendixVo1); - } - } - busAdvanceGinvoiceapplyDetailsVo.setCommonAppendixVos(commonAppendixVos1); - return rb.success().setData(busAdvanceGinvoiceapplyDetailsVo); - } + public PagerVo listPageVo(PagerQuery pq) { + BusAdvanceGinvoiceapplyQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + if (records.size() != 0) { + for (BusAdvanceGinvoiceapplyVo record : records) { + String advGinReasonValue = record.getAdvGinReasonValue(); + if (advGinReasonValue.equals("其它")) { + record.setReasons(record.getOtherReasons()); + } else { + record.setReasons(advGinReasonValue); + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - public ResultBean updateAllBySid(BusAdvanceGinvoiceapplyDto dto, String sid) { - ResultBean rb = ResultBean.fireFail(); - this.updateBySid(dto.toMap(),sid); - busGinvoiceapplyVehicleService.delByAdvGinSid(sid); - List busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos(); - if (busGinvoiceapplyVehicleDtos.size() > 0){ - for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) { - BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); - busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle); - busGinvoiceapplyVehicle.setAdvGinSid(sid); - busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle); - } - } - commonAppendixFeign.deleteFiles(sid); - List commonAppendixVos = dto.getCommonAppendixDtos(); - if (commonAppendixVos.size() > 0){ - for (CommonAppendixDto commonAppendixDto : commonAppendixVos) { - String filePath = commonAppendixDto.getFilePath(); - if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); - } - commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(filePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setName(dto.getName()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType()); - com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); - BeanUtil.copyProperties(commonAppendixDto,commonAppendixDto1); - commonAppendixFeign.save(commonAppendixDto1); - } - } - return rb.success().setMsg("修改成功"); - } + public List listAllVo(BusAdvanceGinvoiceapplyQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } - public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) { - String orgSid = checkUserOrg(dto.getUserSid()); - String businessSid = ""; - if (StringUtils.isBlank(orgSid)) { - return new ResultBean().fail().setMsg("用户组织机构不能为空"); - } - // 验证 - if (StringUtils.isBlank(dto.getSid())) { - // 调用保存接口 - ResultBean resultBean = saveAll(dto); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = resultBean.getData().toString(); - } else { - // 调用更新接口 - ResultBean resultBean = updateAllBySid(dto, dto.getSid()); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = dto.getSid(); - } - // ???待完善(根据虚拟订单审批流程) - Map variables = new HashMap<>(); - variables.put("businessSid", businessSid); - variables.put("isLoan", true); - variables.put("orgSid", orgSid);//部门sid - ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables); - if (resultBean.getSuccess() && resultBean.getData() != null) { - Map map = (Map) resultBean.getData(); - saveSysFormLink(map); - } - return resultBean; - } + public List listVo() { + return baseMapper.selectListVo(); + } - /** - * 检查用户是否设置部门 - * - * @param userSid - * @return 返回部门sid - */ - private String checkUserOrg(String userSid) { - String orgSid = ""; - String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid(); - ResultBean resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid); - if (resultBean.getSuccess()) { - orgSid = resultBean.getData(); - } - return orgSid; - } + public void saveOrUpdateDto(BusAdvanceGinvoiceapplyDto dto) { + BusAdvanceGinvoiceapply entity = new BusAdvanceGinvoiceapply(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } - /** - * 保存流程业务关联表 数据 - * @param map - */ - private void saveSysFormLink(Map map) { - SysFormLinkDto sysFormLinkDto = new SysFormLinkDto(); - sysFormLinkDto.setBusinessSid(map.get("sid")); - sysFormLinkDto.setProcInsId(map.get("procInsId")); - sysFormLinkDto.setTaskDefKey(map.get("taskDefKey")); - sysFormLinkDto.setNodeState(map.get("nodeState")); - sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ADVANCE_GINVOICEAPPLY.getCode()); + public BusAdvanceGinvoiceapplyVo fetchByIdVo(String id) { + BusAdvanceGinvoiceapply entity = this.fetchById(id); + BusAdvanceGinvoiceapplyVo vo = new BusAdvanceGinvoiceapplyVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean saveAll(BusAdvanceGinvoiceapplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + List busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos(); + BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply(); + dto.fillEntity(busAdvanceGinvoiceapply); + busAdvanceGinvoiceapply.setNum(busGinvoiceapplyVehicleDtos.size()); + boolean save = this.save(busAdvanceGinvoiceapply); + if (!save) { + return rb.setMsg("保存失败"); + } + if (busGinvoiceapplyVehicleDtos.size() > 0) { + for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) { + BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); + busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle); + busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid()); + busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle); + } + } + List commonAppendixVos = dto.getCommonAppendixDtos(); + if (commonAppendixVos.size() > 0) { + for (CommonAppendixDto commonAppendixDto : commonAppendixVos) { + String filePath = commonAppendixDto.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(busAdvanceGinvoiceapply.getSid()); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setName(dto.getName()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType()); + com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); + BeanUtil.copyProperties(commonAppendixDto, commonAppendixDto1); + commonAppendixFeign.save(commonAppendixDto1); + } + } + return rb.success().setMsg("保存成功"); + } + + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + this.delBySids(sids); + for (String sid : sids) { + busGinvoiceapplyVehicleService.delByAdvGinSid(sid); + } + return rb.success().setMsg("删除成功"); + } + + public ResultBean fetchAllBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusAdvanceGinvoiceapplyDetailsVo busAdvanceGinvoiceapplyDetailsVo = baseMapper.fetchAllBySid(sid); + List busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(sid); + busAdvanceGinvoiceapplyDetailsVo.setBusGinvoiceapplyVehicleDetailsVos(busGinvoiceapplyVehicleDetailsVos); + ResultBean> listResultBean = commonAppendixFeign.selByLinkSid(sid); + List commonAppendixVos = listResultBean.getData(); + ArrayList commonAppendixVos1 = new ArrayList<>(); + com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo commonAppendixVo1 = new com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.CommonAppendixVo(); + if (commonAppendixVos.size() > 0) { + for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { + BeanUtil.copyProperties(commonAppendixVo, commonAppendixVo1); + commonAppendixVos1.add(commonAppendixVo1); + } + } + busAdvanceGinvoiceapplyDetailsVo.setCommonAppendixVos(commonAppendixVos1); + return rb.success().setData(busAdvanceGinvoiceapplyDetailsVo); + } + + public ResultBean updateAllBySid(BusAdvanceGinvoiceapplyDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + this.updateBySid(dto.toMap(), sid); + busGinvoiceapplyVehicleService.delByAdvGinSid(sid); + List busGinvoiceapplyVehicleDtos = dto.getBusGinvoiceapplyVehicleDtos(); + if (busGinvoiceapplyVehicleDtos.size() > 0) { + for (BusGinvoiceapplyVehicleDto busGinvoiceapplyVehicleDto : busGinvoiceapplyVehicleDtos) { + BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); + busGinvoiceapplyVehicleDto.fillEntity(busGinvoiceapplyVehicle); + busGinvoiceapplyVehicle.setAdvGinSid(sid); + busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle); + } + } + commonAppendixFeign.deleteFiles(sid); + List commonAppendixVos = dto.getCommonAppendixDtos(); + if (commonAppendixVos.size() > 0) { + for (CommonAppendixDto commonAppendixDto : commonAppendixVos) { + String filePath = commonAppendixDto.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setName(dto.getName()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_GIN.getAttachType()); + com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto1 = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); + BeanUtil.copyProperties(commonAppendixDto, commonAppendixDto1); + commonAppendixFeign.save(commonAppendixDto1); + } + } + return rb.success().setMsg("修改成功"); + } + + public ResultBean submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) { + String orgSid = checkUserOrg(dto.getUserSid()); + String businessSid = ""; + if (StringUtils.isBlank(orgSid)) { + return new ResultBean().fail().setMsg("用户组织机构不能为空"); + } + // 验证 + if (StringUtils.isBlank(dto.getSid())) { + // 调用保存接口 + ResultBean resultBean = saveAll(dto); + if (!resultBean.getSuccess()) { + return resultBean.setMsg("提交失败"); + } + businessSid = resultBean.getData().toString(); + } else { + // 调用更新接口 + ResultBean resultBean = updateAllBySid(dto, dto.getSid()); + if (!resultBean.getSuccess()) { + return resultBean.setMsg("提交失败"); + } + businessSid = dto.getSid(); + } + // ???待完善(根据虚拟订单审批流程) + Map variables = new HashMap<>(); + variables.put("businessSid", businessSid); + variables.put("isLoan", true); + variables.put("orgSid", orgSid);//部门sid + ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables); + if (resultBean.getSuccess() && resultBean.getData() != null) { + Map map = (Map) resultBean.getData(); + saveSysFormLink(map); + } + return resultBean; + } + + /** + * 检查用户是否设置部门 + * + * @param userSid + * @return 返回部门sid + */ + private String checkUserOrg(String userSid) { + String orgSid = ""; + String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid(); + ResultBean resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid); + if (resultBean.getSuccess()) { + orgSid = resultBean.getData(); + } + return orgSid; + } + + /** + * 保存流程业务关联表 数据 + * + * @param map + */ + private void saveSysFormLink(Map map) { + SysFormLinkDto sysFormLinkDto = new SysFormLinkDto(); + sysFormLinkDto.setBusinessSid(map.get("sid")); + sysFormLinkDto.setProcInsId(map.get("procInsId")); + sysFormLinkDto.setTaskDefKey(map.get("taskDefKey")); + sysFormLinkDto.setNodeState(map.get("nodeState")); + sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ADVANCE_GINVOICEAPPLY.getCode()); // sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode())); - sysFormLinkFeign.save(sysFormLinkDto); - } + sysFormLinkFeign.save(sysFormLinkDto); + } + + public IPage getAdvanceInvoiceList(PagerQuery pagerQuery) { + AppAdvanceInvoiceQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(params.getUserSid())) { + qw.eq("createBySid", params.getUserSid()); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); + return iPage; + } + + public ResultBean initAdvanceInvoice(String contractSid) { + ResultBean rb = ResultBean.fireFail(); + AppAdvanceInvoiceInfoVo vo = new AppAdvanceInvoiceInfoVo(); + BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid); + BeanUtil.copyProperties(busAdvanceGinvoiceapply, vo, "sid"); + List carList = new ArrayList<>(); + List vinList = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid); + for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : vinList) { + AdCarListVo adCarListVo = new AdCarListVo(); + adCarListVo.setPrice(vehicleDetailsVo.getDealMoney()); + adCarListVo.setVin(vehicleDetailsVo.getVinNo()); + carList.add(adCarListVo); + } + vo.setCarList(carList); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + List confirmFile = new ArrayList<>(); + List confirmFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_KPXXQRS.getAttachType()).getData(); + for (CommonAppendixVo file : confirmFiles) { + confirmFile.add(urlPrefix + file.getFilePath()); + } + vo.setConfirmFile(confirmFile); + List applyFile = new ArrayList<>(); + List applyFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_KHKPSQS.getAttachType()).getData(); + for (CommonAppendixVo file : applyFiles) { + applyFile.add(urlPrefix + file.getFilePath()); + } + vo.setApplyFile(applyFile); + List registerFile = new ArrayList<>(); + List registerFiles = commonAppendixFeign.getAppAppendixList(contractSid, CommonAttachTypeEnum.ADVANCE_CLDJHT.getAttachType()).getData(); + for (CommonAppendixVo file : registerFiles) { + registerFile.add(urlPrefix + file.getFilePath()); + } + vo.setRegisterFile(registerFile); + return rb.success().setData(vo); + } + + public ResultBean saveAdvanceInvoice(AppAdvanceInvoiceDto dto) { + ResultBean rb = ResultBean.fireFail(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + if (StringUtils.isBlank(dto.getContractSid())) { + BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = new BusAdvanceGinvoiceapply(); + BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply); + save(busAdvanceGinvoiceapply); + List carList = dto.getCarList(); + for (AdCarListVo adCarListVo : carList) { + BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); + busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid()); + busGinvoiceapplyVehicle.setVinNo(adCarListVo.getVin()); + busGinvoiceapplyVehicle.setDealMoney(adCarListVo.getPrice()); + busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle); + } + saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid()); + } else { + BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid()); + BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply); + updateById(busAdvanceGinvoiceapply); + busGinvoiceapplyVehicleService.delByAdvGinSid(dto.getContractSid()); + List carList = dto.getCarList(); + for (AdCarListVo adCarListVo : carList) { + BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); + busGinvoiceapplyVehicle.setAdvGinSid(busAdvanceGinvoiceapply.getSid()); + busGinvoiceapplyVehicle.setVinNo(adCarListVo.getVin()); + busGinvoiceapplyVehicle.setDealMoney(adCarListVo.getPrice()); + busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle); + } + commonAppendixFeign.deleteFiles(dto.getContractSid()); + saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid()); + } + return rb.success(); + } + + public void saveFile(List confirmFile, List applyFile, List registerFile, String sid, String staffSid) { + for (String s : confirmFile) { + com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); + String filePath = s.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(staffSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_KPXXQRS.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + for (String s : applyFile) { + com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); + String filePath = s.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(staffSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_KHKPSQS.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + for (String s : registerFile) { + com.yxt.anrui.base.api.commonappendix.CommonAppendixDto commonAppendixDto = new com.yxt.anrui.base.api.commonappendix.CommonAppendixDto(); + String filePath = s.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(staffSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.ADVANCE_CLDJHT.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + } + public ResultBean deleteAdvanceInvoice(String contractSid) { + ResultBean rb = ResultBean.fireFail(); + BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(contractSid); + if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getNodeState())) { + return rb.setMsg("该申请已提交，删除失败"); + } + deleteBySid(contractSid); + busGinvoiceapplyVehicleService.delByAdvGinSid(contractSid); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java index 7a0e269530..b7ebfb1280 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java @@ -56,4 +56,7 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper getArrearsVehicleList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + IPage getAdvanceInvoiceList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index 38075d3bbc..8b8c58d7f6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -54,4 +54,8 @@ ORDER BY bo.contractNo desc + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index ccabdb3385..82f9c2f5b4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -2,6 +2,8 @@ package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo; import com.yxt.common.base.utils.PagerUtil; @@ -150,5 +152,17 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return busArrearsCarryVehicleApplyService.saveArrearsAppendix(list); } + @Override + public ResultBean> getArrearsTakeCarList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + IPage iPage = busArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery); + return rb.success().setData(iPage); + } + + @Override + public ResultBean deleteArrearsTakeCar(String contractSid) { + return busArrearsCarryVehicleApplyService.deleteArrearsTakeCar(contractSid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 69fe91cc2f..c8354ada6d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; @@ -372,4 +374,26 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService getArrearsTakeCarList(PagerQuery pagerQuery) { + AppArrearsCarryVehicleQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(params.getUserSid())) { + qw.eq("createBySid", params.getUserSid()); + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); + return iPage; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index d5b2231b7d..2799854741 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -35,6 +35,8 @@ resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo"> SELECT * FROM bus_delivered bd + WHERE + bd.`state` = 1 group by bd.contractNo ${ew.sqlSegment} @@ -45,6 +47,7 @@ SELECT vinNo as vin FROM bus_delivered WHERE contractNo = #{contractNo} + AND `state` = 1