diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 4e88d03800..71bddc72d3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -2,12 +2,13 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; 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 io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -399,4 +400,14 @@ public interface BaseVehicleFeign { @PostMapping("/getInspectionVinList") @ResponseBody public ResultBean> getInspectionVinList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("PC-巡检获取车价号") + @PostMapping("/getPCInspectionVinList") + @ResponseBody + public ResultBean>> getPCInspectionVinList(@RequestBody InspectionVinQuery query); + + @ApiOperation("销售订单补录选择车架号") + @PostMapping("/saleOrderVin") + @ResponseBody + public ResultBean> saleOrderVin(@RequestBody PagerQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 08bd348de4..176442b218 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -2,6 +2,8 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -311,4 +313,14 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean>> getPCInspectionVinList(InspectionVinQuery query) { + return null; + } + + @Override + public ResultBean> saleOrderVin(PagerQuery 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/app/InputVinListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListQuery.java new file mode 100644 index 0000000000..f55c0aa829 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.basevehicle.app; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 16:48 + * @Description + */ +@Data +public class InputVinListQuery implements Query { + private static final long serialVersionUID = 8552949553126528497L; + + private String saleOrderSid; + private List list; + private String names; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java new file mode 100644 index 0000000000..065b223526 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/InputVinListVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.base.api.basevehicle.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 16:48 + * @Description + */ +@Data +public class InputVinListVo implements Vo { + private static final long serialVersionUID = -9168643121079621489L; + + private String vinNo; + private String vinSid; + @ApiModelProperty("是否已出库") + private Boolean state; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/AppBaseVehicleActualDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/AppBaseVehicleActualDetailsVo.java index c4090d5df6..58ab36e10f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/AppBaseVehicleActualDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/AppBaseVehicleActualDetailsVo.java @@ -35,4 +35,7 @@ public class AppBaseVehicleActualDetailsVo implements Vo { private int vehicleNum; private BaseVehiVesionVo carDetailPage; + + @ApiModelProperty("买断金额") + private String actualMoney; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/AppBaseVehicleActualPayVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/AppBaseVehicleActualPayVo.java new file mode 100644 index 0000000000..3b49f6f01d --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/AppBaseVehicleActualPayVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 9:05 + * @Description + */ +@Data +public class AppBaseVehicleActualPayVo implements Vo { + private static final long serialVersionUID = -1583740093554518398L; + + @ApiModelProperty(value = "付款方式") + private String paymentType; + @ApiModelProperty(value = "厂家销售通路") + private String actualPay; + @ApiModelProperty(value = "开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java index e2e87895fd..ee34f88a22 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/AppBaseVehicleActualSalesVo.java @@ -1,10 +1,12 @@ package com.yxt.anrui.base.api.basevehicleactualsales; import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetailsVo; +import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -30,8 +32,16 @@ public class AppBaseVehicleActualSalesVo implements Vo { @ApiModelProperty("买断原因") private String reason; - private List records; + private List records = new ArrayList<>(); + + private List payList = new ArrayList<>(); @ApiModelProperty("未售买断费用") private String money; + @ApiModelProperty("是否需要付款") + private String payState; + @ApiModelProperty("是否需要付款key") + private String payStateKey; + @ApiModelProperty("付款明细合计") + private String payDetailTotal; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 89f3b6466f..f48fc801f6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -191,4 +191,8 @@ public interface CommonContractFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody CommonContractTaskQuery query); + @ApiOperation(value = "根据销售订单查询合同") + @GetMapping(value = "/getContractByBusSid/{sid}") + ResultBean getContractByBusSid(@PathVariable("sid") String sid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index e08894721f..05086f1601 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -203,4 +203,9 @@ public class CommonContractFeignFallback implements CommonContractFeign { public ResultBean breakProcess(CommonContractTaskQuery query) { return null; } + + @Override + public ResultBean getContractByBusSid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index e1ed5e578d..37dd7e30e6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -552,7 +552,7 @@ public class BaseAccadjApplyService extends MybatisBaseService addDonfigName(List appModelConfigListVos) { for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) { //颜色 - String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) - ? (appModelConfigListVo.getCarColor() + "/") : ""; + /* String color = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) + ? (appModelConfigListVo.getCarColor() + "/") : "";*/ //缓速器 // String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) // && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : ""; @@ -708,7 +708,7 @@ public class BaseModelConfigService extends MybatisBaseService { IPage getInspectionVinList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getVehBySpecialRebateSid(String specialRebateSid); + + List> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper qw); + + + IPage saleOrderVin(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); } \ 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 cb779ab7be..ab5349f37c 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 @@ -1146,14 +1146,38 @@ + + + + select sid, - createBySid as userSid, + createBySid as userSid, taskId, - procInstId as procInsId, - applicationName as applyName, - DATE_FORMAT(createTime, '%Y-%m-%d') as date, + procInstId as procInsId, + applicationName as applyName, + DATE_FORMAT(createTime, '%Y-%m-%d') as date, reason, - money + money, + case isPay when '1' then '1' when '0' then '0' end payStateKey, + case isPay when '1' then '是' when '0' then '否' end payState from base_vehicle_actual_sales where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index dd68005c4f..dbe26f2f94 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetai import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; +import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualsales.*; @@ -712,6 +713,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService voPayList = baseVehicleActualPayService.detailsList(sid); + List payList = Optional.ofNullable(voPayList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppBaseVehicleActualPayVo.class)).collect(Collectors.toList()); + BigDecimal bigDecimal = new BigDecimal("0"); + for (AppBaseVehicleActualPayVo v : payList) { + bigDecimal = bigDecimal.add(new BigDecimal(v.getPayAccount())); + } + vo.setPayList(payList); + vo.setPayDetailTotal(bigDecimal.toString()); + } + return rb.success().setData(vo); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index ec8e3e9444..3b7aeaa4e5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.commoncontract.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.*; import java.util.List; @@ -85,4 +86,6 @@ public interface CommonContractMapper extends BaseMapper { @Update("update common_contract set `state`=#{state} where sid=#{businessSid}") void updateBySidAndState(@Param("businessSid") String businessSid, @Param("state") String state); + + CommonContract getContractByBusSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 9928c5f680..6d10d1a233 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -148,4 +148,10 @@ WHERE sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 044efaea2e..842aa5c773 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -566,4 +566,9 @@ public class CommonContractRest implements CommonContractFeign { public ResultBean breakProcess(CommonContractTaskQuery query) { return commonContractService.breakProcess(query); } + + @Override + public ResultBean getContractByBusSid(String sid) { + return commonContractService.getContractByBusSid(sid); + } } 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 db36ffc275..d3a1a5309c 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 @@ -1652,4 +1652,13 @@ public class CommonContractService extends MybatisBaseService getContractByBusSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + CommonContract commonContract = baseMapper.getContractByBusSid(sid); + if(commonContract == null){ + return rb.setData(new CommonContract()); + } + return rb.success().setData(commonContract); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 4bef87cf1c..fa21436948 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -29,6 +29,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -198,4 +200,18 @@ public interface BusSalesOrderFeign { @ResponseBody ResultBean submitOrder(@RequestBody SubmitSalesOrderDto dto); + @ApiOperation("初始化|录入车架号列表") + @GetMapping("/saleOrderInputVin/{saleOrderSid}") + @ResponseBody + ResultBean saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("采购订单编号list") + @GetMapping("/getList/{saleOrderSid}") + @ResponseBody + ResultBean> getList(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("保存销售订单车架号") + @PostMapping("/saveSaleOrderInputVin") + @ResponseBody + ResultBean saveSaleOrderInputVin(@RequestBody VinDto dto); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 10847c0872..38d6b19078 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -29,6 +29,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -174,4 +176,19 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean submitOrder(SubmitSalesOrderDto dto) { return null; } + + @Override + public ResultBean saleOrderInputVin(String saleOrderSid) { + return null; + } + + @Override + public ResultBean> getList(String saleOrderSid) { + return null; + } + + @Override + public ResultBean saveSaleOrderInputVin(VinDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 64fa61b107..ffbcd28b3d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app.order; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo; @@ -142,4 +143,6 @@ public class AppBusSalesOrderVo implements Vo { @ApiModelProperty(value = "需补交订金") @JsonSerialize(using = ToStringSerializer.class) private String makeUpDeposit; + @JsonIgnore + private String type; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinDto.java new file mode 100644 index 0000000000..9046af43a1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/28 9:39 + * @Description + */ +@Data +public class VinDto implements Dto { + private static final long serialVersionUID = -7317752715537455246L; + + private String saleOrderSid; + private List vinList; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java new file mode 100644 index 0000000000..a12aa88e20 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/28 9:40 + * @Description + */ +@Data +public class VinListDto implements Dto { + private static final long serialVersionUID = -8578924480773553156L; + + private String linkNo; + private String linkSid; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java new file mode 100644 index 0000000000..5a594c161d --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:47 + * @Description + */ +@Data +public class VinListVo implements Vo { + private static final long serialVersionUID = 7025918939372350073L; + + private String linkNo; + private String linkSid; + private Boolean state; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java new file mode 100644 index 0000000000..682c5eeda9 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.vin; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:46 + * @Description + */ +@Data +public class VinVo implements Vo { + private static final long serialVersionUID = -5568525598192648926L; + + private String saleOrderSid; + + private List vinList; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 2069dcef67..305a157ffb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -43,7 +43,6 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -107,8 +106,6 @@ public class BusDeliveredApplyService extends MybatisBaseService listResultBean = finKingDeeFeign.draftSalOutStock(s); - }catch (Exception e){ - - }*/ } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); return rb.success().setData(resultBean.getData()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 41bcc97da8..ac84f359d2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -40,6 +40,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; +import java.util.List; import java.util.Map; /** @@ -159,4 +160,7 @@ public interface BusSalesOrderMapper extends BaseMapper { int updateFlowFiled(Map map); int selectNum(String bill); + + + List getList(String saleOrderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index b067cc9c00..dd3d0ffe07 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -57,7 +57,8 @@ if(bo.nodeState = '已办结', true, false) as showContractBtn, bo.nodeState is null as showUpdateBtn, bo.nodeState is null as showDeleteBtn, - 0 as showFinancialBtn + 0 as showFinancialBtn, + bo.type FROM bus_sales_order bo @@ -214,4 +215,10 @@ from bus_sales_order where billNo LIKE concat(#{bill}, '%') + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 6f6abb009a..87f97879f0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -31,6 +31,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -242,4 +244,19 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean submitOrder(SubmitSalesOrderDto dto) { return busSalesOrderService.submitOrder(dto); } + + @Override + public ResultBean saleOrderInputVin(String saleOrderSid) { + return busSalesOrderService.saleOrderInputVin(saleOrderSid); + } + + @Override + public ResultBean> getList(String saleOrderSid) { + return busSalesOrderService.getList(saleOrderSid); + } + + @Override + public ResultBean saveSaleOrderInputVin(VinDto dto) { + return busSalesOrderService.saveSaleOrderInputVin(dto); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index f99e7055c8..1d0195e401 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceQuery; import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo; import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign; import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign; @@ -44,9 +45,11 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; +import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; @@ -55,6 +58,10 @@ import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListDto; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; @@ -74,6 +81,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; @@ -1280,6 +1288,23 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.getContractByBusSid(record.getSaleOrderSid()); + if (commonContractResultBean.getSuccess()) { + CommonContract commonContract = commonContractResultBean.getData(); + if ("已办结".equals(commonContract.getNodeState())) { + record.setShowInputBtn(true); + } else { + record.setShowInputBtn(false); + } + } + + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -2590,4 +2615,74 @@ public class BusSalesOrderService extends MybatisBaseService saleOrderInputVin(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + VinVo vinVo = new VinVo(); + //根据销售订单sid查询车辆台数 + ResultBean resultBean = getSaleOrderDetails(saleOrderSid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + List vinListVos = new ArrayList<>(); + //根据销售订单查询现车 + List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid); + nowCarList.removeAll(Collections.singleton(null)); + if (!nowCarList.isEmpty()) { + for (AppNowCarListVo vv : nowCarList) { + VinListVo vinListVo = new VinListVo(); + vinListVo.setLinkNo(vv.getVin()); + vinListVo.setLinkSid(vv.getCarSid()); + //根据车架号查询是否已出库 + ResultBean baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid()); + if (baseVehicleResultBean.getSuccess()) { + BaseVehicleSelectVo vo = baseVehicleResultBean.getData(); + if (vo != null) { + if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) { + vinListVo.setState(true); + }else{ + vinListVo.setState(false); + } + } + } + vinListVos.add(vinListVo); + } + } else { + AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); + String num = appOrderDetailsVo.getPriceInfo().getNumber(); + for (int i = 0; i < Integer.valueOf(num).intValue(); i++) { + VinListVo vinListVo = new VinListVo(); + vinListVos.add(vinListVo); + } + } + vinVo.setSaleOrderSid(saleOrderSid); + vinVo.setVinList(vinListVos); + return rb.success().setData(vinVo); + } + + + public ResultBean> getList(String saleOrderSid) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseMapper.getList(saleOrderSid); + return rb.success().setData(stringList); + } + + public ResultBean saveSaleOrderInputVin(VinDto dto) { + ResultBean rb = ResultBean.fireFail(); + List list = dto.getVinList(); + //根据销售订单sid查询车架号 + List busSalesOrderVehicleDetailsVos = busSalesOrderVehicleService.detailsList(dto.getSaleOrderSid()); + if (busSalesOrderVehicleDetailsVos.size() > 0) { + busSalesOrderVehicleService.deleteByOrderSid(dto.getSaleOrderSid()); + } + //新增 + for (VinListDto v : list) { + BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle(); + BeanUtil.copyProperties(v, busSalesOrderVehicle); + busSalesOrderVehicle.setSalesOrderSid(dto.getSaleOrderSid()); + busSalesOrderVehicleService.insert(busSalesOrderVehicle); + } + return rb.success(); + + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index 29bc2b4536..027a43f1af 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -14,10 +14,6 @@ import java.util.List; @Data public class ApPayBill { - @JsonProperty("FPOSTDATE") - @NotBlank - //登账日期:FPOSTDATE (必填项) - public String FPOSTDATE; @JsonProperty("FDATE") @NotBlank //业务日期:FDATE (必填项) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java index 407f1f59de..62c4cabeb0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java @@ -84,9 +84,9 @@ public class SalOutStock { public String Flot; /** * 货主:FOwnerID (必填项) - */ @JsonProperty("FOwnerID") + */ /*@JsonProperty("FOwnerID") @NotBlank - public String FOwnerID; + public String FOwnerID;*/ /** * 仓库:FStockID */ @JsonProperty("FStockID") @@ -94,9 +94,9 @@ public class SalOutStock { public String FStockID; /** * 库存状态:FStockStatusID - */ @JsonProperty("FStockStatusID") + *//* @JsonProperty("FStockStatusID") @NotBlank - public String FStockStatusID; + public String FStockStatusID;*/ /** * 销售单位:FSalUnitID */ @JsonProperty("FSalUnitID") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java index 2119d4dd70..ead3f590f9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java @@ -18,66 +18,65 @@ public class StkTransferDirect { @Data public static class FBillEntry{ /* 调入库存状态:FDestStockStatusId (必填项)*/ - @JsonProperty("FDestStockStatusId") + /*@JsonProperty("FDestStockStatusId") @NotBlank - public String FDestStockStatusId; + public String FDestStockStatusId;*/ /* 调入仓库 (必填项)*/ @JsonProperty("FDestStockId") @NotBlank public String FDestStockId; /*调出库存状态:FSrcStockStatusId (必填项)*/ - @JsonProperty("FSrcStockStatusId") + /* @JsonProperty("FSrcStockStatusId") @NotBlank - public String FSrcStockStatusId; + public String FSrcStockStatusId;*/ /*基本单位:FBaseUnitId (必填项)*/ //@JsonProperty("FBaseUnitId") // @NotBlank // public String FBaseUnitId; /*调入货主类型:FOwnerTypeId (必填项)*/ - @JsonProperty("FOwnerTypeId") + /* @JsonProperty("FOwnerTypeId") @NotBlank - public String FOwnerTypeId; + public String FOwnerTypeId;*/ /* 调出保管者:FKeeperOutId (必填项)*/ - @JsonProperty("FKeeperOutId") + /* @JsonProperty("FKeeperOutId") @NotBlank - public String FKeeperOutId; + public String FKeeperOutId;*/ /* 调出货主:FOwnerOutId (必填项)*/ - @JsonProperty("FOwnerOutId") + /* @JsonProperty("FOwnerOutId") @NotBlank - public String FOwnerOutId; + public String FOwnerOutId;*/ /*调出批号:FLot*/ - @JsonProperty("FLot") + /* @JsonProperty("FLot") @NotBlank - public String FLot; + public String FLot;*/ /* 调出货主类型:FOwnerTypeOutId (必填项)*/ - @JsonProperty("FOwnerTypeOutId") + /*@JsonProperty("FOwnerTypeOutId") @NotBlank - public String FOwnerTypeOutId; + public String FOwnerTypeOutId;*/ + /* 业务日期 */ + /* @JsonProperty("FOwnerTypeOutId") + @NotBlank + public String FBusinessDate;*/ /*调入批号:FDestLot*/ - @JsonProperty("FDestLot") + /* @JsonProperty("FDestLot") @NotBlank - public String FDestLot; + public String FDestLot;*/ /* 调入货主:FOwnerId (必填项)*/ - @JsonProperty("FOwnerId") - @NotBlank - public String FOwnerId; - /* 调入货主:FOwnerIdHead (必填项)*/ - @JsonProperty("FOwnerIdHead") + /* @JsonProperty("FOwnerId") @NotBlank - public String FOwnerIdHead; + public String FOwnerId;*/ /* 调出保管者类型:FKeeperTypeOutId (必填项)*/ - @JsonProperty("FKeeperTypeOutId") + /* @JsonProperty("FKeeperTypeOutId") @NotBlank - public String FKeeperTypeOutId; + public String FKeeperTypeOutId;*/ /* 调入保管者:FKeeperId (必填项)*/ - @JsonProperty("FKeeperId") + /*@JsonProperty("FKeeperId") @NotBlank - public String FKeeperId; + public String FKeeperId;*/ /* 调入保管者类型:FKeeperTypeId (必填项)*/ - @JsonProperty("FKeeperTypeId") + /* @JsonProperty("FKeeperTypeId") @NotBlank - public String FKeeperTypeId; - + public String FKeeperTypeId;*/ /* 单位:FUnitID (必填项)*/ // @JsonProperty("FUnitID") // @NotBlank @@ -91,34 +90,38 @@ public class StkTransferDirect { @NotBlank public String FSrcStockId; } + /* 调入货主:FOwnerIdHead (必填项)*/ + @JsonProperty("FOwnerIdHead") + @NotBlank + public String FOwnerIdHead; /* 调出库存组织:FStockOutOrgId (必填项)*/ @JsonProperty("FStockOutOrgId") @NotBlank public String FStockOutOrgId; /* 调拨类型:FTransferBizType (必填项)*/ - @JsonProperty("FTransferBizType") + /*@JsonProperty("FTransferBizType") @NotBlank - public String FTransferBizType; + public String FTransferBizType;*/ /* 调拨方向:FTransferDirect (必填项)*/ - @JsonProperty("FTransferDirect") + /* @JsonProperty("FTransferDirect") @NotBlank - public String FTransferDirect; + public String FTransferDirect;*/ /* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/ - @JsonProperty("FOwnerTypeOutIdHead") + /*@JsonProperty("FOwnerTypeOutIdHead") @NotBlank - public String FOwnerTypeOutIdHead; + public String FOwnerTypeOutIdHead;*/ /* 调入库存组织:FStockOrgId (必填项)*/ @JsonProperty("FStockOrgId") @NotBlank public String FStockOrgId; /* 调入货主类型:FOwnerTypeIdHead (必填项)*/ - @JsonProperty("FOwnerTypeIdHead") + /*@JsonProperty("FOwnerTypeIdHead") @NotBlank - public String FOwnerTypeIdHead; + public String FOwnerTypeIdHead;*/ /* 单据类型:FBillTypeID (必填项)*/ - @JsonProperty("FBillTypeID") + /*@JsonProperty("FBillTypeID") @NotBlank - public String FBillTypeID; + public String FBillTypeID;*/ /* 日期:FDate (必填项)*/ @JsonProperty("FDate") @NotBlank @@ -136,27 +139,27 @@ public class StkTransferDirect { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date=new Date(); /* 单据类型:FBillTypeID (必填项)*/ - stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); + //stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); /* 日期:FDate (必填项)*/ stkTransferDirect.setFDate(sdf.format(date)); /* 调出库存组织:FStockOutOrgId (必填项)*/ stkTransferDirect.setFStockOutOrgId("101"); /* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/ - stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); + //stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); /* 调拨类型:FTransferBizType (必填项)*/ - stkTransferDirect.setFTransferBizType("InnerOrgTransfer"); + // stkTransferDirect.setFTransferBizType("InnerOrgTransfer"); /* 调拨方向:FTransferDirect (必填项)*/ - stkTransferDirect.setFTransferDirect("GENERAL"); + // stkTransferDirect.setFTransferDirect("GENERAL"); /* 调入库存组织:FStockOrgId (必填项)*/ stkTransferDirect.setFStockOrgId("101"); /* 调入货主类型:FOwnerTypeIdHead (必填项)*/ - stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); + //stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); List fBillEntry=new ArrayList<>(); StkTransferDirect.FBillEntry fbe=new StkTransferDirect.FBillEntry(); /*调入批号:FDestLot*/ - fbe.setFDestLot("1234567890"); + // fbe.setFDestLot("1234567890"); /*调出批号:FLot*/ - fbe.setFLot("1234567890"); + // fbe.setFLot("1234567890"); /*基本单位:FBaseUnitId (必填项)*/ //fbe.setFBaseUnitId("liang"); /* 调入仓库:FDestStockId (必填项)*/ @@ -167,27 +170,27 @@ public class StkTransferDirect { fbe.setFMaterialId(" JX091054"); /* 调入库存状态:FDestStockStatusId (必填项)*/ - fbe.setFDestStockStatusId("KCZT01_SYS"); + // fbe.setFDestStockStatusId("KCZT01_SYS"); /* 调入货主类型:FOwnerTypeId (必填项)*/ - fbe.setFOwnerTypeId("BD_OwnerOrg"); + // fbe.setFOwnerTypeId("BD_OwnerOrg"); /* 调入货主:FOwnerId (必填项)*/ - fbe.setFOwnerId("101"); + // fbe.setFOwnerId("101"); /* 调入货主:FOwnerId (必填项)*/ - fbe.setFOwnerIdHead("101"); + // fbe.setFOwnerIdHead("101"); /* 调出保管者:FKeeperOutId (必填项)*/ - fbe.setFKeeperOutId("101"); + // fbe.setFKeeperOutId("101"); /* 调出货主:FOwnerOutId (必填项)*/ - fbe.setFOwnerOutId("101"); + // fbe.setFOwnerOutId("101"); /* 调出货主类型:FOwnerTypeOutId (必填项)*/ - fbe.setFOwnerTypeOutId("BD_OwnerOrg"); + // fbe.setFOwnerTypeOutId("BD_OwnerOrg"); /* 调出保管者类型:FKeeperTypeOutId (必填项)*/ - fbe.setFKeeperTypeOutId("BD_KeeperOrg"); + // fbe.setFKeeperTypeOutId("BD_KeeperOrg"); /* 调入保管者:FKeeperId (必填项)*/ - fbe.setFKeeperId("101"); + // fbe.setFKeeperId("101"); /* 调入保管者类型:FKeeperTypeId (必填项)*/ - fbe.setFKeeperTypeId("BD_KeeperOrg"); + // fbe.setFKeeperTypeId("BD_KeeperOrg"); /*调出库存状态:FSrcStockStatusId (必填项)*/ - fbe.setFSrcStockStatusId("KCZT01_SYS"); + // fbe.setFSrcStockStatusId("KCZT01_SYS"); /* 调出仓库:FSrcStockId (必填项)*/ fbe.setFSrcStockId("CK001"); fBillEntry.add(fbe); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 93527320ff..69b74c52df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -182,7 +182,7 @@ public class FinPaymentrecordService extends MybatisBaseService params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); + map_fEntityDetail_.put("FSaleOrgId",map_fEntityModel_.get("FSaleOrgId")); for (Map.Entry entry : params.entrySet()) { map_fEntityDetail_.put(entry.getKey(),entry.getValue()); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index f9ac9c9e4c..1bf370fb69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -15,13 +15,13 @@ "FNumber": "@KD_Flot" }, "FOwnerID": { - "FNumber": "@KD_FOwnerID" + "FNumber": "@KD_FSaleOrgId" }, "FStockID": { "FNumber": "@KD_FStockID" }, "FStockStatusID": { - "FNumber": "@KD_FStockStatusID" + "FNumber": "KCZT01_SYS" }, "FSalUnitID": { "FNumber": "liang" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java index fbf7ae00ed..dfe5c28cbc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectCastToKingDeeBillFields.java @@ -51,6 +51,9 @@ public class StkTransferDirectCastToKingDeeBillFields { log.info("FBillEntry_:{}",fBillEntry_); Map params=vehicleList.get(i); Map map_fEntityDetail_=new HashMap<>(); + map_fEntityDetail_.put("FStockOutOrgId",map_fEntityModel_.get("FStockOutOrgId")); + map_fEntityDetail_.put("FStockOrgId",map_fEntityModel_.get("FStockOrgId")); + map_fEntityDetail_.put("FDate",map_fEntityModel_.get("FDate")); for (Map.Entry entry : params.entrySet()) { map_fEntityDetail_.put(entry.getKey(),entry.getValue()); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json index 1a7c30a0b8..4d5fd67466 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json @@ -6,10 +6,10 @@ "FNumber": "liang" }, "FDestLot":{ - "FNumber": "@KD_FDestLot" + "FNumber": "" }, "FLot": { - "FNumber": "@KD_FLot" + "FNumber": "" }, "FQty": 1.0, "FSrcStockId": { @@ -19,32 +19,32 @@ "FNumber": "@KD_FDestStockId" }, "FSrcStockStatusId": { - "FNumber": "@KD_FSrcStockStatusId" + "FNumber": "KCZT01_SYS" }, "FDestStockStatusId": { - "FNumber": "@KD_FDestStockStatusId" + "FNumber": "KCZT01_SYS" }, - "FBusinessDate": "2022-08-31 00:00:00", - "FOwnerTypeOutId": "@KD_FOwnerTypeOutId", + "FBusinessDate": "@KD_FDate", + "FOwnerTypeOutId": "BD_OwnerOrg", "FOwnerOutId": { - "FNumber": "@KD_FOwnerOutId" + "FNumber": "@KD_FStockOutOrgId" }, - "FOwnerTypeId": "@KD_FOwnerTypeId", + "FOwnerTypeId": "BD_OwnerOrg", "FOwnerId": { - "FNumber": "@KD_FOwnerId" + "FNumber": "@KD_FStockOrgId" }, "FBaseUnitId": { "FNumber": "liang" }, "FBaseQty": 1.0, "FISFREE": false, - "FKeeperTypeId": "@KD_FKeeperTypeId", + "FKeeperTypeId": "BD_KeeperOrg", "FKeeperId": { - "FNumber": "@KD_FKeeperId" + "FNumber": "@KD_FStockOrgId" }, - "FKeeperTypeOutId": "@KD_FKeeperTypeOutId", + "FKeeperTypeOutId": "BD_KeeperOrg", "FKeeperOutId": { - "FNumber": "@KD_FKeeperOutId" + "FNumber": "@KD_FStockOutOrgId" }, "FDestMaterialId": { "FNUMBER": " JX091054" diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json index 40ee322140..bce2dbc336 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_model.json @@ -1,42 +1,42 @@ { "FID": 0, "FBillTypeID": { - "FNUMBER": "@KD_FBillTypeID" + "FNUMBER": "ZJDB01_SYS" }, "FBizType": "NORMAL", - "FTransferDirect": "@KD_FTransferDirect", - "FTransferBizType": "@KD_FTransferBizType", + "FTransferDirect": "GENERAL", + "FTransferBizType": "调车", "FSettleOrgId": { - "FNumber": "101" + "FNumber": "" }, "FSaleOrgId": { - "FNumber": "101" + "FNumber": "" }, "FStockOutOrgId": { "FNumber": "@KD_FStockOutOrgId" }, - "FOwnerTypeOutIdHead": "@KD_FOwnerTypeOutIdHead", + "FOwnerTypeOutIdHead": "BD_OwnerOrg", "FOwnerOutIdHead": { - "FNumber": "101" + "FNumber": "" }, "FStockOrgId": { "FNumber": "@KD_FStockOrgId" }, "FIsIncludedTax": true, "FIsPriceExcludeTax": true, - "FOwnerTypeIdHead": "@KD_FOwnerTypeIdHead", + "FOwnerTypeIdHead": "BD_OwnerOrg", "FSETTLECURRID": { "FNUMBER": "PRE001" }, "FOwnerIdHead": { - "FNumber": "101" + "FNumber": "@KD_FStockOrgId" }, - "FDate": "2022-08-31 00:00:00", + "FDate": "@KD_FDate", "FBaseCurrId": { "FNumber": "PRE001" }, "FCustID": { - "FNUMBER": "GYRHHR002529" + "FNUMBER": "" }, "FBillEntry": [] } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/pom.xml b/anrui-portal/anrui-portal-api/pom.xml index 5805a9043d..79caffa5b9 100644 --- a/anrui-portal/anrui-portal-api/pom.xml +++ b/anrui-portal/anrui-portal-api/pom.xml @@ -32,9 +32,12 @@ org.springframework.cloud spring-cloud-starter-openfeign + org.projectlombok lombok + 1.18.24 + true com.baomidou diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommon.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommon.java index 6a972ac227..0208cabc16 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommon.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommon.java @@ -20,4 +20,6 @@ public class DictCommon extends BaseEntity { private String dictValue; @ApiModelProperty(value = "数据项的父级sid") private String parentSid; + @ApiModelProperty(value = "分组名称") + private String groupName; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonDto.java index 4e5593058c..f2dbe3d071 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonDto.java @@ -30,4 +30,7 @@ public class DictCommonDto implements Dto { @ApiModelProperty(value = "数据项的父级sid", required = true) @NotBlank(message = "数据项的父级sid不能为空") private String parentSid; + + @ApiModelProperty(value = "分组名称", required = true) + private String groupName; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonVo.java index 3dec666c39..57c733fe96 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonVo.java @@ -26,4 +26,7 @@ public class DictCommonVo implements Vo { private String dictValue; @ApiModelProperty(value = "父级sid：0为第一级") private String parentSid; + + @ApiModelProperty(value = "分组名称") + private String groupName; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java new file mode 100644 index 0000000000..16f2f40cec --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMapping.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMapping
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射", description = "数据映射") +@TableName("sys_mapping") +public class SysMapping extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java new file mode 100644 index 0000000000..9f9005b8d9 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingVo.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo
+ * Description: sys_mapping 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 视图数据详情", description = "数据映射 视图数据详情") +public class SysMappingDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java new file mode 100644 index 0000000000..7d23e6bdac --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingDto.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto
+ * Description: sys_mapping 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 数据传输对象", description = "数据映射 数据传输对象") +public class SysMappingDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("用户sid") + private String userSid; // 数据字典sid + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java new file mode 100644 index 0000000000..d710445e2d --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java @@ -0,0 +1,88 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +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: sysmapping(sysmapping)
+ * File: SysMappingFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeign
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "数据映射") +@FeignClient( + contextId = "anrui-portal-SysMapping", + name = "anrui-portal", + path = "v1/sysmapping", + fallback = SysMappingFeignFallback.class) +public interface SysMappingFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody SysMappingDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("新增映射") + @PostMapping("/saveMappingList") + @ResponseBody + public ResultBean saveMappingList(@RequestBody List dto); + + @ApiOperation("根据条件查询详情") + @PostMapping("/selectMappingInfo") + @ResponseBody + public ResultBean selectMappingInfo(@RequestBody SysMappingInfoQuery query); +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java new file mode 100644 index 0000000000..1aa609b3c8 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeignFallback
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysMappingFeignFallback implements SysMappingFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口sysmapping/sysmapping/listPage无法访问"); + } + + @Override + public ResultBean save(SysMappingDto dto){ + return ResultBean.fireFail().setMsg("接口sysmapping/sysmapping/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口sysmapping/sysmapping/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口sysmapping/sysmapping/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean saveMappingList(List dto) { + return null; + } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + return null; + } +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java new file mode 100644 index 0000000000..91a82748bd --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoQuery implements Query { + private static final long serialVersionUID = 5179141159925489016L; + + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + + @ApiModelProperty("数据key") + private String dictKey; // 数据key +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java new file mode 100644 index 0000000000..f6aa7a47d1 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoVo implements Vo { + + + private static final long serialVersionUID = -4909774998558087805L; + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java new file mode 100644 index 0000000000..4c770a10f5 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingQuery
+ * Description: sys_mapping 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 查询条件", description = "数据映射 查询条件") +public class SysMappingQuery implements Query { + + private static final long serialVersionUID = -546734185535363676L; + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + @ApiModelProperty("数据字典类别名称") + private String dictTypeName; // 数据字典类别名称 + @ApiModelProperty("数据key") + private String dictKey; // 数据key + @ApiModelProperty("数据value") + private String dictValue; // 数据value + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java new file mode 100644 index 0000000000..03646f84dd --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingVo.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo
+ * Description: sys_mapping 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 视图数据对象", description = "数据映射 视图数据对象") +public class SysMappingVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + @ApiModelProperty("数据字典类别名称") + private String dictTypeName; // 数据字典类别名称 + @ApiModelProperty("数据key") + private String dictKey; // 数据key + @ApiModelProperty("数据value") + private String dictValue; // 数据value +} diff --git a/anrui-portal/anrui-portal-biz/pom.xml b/anrui-portal/anrui-portal-biz/pom.xml index e7539e40a3..43f5afdc20 100644 --- a/anrui-portal/anrui-portal-biz/pom.xml +++ b/anrui-portal/anrui-portal-biz/pom.xml @@ -84,6 +84,12 @@ 0.0.1 compile + + org.projectlombok + lombok + 1.18.24 + true + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml index 60aca988c1..9ae3a130a2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml @@ -16,7 +16,7 @@ @@ -30,7 +30,8 @@ SELECT sid, dictKey, dictType, - dictValue + dictValue, + groupName FROM dict_common WHERE dictType = #{type} AND dictkey = #{key} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java new file mode 100644 index 0000000000..0020c83dea --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysmapping; + +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.portal.api.sysmapping.SysMappingInfoVo; +import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.portal.api.sysmapping.SysMapping; +import com.yxt.anrui.portal.api.sysmapping.SysMappingVo; + +import java.util.List; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmapping.SysMappingMapper
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysMappingMapper extends BaseMapper { + + //@Update("update sys_mapping set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_mapping") + List selectListVo(); + + SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper qw); +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml new file mode 100644 index 0000000000..a596f7a84b --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java new file mode 100644 index 0000000000..19db2ebc09 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java @@ -0,0 +1,113 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysmapping; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysmapping.*; +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 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; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysmapping.SysMappingRest
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "sys_mapping") +@RestController("com.yxt.anrui.portal.biz.sysmapping.SysMappingRest") +@RequestMapping("v1/sysmapping") +public class SysMappingRest implements SysMappingFeign { + + @Autowired + private SysMappingService sysMappingService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + PagerVo page = new PagerVo<>(); + IPage iPage = sysMappingService.listPageVo(pq); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMappingDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMappingDetailsVo vo = sysMappingService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean saveMappingList(List dto) { + ResultBean rb = ResultBean.fireFail(); + sysMappingService.saveMappingList(dto); + return rb.success(); + } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + ResultBean rb = ResultBean.fireFail(); + SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query); + return rb.success().setData(vo); + } +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java new file mode 100644 index 0000000000..57398f04a7 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java @@ -0,0 +1,166 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.biz.sysmapping; + +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.portal.api.sysmapping.*; +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingService.java
+ * Class: com.yxt.anrui.portal.biz.sysmapping.SysMappingService
+ * Description: sys_mapping 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysMappingService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(SysMappingQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public IPage listPageVo(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + QueryWrapper qw = queryWrapper(pq.getParams()); + IPage iPage = baseMapper.selectPageVo(page, qw); + return iPage; + } + + public QueryWrapper queryWrapper(SysMappingQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMap_sourceKey())) { + qw.eq("sm.map_sourceKey", query.getMap_sourceKey()); + } + if (StringUtils.isNotBlank(query.getMap_sourceValue())) { + qw.like("sm.map_sourceValue", query.getMap_sourceValue()); + } + if (StringUtils.isNotBlank(query.getMap_object())) { + qw.like("sm.map_object", query.getMap_object()); + } + if (StringUtils.isNotBlank(query.getMap_item())) { + qw.like("sm.map_item", query.getMap_item()); + } + if (StringUtils.isNotBlank(query.getMap_itemKey())) { + qw.eq("sm.map_itemKey", query.getMap_itemKey()); + } + if (StringUtils.isNotBlank(query.getMap_itemValue())) { + qw.like("sm.map_itemValue", query.getMap_itemValue()); + } + if (StringUtils.isNotBlank(query.getDictTypeCode())) { + qw.eq("dc.dictKey", query.getDictTypeCode()); + } + if (StringUtils.isNotBlank(query.getDictTypeName())) { + qw.like("dc.dictValue", query.getDictTypeName()); + } + if (StringUtils.isNotBlank(query.getDictKey())) { + qw.eq("dt.dictTypeCode", query.getDictKey()); + } + if (StringUtils.isNotBlank(query.getDictValue())) { + qw.like("dt.dictTypeName", query.getDictValue()); + } + return qw; + } + + + public void saveOrUpdateDto(SysMappingDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(SysMappingDto dto) { + SysMapping entity = new SysMapping(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(SysMappingDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + SysMapping entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public SysMappingDetailsVo fetchDetailsVoBySid(String sid) { + SysMapping entity = fetchBySid(sid); + SysMappingDetailsVo vo = new SysMappingDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void saveMappingList(List dto) { + for (SysMappingDto sysMappingDto : dto) { + SysMapping entity = new SysMapping(); + BeanUtil.copyProperties(sysMappingDto, entity, "sid"); + entity.setCreateBySid(sysMappingDto.getUserSid()); + save(entity); + } + } + + public SysMappingInfoVo selectMappingInfo(SysMappingInfoQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getMap_sourceKey())) { + qw.eq("sm.map_sourceKey", query.getMap_sourceKey()); + } + if (StringUtils.isNotBlank(query.getMap_object())) { + qw.eq("sm.map_object", query.getMap_object()); + } + if (StringUtils.isNotBlank(query.getMap_item())) { + qw.eq("sm.map_item", query.getMap_item()); + } + if (StringUtils.isNotBlank(query.getDictTypeCode())) { + qw.eq("dt.dictTypeCode", query.getDictTypeCode()); + } + if (StringUtils.isNotBlank(query.getDictKey())) { + qw.eq("dc.dictKey", query.getDictKey()); + } + SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw); + return vo; + } +} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java index b6217ca2f4..6a71d7dd2a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/wx/WxSysUserRest.java @@ -1,5 +1,6 @@ package com.yxt.anrui.portal.biz.sysuser.wx; +import cn.hutool.core.codec.Base64; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.auth0.jwt.JWT; @@ -24,7 +25,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import sun.misc.BASE64Encoder; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -529,7 +529,7 @@ public class WxSysUserRest implements WxSysUserFeign { Key sKey = new SecretKeySpec(secretKey.getBytes("UTF-8"), mac.getAlgorithm()); mac.init(sKey); byte[] hash = mac.doFinal(signStr.getBytes("UTF-8")); - String sig = new BASE64Encoder().encode(hash); + String sig = Base64.encode(hash); String auth = "hmac id=\"" + secretId + "\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"" + sig + "\""; return auth; diff --git a/anrui-portal/anrui-portal-biz/src/test/java/com/yxt/anrui/portal/test/controller/TestController.java b/anrui-portal/anrui-portal-biz/src/test/java/com/yxt/anrui/portal/test/controller/TestController.java index 204df0540a..ecc5e9292a 100644 --- a/anrui-portal/anrui-portal-biz/src/test/java/com/yxt/anrui/portal/test/controller/TestController.java +++ b/anrui-portal/anrui-portal-biz/src/test/java/com/yxt/anrui/portal/test/controller/TestController.java @@ -1,5 +1,6 @@ package com.yxt.anrui.portal.test.controller; +import cn.hutool.core.codec.Base64; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.annotation.JSONField; @@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import sun.misc.BASE64Encoder; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -218,7 +218,7 @@ public class TestController { Key sKey = new SecretKeySpec(secretKey.getBytes("UTF-8"), mac.getAlgorithm()); mac.init(sKey); byte[] hash = mac.doFinal(signStr.getBytes("UTF-8")); - String sig = new BASE64Encoder().encode(hash); + String sig = Base64.encode(hash); String auth = "hmac id=\"" + secretId + "\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"" + sig + "\""; return auth; diff --git a/anrui-scm/anrui-scm-api/pom.xml b/anrui-scm/anrui-scm-api/pom.xml index bac4187cd2..b5d623076b 100644 --- a/anrui-scm/anrui-scm-api/pom.xml +++ b/anrui-scm/anrui-scm-api/pom.xml @@ -27,6 +27,7 @@ org.projectlombok lombok + 1.18.24 true diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java new file mode 100644 index 0000000000..132f2023a4 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebate.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate
+ * Description: 回款返利表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利表", description = "回款返利表") +@TableName("scm_collection_rebate") +public class ScmCollectionRebate extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路") + private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java new file mode 100644 index 0000000000..ebc54405e7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java @@ -0,0 +1,103 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo
+ * Description: 回款返利表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利表 视图数据详情", description = "回款返利表 视图数据详情") +public class ScmCollectionRebateDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("状态") + private String state; // 状态 + @ApiModelProperty("创建日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; // 创建日期 + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路") + private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java new file mode 100644 index 0000000000..e7ca791498 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java @@ -0,0 +1,97 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto
+ * Description: 回款返利表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利表 数据传输对象", description = "回款返利表 数据传输对象") +public class ScmCollectionRebateDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("状态") + private String state; // 状态 + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路") + private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java new file mode 100644 index 0000000000..6db8157bf0 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +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: anrui-scm(回款返利)
+ * File: ScmCollectionRebateFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign
+ * Description: 回款返利表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionRebate", + name = "anrui-scm", + path = "v1/scmcollectionrebate", + fallback = ScmCollectionRebateFeignFallback.class) +public interface ScmCollectionRebateFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionRebateDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java new file mode 100644 index 0000000000..0b28c726a6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeignFallback
+ * Description: 回款返利表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebate/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionRebateDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebate/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebate/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebate/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java new file mode 100644 index 0000000000..0b1e52672a --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateQuery
+ * Description: 回款返利表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件") +public class ScmCollectionRebateQuery implements Query { + + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty(value = "创建开始日期") + private String createStartTime; + @ApiModelProperty(value = "创建结束日期") + private String createEndTime; + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java new file mode 100644 index 0000000000..2513f0d8e2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebate; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo
+ * Description: 回款返利表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利表 视图数据对象", description = "回款返利表 视图数据对象") +public class ScmCollectionRebateVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("状态") + private String state; // 状态 + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路") + private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private String freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java new file mode 100644 index 0000000000..6394e305a3 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapply.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply
+ * Description: 回款返利核对申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表", description = "回款返利核对申请表") +@TableName("scm_collectionrebate_checkapply") +public class ScmCollectionrebateCheckapply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("核对申请标题") + private String checkApply; // 核对申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java new file mode 100644 index 0000000000..eab0a4443f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo
+ * Description: 回款返利核对申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表 视图数据详情", description = "回款返利核对申请表 视图数据详情") +public class ScmCollectionrebateCheckapplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("核对申请标题") + private String checkApply; // 核对申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java new file mode 100644 index 0000000000..1f43fd5c93 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto
+ * Description: 回款返利核对申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表 数据传输对象", description = "回款返利核对申请表 数据传输对象") +public class ScmCollectionrebateCheckapplyDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("核对申请标题") + private String checkApply; // 核对申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java new file mode 100644 index 0000000000..a041cefd5c --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +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: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign
+ * Description: 回款返利核对申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利核对申请表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionrebateCheckapply", + name = "anrui-scm", + path = "v1/scmcollectionrebatecheckapply", + fallback = ScmCollectionrebateCheckapplyFeignFallback.class) +public interface ScmCollectionrebateCheckapplyFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java new file mode 100644 index 0000000000..eea48ec7da --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeignFallback
+ * Description: 回款返利核对申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollectionrebateCheckapplyFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionrebateCheckapplyDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java new file mode 100644 index 0000000000..f635c51c9f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery
+ * Description: 回款返利核对申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表 查询条件", description = "回款返利核对申请表 查询条件") +public class ScmCollectionrebateCheckapplyQuery implements Query { + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("核对申请标题") + private String checkApply; // 核对申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java new file mode 100644 index 0000000000..535a4d6cba --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo
+ * Description: 回款返利核对申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表 视图数据对象", description = "回款返利核对申请表 视图数据对象") +public class ScmCollectionrebateCheckapplyVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("核对申请标题") + private String checkApply; // 核对申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java new file mode 100644 index 0000000000..13ed8e83c2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetail.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail
+ * Description: 回款返利核对申请表_返利列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表_返利列表", description = "回款返利核对申请表_返利列表") +@TableName("scm_collectionrebate_checkapplydetail") +public class ScmCollectionrebateCheckapplydetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("核对申请sid") + private String mainSid; // 核对申请sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java new file mode 100644 index 0000000000..1835d4cab7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo
+ * Description: 回款返利核对申请表_返利列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表_返利列表 视图数据详情", description = "回款返利核对申请表_返利列表 视图数据详情") +public class ScmCollectionrebateCheckapplydetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("核对申请sid") + private String mainSid; // 核对申请sid + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java new file mode 100644 index 0000000000..714f579578 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto
+ * Description: 回款返利核对申请表_返利列表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表_返利列表 数据传输对象", description = "回款返利核对申请表_返利列表 数据传输对象") +public class ScmCollectionrebateCheckapplydetailDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("核对申请sid") + private String mainSid; // 核对申请sid + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java new file mode 100644 index 0000000000..751f70fb6d --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +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: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign
+ * Description: 回款返利核对申请表_返利列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利核对申请表_返利列表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionrebateCheckapplydetail", + name = "anrui-scm", + path = "v1/scmcollectionrebatecheckapplydetail", + fallback = ScmCollectionrebateCheckapplydetailFeignFallback.class) +public interface ScmCollectionrebateCheckapplydetailFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java new file mode 100644 index 0000000000..1780b579fb --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeignFallback
+ * Description: 回款返利核对申请表_返利列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionrebateCheckapplydetailFeignFallback implements ScmCollectionrebateCheckapplydetailFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java new file mode 100644 index 0000000000..64daa11f89 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery
+ * Description: 回款返利核对申请表_返利列表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表_返利列表 查询条件", description = "回款返利核对申请表_返利列表 查询条件") +public class ScmCollectionrebateCheckapplydetailQuery implements Query { + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("核对申请sid") + private String mainSid; // 核对申请sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java new file mode 100644 index 0000000000..5784d552a5 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo
+ * Description: 回款返利核对申请表_返利列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利核对申请表_返利列表 视图数据对象", description = "回款返利核对申请表_返利列表 视图数据对象") +public class ScmCollectionrebateCheckapplydetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("核对申请sid") + private String mainSid; // 核对申请sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java new file mode 100644 index 0000000000..cf90e1a17e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWith.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith
+ * Description: 回款返利预提表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提表", description = "回款返利预提表") +@TableName("scm_collection_rebate_with") +public class ScmCollectionRebateWith extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("回款返利预提申请sid") + private String mainSid; // 回款返利预提申请sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java new file mode 100644 index 0000000000..b06b4f9926 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo
+ * Description: 回款返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提表 视图数据详情", description = "回款返利预提表 视图数据详情") +public class ScmCollectionRebateWithDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("回款返利预提申请sid") + private String mainSid; // 回款返利预提申请sid + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java new file mode 100644 index 0000000000..f9fd75d5f2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto
+ * Description: 回款返利预提表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提表 数据传输对象", description = "回款返利预提表 数据传输对象") +public class ScmCollectionRebateWithDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("回款返利预提申请sid") + private String mainSid; // 回款返利预提申请sid + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java new file mode 100644 index 0000000000..2d82799a03 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +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: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign
+ * Description: 回款返利预提表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利预提表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionRebateWith", + name = "anrui-scm", + path = "v1/scmcollectionrebatewith", + fallback = ScmCollectionRebateWithFeignFallback.class) +public interface ScmCollectionRebateWithFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionRebateWithDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java new file mode 100644 index 0000000000..7d070da1b1 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeignFallback
+ * Description: 回款返利预提表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionRebateWithFeignFallback implements ScmCollectionRebateWithFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionRebateWithDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithQuery.java new file mode 100644 index 0000000000..7f6c6c85a9 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithQuery.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery
+ * Description: 回款返利预提表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提表 查询条件", description = "回款返利预提表 查询条件") +public class ScmCollectionRebateWithQuery implements Query { + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("回款返利预提申请sid") + private String mainSid; // 回款返利预提申请sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithVo.java new file mode 100644 index 0000000000..02283e8b51 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewith; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo
+ * Description: 回款返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提表 视图数据对象", description = "回款返利预提表 视图数据对象") +public class ScmCollectionRebateWithVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid + @ApiModelProperty("回款返利预提申请sid") + private String mainSid; // 回款返利预提申请sid + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java new file mode 100644 index 0000000000..4bdab40ee2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApply.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply
+ * Description: 回款返利预提申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提申请表", description = "回款返利预提申请表") +@TableName("scm_collection_rebate_with_apply") +public class ScmCollectionRebateWithApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款申请标题") + private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java new file mode 100644 index 0000000000..ea151f022b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo
+ * Description: 回款返利预提申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提申请表 视图数据详情", description = "回款返利预提申请表 视图数据详情") +public class ScmCollectionRebateWithApplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款申请标题") + private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java new file mode 100644 index 0000000000..80dacb91ec --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto
+ * Description: 回款返利预提申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提申请表 数据传输对象", description = "回款返利预提申请表 数据传输对象") +public class ScmCollectionRebateWithApplyDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款申请标题") + private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java new file mode 100644 index 0000000000..549723d423 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +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: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign
+ * Description: 回款返利预提申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利预提申请表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionRebateWithApply", + name = "anrui-scm", + path = "v1/scmcollectionrebatewithapply", + fallback = ScmCollectionRebateWithApplyFeignFallback.class) +public interface ScmCollectionRebateWithApplyFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java new file mode 100644 index 0000000000..2088bd3d43 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeignFallback
+ * Description: 回款返利预提申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionRebateWithApplyFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionRebateWithApplyDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java new file mode 100644 index 0000000000..86b52e3115 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery
+ * Description: 回款返利预提申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提申请表 查询条件", description = "回款返利预提申请表 查询条件") +public class ScmCollectionRebateWithApplyQuery implements Query { + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款申请标题") + private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java new file mode 100644 index 0000000000..23c63c6445 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo
+ * Description: 回款返利预提申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利预提申请表 视图数据对象", description = "回款返利预提申请表 视图数据对象") +public class ScmCollectionRebateWithApplyVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款申请标题") + private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人姓名") + private String createByName; // 创建人姓名 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("taskId") + private String taskId; // taskId + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java index 75cdbe5d91..80c3da0aca 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java @@ -53,6 +53,7 @@ import java.util.Date; @ApiModel(value = "盘库记录 视图数据对象", description = "盘库记录 视图数据对象") public class ScmVehicleInventoryVo implements Vo { + private String id; // id private String sid; // sid @ApiModelProperty("车架号") @@ -73,4 +74,6 @@ public class ScmVehicleInventoryVo implements Vo { private String InventoryState; // 盘库结果 @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("创建组织") + private String createOrgSid; // 创建组织 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java index 5008114fba..df2329b517 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java @@ -13,7 +13,7 @@ public class AppScmVehiclePatrolinspectionPageQuery implements Query { private String userSid; @ApiModelProperty("优先匹配车架号") - private String name; + private String names; @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31") private String date; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java index a6075bd4d6..97b6bb77cf 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java @@ -61,6 +61,11 @@ public interface ScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("查询待巡检记录列表") + @PostMapping("/stayListPage") + @ResponseBody + public ResultBean> stayListPage(@RequestBody PagerQuery pq); + @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java index f34cee5ef3..41001fc3b5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java @@ -54,6 +54,11 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol return rb.setMsg("接口anrui_scm/scmvehiclepatrolinspection/listPage无法访问"); } + @Override + public ResultBean> stayListPage(PagerQuery pq) { + return null; + } + @Override public ResultBean save(ScmVehiclePatrolinspectionDto dto){ return ResultBean.fireFail().setMsg("接口anrui_scm/scmvehiclepatrolinspection/save无法访问"); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java index fd59018e76..77bb3f0173 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java @@ -50,7 +50,7 @@ import lombok.Data; public class ScmVehiclePatrolinspectionQuery implements Query { @ApiModelProperty("车架号") - private String mainSid; // 车架号 + private String vinNo; // 车架号 @ApiModelProperty("存放地点sid") private String locationSid; // 存放地点sid @ApiModelProperty("巡检开始日期") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java index 7e2588345c..b3b4b4403d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui_scm(anrui_scm)
* File: ScmVehiclePatrolinspectionVo.java
@@ -49,14 +51,23 @@ import lombok.Data; @ApiModel(value = "巡检记录 视图数据对象", description = "巡检记录 视图数据对象") public class ScmVehiclePatrolinspectionVo implements Vo { + private String id; // id private String sid; // sid @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("月度巡检sid") private String mainSid; // 月度巡检sid + @ApiModelProperty("车型") + private String model; // 车型 + @ApiModelProperty("存放地点sid") + private String locationSid; // 存放地点sid @ApiModelProperty("存放地点") private String location; // 存放地点 + @ApiModelProperty("库管人员sid") + private String liableSid; // 库管人员sid + @ApiModelProperty("库管人员名称") + private String liableName; // 库管人员名称 @ApiModelProperty("巡检日期") private String patrolInspectionDate; // 巡检日期 @ApiModelProperty("巡检人员") @@ -65,4 +76,12 @@ public class ScmVehiclePatrolinspectionVo implements Vo { private String patrolInspectionState; // 巡检状态（通过/不通过） @ApiModelProperty("巡检状态（通过/不通过）") private String patrolInspectionStateKey; // 巡检状态（通过/不通过） + @ApiModelProperty("创建组织") + private String createOrgSid; // 创建组织 + @ApiModelProperty("巡检情况说明") + private String situationExplain; + @ApiModelProperty("存在问题") + private String problems; + @ApiModelProperty("相关照片") + private List images; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java index 622dd18850..a47c643987 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java @@ -68,6 +68,10 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto { private String problems; @ApiModelProperty("处理结果") private String results; + @ApiModelProperty("相关责任人名称") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; @ApiModelProperty("相关责任人") private List liableList; @ApiModelProperty("经纬度") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java index e39d0809aa..1e67ffe577 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java @@ -17,4 +17,10 @@ public class AppScmVehPatrolinspectionmonthInfoVo implements Vo { @ApiModelProperty("存在的问题") private String question; + @ApiModelProperty("接收人") + private String recipient; + + @ApiModelProperty("创建日期") + private String date; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java index 72bf73c691..9c2e69d87f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java index 8240ed3510..df876428b4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; @@ -49,15 +50,12 @@ import lombok.Data; @ApiModel(value = "月度日常管理记录 查询条件", description = "月度日常管理记录 查询条件") public class ScmVehPatrolinspectionmonthQuery implements Query { - @ApiModelProperty("编号（yyyyMMdd）") - private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") - private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") - private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("创建开始日期") + private String createStartTime; // 创建开始日期 + @ApiModelProperty("创建结束日期") + private String createEndTime; // 创建结束日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java index 2f137d2b84..877a267a0e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java @@ -49,20 +49,29 @@ import lombok.Data; @ApiModel(value = "月度日常管理记录 视图数据对象", description = "月度日常管理记录 视图数据对象") public class ScmVehPatrolinspectionmonthVo implements Vo { - private String sid; // sid - - @ApiModelProperty("编号（yyyyMMdd）") - private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") - private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") - private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建人") + private String sid; + @ApiModelProperty("编号") + private String billNo; + @ApiModelProperty("创建人员") private String createByName; - @ApiModelProperty("巡检报告生成状态") + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("创建时间") + private String createTime; + @ApiModelProperty("剩余巡检记录数量") + private String surplusNumber; + @ApiModelProperty("巡检记录总数数量") + private String totalNumber; + @ApiModelProperty("未处理数量") + private String unHandledNumber; + @ApiModelProperty("已处理数量") + private String processedNumber; + @ApiModelProperty("未巡检数量") + private String notHandledNumber; + @ApiModelProperty("实际巡检数量") + private String actualNumber; + @ApiModelProperty("报告状态") private int state; + @ApiModelProperty("是否显示生成报告按钮") + private Boolean showReportBtn; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java index bfb6c3a5ae..acd1f1786d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportDto.java @@ -26,12 +26,16 @@ package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppLiableListDto; +import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: aaa(aaa)
* File: ScmVehPatrolinspectionreportDto.java
@@ -50,13 +54,15 @@ import lombok.Data; public class ScmVehPatrolinspectionreportDto implements Dto { private String sid; // sid - + private String userSid; // userSid @ApiModelProperty("月度日常管理记录sid") private String mainSid; // 月度日常管理记录sid @ApiModelProperty("接收人sid") private String receiverSids; // 接收人sid @ApiModelProperty("接收人姓名") private String receiverNames; // 接收人姓名 + @ApiModelProperty("接收人list") + private List list; @ApiModelProperty("盘库报告内容") private String reportContent; // 盘库报告内容 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java index 55c5f8990f..e4835ad89d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehpatrolinspectionreport; +import com.yxt.anrui.scm.api.scmvehinventoryreport.ScmVehInventoryreportDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -75,4 +76,9 @@ public interface ScmVehPatrolinspectionreportFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("发送报告") + @PostMapping("/sendReport") + @ResponseBody + public ResultBean sendReport(@RequestBody ScmVehPatrolinspectionreportDto dto); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java index 1f00b36ceb..4c079a1752 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeignFallback.java @@ -69,4 +69,9 @@ public class ScmVehPatrolinspectionreportFeignFallback implements ScmVehPatrolin ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口aaa/scmvehpatrolinspectionreport/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean sendReport(ScmVehPatrolinspectionreportDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/pom.xml b/anrui-scm/anrui-scm-biz/pom.xml index c217aaf175..d920e9702c 100644 --- a/anrui-scm/anrui-scm-biz/pom.xml +++ b/anrui-scm/anrui-scm-biz/pom.xml @@ -83,6 +83,20 @@ message-center-api 0.0.1 + + + + com.sun.xml.ws + jaxws-ri + 2.3.2 + pom + + + org.projectlombok + lombok + 1.18.24 + true + diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 1b79ea7fbd..5c3ed76277 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -13,7 +13,6 @@ import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.OperVehicleState; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -89,8 +88,6 @@ public class ScmApplyInboundService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - /* APPayable apPayable=new APPayable(); - BeanUtil.copyProperties(p.getRecords().get(0),apPayable); - finKingDeeFeign.draftEntryBill(apPayable);*/ return p; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java new file mode 100644 index 0000000000..1305622eea --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebate; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateMapper
+ * Description: 回款返利表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateMapper extends BaseMapper { + + //@Update("update scm_collection_rebate 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 scm_collection_rebate") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml new file mode 100644 index 0000000000..d5fca3e354 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java new file mode 100644 index 0000000000..89c5902953 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java @@ -0,0 +1,116 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebate; + +import com.yxt.anrui.scm.api.scmcollectionrebate.*; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply; +import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService; +import com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyService; +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 io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateRest
+ * Description: 回款返利表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateRest") +@RequestMapping("v1/scmcollectionrebate") +public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { + + @Autowired + private ScmCollectionRebateService scmCollectionRebateService; + @Autowired + private ScmCollectionRebateWithService scmCollectionRebateWithService; + @Autowired + private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionRebateDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + List stringList = scmCollectionRebateWithService.fetchByCollectionReBateSid(sid); + for (String s : stringList) { + ScmCollectionRebateWithApply scmCollectionRebateWithApply = scmCollectionRebateWithApplyService.fetchBySid(s); + if (!scmCollectionRebateWithApply.getNodeState().equals("待提交")) { + return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除"); + } + } + ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid); + Integer state = scmCollectionRebate.getState(); + if (state == 1) { + return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除"); + } + } + scmCollectionRebateService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java new file mode 100644 index 0000000000..a0720980f4 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -0,0 +1,125 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebate; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.scm.api.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateQuery; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService
+ * Description: 回款返利表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionRebateQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid",query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getCollectionTypeKey())){ + qw.eq("collectionTypeKey",query.getCollectionTypeKey()); + } + if (StringUtils.isNotBlank(query.getCollectionDate())){ + qw.eq("collectionDate",query.getCollectionDate()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionRebateDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + if (dto.getState().equals(1)){ + dto.setState("3"); + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionRebateDto dto){ + ScmCollectionRebate entity = new ScmCollectionRebate(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionRebateDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionRebate entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionRebate entity = fetchBySid(sid); + ScmCollectionRebateDetailsVo vo = new ScmCollectionRebateDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java new file mode 100644 index 0000000000..42ae68f074 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyMapper
+ * Description: 回款返利核对申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper { + + //@Update("update scm_collectionrebate_checkapply 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 scm_collectionrebate_checkapply") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml new file mode 100644 index 0000000000..612cfd8a21 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java new file mode 100644 index 0000000000..24929e1a82 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply; + +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 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.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyRest
+ * Description: 回款返利核对申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利核对申请表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyRest") +@RequestMapping("v1/scmcollectionrebatecheckapply") +public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateCheckapplyFeign { + + @Autowired + private ScmCollectionrebateCheckapplyService scmCollectionrebateCheckapplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionrebateCheckapplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplyService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java new file mode 100644 index 0000000000..7a5721b602 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplyService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyService
+ * Description: 回款返利核对申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionrebateCheckapplyService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionrebateCheckapplyQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionrebateCheckapplyDto dto){ + ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionrebateCheckapplyDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionrebateCheckapply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionrebateCheckapply entity = fetchBySid(sid); + ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java new file mode 100644 index 0000000000..21a234afcc --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailMapper
+ * Description: 回款返利核对申请表_返利列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper { + + //@Update("update scm_collectionrebate_checkapplydetail 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 scm_collectionrebate_checkapplydetail") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml new file mode 100644 index 0000000000..e14ef348a8 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java new file mode 100644 index 0000000000..573a0a9af8 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail; + +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 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.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailRest
+ * Description: 回款返利核对申请表_返利列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利核对申请表_返利列表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailRest") +@RequestMapping("v1/scmcollectionrebatecheckapplydetail") +public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionrebateCheckapplydetailFeign { + + @Autowired + private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionrebateCheckapplydetailService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplydetailService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplydetailService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapplydetailDetailsVo vo = scmCollectionrebateCheckapplydetailService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java new file mode 100644 index 0000000000..40647bb41f --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionrebateCheckapplydetailService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService
+ * Description: 回款返利核对申请表_返利列表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionrebateCheckapplydetailQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionrebateCheckapplydetailDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionrebateCheckapplydetailDto dto){ + ScmCollectionrebateCheckapplydetail entity = new ScmCollectionrebateCheckapplydetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionrebateCheckapplydetailDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionrebateCheckapplydetail entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionrebateCheckapplydetail entity = fetchBySid(sid); + ScmCollectionrebateCheckapplydetailDetailsVo vo = new ScmCollectionrebateCheckapplydetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java new file mode 100644 index 0000000000..c10c7e8bec --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatewith; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithMapper
+ * Description: 回款返利预提表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateWithMapper extends BaseMapper { + + //@Update("update scm_collection_rebate_with 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 scm_collection_rebate_with") + List selectListVo(); + + @Select("SELECT mainSid FROM scm_collection_rebate_with WHERE collectionRebateSid = #{sid}") + List fetchByCollectionReBateSid(String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml new file mode 100644 index 0000000000..5eaec3ec1e --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java new file mode 100644 index 0000000000..3ac1e5c31c --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatewith; + +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 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.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithRest
+ * Description: 回款返利预提表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利预提表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithRest") +@RequestMapping("v1/scmcollectionrebatewith") +public class ScmCollectionRebateWithRest implements ScmCollectionRebateWithFeign { + + @Autowired + private ScmCollectionRebateWithService scmCollectionRebateWithService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateWithService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionRebateWithDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateWithService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateWithService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateWithDetailsVo vo = scmCollectionRebateWithService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java new file mode 100644 index 0000000000..fdd7f85075 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java @@ -0,0 +1,114 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatewith; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService
+ * Description: 回款返利预提表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateWithService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionRebateWithQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateWithQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionRebateWithDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionRebateWithDto dto){ + ScmCollectionRebateWith entity = new ScmCollectionRebateWith(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionRebateWithDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionRebateWith entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateWithDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionRebateWith entity = fetchBySid(sid); + ScmCollectionRebateWithDetailsVo vo = new ScmCollectionRebateWithDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List fetchByCollectionReBateSid(String sid) { + return baseMapper.fetchByCollectionReBateSid(sid); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java new file mode 100644 index 0000000000..49630ba2e0 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyMapper
+ * Description: 回款返利预提申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateWithApplyMapper extends BaseMapper { + + //@Update("update scm_collection_rebate_with_apply 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 scm_collection_rebate_with_apply") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml new file mode 100644 index 0000000000..498cc50ac4 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java new file mode 100644 index 0000000000..af5bd0f3da --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply; + +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 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.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyRest
+ * Description: 回款返利预提申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利预提申请表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyRest") +@RequestMapping("v1/scmcollectionrebatewithapply") +public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWithApplyFeign { + + @Autowired + private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateWithApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateWithApplyService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateWithApplyService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateWithApplyDetailsVo vo = scmCollectionRebateWithApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java new file mode 100644 index 0000000000..5e6bb5ef14 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利)
+ * File: ScmCollectionRebateWithApplyService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyService
+ * Description: 回款返利预提申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-27 15:14:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateWithApplyService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionRebateWithApplyQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateWithApplyQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionRebateWithApplyDto dto){ + ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionRebateWithApplyDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionRebateWithApply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionRebateWithApply entity = fetchBySid(sid); + ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index f52ae83044..1b3bb6777a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -341,30 +341,12 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFTransferBizType("调车"); //调拨类型 - stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向 - stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型 stkTransferDirect.setFStockOrgId("101"); //调入库存组织 - stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型 - stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型 stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); - fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态 - fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态 - fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型 - fBillEntry.setFKeeperOutId("101");//调出保管者 - fBillEntry.setFOwnerOutId("101");//调出货主 - fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型 - fBillEntry.setFOwnerId("101");//调入货主 - fBillEntry.setFOwnerIdHead("101");//调入货主 - fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型 - fBillEntry.setFKeeperId("101");//调入保管者 - fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型 fBillEntry.setFDestStockId("CK003");//调入仓库 fBillEntry.setFMaterialId(scmVehicleEnterlibrary.getVinNo());//物料编码 fBillEntry.setFSrcStockId("CK001");//调出仓库 - fBillEntry.setFDestLot(scmVehicleEnterlibrary.getVinNo());//调入批号 - fBillEntry.setFLot(scmVehicleEnterlibrary.getVinNo());//调出批号 FPAYBILLENTRYs.add(fBillEntry); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); ResultBean resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 87f03503ff..9427a7198f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -894,37 +894,18 @@ public class ScmVehicleGressionService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFTransferBizType("调车"); //调拨类型 - stkTransferDirect.setFTransferDirect("GENERAL"); //调拨方向 - stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); //调出货主类型 stkTransferDirect.setFStockOrgId("101"); //调入库存组织 - stkTransferDirect.setFOwnerTypeIdHead("BD_OwnerOrg"); //调入货主类型 - stkTransferDirect.setFBillTypeID("ZJDB01_SYS"); //单据类型 stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期 StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry(); - fBillEntry.setFDestStockStatusId("KC-001");//调入库存状态 - fBillEntry.setFSrcStockStatusId("KC-001");//调出库存状态 - fBillEntry.setFOwnerTypeId("BD_OwnerOrg");//调入货主类型 - fBillEntry.setFKeeperOutId("101");//调出保管者 - fBillEntry.setFOwnerOutId("101");//调出货主 - fBillEntry.setFOwnerTypeOutId("BD_OwnerOrg");//调出货主类型 - fBillEntry.setFOwnerId("101");//调入货主 - fBillEntry.setFOwnerIdHead("101");//调入货主 - fBillEntry.setFKeeperTypeOutId("BD_KeeperOrg");//调出保管者类型 - fBillEntry.setFKeeperId("101");//调入保管者 - fBillEntry.setFKeeperTypeId("BD_KeeperOrg");//调入保管者类型 fBillEntry.setFDestStockId("CK003");//调入仓库 fBillEntry.setFMaterialId(s);//物料编码 fBillEntry.setFSrcStockId("CK001");//调出仓库 - fBillEntry.setFLot(s); - fBillEntry.setFDestLot(s); FPAYBILLENTRYs.add(fBillEntry); stkTransferDirect.setFBillEntry(FPAYBILLENTRYs); finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); } } } - return rb.success().setData(resultBean.getData()); } else { return rb.setMsg("操作失败!提交的数据不一致"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java index cef29e52cc..c851a6caa0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java @@ -76,7 +76,6 @@ public interface ScmVehicleInventoryMapper extends BaseMapper getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); @@ -143,4 +142,5 @@ public interface ScmVehicleInventoryMapper extends BaseMapper getInventoryAll(String useOrgSid); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml index c6c619f267..14b81f7793 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml @@ -171,5 +171,4 @@ where svi.useOrgSid = #{useOrgSid} order by id desc - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index f0056a8c64..823d479abc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -139,6 +139,17 @@ public class ScmVehicleInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmVehicleInventoryVo record : pagging.getRecords()) { + String vinNo = record.getVinNo(); + String createOrgSid = record.getCreateOrgSid(); + String id = record.getId(); + List scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid); + if (scmVehicleStayInventoryVos.size() > 0){ + ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); + record.setInventoryName(scmVehicleStayInventoryVo.getLastName()); + record.setInventoryDate(scmVehicleStayInventoryVo.getLastDate()); + } + } for (ScmVehicleInventoryVo record : pagging.getRecords()) { record.setInventoryState(""); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java index c785150358..bd28a2097e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java @@ -77,7 +77,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + IPage getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); VehPatrolinspectionmonthVo getMonthByMainSid(@Param("mainSid") String mainSid); @@ -99,6 +99,6 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey); - @Select("update scm_vehicle_patrolinspection set isDelete = 1 where sid = #{sid} ") - void updateBySid(@Param("sid") String sid); + @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ") + void updatePatrolInspectionState(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml index cd38747538..d77c3cf898 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml @@ -34,9 +34,9 @@ FROM scm_vehicle_patrolinspection svp ${ew.sqlSegment} - - and concat(svp.mainSid) LIKE concat('%' - , #{name} + + and concat(svp.vinNo) LIKE concat('%' + , #{names} , '%') diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java index 4074a315fc..0245dab480 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java @@ -70,6 +70,13 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio return rb.success().setData(pv); } + @Override + public ResultBean> stayListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehiclePatrolinspectionService.stayListPage(pq); + return rb.success().setData(pv); + } + @Override @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index e32c89bcee..180b47910b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -28,15 +28,22 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection; 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.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmfile.ScmFileVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService; +import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -72,6 +79,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService createQueryWrapper(ScmVehiclePatrolinspectionQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -84,19 +97,70 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("createOrgSid", query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getMainSid())) { - qw.like("mainSid", query.getMainSid()); + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("vinNo", query.getVinNo()); } if (StringUtils.isNotBlank(query.getLocationSid())) { - qw.like("locationSid", query.getLocationSid()); + qw.eq("locationSid", query.getLocationSid()); } String patrolInspectionStartDate = query.getPatrolInspectionStartDate(); String patrolInspectionEndDate = query.getPatrolInspectionEndDate(); qw.apply(StringUtils.isNotEmpty(patrolInspectionStartDate), "date_format (patrolInspectionDate,'%Y-%m-%d') >= date_format('" + patrolInspectionStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(patrolInspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolInspectionEndDate + "','%Y-%m-%d')" ); + qw.eq("patrolInspectionStateKey",002).or().eq("patrolInspectionStateKey",003); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo stayListPage(PagerQuery pq) { + ScmVehiclePatrolinspectionQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid", query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("vinNo", query.getVinNo()); + } + if (StringUtils.isNotBlank(query.getLocationSid())) { + qw.eq("locationSid", query.getLocationSid()); + } + qw.eq("patrolInspectionStateKey",000).or().eq("patrolInspectionStateKey",001); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmVehiclePatrolinspectionVo record : pagging.getRecords()) { + String vinNo = record.getVinNo(); + String id = record.getId(); + String createOrgSid = record.getCreateOrgSid(); + List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(vinNo, id, createOrgSid); + if (scmVehicleStayPatrolinspectionVos.size() > 0){ + ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0); + record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName()); + record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate()); + } + BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData(); + record.setModel(vehicleVo.getModelName()); + String locationSid = record.getLocationSid(); + ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid); + record.setLiableSid(scmWarehouse.getLibTubeSid()); + record.setLiableName(scmWarehouse.getLibTubeName()); + String mainSid = record.getMainSid(); + ScmVehiclePatrolinspectionsheetDetailsVo scmVehiclePatrolinspectionsheetDetailsVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(mainSid); + if (scmVehiclePatrolinspectionsheetDetailsVo != null){ + record.setSituationExplain(scmVehiclePatrolinspectionsheetDetailsVo.getSituationExplain()); + record.setProblems(scmVehiclePatrolinspectionsheetDetailsVo.getProblemsAndResults()); + String sid = scmVehiclePatrolinspectionsheetDetailsVo.getSid(); + List scmFileVos = scmFileService.fetchByMainSid(sid); + List strings = new ArrayList<>(); + for (ScmFileVo scmFileVo : scmFileVos) { + String filePath = scmFileVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + strings.add(filePath); + } + record.setImages(strings); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -144,6 +208,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("svp.isDelete", 0); if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); } @@ -151,7 +216,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService iPage = baseMapper.getInventoryList(page, qw, params.getNames()); List records = iPage.getRecords(); @@ -233,7 +297,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService iPage = baseMapper.getCarInventoryList(page, qw, params.getName()); + IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getNames()); return iPage; } @@ -243,8 +307,8 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService selectListAll(String useOrgSid) { @@ -262,4 +326,5 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getMonthRemarksByMainSid(String sid, String stateKey) { return baseMapper.getMonthRemarksByMainSid(sid, stateKey); } + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java index 4c2706a04b..ff45a39f8d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java @@ -84,4 +84,7 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper list = new ArrayList<>(); - List splitName = Arrays.asList(vo.getLiableName().split(",")); - List splitSid = Arrays.asList(vo.getLiableSid().split(",")); - for (int i = 0; i < splitName.size(); i++) { - AppLiableListVo v = new AppLiableListVo(); - v.setLiableName(splitName.get(i)); - v.setLiableSid(splitSid.get(i)); - list.add(v); - } - vo.setLiableList(list); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { for (ScmFile scmFile : scmFiles1) { @@ -233,18 +225,18 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService list = new ArrayList<>(); - List splitName = Arrays.asList(vo.getLiableName().split(",")); - List splitSid = Arrays.asList(vo.getLiableSid().split(",")); - for (int i = 0; i < splitName.size(); i++) { - AppLiableListVo v = new AppLiableListVo(); - v.setLiableName(splitName.get(i)); - v.setLiableSid(splitSid.get(i)); - list.add(v); - } - vo.setLiableList(list); - } +// if (StringUtils.isNotBlank(vo.getLiableName())) { +// List list = new ArrayList<>(); +// List splitName = Arrays.asList(vo.getLiableName().split(",")); +// List splitSid = Arrays.asList(vo.getLiableSid().split(",")); +// for (int i = 0; i < splitName.size(); i++) { +// AppLiableListVo v = new AppLiableListVo(); +// v.setLiableName(splitName.get(i)); +// v.setLiableSid(splitSid.get(i)); +// list.add(v); +// } +// vo.setLiableList(list); +// } List images = new ArrayList<>(); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { @@ -299,19 +291,15 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName()); + scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid()); scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid); scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid()); scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid); scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid()); + BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData(); + scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName()); + scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid()); save(scmVehiclePatrolinspectionsheet); scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); List images = dto.getImages(); @@ -327,11 +315,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); - for (AppLiableListDto appLiableListDto : liableList) { - SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); - Integer id = sysUserVos.getId(); - receiveIdList.add(String.valueOf(id)); - } + List liableList = new ArrayList<>(); + AppLiableListDto appLiableListDto = new AppLiableListDto(); + appLiableListDto.setLiableName(dto.getLiableName()); + appLiableListDto.setLiableSid(dto.getLiableSid()); + liableList.add(appLiableListDto); + SysUserVo sysUserVos = sysUserFeign.fetchBySid(dto.getLiableSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); appPatrolinspectionDto.setList(liableList); @@ -344,15 +335,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName()); + scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid()); scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { @@ -369,11 +353,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); - for (AppLiableListDto appLiableListDto : liableList) { - SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); - Integer id = sysUserVos.getId(); - receiveIdList.add(String.valueOf(id)); - } + List liableList = new ArrayList<>(); + AppLiableListDto appLiableListDto = new AppLiableListDto(); + appLiableListDto.setLiableName(dto.getLiableName()); + appLiableListDto.setLiableSid(dto.getLiableSid()); + liableList.add(appLiableListDto); + SysUserVo sysUserVos = sysUserFeign.fetchBySid(dto.getLiableSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); appPatrolinspectionDto.setList(liableList); @@ -583,17 +570,11 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - if (liableList.size() > 0) { - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); - } + BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData(); + patrolinspectionsheet.setModel(vehicleVo.getModelName()); + patrolinspectionsheet.setModelSid(vehicleVo.getModelSid()); + patrolinspectionsheet.setDutyName(dto.getLiableName()); + patrolinspectionsheet.setDutySid(dto.getLiableSid()); scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { @@ -615,15 +596,11 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); - String DutyName = ""; - String DutySid = ""; - for (AppLiableListDto appLiableListDto : liableList) { - DutyName = appLiableListDto.getLiableName() + "," + DutyName; - DutySid = appLiableListDto.getLiableSid() + "," + DutySid; - } - patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); - patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData(); + patrolinspectionsheet.setModel(vehicleVo.getModelName()); + patrolinspectionsheet.setModelSid(vehicleVo.getModelSid()); + patrolinspectionsheet.setDutyName(dto.getLiableName()); + patrolinspectionsheet.setDutySid(dto.getLiableSid()); scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { @@ -687,4 +664,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService getCarInspectionReportList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); - @Update("update scm_veh_patrolinspectionmonth set state = 1 where sid = #{sid}") - void updateBySidAndState(String sid); + AppScmVehPatrolinspectionmonthInfoVo selByMainSid(String sid); + + @Update(" update scm_veh_patrolinspectionmonth set `state` = '1' where sid=#{mainSid} ") + void updateBySidState(@Param("mainSid") String mainSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml index d2a4bc3bb4..d92a4d287a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml @@ -5,8 +5,18 @@ + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java index acef13915f..835c0fe93e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -97,9 +98,34 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmVehPatrolinspectionmonthQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); + QueryWrapper qw = new QueryWrapper<>(); + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("createByName", query.getCreateByName()); + } + qw.orderByDesc("id"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmVehPatrolinspectionmonthVo record : pagging.getRecords()) { + String mainSid = record.getSid(); + VehPatrolinspectionmonthVo vo = scmVehiclePatrolinspectionService.getMonthByMainSid(mainSid); + record.setSurplusNumber(String.valueOf(vo.getUnHandledNumber() + vo.getNotHandledNumber())); + record.setTotalNumber(String.valueOf(vo.getTotalNumber())); + record.setUnHandledNumber(String.valueOf(vo.getUnHandledNumber())); + record.setProcessedNumber(String.valueOf(vo.getProcessedNumber())); + record.setNotHandledNumber(String.valueOf(vo.getNotHandledNumber())); + record.setActualNumber(String.valueOf(vo.getNormalNumber() + vo.getUnHandledNumber() + vo.getProcessedNumber())); + if (record.getState() == 0) { + record.setShowReportBtn(true); + } else { + record.setShowReportBtn(false); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -162,7 +188,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService getCarInspectionReport(String sid) { ResultBean rb = ResultBean.fireFail(); AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo(); + AppScmVehPatrolinspectionmonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid); + if (appScmVehInventorymonthInfoVo != null) { + vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient()); + vo.setDate(appScmVehInventorymonthInfoVo.getDate()); + } VehPatrolinspectionmonthVo vehPatrolinspectionmonthVo = scmVehiclePatrolinspectionService.getMonthByMainSid(sid); vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getNormalNumber() + vehPatrolinspectionmonthVo.getUnHandledNumber() + vehPatrolinspectionmonthVo.getProcessedNumber())); vo.setTotalNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber())); @@ -301,19 +332,14 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService selectListAll() { return baseMapper.selectListAll(); } + + public void updateBySidState(String mainSid) { + baseMapper.updateBySidState(mainSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java index 37c726a16a..bff09b1c24 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java @@ -92,4 +92,9 @@ public class ScmVehPatrolinspectionreportRest implements ScmVehPatrolinspectionr ScmVehPatrolinspectionreportDetailsVo vo = scmVehPatrolinspectionreportService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean sendReport(ScmVehPatrolinspectionreportDto dto) { + return scmVehPatrolinspectionreportService.sendReport(dto); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java index 0fc08925d0..c103edbfd0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java @@ -26,8 +26,28 @@ package com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppLiableListDto; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppPatrolinspectionDto; +import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; +import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto; +import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; +import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; +import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService; +import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService; +import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService; +import com.yxt.common.base.utils.JPushServer; +import com.yxt.messagecenter.api.message.AppMessageDto; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MsgTargetUriEnum; +import com.yxt.messagecenter.api.messagelist.MessageListDto; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; +import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; +import com.yxt.messagecenter.api.messagetype.MessageTypeVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -41,9 +61,14 @@ import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspection import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDto; import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; /** * Project: aaa(aaa)
@@ -60,51 +85,107 @@ import java.util.List; */ @Service public class ScmVehPatrolinspectionreportService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmVehPatrolinspectionreportQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmVehPatrolinspectionreportQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmVehPatrolinspectionreportDto dto){ + + @Autowired + ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService; + @Autowired + ScmVehPatrolinspectionmonthService scmVehPatrolinspectionmonthService; + @Autowired + ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService; + @Autowired + private SysUserFeign sysUserFeign; + + private QueryWrapper createQueryWrapper(ScmVehPatrolinspectionreportQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmVehPatrolinspectionreportQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmVehPatrolinspectionreportDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(ScmVehPatrolinspectionreportDto dto){ - ScmVehPatrolinspectionreport entity = new ScmVehPatrolinspectionreport(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(ScmVehPatrolinspectionreportDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehPatrolinspectionreportDto dto) { + ScmVehPatrolinspectionreport entity = new ScmVehPatrolinspectionreport(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehPatrolinspectionreportDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmVehPatrolinspectionreport entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmVehPatrolinspectionreportDetailsVo fetchDetailsVoBySid(String sid){ - ScmVehPatrolinspectionreport entity = fetchBySid(sid); - ScmVehPatrolinspectionreportDetailsVo vo = new ScmVehPatrolinspectionreportDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + ScmVehPatrolinspectionreport entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehPatrolinspectionreportDetailsVo fetchDetailsVoBySid(String sid) { + ScmVehPatrolinspectionreport entity = fetchBySid(sid); + ScmVehPatrolinspectionreportDetailsVo vo = new ScmVehPatrolinspectionreportDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean sendReport(ScmVehPatrolinspectionreportDto dto) { + ResultBean rb = ResultBean.fireFail(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + ScmVehPatrolinspectionreport scmVehPatrolinspectionreport = new ScmVehPatrolinspectionreport(); + BeanUtil.copyProperties(dto, scmVehPatrolinspectionreport, "sid"); + String StateKey1 = "001"; + String StateKey2 = "002"; + List questions1 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(dto.getMainSid(), StateKey1); + List questions2 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(dto.getMainSid(), StateKey2); + + StringBuilder question = new StringBuilder(); + + for (AppVinAndRemarksVo remark : questions1) { + // 问题未解决 + question.append(remark.getVinNo()); + question.append("："); + question.append(remark.getRemarks()); + question.append("（问题已反馈）"); + question.append("\n"); + } + for (AppVinAndRemarksVo remark : questions2) { + // 问题已解决 + question.append(remark.getVinNo()); + question.append("："); + question.append(remark.getRemarks()); + question.append("（问题已解决）"); + question.append("\n"); + } + save(scmVehPatrolinspectionreport); + scmVehiclePatrolinspectionService.updateState(dto.getMainSid()); + scmVehPatrolinspectionmonthService.updateBySidState(dto.getMainSid()); + List receiveIdList = new ArrayList<>(); + List list = dto.getList(); + for (AppLiableListDto appLiableListDto : list) { + SysUserVo data = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); + receiveIdList.add(String.valueOf(data.getId())); + } + AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); + appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); + appPatrolinspectionDto.setList(dto.getList()); + appPatrolinspectionDto.setMainSid(dto.getMainSid()); + appPatrolinspectionDto.setReceiveIdList(receiveIdList); + scmVehiclePatrolinspectionsheetService.sendMessage(appPatrolinspectionDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 75b95982fd..dc582d018f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -46,6 +46,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -264,5 +268,22 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean> contractInfo(@RequestBody InsuranceDto insuranceDto); + /*-------------------------------录入车架号---------------------------------------------*/ + + @ApiOperation("初始化|录入车架号列表") + @GetMapping("/init/saleOrderInputVin/{saleOrderSid}") + @ResponseBody + ResultBean getVinList(@PathVariable("saleOrderSid") String saleOrderSid); + + @ApiOperation("补录车架号，选择列表") + @PostMapping("/init/saleOrderVin") + @ResponseBody + ResultBean> saleOrderVin(@RequestBody PagerQuery query); + + @ApiOperation("保存销售订单车架号") + @PostMapping("/save/saleOrderVin") + @ResponseBody + ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index f64f05e11b..1d2edaa526 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -45,6 +45,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -232,4 +236,19 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean> contractInfo(InsuranceDto insuranceDto) { return null; } + + @Override + public ResultBean getVinList(String saleOrderSid) { + return null; + } + + @Override + public ResultBean> saleOrderVin(PagerQuery query) { + return null; + } + + @Override + public ResultBean saveSaleOrderVin(InputVinDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java new file mode 100644 index 0000000000..cf213e9ab7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.fasterxml.jackson.annotation.JsonIgnore; +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/9/27 14:38 + * @Description + */ +@Data +public class BusVinNoVo implements Vo { + private static final long serialVersionUID = -5832863962678240592L; + + @ApiModelProperty("是否已出库") + private Boolean state; + @JsonProperty("vin") + private String linkNo; + @JsonProperty("carSid") + private String linkSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java new file mode 100644 index 0000000000..5e7fe4d6d1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/28 9:18 + * @Description + */ +@Data +public class InputVinDto implements Dto { + private static final long serialVersionUID = -1105390623554097436L; + private String saleOrderSid; + + private List vinList; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java new file mode 100644 index 0000000000..a8f8cf8eee --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/28 9:20 + * @Description + */ +@Data +public class InputVinListDto implements Dto { + private static final long serialVersionUID = -6013714991280967471L; + @JsonProperty("vin") + private String linkNo; + @JsonProperty("carSid") + private String linkSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java new file mode 100644 index 0000000000..caf35ee23b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 15:39 + * @Description + */ +@Data +public class InputVinQuery implements Query { + private static final long serialVersionUID = 8689735317478969417L; + + private String saleOrderSid; + private List list; + private String names; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java new file mode 100644 index 0000000000..0ad47b54d9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +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/9/27 15:28 + * @Description + */ +@Data +public class InputVinVo implements Vo { + private static final long serialVersionUID = -3495013067534199733L; + @ApiModelProperty("是否已出库") + private Boolean state; + @JsonProperty("vin") + private String vinNo; + @JsonProperty("carSid") + private String vinSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java new file mode 100644 index 0000000000..3e6ebce2eb --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/VinNoVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/27 14:35 + * @Description + */ +@Data +public class VinNoVo implements Vo { + private static final long serialVersionUID = -8321321070396276564L; + + private String saleOrderSid; + private List vinList; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java index 09a91eaac6..51e763702e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java @@ -52,6 +52,12 @@ public class AppScmVehiclePatrolinVo implements Vo { @ApiModelProperty("相关附件") private List images = new ArrayList<>(); + @ApiModelProperty("相关责任人名称") + private String liableName; + + @ApiModelProperty("相关责任人sid") + private String liableSid; + @ApiModelProperty("相关责任人") private List liableList = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java index 2d65fde982..b58aae1904 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java @@ -71,6 +71,11 @@ public interface AppScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean getCarInspectionReport(@PathVariable("sid") String sid); + @ApiOperation("发送报告") + @PostMapping("/sendReport") + @ResponseBody + public ResultBean sendReport(@RequestBody VehPatrolinspectionreportDto dto); + @ApiOperation("手机端-获取待巡检列表") @PostMapping("/getInspectionList") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java index e6dac50be9..cd55071bed 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java @@ -62,6 +62,11 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle return null; } + @Override + public ResultBean sendReport(VehPatrolinspectionreportDto dto) { + return null; + } + @Override public ResultBean> getInspectionList(PagerQuery pagerQuery) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java index 3820457559..2162f93ec8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java @@ -80,6 +80,12 @@ public class PatrolinspectionDto implements Dto { @ApiModelProperty("相关责任人") private List liableList; + @ApiModelProperty("相关责任人名称") + private String liableName; + + @ApiModelProperty("相关责任人sid") + private String liableSid; + @ApiModelProperty("相关照片") private List images; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java index d70d0daf49..8488f03854 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java @@ -33,6 +33,12 @@ public class PatrolinspectionInfoVo implements Vo { @JsonProperty("result") private String results; + @ApiModelProperty("相关责任人名称") + private String liableName; + + @ApiModelProperty("相关责任人sid") + private String liableSid; + @ApiModelProperty("相关责任人") private List liableList; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java index 22f018120e..e84110b47d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java @@ -13,7 +13,7 @@ public class PatrolinspectionPageQuery implements Query { private String userSid; @ApiModelProperty("优先匹配车架号") - private String name; + private String names; @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31") private String date; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionreportDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionreportDto.java new file mode 100644 index 0000000000..6000b0b4b1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionreportDto.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.inspection; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class VehPatrolinspectionreportDto implements Dto { + private static final long serialVersionUID = 5441506884852024375L; + + private String sid; // sid + private String userSid; // userSid + @ApiModelProperty("月度日常管理记录sid") + private String mainSid; // 月度日常管理记录sid + @ApiModelProperty("接收人sid") + private String receiverSids; // 接收人sid + @ApiModelProperty("接收人姓名") + private String receiverNames; // 接收人姓名 + @ApiModelProperty("接收人list") + private List list; + @ApiModelProperty("巡检报告内容") + private String reportContent; // 巡检报告内容 +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutDetailsListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutDetailsListVo.java index 370a6bf0a6..f9eac33e16 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutDetailsListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutDetailsListVo.java @@ -41,4 +41,8 @@ public class UnsoldBuyoutDetailsListVo implements Vo { private int vehicleNum; private UnsoldVesionVo carDetailPage; + + @ApiModelProperty("买断金额") + @JsonProperty("buyOutPrice") + private String actualMoney; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutPayListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutPayListVo.java new file mode 100644 index 0000000000..18038514da --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutPayListVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.terminal.api.supplychain.unsoldBuyout; + +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/9/27 9:25 + * @Description + */ +@Data +public class UnsoldBuyoutPayListVo implements Vo { + private static final long serialVersionUID = -96380194004283606L; + + @ApiModelProperty(value = "付款方式") + @JsonProperty("payType") + private String paymentType; + @ApiModelProperty(value = "厂家销售通路") + @JsonProperty("salesChannel") + private String actualPay; + @ApiModelProperty(value = "开户行") + @JsonProperty("bankName") + private String bank; + + @ApiModelProperty("收款银行账号") + @JsonProperty("depositBankNo") + private String receivingAccount; + @ApiModelProperty("付款金额") + @JsonProperty("payPrice") + private String payAccount; + @ApiModelProperty("付款备注") + @JsonProperty("remarks") + private String payRemark; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java index 5afdfe97c6..e945969add 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutVo.java @@ -32,8 +32,16 @@ public class UnsoldBuyoutVo implements Vo { private String reason; private List records; + private List payList; @ApiModelProperty("买断费用") - @JsonProperty("buyOutPrice") + @JsonProperty("buyOutPriceTotal") private String money; + + @ApiModelProperty("是否需要付款") + private String payState; + @ApiModelProperty("是否需要付款key") + private String payStateKey; + @ApiModelProperty("付款明细合计") + private String payDetailTotal; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index c78f923383..2b81cc6d98 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -46,6 +46,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -320,4 +324,19 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.contractInfo(insuranceDto); } + @Override + public ResultBean getVinList(String saleOrderSid) { + return appBusSalesOrderService.getVinList(saleOrderSid); + } + + @Override + public ResultBean> saleOrderVin(PagerQuery query) { + return appBusSalesOrderService.saleOrderVin(query); + } + + @Override + public ResultBean saveSaleOrderVin(InputVinDto dto) { + return appBusSalesOrderService.saveSaleOrderVin(dto); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 622c6339be..f3b68abd59 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -27,6 +27,9 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListQuery; +import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.PrintConfirmDto; import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo; @@ -38,6 +41,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitMo import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto; +import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo; import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto; @@ -86,6 +91,10 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -142,6 +151,8 @@ public class AppBusSalesOrderService { private SysUserFeign sysUserFeign; @Autowired private CommonContractFeign commonContractFeign; + @Autowired + private BaseVehicleFeign baseVehicleFeign; /************************************* 销售订单接口 *********************************************/ @@ -191,7 +202,7 @@ public class AppBusSalesOrderService { ResultBean rb = ResultBean.fireFail(); BusSalesOrderBillInfoVo vo = new BusSalesOrderBillInfoVo(); AppOrderInitQuery appOrderInitQuery = new AppOrderInitQuery(); - BeanUtil.copyProperties(orderInitQuery,appOrderInitQuery); + BeanUtil.copyProperties(orderInitQuery, appOrderInitQuery); ResultBean resultBean = busSalesOrderFeign.getBillInfo(appOrderInitQuery); AppBusSalesOrderBillInfoVo appBusSalesOrderBillInfoVo = resultBean.getData(); BeanUtil.copyProperties(appBusSalesOrderBillInfoVo, vo); @@ -551,9 +562,37 @@ public class AppBusSalesOrderService { public ResultBean> contractInfo(InsuranceDto insuranceDto) { ResultBean> rb = ResultBean.fireFail(); PrintConfirmDto printConfirmDto = new PrintConfirmDto(); - BeanUtil.copyProperties(insuranceDto,printConfirmDto); + BeanUtil.copyProperties(insuranceDto, printConfirmDto); ResultBean> resultBean = commonContractFeign.printConfirm(printConfirmDto); List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InsurancePrintVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } + + public ResultBean getVinList(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + VinNoVo vinNoVo = new VinNoVo(); + ResultBean resultBean = busSalesOrderFeign.saleOrderInputVin(saleOrderSid); + VinVo vinVo = resultBean.getData(); + BeanUtil.copyProperties(vinVo, vinNoVo); + return rb.success().setData(vinNoVo); + } + + public ResultBean> saleOrderVin(PagerQuery query) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(query); + ResultBean> resultBean = baseVehicleFeign.saleOrderVin(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InputVinVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + } + + public ResultBean saveSaleOrderVin(InputVinDto dto) { + ResultBean rb = ResultBean.fireFail(); + VinDto vinDto = new VinDto(); + BeanUtil.copyProperties(dto, vinDto); + ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputVin(vinDto); + return resultBean; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java index ec2b5b8c2c..79c93cca6f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java @@ -71,6 +71,11 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins return appScmVehiclePatrolinspectionService.getCarInspectionReport(sid); } + @Override + public ResultBean sendReport(VehPatrolinspectionreportDto dto) { + return appScmVehiclePatrolinspectionService.sendReport(dto); + } + @Override public ResultBean> getInspectionList(PagerQuery pagerQuery) { return appScmVehiclePatrolinspectionService.getInspectionList(pagerQuery); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java index 424bbeb32e..4f6d44093f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java @@ -43,6 +43,8 @@ import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppScmVehPatrolinspecti import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppScmVehPatrolinspectionmonthQuery; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppScmVehPatrolinspectionmonthVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDto; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeign; import com.yxt.anrui.terminal.api.supplychain.inspection.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; @@ -78,6 +80,8 @@ public class AppScmVehiclePatrolinspectionService { ScmVehiclePatrolinspectionsheetFeign scmVehiclePatrolinspectionsheetFeign; @Autowired ScmVehPatrolinspectionmonthFeign scmVehPatrolinspectionmonthFeign; + @Autowired + ScmVehPatrolinspectionreportFeign scmVehPatrolinspectionreportFeign; public ResultBean getInspectionRecords(String userSid) { ResultBean resultBean = scmVehPatrolinspectionmonthFeign.getInspectionRecords(userSid); @@ -170,4 +174,11 @@ public class AppScmVehiclePatrolinspectionService { PagerVo vo = CoverUtils.selectPagerVo(inspectionList.getData()); return rb.success().setData(vo); } + + public ResultBean sendReport(VehPatrolinspectionreportDto dto) { + ScmVehPatrolinspectionreportDto scmVehPatrolinspectionreportDto = new ScmVehPatrolinspectionreportDto(); + BeanUtil.copyProperties(dto, scmVehPatrolinspectionreportDto); + ResultBean resultBean = scmVehPatrolinspectionreportFeign.sendReport(scmVehPatrolinspectionreportDto); + return resultBean; + } } \ No newline at end of file