diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java index 7867896657..49a229cb1d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java @@ -32,4 +32,7 @@ public class BaseManufacturerListVo implements Vo { @ApiModelProperty("账户名称") private String accountName; + + @ApiModelProperty("厂商名称") + private String manufacturerName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java index 741349726e..2aece8bfab 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleQuery.java @@ -16,6 +16,10 @@ import java.util.List; public class PayBaseVehicleQuery implements Query { private static final long serialVersionUID = 8939482367294270164L; + @ApiModelProperty("是否已销售，1是0否") + private String isSales; + @ApiModelProperty("款项是否已交清，1是0否") + private String isSettle; @ApiModelProperty(value = "品牌") private String brandSid; @ApiModelProperty(value = "功能") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java index 8782e4ff81..3ad1e34f72 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PayBaseVehicleVo.java @@ -6,6 +6,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @Author dimengzhe * @Date 2022/10/8 11:16 @@ -15,45 +17,50 @@ import lombok.Data; public class PayBaseVehicleVo implements Vo { private static final long serialVersionUID = 8935506131970564858L; private String sid; - @ApiModelProperty(value = "品牌") - private String brandName; + @ApiModelProperty(value = "车型") private String vehicleAlias; - @ApiModelProperty(value = "车型sid") - private String modelSid; @ApiModelProperty(value = "车架号") private String vinNo; - @ApiModelProperty(value = "颜色") - private String color; + @ApiModelProperty("版本") + private String marketSegmentsValue; + @ApiModelProperty("颜色") + private String carColor; + @ApiModelProperty("排放") + private String emissionStandardValue; + @ApiModelProperty("变速箱") + private String tranCaseTypeValue; + @ApiModelProperty("后桥") + private String rearAxleValue; + @ApiModelProperty("厂家库龄") + private String libraryAge; + @ApiModelProperty("公司库龄") + private String orgLibraryAge; + @ApiModelProperty("上装名称") + private String topName; + @ApiModelProperty("内部编码") + private String insideCode; + @ApiModelProperty("厂家结算价") + private BigDecimal money; + @ApiModelProperty("合同号") + private String contractNo; + @ApiModelProperty("销售订单编号") + private String saleBillNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("销售订单类型") + private String saleTypeValue; + @ApiModelProperty("买断状态") + private String settlementStatusValue; + + @ApiModelProperty(value = "品牌") + private String brandName; @ApiModelProperty(value = "存放地点") private String location; - @ApiModelProperty(value = "存放地点sid") - private String locationSid; - @ApiModelProperty(value = "销售指导价") - @JsonSerialize(using = ToStringSerializer.class) - private String guidedPrice; - - @ApiModelProperty(value = "常用配置") - private String configName; + @ApiModelProperty(value = "车型sid") + private String modelSid; @ApiModelProperty(value = "常用配置sid") private String configSid; - @ApiModelProperty(value = "入库日期") - private String priceDate; - - @ApiModelProperty(value = "入库价：厂家结算价") - @JsonSerialize(using = ToStringSerializer.class) - private String priced; - - @ApiModelProperty("内部编码") - private String insideCode; - @ApiModelProperty("库龄") - private int dayNum; - @ApiModelProperty("版本") - private String vehicleVersionValue; - @ApiModelProperty("燃料") - private String fuelTypeValue; - @ApiModelProperty("变速箱") - private String gearboxTypeValue; - @ApiModelProperty("排放标准") - private String emissionStandardValue; + @ApiModelProperty(value = "上装sid") + private String topSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index ee8cb05a14..2f41b67001 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -190,6 +190,7 @@ bmb.depositBank, bmb.bankAccount, bmb.accountName, + bm.manufacturerName, bmb.sid actualPaySid from base_manufacturer_bank bmb left join base_manufacturer bm on bm.sid = bmb.manufacturerSid 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 1c98593306..2edb08446d 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 @@ -1427,36 +1427,58 @@ + SELECT * FROM fin_payment ${ew.sqlSegment} + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java new file mode 100644 index 0000000000..0a5c605ccd --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpayment; + +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.fin.api.finpayment.FinPayment; +import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery; +import com.yxt.anrui.fin.api.finpayment.FinPaymentVo; +import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo; +import com.yxt.anrui.fin.api.finpayment.FinPaymentDto; +import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign; + +/** + * Project: anrui-fin(付款信息管理)
+ * File: FinPaymentFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentRest
+ * Description: 付款信息管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-12-13 14:27:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "付款信息管理") +@RestController("com.yxt.anrui.fin.biz.finpayment.FinPaymentRest") +@RequestMapping("v1/finpayment") +public class FinPaymentRest implements FinPaymentFeign { + + @Autowired + private FinPaymentService finPaymentService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finPaymentService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody FinPaymentDto dto){ + ResultBean rb = ResultBean.fireFail(); + finPaymentService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + finPaymentService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + FinPaymentDetailsVo vo = finPaymentService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> selectByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List voList = finPaymentService.selectByUseOrgSid(useOrgSid); + return rb.success().setData(voList); + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java new file mode 100644 index 0000000000..b8ce368917 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java @@ -0,0 +1,114 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpayment; + +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.fin.api.finpayment.FinPayment; +import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery; +import com.yxt.anrui.fin.api.finpayment.FinPaymentVo; +import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo; +import com.yxt.anrui.fin.api.finpayment.FinPaymentDto; +import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-fin(付款信息管理)
+ * File: FinPaymentService.java
+ * Class: com.yxt.anrui.fin.biz.finpayment.FinPaymentService
+ * Description: 付款信息管理 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-12-13 14:27:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class FinPaymentService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(FinPaymentQuery 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) { + FinPaymentQuery 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(FinPaymentDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinPaymentDto dto) { + FinPayment entity = new FinPayment(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinPaymentDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + FinPayment entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinPaymentDetailsVo fetchDetailsVoBySid(String sid) { + FinPayment entity = fetchBySid(sid); + FinPaymentDetailsVo vo = new FinPaymentDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List selectByUseOrgSid(String useOrgSid) { + return baseMapper.selectByUseOrgSid(useOrgSid); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java index 79a615bce9..f139eb6374 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java @@ -56,9 +56,6 @@ import java.util.Map; @Mapper public interface FinPaymentapplyMapper extends BaseMapper { - //@Update("update fin_paymentapply 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); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index 3a6ed68b5b..3ecc29f0bf 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -4,22 +4,44 @@ select fp.sid, + fp.deptSid, + fp.deptName, + fp.costRangeKey, + fp.costRangeValue, + fp.isLeaderSp, fp.createBySid, fp.busSid, fp.costTypeKey, fp.costTypeValue, - fp.costTitleKey, - fp.costTitleValue, fp.cost, fp.payCompanySid, fp.payCompany, - fp.receiveBank, - fp.receiveCompany, - fp.receiveBankAccount, fp.taskId, fp.procInstId, - fp.receiveCompanySid, fp.remarks, fp.name, DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, fp.isVeh, fp.carBrandSid, - fp.carBrandName + fp.carBrandName, + fp.isSales, + fp.isSettle, + fp.useOrgSid from fin_paymentapply fp where fp.sid = #{sid} @@ -106,15 +130,13 @@ - select fd.sid, + SELECT fd.sid, fd.actualPay, + fd.costTitleKey, + fd.costTitleValue, fd.paymentType, fd.bank, fd.receivingAccount, fd.payAccount, fd.remarks, - fd.paymentTypeKey - from fin_paymentapply_details fd - where fd.applySid = #{sid} + fd.paymentTypeKey, + fd.receiveCompany, + SUM(fdb.payAccount) AS payAccountTotal + FROM fin_paymentapply_details fd + LEFT JOIN fin_paymentapply_details_below fdb + ON fd.sid = fdb.detailSid + WHERE fd.applySid = #{sid} + GROUP BY fd.sid \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java index f2aac89444..8c88244258 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -5,7 +5,12 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.AppFinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo; import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; +import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService; +import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -18,6 +23,12 @@ import java.util.List; */ @Service public class FinPaymentapplyDetailsService extends MybatisBaseService { + + @Autowired + private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService; + @Autowired + private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService; + public List getDetailsList(String sid) { return baseMapper.getDetailsList(sid); } @@ -32,7 +43,24 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService finPaymentapplyDetailsBelowList = dto.getFinPaymentapplyDetailsBelowList(); + for (FinPaymentapplyDetailsBelowDto finPaymentapplyDetailsBelowDto : finPaymentapplyDetailsBelowList) { + finPaymentapplyDetailsBelowDto.setDetailSid(finPaymentapplyDetails.getSid()); + String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto); + List finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList(); + for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) { + finPaymentapplyDetailsBelowEveDto.setDetailSid(belowSid); + finPaymentapplyDetailsBelowEveDto.setCostTypeKey("004"); + finPaymentapplyDetailsBelowEveDto.setCostTypeValue("融资付款"); + finPaymentapplyDetailsBelowEveService.insertByDto(finPaymentapplyDetailsBelowEveDto); + } + } } return bigDecimal.toString(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java index 96aa764fd1..6e318171d8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -52,13 +53,6 @@ import java.util.List; @Mapper public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper { - //@Update("update fin_paymentapply_details_below 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 fin_paymentapply_details_below") - List selectListVo(); + @Select("select * from fin_paymentapply_details_below where detailSid = #{mainSid}") + List selByMainSid(String mainSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml index c43db5ef31..58a332166b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java index 19b964d292..86da3c6d37 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java @@ -39,6 +39,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsB import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: anrui-fin(付款明细)
* File: FinPaymentapplyDetailsBelowService.java
@@ -55,35 +57,14 @@ import org.springframework.stereotype.Service; @Service public class FinPaymentapplyDetailsBelowService extends MybatisBaseService { - public void saveOrUpdateDto(FinPaymentapplyDetailsBelowDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(FinPaymentapplyDetailsBelowDto dto) { + public String insertByDto(FinPaymentapplyDetailsBelowDto dto) { FinPaymentapplyDetailsBelow entity = new FinPaymentapplyDetailsBelow(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); + return entity.getSid(); } - public void updateByDto(FinPaymentapplyDetailsBelowDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - FinPaymentapplyDetailsBelow entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public FinPaymentapplyDetailsBelowDetailsVo fetchDetailsVoBySid(String sid) { - FinPaymentapplyDetailsBelow entity = fetchBySid(sid); - FinPaymentapplyDetailsBelowDetailsVo vo = new FinPaymentapplyDetailsBelowDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java new file mode 100644 index 0000000000..f7459d6fa8 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo; + +import java.util.List; + +/** + * Project: anrui-fin(平仓)
+ * File: FinPaymentapplyDetailsBelowEveMapper.java
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveMapper
+ * Description: 付款申请明细-明细-平仓.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-12-13 10:03:07
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper { + + //@Update("update fin_paymentapply_details_below_eve 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 fin_paymentapply_details_below_eve") + List selectListVo(); + + @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}") + List selByMainSid(String mainSid); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml new file mode 100644 index 0000000000..44d997bd1c --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java new file mode 100644 index 0000000000..db00002816 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; + +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.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign; + +/** + * Project: anrui-fin(平仓)
+ * File: FinPaymentapplyDetailsBelowEveFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveRest
+ * Description: 付款申请明细-明细-平仓.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-12-13 10:03:07
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "付款申请明细-明细-平仓") +@RestController +@RequestMapping("v1/finpaymentapplydetailsbeloweve") +public class FinPaymentapplyDetailsBelowEveRest implements FinPaymentapplyDetailsBelowEveFeign { + + @Autowired + private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finPaymentapplyDetailsBelowEveService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody FinPaymentapplyDetailsBelowEveDto dto){ + ResultBean rb = ResultBean.fireFail(); + finPaymentapplyDetailsBelowEveService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + finPaymentapplyDetailsBelowEveService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + FinPaymentapplyDetailsBelowEveDetailsVo vo = finPaymentapplyDetailsBelowEveService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java new file mode 100644 index 0000000000..1557e3618b --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -0,0 +1,114 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve; + +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.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto; +import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-fin(平仓)
+ * File: FinPaymentapplyDetailsBelowEveService.java
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService
+ * Description: 付款申请明细-明细-平仓 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-12-13 10:03:07
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(FinPaymentapplyDetailsBelowEveQuery 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) { + FinPaymentapplyDetailsBelowEveQuery 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(FinPaymentapplyDetailsBelowEveDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinPaymentapplyDetailsBelowEveDto dto){ + FinPaymentapplyDetailsBelowEve entity = new FinPaymentapplyDetailsBelowEve(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinPaymentapplyDetailsBelowEveDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + FinPaymentapplyDetailsBelowEve entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinPaymentapplyDetailsBelowEveDetailsVo fetchDetailsVoBySid(String sid){ + FinPaymentapplyDetailsBelowEve entity = fetchBySid(sid); + FinPaymentapplyDetailsBelowEveDetailsVo vo = new FinPaymentapplyDetailsBelowEveDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml index 7df2da8f25..76d18700e6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleMapper.xml @@ -16,12 +16,7 @@ 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 index f5341c0980..16124a8674 100644 --- 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 @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; @@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -56,6 +58,9 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; @ApiModelProperty("备注") private String remarks; // 备注 @ApiModelProperty("部门sid") 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 index edfe63823d..bdf1a713f6 100644 --- 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 @@ -27,9 +27,11 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyDelegateQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -118,5 +120,13 @@ public interface ScmCollectionrebateCheckapplyFeign { @GetMapping(value = "/getPreviousNodesForReject") ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody ScmCollectionRebateCheckApplyDelegateQuery delegateQuery); + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody ScmCollectionRebateCheckApplyDelegateQuery delegateQuery); } \ 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 index 93f35886b6..ab0eaef8c4 100644 --- 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 @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; @@ -114,4 +115,14 @@ public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollection public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { return null; } + + @Override + public ResultBean delegate(ScmCollectionRebateCheckApplyDelegateQuery delegateQuery) { + return null; + } + + @Override + public ResultBean assignTask(ScmCollectionRebateCheckApplyDelegateQuery delegateQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyDelegateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyDelegateQuery.java new file mode 100644 index 0000000000..4084f73f4f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyDelegateQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class ScmCollectionRebateCheckApplyDelegateQuery { + + private String userSid; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} 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 index 8e8edb9132..2781fdf116 100644 --- 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 @@ -31,6 +31,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; @@ -89,9 +90,9 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe ResultBean rb = ResultBean.fireFail(); for (String sid : sids) { ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = scmCollectionrebateCheckapplyService.fetchBySid(sid); - if (!scmCollectionrebateCheckapply.getNodeState().equals("待提交")){ - return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除"); - } + if (!scmCollectionrebateCheckapply.getNodeState().equals("待提交")) { + return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除"); + } } scmCollectionrebateCheckapplyService.delBySids(sids); return rb.success(); @@ -146,4 +147,14 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { return scmCollectionrebateCheckapplyService.getPreviousNodesForReject(query); } + + @Override + public ResultBean delegate(ScmCollectionRebateCheckApplyDelegateQuery query) { + return scmCollectionrebateCheckapplyService.delegate(query); + } + + @Override + public ResultBean assignTask(ScmCollectionRebateCheckApplyDelegateQuery query) { + return scmCollectionrebateCheckapplyService.assignTask(query); + } } 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 index 81385a5102..d4328cc58a 100644 --- 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 @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; @@ -42,6 +43,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; @@ -462,4 +464,20 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } + + public ResultBean delegate(ScmCollectionRebateCheckApplyDelegateQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); + BeanUtil.copyProperties(query, delegateQuery); + flowFeign.delegate(delegateQuery); + return rb.success(); + } + + public ResultBean assignTask(ScmCollectionRebateCheckApplyDelegateQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); + BeanUtil.copyProperties(query, delegateQuery); + flowFeign.assignTask(delegateQuery); + 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/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyDetailsVo.java new file mode 100644 index 0000000000..4f2ebcb8ec --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyDetailsVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply; + + +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; +import java.util.List; + +/** + * 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 AppCollectionrebateCheckapplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("核对申请标题") + private String checkApply; + @ApiModelProperty("部门") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("taskId") + private String taskId; + @ApiModelProperty("按返利类型统计") + private List scmWhenCollectionrebateCheckapplydetailDetails; + @ApiModelProperty("按预提年月统计") + private List scmLastCollectionrebateCheckapplydetailDetails; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java new file mode 100644 index 0000000000..7117a78ad9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyFeign.java @@ -0,0 +1,74 @@ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply; + + +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppFlowDto; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppFlowQuery; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.AppFlowTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "售后盘盈入库") +@FeignClient( + contextId = "terminal-AppCollectionrebateCheckapply", + name = "anrui-terminal", + path = "v1/collectionrebatecheckapply") +public interface AppCollectionrebateCheckapplyFeign { + + @ApiOperation("详情") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("明细") + @GetMapping("/collectionRebateCheckDetails/{sid}") + public ResultBean> collectionRebateCheckDetails(@PathVariable("sid") String sid); + + /**********************************************流程********************************************/ + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap AppFlowQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplydetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplydetailDetailsVo.java new file mode 100644 index 0000000000..4b1398212e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplydetailDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 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 AppCollectionrebateCheckapplydetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("台数") + private String num; // 台数 + @ApiModelProperty("预提金额") + private String estimateRebate; + @ApiModelProperty("上传金额") + private String uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private String adjustmentMoney; // 调整金额 + @ApiModelProperty("回款返利sid") + private String collectionRebateSid; // 回款返利sid +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppDelegateQuery.java new file mode 100644 index 0000000000..0a20c9643e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class AppDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowDto.java new file mode 100644 index 0000000000..862c4cc16f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/8/9 14:09 + * @Description + */ +@Data +public class AppFlowDto implements Dto { + private static final long serialVersionUID = 3626473483180150495L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowQuery.java new file mode 100644 index 0000000000..5de6c9ae4c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author dimengzhe + * @Date 2022/8/9 14:15 + * @Description + */ +@Data +public class AppFlowQuery implements Query { + private static final long serialVersionUID = 5514095179438249641L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; + + @ApiModelProperty("组织机构全路径") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowTaskQuery.java new file mode 100644 index 0000000000..8027f0ba85 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatecheckapply/flowable/AppFlowTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/8/9 14:11 + * @Description + */ +@Data +public class AppFlowTaskQuery implements Query { + private static final long serialVersionUID = -7082170710942810289L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java index e437e026c0..193689c1ff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/collectionrebatewithapply/AppCollectionRebateWithApplyFeign.java @@ -20,7 +20,6 @@ import java.util.List; * @Date * @Description */ -@Api(tags = "售后盘盈入库") @FeignClient( contextId = "terminal-AppCollectionRebateWithApply", name = "anrui-terminal", diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyRest.java new file mode 100644 index 0000000000..498daa1f18 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyRest.java @@ -0,0 +1,90 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.supplychain.collectionrebatecheckapply; + +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplyDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplyFeign; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.*; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("v1/collectionrebatecheckapply") +public class AppCollectionrebateCheckapplyRest implements AppCollectionrebateCheckapplyFeign { + + @Autowired + private AppCollectionrebateCheckapplyService appCollectionRebateWithApplyService; + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return appCollectionRebateWithApplyService.fetchDetailsBySid(sid); + } + + @Override + public ResultBean> collectionRebateCheckDetails(String sid) { + return appCollectionRebateWithApplyService.collectionRebateCheckDetails(sid); + } + + @Override + public ResultBean agreeCreditInfo(AppFlowDto dto) { + return appCollectionRebateWithApplyService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(AppFlowTaskQuery query) { + return appCollectionRebateWithApplyService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(AppFlowTaskQuery query) { + return appCollectionRebateWithApplyService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(AppFlowTaskQuery query) { + return appCollectionRebateWithApplyService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(AppFlowQuery query) { + return appCollectionRebateWithApplyService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppDelegateQuery delegateQuery) { + return appCollectionRebateWithApplyService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + return appCollectionRebateWithApplyService.assignTask(delegateQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyService.java new file mode 100644 index 0000000000..ac979767a0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/collectionrebatecheckapply/AppCollectionrebateCheckapplyService.java @@ -0,0 +1,199 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.supplychain.collectionrebatecheckapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplyDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.AppCollectionrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatewithapply.AppCollectionRebateDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.collectionrebatecheckapply.flowable.*; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +@Service +public class AppCollectionrebateCheckapplyService { + + @Resource + private ScmCollectionrebateCheckapplyFeign scmCollectionrebateCheckapplyFeign; + @Autowired + private ScmCollectionrebateCheckapplydetailFeign scmCollectionrebateCheckapplydetailFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapplyDetailsVo data = scmCollectionrebateCheckapplyFeign.fetchDetailsBySid(sid).getData(); + AppCollectionrebateCheckapplyDetailsVo appCollectionrebateCheckapplyDetailsVo = new AppCollectionrebateCheckapplyDetailsVo(); + appCollectionrebateCheckapplyDetailsVo.setProcInsId(data.getProcInstId()); + BeanUtil.copyProperties(data, appCollectionrebateCheckapplyDetailsVo); + List when = appCollectionrebateCheckapplyDetailsVo.getScmWhenCollectionrebateCheckapplydetailDetails(); + List last = appCollectionrebateCheckapplyDetailsVo.getScmLastCollectionrebateCheckapplydetailDetails(); + for (AppCollectionrebateCheckapplydetailDetailsVo collectionrebateCheckapplydetailDetailsVo : when) { + collectionrebateCheckapplydetailDetailsVo.setSid(collectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid()); + } + for (AppCollectionrebateCheckapplydetailDetailsVo collectionrebateCheckapplydetailDetailsVo : last) { + collectionrebateCheckapplydetailDetailsVo.setSid(collectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid()); + } + return rb.success().setData(appCollectionrebateCheckapplyDetailsVo); + } + + public ResultBean> collectionRebateCheckDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List appCollectionRebateDetailsVos = new ArrayList<>(); + List data = scmCollectionrebateCheckapplydetailFeign.collectionRebateCheckDetails(sid).getData(); + for (ScmCollectionRebateDetailsVo datum : data) { + AppCollectionRebateDetailsVo appCollectionRebateDetailsVo = new AppCollectionRebateDetailsVo(); + BeanUtil.copyProperties(datum,appCollectionRebateDetailsVo); + appCollectionRebateDetailsVos.add(appCollectionRebateDetailsVo); + } + return rb.success().setData(appCollectionRebateDetailsVos); + } + + public ResultBean agreeCreditInfo(AppFlowDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + ScmCollectionRebateCheckApplyCompleteDto scmCollectionRebateCheckApplyCompleteDto = new ScmCollectionRebateCheckApplyCompleteDto(); + BeanUtil.copyProperties(dto, scmCollectionRebateCheckApplyCompleteDto); + scmCollectionRebateCheckApplyCompleteDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = scmCollectionrebateCheckapplyFeign.complete(scmCollectionRebateCheckApplyCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = scmCollectionrebateCheckapplyFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = scmCollectionrebateCheckapplyFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(AppFlowTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = scmCollectionrebateCheckapplyFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(AppFlowQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + GetNodeQuery getNodeQuery = new GetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = scmCollectionrebateCheckapplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = scmCollectionrebateCheckapplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + + public ResultBean delegate(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateCheckApplyDelegateQuery delegateQuery1 = new + ScmCollectionRebateCheckApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + scmCollectionrebateCheckapplyFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateCheckApplyDelegateQuery delegateQuery1 = new + ScmCollectionRebateCheckApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + scmCollectionrebateCheckapplyFeign.assignTask(delegateQuery1); + return rb.success(); + } +}