diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java index 95fb04551b..3637ee8123 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -31,13 +32,13 @@ public class AppCommonContractInitVo implements Vo { private String contractPrice; @ApiModelProperty("新车买卖合同") - private List contractImages; + private List contractImages = new ArrayList<>(); @ApiModelProperty("现场签署图片") - private List siteSigImages; + private List siteSigImages = new ArrayList<>(); @ApiModelProperty("身份证图片") - private List idCardImages; + private List idCardImages = new ArrayList<>(); @ApiModelProperty("客户类型") private String customerKey; @@ -66,5 +67,10 @@ public class AppCommonContractInitVo implements Vo { @ApiModelProperty("身份证图片") private String idImagesUrl; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("车型sid") + private String modelSid; + } 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 2f98f8ec13..d93fd26f53 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 @@ -45,6 +45,8 @@ public class AppCommonContractPageVo implements Vo { private Boolean isShowDownload; @JsonIgnore private String commonContractUrl; + @JsonProperty("number") + private String num; 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 ac8884d7f4..0b21b84e62 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 @@ -37,6 +37,11 @@ public class CommonContract extends BaseEntity { @ApiModelProperty("合同类型") private String contractType; + + @ApiModelProperty("客户类型") + private String customerType; + @ApiModelProperty("客户类型key") + private String customerTypeKey; @ApiModelProperty("客户sid") private String customerSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java index 68510cefbc..f367ab618d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java @@ -26,4 +26,21 @@ public class DictCommonEnum { this.remarks = remarks; } } + + /** + * 客户类型 + */ + @Getter + public static enum customerType { + GR_TYPE("1", "个人"), + QY_TYPE("2", "企业"), + ; + private final String code; + private final String remarks; + + customerType(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } } 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 c61a899565..efa6e5736e 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 @@ -77,7 +77,8 @@ contractAmount AS contractPrice, if(length(nodeState) > 0, nodeState, '待提交') as nodeState, if(length(nodeState) > 0, false, true) as isShowUpdate, - commonContractUrl + commonContractUrl, + num FROM common_contract ${ew.sqlSegment} @@ -94,19 +95,23 @@ 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 23684e1913..2e256ad826 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 @@ -987,7 +987,7 @@ public class CommonContractService extends MybatisBaseService qw = appCreateQueryWrapper(query); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.getContractList(page, qw,query.getNames()); + IPage iPage = baseMapper.getContractList(page, qw, query.getNames()); List records = iPage.getRecords(); records.removeAll(Collections.singleton(null)); if (!records.isEmpty()) { @@ -1050,24 +1050,28 @@ public class CommonContractService extends MybatisBaseService idCard = new ArrayList<>(); - List idCardImages = Arrays.asList(split3); - for (String idCardImage : idCardImages) { - String idCardImagesUrl = urlPrefix + idCardImage; - idCard.add(idCardImagesUrl); - } - vo.setIdCardImages(idCard); + if ("1".equals(vo.getCustomerKey())) { + //查询客户的档案库中是否有图片 + ResultBean> resultBean = crmCustomerTempFeign.selectCustomerFile(vo.getCustomerSid()); + List stringList = resultBean.getData(); + if (stringList.size() > 0) { + vo.setIdCardArchives(true); + vo.setIdCardImages(stringList); } else { - vo.setIdCardImages(new ArrayList<>()); + vo.setIdCardArchives(false); + if (StringUtils.isNotBlank(vo.getIdImagesUrl())) { + String[] split3 = vo.getSceneSignUrl().split(","); + List idCard = new ArrayList<>(); + List idCardImages = Arrays.asList(split3); + for (String idCardImage : idCardImages) { + String idCardImagesUrl = urlPrefix + idCardImage; + idCard.add(idCardImagesUrl); + } + vo.setIdCardImages(idCard); + } else { + vo.setIdCardImages(new ArrayList<>()); + } } - } else if (vo.getCustomerKey().equals("2")) { - vo.setIdCardArchives(true); -// 往里添加客户档案里的身份证信息 } } return vo; @@ -1408,7 +1412,7 @@ public class CommonContractService extends MybatisBaseService 0) { //添加合同下载路径 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index c314599f76..bdaa951b09 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -30,6 +30,8 @@ public class AppOrderDetailsVo implements Vo { private String phone; @ApiModelProperty(value = "客户类型") private String customerKey; + @ApiModelProperty("客户类型") + private String customerType; @ApiModelProperty(value = "订单类型") private String orderType; @ApiModelProperty(value = "挂靠公司") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 9dd7f64452..b067cc9c00 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -93,11 +93,11 @@ resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillInfoVo"> SELECT customerSid, customerName, - mobile AS customerMobile, - payTypeKey AS payType, - payType AS payValue, - billingTypeKey AS invoiceType, - billingType AS invoiceValue, + mobile AS customerMobile, + payTypeKey AS payType, + payType AS payValue, + billingTypeKey AS invoiceType, + billingType AS invoiceValue, affiliatedCompany, affiliatedCompanySid as affiliatedOrgSid, financePlan, @@ -175,6 +175,7 @@ bo.customerName as name, bo.mobile as phone, bo.customerClassKey as customerKey, + bo.customerClass as customerType, bo.affiliatedCompany as affiliated, bo.billingType as invoiceType, bo.orgName as departmentName, @@ -209,7 +210,7 @@ diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index cb6c0367f6..d07dc6c1e2 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -147,5 +147,8 @@ public interface CrmCustomerTempFeign { @PutMapping("/saveCustomerArchives") public ResultBean saveCustomerArchives(@Valid @RequestBody AppCrmCustomerTempArchivesDto dto); + @ResponseBody + @GetMapping("/selectCustomerFile/{customerSid}") + public ResultBean> selectCustomerFile(@PathVariable("customerSid")String customerSid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 7ba662045f..551ea612e5 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -115,5 +115,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean> selectCustomerFile(String customerSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml index 2156cae525..af873601ce 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml @@ -26,7 +26,6 @@ ccf.dataType AS `key`, ccf.fileName AS title, createTime --- (SELECT MAX(cf.createTime) FROM crm_file cf WHERE cf.linkSid = ccf.sid) AS createTime FROM crm_customer_file ccf WHERE ccf.linkSid = #{customerSid} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java index 31a6700cf7..6436b83287 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java @@ -32,8 +32,6 @@ import com.yxt.anrui.base.api.basedatalist.BaseDataListFeign; import com.yxt.anrui.base.api.basedatalist.BaseDataListVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.crm.api.crmcustomerfile.*; -import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto; -import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataDto; import com.yxt.anrui.crm.api.crmfile.CrmFile; import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; import com.yxt.anrui.crm.api.crmfile.CrmFileDto; @@ -41,19 +39,16 @@ import com.yxt.anrui.crm.biz.crmfile.CrmFileService; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.base.utils.DateUtils; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.DateUtils; 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 org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -311,4 +306,22 @@ public class CrmCustomerFileService extends MybatisBaseService> selectCustomerFile(String customerSid) { + ResultBean> rb = ResultBean.fireFail(); + List dataVos = baseMapper.selectByCustomerSid(customerSid); + List list = new ArrayList<>(); + if (dataVos.size() > 0) { + for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) { + String sid = appCustomerArchivesDataVo.getSid(); + List listVo = baseMapper.selArchivesFileImageBySid(sid); + for (CrmFile crmFile : listVo) { + String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath(); + list.add(url); + } + appCustomerArchivesDataVo.setFiles(list); + } + } + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 6fc4a03b54..040143a4fa 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -263,5 +263,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerFileService.saveCustomerArchives(dto); } + @Override + public ResultBean> selectCustomerFile(String customerSid) { + return crmCustomerFileService.selectCustomerFile(customerSid); + } + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java index 6ddbc5cd79..3d7b58796d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java @@ -57,13 +57,8 @@ public class CommonContractInitVo implements Vo { @ApiModelProperty("客户sid") private String customerSid; - - @ApiModelProperty("合同附件") - private String appdixUrl; - - @ApiModelProperty("现场签署图片附件") - private String sceneSignUrl; - - @ApiModelProperty("身份证图片") - private String idImagesUrl; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("车型sid") + private String modelSid; }