From e7cb4f3abdf0c7c9147729decee848359777a2c9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 14 Jun 2024 17:30:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E4=BB=B6=E8=BF=94=E5=8E=82=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsOldpartreturnApply.java | 6 +- .../AsOldpartreturnApplyDetailsVo.java | 10 +-- .../AsOldpartreturnApplyDto.java | 10 +-- .../AsOldpartreturnApplyQuery.java | 2 +- .../AsOldpartreturnApplyVo.java | 2 +- .../AsOldparthandleApplyMapper.java | 2 + .../AsOldparthandleApplyMapper.xml | 8 ++ .../AsOldparthandleApplyService.java | 21 +++++ .../AsOldpartreturnService.java | 82 +++++++++---------- .../AsOldpartreturnApplyMapper.java | 2 + .../AsOldpartreturnApplyMapper.xml | 9 ++ .../AsOldpartreturnApplyService.java | 42 ++++++++-- 12 files changed, 127 insertions(+), 69 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApply.java index dde3f9cd8f..7967473bc5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApply.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApply.java @@ -55,9 +55,9 @@ public class AsOldpartreturnApply extends BaseEntity { @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 @ApiModelProperty("发起部门sid") - private String createDeptSid; // 发起部门sid + private String deptSid; // 发起部门sid @ApiModelProperty("发起部门名称") - private String createDeptName; // 发起部门名称 + private String deptName; // 发起部门名称 @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @@ -66,8 +66,6 @@ public class AsOldpartreturnApply extends BaseEntity { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") - private String orgSidPath; // 组织全路径 @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id @ApiModelProperty("环节定义的sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDetailsVo.java index 31510dcb45..7d55599d94 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDetailsVo.java @@ -65,10 +65,10 @@ public class AsOldpartreturnApplyDetailsVo implements Vo { private String createBySid; @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("发起部门sid") - private String createDeptSid; // 发起部门sid - @ApiModelProperty("发起部门名称") - private String createDeptName; // 发起部门名称 + @ApiModelProperty("发起部门sid") + private String deptSid; // 发起部门sid + @ApiModelProperty("发起部门名称") + private String deptName; // 发起部门名称 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("申请日期") private Date createTime; @@ -80,8 +80,6 @@ public class AsOldpartreturnApplyDetailsVo implements Vo { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") - private String orgSidPath; // 组织全路径 @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id @ApiModelProperty("环节定义的sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDto.java index 204630d9f0..5373b93cc5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyDto.java @@ -64,10 +64,10 @@ public class AsOldpartreturnApplyDto implements Dto { private String createBySid; @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("发起部门sid") - private String createDeptSid; // 发起部门sid - @ApiModelProperty("发起部门名称") - private String createDeptName; // 发起部门名称 + @ApiModelProperty("发起部门sid") + private String deptSid; // 发起部门sid + @ApiModelProperty("发起部门名称") + private String deptName; // 发起部门名称 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("申请日期") private Date createTime; @@ -79,8 +79,6 @@ public class AsOldpartreturnApplyDto implements Dto { private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("组织全路径") - private String orgSidPath; // 组织全路径 @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id @ApiModelProperty("环节定义的sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java index d6c63f3dce..be0e743fd8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java @@ -54,7 +54,7 @@ public class AsOldpartreturnApplyQuery implements Query { @ApiModelProperty("分公司名称") private String useOrgName; @ApiModelProperty("申请部门") - private String createDeptName; + private String deptName; @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("单据编号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyVo.java index bac552523b..b74cf0b359 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyVo.java @@ -62,7 +62,7 @@ public class AsOldpartreturnApplyVo implements Vo { @ApiModelProperty("分公司名称") private String useOrgName; @ApiModelProperty("申请部门") - private String createDeptName; + private String deptName; @ApiModelProperty("申请人") private String createByName; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java index bd8640f9bd..3bc4683178 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java @@ -67,4 +67,6 @@ public interface AsOldparthandleApplyMapper extends BaseMapper map); + + String selectNum(String billNo); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml index 64304d25c7..35cecb2506 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml @@ -40,4 +40,12 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java index c40f843677..5a291f6be1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.as.biz.asoldparthandleapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,6 +40,7 @@ import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery; import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo; import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*; import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService; +import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.*; import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery; import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign; @@ -93,6 +95,8 @@ public class AsOldparthandleApplyService extends MybatisBaseService asOldparthandleList = dto.getAsOldparthandleList(); + String deptSid = dto.getDeptSid(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + dto.setUseOrgSid(useOrgSid); + dto.setUseOrgName(organizationVo.getName()); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "JJCL" + organizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); String sid = this.insertByDto(dto); for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { asOldparthandleDto.setMainSid(sid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java index b2522b39ab..e084b301ef 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturn/AsOldpartreturnService.java @@ -59,52 +59,48 @@ import java.util.List; @Service public class AsOldpartreturnService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - AsOldpartreturnQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(AsOldpartreturnDto dto){ + public PagerVo listPageVo(PagerQuery pq) { + AsOldpartreturnQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(AsOldpartreturnDto dto) { + this.insertByDto(dto); + return; + } + + public void insertByDto(AsOldpartreturnDto dto) { + AsOldpartreturn entity = new AsOldpartreturn(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(AsOldpartreturnDto dto) { String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(AsOldpartreturnDto dto){ - AsOldpartreturn entity = new AsOldpartreturn(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(AsOldpartreturnDto dto){ - String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - AsOldpartreturn entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public AsOldpartreturnDetailsVo fetchDetailsVoBySid(String sid){ - AsOldpartreturn entity = fetchBySid(sid); - AsOldpartreturnDetailsVo vo = new AsOldpartreturnDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + AsOldpartreturn entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public AsOldpartreturnDetailsVo fetchDetailsVoBySid(String sid) { + AsOldpartreturn entity = fetchBySid(sid); + AsOldpartreturnDetailsVo vo = new AsOldpartreturnDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public List selByMainSid(String mainSid) { - return baseMapper.selByMainSid(mainSid); - } + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java index 85cdc92169..b6824f0f4c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java @@ -64,4 +64,6 @@ public interface AsOldpartreturnApplyMapper extends BaseMapper map); int selectBySid(String join); + + String selectNum(String billNo); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml index 9a51d57d37..9004d5a44c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml @@ -22,6 +22,7 @@ ON aoa.`sid` = ao.`mainSid` LEFT JOIN as_oldpartreturn_confirm ac ON ac.`mainSid` = aoa.`sid` + LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid ${ew.sqlSegment} @@ -53,4 +54,12 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java index bd75acfc3d..dbc4bacc0a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.as.biz.asoldpartreturnapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,6 +40,7 @@ import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnExcelInfo; import com.yxt.anrui.as.api.asoldpartreturn.ReturnExcelInfo; import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*; import com.yxt.anrui.as.biz.asoldpartreturn.AsOldpartreturnService; +import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.*; import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery; import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign; @@ -49,6 +51,8 @@ import com.yxt.anrui.as.feign.message.MessageFeign; import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowableQuery; import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; @@ -108,6 +112,8 @@ public class AsOldpartreturnApplyService extends MybatisBaseService asOldpartreturnList = dto.getAsOldpartreturnList(); + String deptSid = dto.getDeptSid(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + dto.setUseOrgSid(useOrgSid); + dto.setUseOrgName(organizationVo.getName()); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "JJFC" + organizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); String sid = this.insertByDto(dto); for (AsOldpartreturnDto asOldpartreturnDto : asOldpartreturnList) { asOldpartreturnDto.setMainSid(sid); @@ -290,7 +314,8 @@ public class AsOldpartreturnApplyService extends MybatisBaseService variables = new HashMap<>(); //用户的部门全路径sid - bv.setOrgSidPath(asOldpartreturnApply.getOrgSidPath()); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldpartreturnApply.getDeptSid()).getData(); + bv.setOrgSidPath(deptVo.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); //用户sid @@ -379,7 +404,8 @@ public class AsOldpartreturnApplyService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) {