From d690e985f5fd61f667bbdb0aa7e7c2692676ff38 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 19 Sep 2022 08:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonappendix/CommonAttachTypeEnum.java | 1 + .../AppCommonContractPageVo.java | 12 ++++ .../AppCommonContractQuery.java | 2 +- .../api/commoncontract/CommonContract.java | 6 +- .../CommonContractBuscenterVo.java | 3 - .../base/common/enums/CommonContractEnum.java | 4 +- .../commonappendix/CommonAppendixMapper.java | 3 + .../commonappendix/CommonAppendixMapper.xml | 37 +++++++--- .../commonappendix/CommonAppendixService.java | 5 ++ .../commoncontract/CommonContractMapper.java | 2 +- .../commoncontract/CommonContractMapper.xml | 61 +++++++++------- .../commoncontract/CommonContractService.java | 69 +++++++++++++------ .../ScmVehicleGressionService.java | 9 ++- 13 files changed, 142 insertions(+), 72 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index bda7555973..6a5e21fb30 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -36,6 +36,7 @@ public enum CommonAttachTypeEnum { * 26、0009_11：放款文件_首付款证明 */ CONTRACT("0001", "合同"), + CONTRACT_UPLOAD("0001_1", "合同下载"), CREDIT("0002", "人行征信"), INVOICE("0003", "开票申请附件"), INVOICE_KHKPSQS("0003_1", "客户开票申请书"), diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java index 9a06bc521e..2f98f8ec13 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java @@ -1,10 +1,14 @@ package com.yxt.anrui.base.api.commoncontract; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class AppCommonContractPageVo implements Vo { @@ -36,5 +40,13 @@ public class AppCommonContractPageVo implements Vo { @ApiModelProperty("节点状态") private String nodeState; + private List files = new ArrayList<>(); + @ApiModelProperty("是否显示下载") + private Boolean isShowDownload; + @JsonIgnore + private String commonContractUrl; + + + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java index 931ea6d665..daf3f82383 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractQuery.java @@ -29,7 +29,7 @@ public class AppCommonContractQuery implements Query { @ApiModelProperty("状态") private String type; - @ApiModelProperty("") + @ApiModelProperty("客户") private String names; @ApiModelProperty("分公司sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index a4c330bcf2..ac8884d7f4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -29,8 +29,6 @@ import java.util.Date; public class CommonContract extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("合同编号(合同类型+部门编码+yyyyMMdd+001)") private String contractNo; @@ -109,8 +107,8 @@ public class CommonContract extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; - @ApiModelProperty("生成的合同的url") - private String commonContractUrl; private String configSid; + + private String commonContractUrl; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java index 4e4b066971..568631fbf8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java @@ -87,7 +87,4 @@ public class CommonContractBuscenterVo implements Vo { @ApiModelProperty("附件文件") private List pcCommonAppendixDtoList; - - private String commonContractUrl; - } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java index 1442606aac..b4bf56be79 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java @@ -14,8 +14,8 @@ public class CommonContractEnum { /** * 新车买卖合同 */ - DC_CONTRACT("010", "新车买卖合同（订车）"), - XC_CONTRACT("009", "新车买卖合同（现车）"); + DC_CONTRACT("010", "新车买卖合同(订车)"), + XC_CONTRACT("009", "新车买卖合同(现车)"); /** * code值 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java index fcdb79a990..1fb4369550 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -63,4 +64,6 @@ public interface CommonAppendixMapper extends BaseMapper { @Select("SELECT * FROM common_appendix WHERE filePath =#{s}") CommonAppendixVo fetchByFilePath(String s); + + List selectByType(@Param("sid") String sid, @Param("attachType") String attachType,@Param("path") String path); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml index b2d323aded..b0f8368248 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.xml @@ -4,25 +4,33 @@ - DELETE FROM common_appendix - WHERE linkSid=#{linkSid} - - AND attachType=#{attachType} + DELETE + FROM common_appendix + WHERE linkSid = #{linkSid} + + AND attachType = #{attachType} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java index 9155a8d9cc..ff38b69e4b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.commonappendix.*; +import com.yxt.anrui.base.api.commoncontract.PrintConfirmVo; import com.yxt.anrui.crm.api.crmvisit.CrmVisitFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; @@ -478,4 +479,8 @@ public class CommonAppendixService extends MybatisBaseService selectByType(String sid, String attachType,String path) { + return baseMapper.selectByType(sid,attachType,path); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java index 4f19b9e6aa..ec8e3e9444 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java @@ -68,7 +68,7 @@ public interface CommonContractMapper extends BaseMapper { CommonContractBuscenterVo selectByBusSid(String busSid); - IPage getContractList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getContractList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw,@Param("names")String names); /** * 移动端-初始化合同审核 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 2b603f43fd..c61a899565 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -3,7 +3,7 @@ INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid, - createDate, address, deposit, contractAmount, remarks) + createDate, address, deposit, contractAmount, remarks) VALUES (UUID(), @@ -39,19 +39,19 @@ @@ -95,9 +104,9 @@ customerSid, appdixUrl, sceneSignUrl, - taskId, - procInstId as procInsId, - staffSid as userSid + taskId, + procInstId as procInsId, + staffSid as userSid FROM common_contract WHERE sid = #{contractSid} @@ -120,7 +129,7 @@ UPDATE common_contract SET nodeState=#{nodeState} - , nodeId=#{taskDefKey} + , nodeId=#{taskDefKey} , procDefId=#{procDefId} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index a4fb65ad53..23684e1913 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto; import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery; @@ -986,35 +987,35 @@ public class CommonContractService extends MybatisBaseService qw = appCreateQueryWrapper(query); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.getContractList(page, qw); + IPage iPage = baseMapper.getContractList(page, qw,query.getNames()); + List records = iPage.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (AppCommonContractPageVo vo : records) { + String sid = vo.getContractSid(); + //根据sid查询合同 + List list = commonAppendixService.selectByType(sid, CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType(), docPdfComponent.getPrefixTemplateUrl()); + vo.setFiles(list); + if (StringUtils.isNotBlank(vo.getCommonContractUrl())) { + vo.setIsShowDownload(true); + } else { + vo.setIsShowDownload(false); + } + } + } PagerVo p = PagerUtil.pageToVo(iPage, null); return p; } private QueryWrapper appCreateQueryWrapper(AppCommonContractQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - - -// if (StringUtils.isNotBlank(query.getType())) { //合同类型 -// qw.eq("contractTypeKey", query.getType()); -// } - if (StringUtils.isNotBlank(query.getNames())) { // 甲方名称 - qw.like("partyA", query.getNames()); - } - if (StringUtils.isNotBlank(query.getNames())) { // 乙方名称 - qw.like("partyB", query.getNames()); - } - if (StringUtils.isNotBlank(query.getNames())) { // 其他方名称 - qw.like("partyC", query.getNames()); - } if (StringUtils.isNotBlank(query.getUserSid())) { // 业务员sid qw.eq("staffSid", query.getUserSid()); } - if (StringUtils.isNotBlank(query.getType())) { // 业务员sid + if (StringUtils.isNotBlank(query.getType())) { qw.eq("state", query.getType()); } + qw.orderByDesc("id"); return qw; } @@ -1106,7 +1107,7 @@ public class CommonContractService extends MybatisBaseService -1) { siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1116,7 +1117,7 @@ public class CommonContractService extends MybatisBaseService -1) { idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1125,7 +1126,7 @@ public class CommonContractService extends MybatisBaseService 0) { + //添加合同下载路径 + for (PrintConfirmVo vo : list) { + String str = vo.getDownloadUrl(); + String urlPrefix = docPdfComponent.getPrefixTemplateUrl(); + String uploadPath = docPdfComponent.getUploadTemplateUrl(); + CommonAppendix commonAppendix = new CommonAppendix(); + commonAppendix.setLinkSid(commonContract.getSid()); + commonAppendix.setAttachType(CommonAttachTypeEnum.CONTRACT_UPLOAD.getAttachType()); + String pathLoc = str.replace(urlPrefix, uploadPath); + pathLoc = pathLoc.replace("/", File.separator); + File file = new File(pathLoc); + String size = ""; + if (file != null) { + size = FileUploadComponent.getPrintSize(file.length()); + } + String suffix = str.substring(str.lastIndexOf(".") + 1); // 文件类型 + String fileName = str.substring(str.lastIndexOf("/") + 1, str.lastIndexOf(".")); // 文件名 + commonAppendix.setFileName(vo.getName()); + commonAppendix.setFileType(suffix); + commonAppendix.setFileSize(size); + commonAppendix.setFilePath(str.replace(urlPrefix, "")); + commonAppendix.setRemarks("合同下载"); + commonAppendixService.insert(commonAppendix); + } + } return commonContract.getSid(); }); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index b1545eb36f..990f2c29dc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -413,7 +413,7 @@ public class ScmVehicleGressionService extends MybatisBaseService vinList = scmVehicleGressionVehService.fetchVoByMainSid(businessSid); if (vinList.size() > 0) { for (String s : vinList) { - BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); + BaseVehicle baseVehicleVo = baseVehicleFeign.selectByVinNoAndOrgSid(s,scmVehicleGression.getUseOrgSid()).getData(); +// BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(s).getData(); BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid()); baseVehicleTempstateDto.setTempStateKey("001");