From 1ff7d18c341bc8cff84477e6d6a1964a86a5bd7a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 21 Feb 2023 17:47:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicleout/BaseVehicleOut.java | 4 ++ .../BaseVehicleOutDetailsVo.java | 5 ++ .../api/basevehicleout/BaseVehicleOutDto.java | 5 ++ .../api/basevehicleout/BaseVehicleOutVo.java | 3 + .../BusVehicleApplyDetailsVo.java | 4 ++ .../busvehicleapply/BusVehicleApplyDto.java | 4 +- .../biz/basetrailer/BaseTrailerService.java | 2 + .../basevehicleout/BaseVehicleOutService.java | 4 ++ .../BusVehicleApplyService.java | 39 ++++++++++++- .../FinPaymentrecordFeign.java | 5 ++ .../FinPaymentrecordFeignFallback.java | 5 ++ .../FinPaymentrecordMapper.xml | 1 + .../FinPaymentrecordRest.java | 7 +++ .../FinPaymentrecordService.java | 56 +++++++++++++++++++ .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../biz/sysfunction/SysFunctionService.java | 5 ++ 16 files changed, 147 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java index f7cc155ba9..e86cec4984 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java @@ -113,4 +113,8 @@ public class BaseVehicleOut extends BaseEntity { @ApiModelProperty("财务中客户编码") private String cwCustomerNo; + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java index fa68827229..6a592df27a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java @@ -83,4 +83,9 @@ public class BaseVehicleOutDetailsVo implements Vo { private String innerName; @ApiModelProperty("内部引荐人用户sid") private String innerUserSid; + + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index 02a11ee65e..8a723c8e03 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -106,4 +106,9 @@ public class BaseVehicleOutDto implements Dto { private String innerName; @ApiModelProperty("内部引荐人用户sid") private String innerUserSid; + + @ApiModelProperty("采购类型key") + private String manPurOrderTypeKey; + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index c3591530a5..199185bc52 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -109,4 +109,7 @@ public class BaseVehicleOutVo implements Vo { private String trailerOrInstallCode; @ApiModelProperty("内部引荐人姓名") private String innerName; + + @ApiModelProperty("采购类型value") + private String manPurOrderTypeValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java index ec0bb06357..33e933b794 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java @@ -3,6 +3,8 @@ package com.yxt.anrui.base.api.busvehicleapply; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -73,4 +75,6 @@ public class BusVehicleApplyDetailsVo implements Vo { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty("附件信息") + private List commonAppendixs; //附件信息 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index 9b14876427..909e519bc2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.busvehicleapply; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -87,5 +88,6 @@ public class BusVehicleApplyDto implements Dto { @ApiModelProperty("当前组织机构全路径sid") private String orgPath; - + @ApiModelProperty("附件信息") + private List commonAppendixs; //附件信息 } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 063d8cf676..7a68892a86 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -491,6 +491,8 @@ public class BaseTrailerService extends MybatisBaseService busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(sid); busVehicleApplyDetailsVo.setBusVehicleApplyDetailList(busVehicleApplyDetailVos); + List commonAppendixVos = commonAppendixService.selByLinkSid(sid); + for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { + String filePath = commonAppendixVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + commonAppendixVo.setFilePath(filePath); + } + busVehicleApplyDetailsVo.setCommonAppendixs(commonAppendixVos); return busVehicleApplyDetailsVo; } @@ -237,6 +253,7 @@ public class BusVehicleApplyService extends MybatisBaseService saveOrUpdateDto(BusVehicleApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); + List commonAppendixs = dto.getCommonAppendixs(); if (StringUtils.isBlank(sid)) {//新增 //======================================= String orgSidPath = ""; @@ -295,6 +312,15 @@ public class BusVehicleApplyService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendix.setFilePath(filePath); + commonAppendix.setLinkSid(sid); + commonAppendixService.saveOrUpdateDto(commonAppendix); + } } else {//修改 BusVehicleApply busVehicleApply = fetchBySid(sid); if (busVehicleApply == null) { @@ -326,7 +352,16 @@ public class BusVehicleApplyService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendix.setFilePath(filePath); + commonAppendix.setLinkSid(sid); + commonAppendixService.saveOrUpdateDto(commonAppendix); + } } return rb.success().setData(sid); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java index 2b573df11c..2d9820bbd5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java @@ -62,6 +62,11 @@ public interface FinPaymentrecordFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("根据条件分页查询数据的列表（层级查询）") + @PostMapping("/listPageCJCX") + @ResponseBody + public ResultBean> listPageCJCX(@RequestBody PagerQuery pq); + @ApiOperation("新增") @PostMapping("/save") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java index fc05fa27c8..ad11923f04 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java @@ -56,6 +56,11 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign { return rb.setMsg("接口anrui-fin/finpaymentrecord/listPage无法访问"); } + @Override + public ResultBean> listPageCJCX(PagerQuery pq) { + return null; + } + @Override public ResultBean save(FinPaymentrecordDto dto) { return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index b1c63fc43d..8bf8540885 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -25,6 +25,7 @@ fp.payFile, fp.payCode FROM fin_paymentrecord fp + LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid ${ew.sqlSegment} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java index d39323905c..da7910e576 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java @@ -65,6 +65,13 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign { return rb.success().setData(pv); } + @Override + public ResultBean> listPageCJCX(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finPaymentrecordService.listPageCJCX(pq); + return rb.success().setData(pv); + } + @Override public ResultBean save(FinPaymentrecordDto dto) { return finPaymentrecordService.saveDto(dto); 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 945babb900..f5a43ed275 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,6 +182,62 @@ public class FinPaymentrecordService extends MybatisBaseService listPageCJCX(PagerQuery pq) { + FinPaymentrecordQuery pageQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (pageQuery != null) { + //根据用户的组织机构查询分公司 + String orgSidPath = pageQuery.getOrgPath(); + //分公司sid + String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData(); + SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); + String orgLevelKey = data.getOrgLevelKey(); + if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, 73); + qw.like("so.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + qw.eq("fp.createOrgSid", orgSid); + } + //付款状态 + if (StringUtils.isNotBlank(pageQuery.getState())) { + qw.eq("fp.state", pageQuery.getState()); + } + //款项类别 + if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) { + qw.eq("fp.costTypekey", pageQuery.getCostTypeKey()); + } + //款项名称 + if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) { + qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey()); + } + //申请日期 + qw.apply(StringUtils.isNotBlank(pageQuery.getCreateStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(pageQuery.getCreateEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getCreateEndDate() + "','%Y-%m-%d')" + ); + } + qw.orderByDesc("fp.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + List list = pagging.getRecords(); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (FinPaymentrecordVo vv : list) { + String payFile = vv.getPayFile(); + if (StringUtils.isNotBlank(payFile)) { + List strings = Arrays.asList(payFile.split(",")); + for (int i = 0; i < strings.size(); i++) { + if (!strings.get(i).contains(fileUploadComponent.getUrlPrefix())) { + strings.set(i, fileUploadComponent.getUrlPrefix() + strings.get(i)); + } + } + vv.setPayFiles(strings); + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean saveDto(FinPaymentrecordDto dto) { ResultBean rb = ResultBean.fireFail(); FinPaymentrecord finPaymentrecord = new FinPaymentrecord(); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index c42914e5df..44203a4e1d 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -10,7 +10,7 @@ public enum ProcDefEnum { ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), - SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25 + SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),//TODO：正式新2023-02-21 FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"), diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java index 5adcf3be50..61a4366e24 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java @@ -183,6 +183,11 @@ public class SysFunctionService extends MybatisBaseService sysSourceVos = sysSourceService.listFunctionTreeVo(name); for (SysFunctionTreeVo s : sysSourceVos) { List sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid()); + for (SysFunctionTreeVo sysFunctionTreeVo : sysFunctionVoList) { + if (StringUtils.isNotBlank(sysFunctionTreeVo.getRemarks())){ + sysFunctionTreeVo.setName(sysFunctionTreeVo.getName() + "(" + sysFunctionTreeVo.getRemarks() + ")"); + } + } s.setChildren(sysFunctionVoList); s.setIsSource("1"); //判断该资源下的功能是否有可用的状态