From 5be626dd6009b9012aeb23e746b67e63119b096e Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Mon, 16 May 2022 12:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BD=A6=E5=9E=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=88=E5=90=8C=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=90=88=E5=90=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemodelconfig/BaseModelConfigMapper.xml | 6 +- .../BaseModelConfigService.java | 8 +- .../biz/basevehicle/BaseVehicleMapper.java | 10 + .../biz/basevehicle/BaseVehicleMapper.xml | 119 +++++----- .../base/biz/basevehicle/BaseVehicleRest.java | 11 + .../biz/basevehicle/BaseVehicleService.java | 41 ++++ .../BaseVehmodelConfigMapper.xml | 34 +-- .../BaseVehmodelConfigService.java | 11 +- .../commoncontract/CommonContractMapper.java | 11 + .../commoncontract/CommonContractMapper.xml | 30 +++ .../commoncontract/CommonContractRest.java | 29 ++- .../commoncontract/CommonContractService.java | 203 ++++++++++++++++-- 12 files changed, 405 insertions(+), 108 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index 01386099f0..4d20994536 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -328,7 +328,7 @@ WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bvc.configurationItemsSid - and bv.useOrg = bvc.useOrgSid) AS nowCarNum, + and bv.useOrg = bvc.useOrgSid) AS nowCarNum, (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid @@ -490,7 +490,7 @@ SELECT bv.sid, - bv.modelName, - bv.vinNo, - bv.engineNo, - bv.vehicleStateValue, - bv.location, - bv.libraryAge + bv.modelName, + bv.vinNo, + bv.engineNo, + bv.vehicleStateValue, + bv.location, + bv.libraryAge FROM base_vehicle bv ${ew.sqlSegment} @@ -69,10 +69,10 @@ bv.libraryAge FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid - LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid - LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState - ${ew.customSqlSegment} + LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid + LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid + LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState + ${ew.customSqlSegment} @@ -158,16 +158,16 @@ bvm.isValidity, bvm.isValidityValue FROM base_vehicle_model bvm - LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid - LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid - LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand + LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid + LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid + LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand WHERE bvm.sid = #{modelSid} - AND bmc.sid = #{modelConfigSid} + AND bmc.sid = #{modelConfigSid} INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location, - vehicleState, firstStartDate, libraryAge) + vehicleState, firstStartDate, libraryAge) VALUES (UUID(), @@ -196,8 +196,8 @@ SELECT bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid + LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid ${ew.sqlSegment} @@ -373,9 +373,9 @@ bv.modelConfigSid AS configSid FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` - ${ew.customSqlSegment} + LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` + ${ew.customSqlSegment} @@ -476,29 +476,30 @@ bv.modelConfigSid AS configSid FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` - ${ew.customSqlSegment} + LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` + ${ew.customSqlSegment} ORDER BY - bv.priceDate desc + bv.priceDate desc @@ -632,9 +633,9 @@ DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate, bv.priced FROM base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` - ${ew.customSqlSegment} + LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` + ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 688b44c466..2a8cdd448c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -501,6 +501,10 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Override public ResultBean> getModelList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); + AppVehicleModelPriceQuery params = pagerQuery.getParams(); + if (params == null) { + return rb.setMsg("必传数据不能为空"); + } String userSid = pagerQuery.getParams().getUserSid(); if (StringUtils.isBlank(userSid)) { return rb.setMsg("用户sid不能为空"); @@ -531,5 +535,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(vo); } + @Override + public ResultBean getModelNowCarList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + AppBaseConfigNowCarVo vo = baseVehicleService.getModelNowCarList(pagerQuery); + return rb.success().setData(vo); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 340d951301..671c28ee8e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1196,4 +1196,45 @@ public class BaseVehicleService extends MybatisBaseService pagerQuery) { + AppBaseConfigNowCarQuery query = pagerQuery.getParams(); + SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData(); + String useOrg = data.getSid(); + AppBaseConfigNowCarVo appBaseConfigNowCarVo = new AppBaseConfigNowCarVo(); + List vinNowCarVos = new ArrayList<>(); + QueryWrapper qw = modelNowCarWrapper(query); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getModelNowCarList(page, qw); + for (AppBaseVinNowCarVo record : pagging.getRecords()) { + vinNowCarVos.add(record); + } + appBaseConfigNowCarVo.setRecords(vinNowCarVos); + return appBaseConfigNowCarVo; + } + + private QueryWrapper modelNowCarWrapper(AppBaseConfigNowCarQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getNames())) { + qw.eq("bv.modelSid", query.getModelSid());//车型sid + } + if (StringUtils.isNotBlank(query.getNames())) { + qw.eq("bv.modelConfigSid", query.getConfigSid());//配置sid + } + if (StringUtils.isNotBlank(query.getNames())) { + qw.like("bv.vinNo", query.getNames());//车架号 + } + if (StringUtils.isNotBlank(query.getUseOrg())) { + qw.eq("bv.useOrg", query.getUseOrg()); + } + } + return qw; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 617246c010..f3d4824cc5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -5,9 +5,9 @@ SELECT bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid ${ew.sqlSegment} @@ -184,7 +184,7 @@ + + + + + DELETE diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index ca06b93e4b..02e544a0c6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -13,6 +13,7 @@ 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.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -170,7 +171,7 @@ public class CommonContractRest implements CommonContractFeign { attachType = CommonAttachTypeEnum.CONTRACT.getAttachType(); if (pcCommonAppendixDtoList != null) { for (PcCommonAppendixDto pcCommonAppendixDto : pcCommonAppendixDtoList) { - commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, dto.getStaffSid(),attachType); + commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, dto.getStaffSid(), attachType); fileUploadComponent.getUrlPrefix(); String filePath = pcCommonAppendixDto.getFilePath(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -184,7 +185,7 @@ public class CommonContractRest implements CommonContractFeign { attachType = CommonAttachTypeEnum.SCENESIGN.getAttachType(); if (sceneSignUrlList.size() != 0) { for (PcCommonAppendixDto pcCommonAppendixDto : sceneSignUrlList) { - commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, dto.getSid(), dto.getStaffSid(),attachType); + commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, dto.getSid(), dto.getStaffSid(), attachType); fileUploadComponent.getUrlPrefix(); String filePath = pcCommonAppendixDto.getFilePath(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -499,4 +500,28 @@ public class CommonContractRest implements CommonContractFeign { public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) { return commonContractService.submitCarSaleContractApprove(dto); } + + @Override + @ApiOperation("移动端-合同审核列表") + public ResultBean> getContractList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = commonContractService.getContractList(pagerQuery); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("移动端-初始化合同审核") + public ResultBean getContractInfo(String contractSid, String userSid) { + ResultBean rb = ResultBean.fireFail(); + AppCommonContractInitVo vo = commonContractService.getContractInfo(contractSid, userSid); + return rb.success().setData(vo); + } + + @Override + @ApiOperation("移动端-保存合同审核") + public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = commonContractService.saveContractInfo(dto); + return rb.success(); + } } 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 317c35a14f..28ea520b5c 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 @@ -4,6 +4,8 @@ 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.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; @@ -14,7 +16,11 @@ import com.yxt.anrui.base.biz.flow.FlowableService; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; +import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFile; +import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; +import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileListVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; @@ -25,6 +31,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; @@ -40,6 +47,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.xml.crypto.Data; import java.io.File; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -81,10 +89,10 @@ public class CommonContractService extends MybatisBaseService getContractList(PagerQuery pagerQuery) { + AppCommonContractQuery query = pagerQuery.getParams(); + String staffSid = sysUserFeign.getUserOrgInfoByUserSid(query.getUserSid()).getData().getStaffSid(); + query.setStaffSid(staffSid); + QueryWrapper qw = appCreateQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage iPage = baseMapper.getContractList(page, qw); + 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.getStaffSid())) { // 业务员sid + qw.like("staffSid", query.getStaffSid()); + } + return qw; + } + + /** + * 移动端-初始化合同审核 + * + * @param contractSid + * @param userSid + * @return + */ + public AppCommonContractInitVo getContractInfo(String contractSid, String userSid) { + String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid(); + AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid, staffSid); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + + String[] split1 = vo.getAppdixUrl().split(","); + List contract = new ArrayList<>(); + List contractImages = Arrays.asList(split1); + for (String contractImage : contractImages) { + String contractImageUrl = urlPrefix + contractImage; + contract.add(contractImageUrl); + } + vo.setContractImages(contract); + + String[] split2 = vo.getSceneSignUrl().split(","); + List siteSig = new ArrayList<>(); + List siteSigImages = Arrays.asList(split2); + for (String siteSigImage : siteSigImages) { + String siteSigImagesUrl = urlPrefix + siteSigImage; + siteSig.add(siteSigImagesUrl); + } + vo.setSiteSigImages(siteSig); + + if (vo.getCustomerKey().equals("1")) { + vo.setIdCardArchives(false); + if (StringUtils.isNotBlank(vo.getSceneSignUrl())) { + + 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; + } + + /** + * 合同审核保存接口 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) { + ResultBean rb = ResultBean.fireFail(); + + AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); + CommonContract commonContract = new CommonContract(); + commonContract.setContractNo(dto.getContractId()); + commonContract.setPrice(dto.getPrice()); + commonContract.setNum(Integer.valueOf(dto.getNumber())); + commonContract.setModelName(dto.getModel()); + commonContract.setPartyB(dto.getPartyB()); + commonContract.setContractAmount(dto.getContractPrice()); + commonContract.setCustomerSid(dto.getCustomerSid()); + commonContract.setStaffSid(data.getStaffSid()); + commonContract.setStaffName(data.getStaffName()); + commonContract.setOrgSid(data.getOrgSid()); + String s1 = ""; + String s2 = ""; + String s3 = ""; + if (dto.getContractImages().size() > 0) { + for (String contractImage : dto.getContractImages()) { + if (contractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + contractImage = contractImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + s1 += contractImage + ","; + } + commonContract.setAppdixUrl(s1.substring(0, s1.length() - 1)); + } + + if (dto.getContractImages().size() > 0) { + for (String siteSigImages : dto.getSiteSigImages()) { + if (siteSigImages.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), ""); + } + s2 += siteSigImages + ","; + } + commonContract.setSceneSignUrl(s2.substring(0, s2.length() - 1)); + } + + if (dto.getContractImages().size() > 0) { + for (String idCardImage : dto.getIdCardImages()) { + if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + s3 += idCardImage + ","; + } + commonContract.setIdImagesUrl(s3.substring(0, s3.length() - 1)); + } + save(commonContract); + return rb.success(); + } //ToDo: /** * 合同信息数据 @@ -942,22 +1103,22 @@ public class CommonContractService extends MybatisBaseService getMap(Map map, PrintConfirmDto dto) { Map commonContractMap = map;*/ - /** - * 车辆登记合同参数： - * 甲方：${partyA} - * 乙方：${partyB} - * 签订时间：${createDate} - * 车辆出售方：${partyA} - * 车辆信息List: - * { - * 序号： - * 品牌：${item.brandName} - * 车架号：${item.VINNo} - * 发动机号：${item.engineNo} - * } - */ - //甲方为卖方，即xxx公司，即根据销售订单的单位sid查询单位的名称 - //乙方为受卖方，即销售订单的客户名称 + /** + * 车辆登记合同参数： + * 甲方：${partyA} + * 乙方：${partyB} + * 签订时间：${createDate} + * 车辆出售方：${partyA} + * 车辆信息List: + * { + * 序号： + * 品牌：${item.brandName} + * 车架号：${item.VINNo} + * 发动机号：${item.engineNo} + * } + */ + //甲方为卖方，即xxx公司，即根据销售订单的单位sid查询单位的名称 + //乙方为受卖方，即销售订单的客户名称 /* ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(dto.getBusSid()); if (busOrderVoResultBean.getSuccess() && busOrderVoResultBean.getData() != null) { BusOrderVo orderVo = busOrderVoResultBean.getData(); @@ -968,7 +1129,7 @@ public class CommonContractService extends MybatisBaseService