From 631e5b1334688d80132af42ce2a70e3274e9c33d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 4 Feb 2023 15:59:13 +0800 Subject: [PATCH 1/3] =?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 --- .../basevehicleout/BaseVehicleOutService.java | 61 ++++++++++++------- .../api/bussalesorder/BusSalesOrderFeign.java | 5 ++ .../BusSalesOrderFeignFallback.java | 5 ++ .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 5 ++ .../biz/bussalesorder/BusSalesOrderRest.java | 5 ++ .../bussalesorder/BusSalesOrderService.java | 9 +++ .../FinCollectionConfirmationFeign.java | 4 ++ ...inCollectionConfirmationFeignFallback.java | 5 ++ .../FinCollectionConfirmationMapper.java | 3 + .../FinCollectionConfirmationMapper.xml | 4 ++ .../FinCollectionConfirmationRest.java | 5 ++ .../FinCollectionConfirmationService.java | 26 ++++++-- .../FinSelectedReceivablesDetailedMapper.java | 1 + .../FinSelectedReceivablesDetailedMapper.xml | 30 +++++++++ ...FinSelectedReceivablesDetailedService.java | 4 ++ .../api/dictcommon/DictCommonFeign.java | 5 ++ .../dictcommon/DictCommonFeignFallback.java | 5 ++ .../biz/dictcommon/DictCommonMapper.java | 8 +++ .../biz/dictcommon/DictCommonMapper.xml | 4 ++ .../portal/biz/dictcommon/DictCommonRest.java | 5 ++ .../biz/dictcommon/DictCommonService.java | 6 ++ 22 files changed, 182 insertions(+), 25 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 0c545e9cf4..a087983297 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -30,6 +30,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo; @@ -93,6 +94,8 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { @@ -136,30 +139,46 @@ public class BaseVehicleOutService extends MybatisBaseService stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getCustomerNo(),dto.getVinSid()); + if(!stringResultBean.getSuccess()){ + return rb.setMsg("请检查合同是否审核"); + } + String temporaryNo = stringResultBean.getData(); +// Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); + Boolean aBoolean1 = finKingDeeFeign.customerExistState(temporaryNo).getData(); if (!aBoolean1) { - List bdCustomers = new ArrayList<>(); - BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); - if (data != null){ - bdCustomer.setTOrgIds(data.getOrgCode()); - }else { - bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode()); - } - bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8)); - String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8); - if (FNumber1.length() > 30) { - FNumber1 = FNumber1.substring(0, 30); - bdCustomer.setFNumber(FNumber1); - } else { - bdCustomer.setFNumber(FNumber1); + Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); + if(!aBoolean2){ + List bdCustomers = new ArrayList<>(); + BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData(); + if (data != null){ + bdCustomer.setTOrgIds(data.getOrgCode()); + }else { + bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode()); + } + bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8)); + String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8); + if (FNumber1.length() > 30) { + FNumber1 = FNumber1.substring(0, 30); + bdCustomer.setFNumber(FNumber1); + } else { + bdCustomer.setFNumber(FNumber1); + } + bdCustomer.setFShortName(dto.getConcatNo()); + bdCustomers.add(bdCustomer); + finKingDeeFeign.draftBdCustomers(bdCustomers); + dto.setCwCustomerNo(bdCustomer.getFNumber()); + }else{ + b = true; + return rb.success().setData(b); } - bdCustomer.setFShortName(dto.getConcatNo()); - bdCustomers.add(bdCustomer); - finKingDeeFeign.draftBdCustomers(bdCustomers); - dto.setCwCustomerNo(bdCustomer.getFNumber()); } else { - b = true; - return rb.success().setData(b); + /* b = true; + return rb.success().setData(b);*/ + //查询已选择的收款单的车架号是否存在，若存在则修改，不存在则不用管 + //临时号截取最后两位 + ResultBean resultBean = finCollectionConfirmationFeign.updateVin(dto.getVinNo(),dto.getConcatNo(),temporaryNo.substring(temporaryNo.length()-2)); } } //修改客户简称为合同编号 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 9145c49453..2438183e62 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -273,4 +273,9 @@ public interface BusSalesOrderFeign { @PutMapping("/completeBy") @ResponseBody public ResultBean completeBy(@RequestBody OrderFlowableQuery orderFlowableQuery); + + @ApiOperation(value = "查询客户的临时编码") + @GetMapping("/selectTemporaryNo") + @ResponseBody + ResultBean selectTemporaryNo(@RequestParam("contractNo")String contractNo,@RequestParam("vehSid")String vehSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 2297913a96..4cbd115612 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -249,4 +249,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) { return null; } + + @Override + public ResultBean selectTemporaryNo(String contractNo, String vehSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 00551d62d4..96ff80881e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -193,4 +193,6 @@ public interface BusSalesOrderMapper extends BaseMapper { int updateImages(@Param("imagesFile") String imagesFile, @Param("sid") String sid); OrderRemarksVo getOrderRemarksInfo(String saleOrderSid); + + String selectTemporaryNo(@Param("contractNo") String contractNo, @Param("vehSid") String vehSid); } \ No newline at end of file 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 c17dd281ad..09aff650fd 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 @@ -326,4 +326,9 @@ from bus_sales_order where sid = #{saleOrderSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index f715c59f90..1e7ce13163 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -328,4 +328,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) { return busSalesOrderService.completeBy(orderFlowableQuery); } + + @Override + public ResultBean selectTemporaryNo(String contractNo, String vehSid) { + return busSalesOrderService.selectTemporaryNo(contractNo,vehSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 77284c0873..817f305fd2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -3873,4 +3873,13 @@ public class BusSalesOrderService extends MybatisBaseService selectTemporaryNo(String contractNo, String vehSid) { + ResultBean rb = ResultBean.fireFail(); + String temporaryNo = baseMapper.selectTemporaryNo(contractNo,vehSid); + if(StringUtils.isBlank(temporaryNo)){ + return rb; + } + return rb.success().setData(temporaryNo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 14ab97abfa..1f6d6f0e35 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -137,4 +137,8 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("根据分公司sid获取收款单编号") @GetMapping("/getApplyCode") ResultBean getApplyCode(@RequestParam("useOrgSid")String useOrgSid); + + @ApiOperation("更新已选择的款项明细的车架号") + @PutMapping("/updateVin") + ResultBean updateVin(@RequestParam("vinNo")String vinNo,@RequestParam("contractNo")String contractNo,@RequestParam("temporaryNo")String temporaryNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 00828ef0a3..b8cfe015b4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -147,4 +147,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf public ResultBean getApplyCode(String useOrgSid) { return null; } + + @Override + public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 3f695039cf..505a85931c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -109,4 +110,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper + + + update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index dbf41beea5..9b2d6cf9f3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -222,4 +222,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF String applyCode = finCollectionConfirmationService.getApplyCode(useOrgSid); return rb.success().setData(applyCode); } + + @Override + public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) { + return finCollectionConfirmationService.updateVin(vinNo,contractNo,temporaryNo); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 501bb0c9cd..095abd39cc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; @@ -1213,9 +1214,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); - List records = collectionConfirmList.getRecords(); - for (AppFinUncollectedReceivablesDetailedVo record : records) { +// IPage collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); + List collList = finSelectedReceivablesDetailedService.getPaymentList(qw,params.getName()); +// List records = collectionConfirmList.getRecords(); + for (AppFinUncollectedReceivablesDetailedVo record : collList) { record.setConfirmDate(dateFormat.format(new Date())); String busVinSid = record.getBusVinSid(); ResultBean resultBean = busSalesOrderVehicleFeign.details(busVinSid); @@ -1233,7 +1235,17 @@ public class FinCollectionConfirmationService extends MybatisBaseServicev.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); + } + //分页 + IPage page1 = new Page<>(); + page1.setRecords(collList); + page1.setTotal(collList.size()); + page1.setPages((collList.size() / pagerQuery.getSize()) + 1); + page1.setCurrent(pagerQuery.getCurrent()); + page1.setSize(pagerQuery.getSize()); + return page1; } /** @@ -2039,4 +2051,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + List getPaymentList(@Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index a583744b28..42f2e7e861 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -53,6 +53,36 @@ order by furd.contractNo desc + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java index 3192d3fb94..cfb90e5e6f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java @@ -138,4 +138,9 @@ public class DictCommonRest implements DictCommonFeign { return new ResultBean().fail().setData(new DictCommon()); } } + + @Override + public ResultBean> getTypeValueList(String type, String groupNum) { + return dictCommonService.getList(type,groupNum); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java index ca2adc137c..e977d081fd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java @@ -10,6 +10,7 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; import java.util.List; @@ -72,4 +73,9 @@ public class DictCommonService extends MybatisBaseService> getList(String type, String groupNum) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getList(type,groupNum); + return rb.success().setData(list); + } } From 779db4ea64ab06a3710b31711fe02c08c431c966 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 4 Feb 2023 16:52:56 +0800 Subject: [PATCH 2/3] =?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 --- .../anrui/base/biz/basevehicleout/BaseVehicleOutService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 0c545e9cf4..177496b59b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -348,7 +348,7 @@ public class BaseVehicleOutService extends MybatisBaseService Date: Sat, 4 Feb 2023 16:57:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmcustomertemp/CrmCustomerTempFeign.java | 15 +++++++++++++++ .../CrmCustomerTempFeignFallback.java | 15 +++++++++++++++ .../crmcustomertemp/CrmCustomerTempMapper.java | 6 ++++++ .../crmcustomertemp/CrmCustomerTempMapper.xml | 12 ++++++++++++ .../crmcustomertemp/CrmCustomerTempRest.java | 15 +++++++++++++++ .../CrmCustomerTempService.java | 18 ++++++++++++++++++ 6 files changed, 81 insertions(+) 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 334b452dec..08f95c69bf 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 @@ -179,4 +179,19 @@ public interface CrmCustomerTempFeign { @PostMapping("/saveFileCustomer") @ApiOperation("合同审核通过后更新客户档案证件") ResultBean saveFileCustomer(@RequestBody CrmCustomerFileDDto dto); + + @ResponseBody + @PostMapping("/updateCompany/{sid}/{companyName}") + @ApiOperation("测试") + ResultBean updateCompany(@PathVariable("sid")String sid,@PathVariable("companyName")String companyName); + + @ResponseBody + @PutMapping("/updateEmail/{sid}/{email}") + @ApiOperation("测试") + ResultBean updateEmail(@PathVariable("sid")String sid,@PathVariable("email")String email); + + @ResponseBody + @PutMapping("/updateRemarks") + @ApiOperation("测试") + ResultBean updateRemarks(@RequestParam("sid")String sid,@RequestParam("remarks")String remarks); } \ 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 dcd57b8f79..0a4f7f15a9 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 @@ -145,5 +145,20 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean updateCompany(String sid, String companyName) { + return null; + } + + @Override + public ResultBean updateEmail(String sid, String email) { + return null; + } + + @Override + public ResultBean updateRemarks(String sid, String remarks) { + return null; + } + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index b8d565d99f..8d078935e6 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -123,4 +123,10 @@ public interface CrmCustomerTempMapper extends BaseMapper { CrmCustomerTempVo selectNo(String customerNo); CrmCustomerTempVo selectNo1(@Param("customerNo") String customerNo, @Param("sid") String sid); + + int updateCompany(@Param("sid") String sid, @Param("companyName") String companyName); + + int updateEmail(@Param("sid") String sid, @Param("email") String email); + + int updateRemarks(@Param("sid") String sid, @Param("remarks") String remarks); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 949ecd9513..480f6b9cbd 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -219,4 +219,16 @@ where customerNo = #{customerNo} and sid != #{sid} + + + update crm_customer_temp set companyName = #{companyName} where sid = #{sid} + + + + update crm_customer_temp set e_mail = #{email} where sid = #{sid} + + + + update crm_customer_temp set remarks = #{remarks} where sid = #{sid} + \ 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 33ecff6120..cfb659e6c7 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 @@ -294,5 +294,20 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveFileCustomer(dto); } + @Override + public ResultBean updateCompany(String sid, String companyName) { + return crmCustomerTempService.updateCompany(sid,companyName); + } + + @Override + public ResultBean updateEmail(String sid, String email) { + return crmCustomerTempService.updateEmail(sid,email); + } + + @Override + public ResultBean updateRemarks(String sid, String remarks) { + return crmCustomerTempService.updateRemarks(sid,remarks); + } + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 01f4c8f56a..4cadb31dbc 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -1228,4 +1228,22 @@ public class CrmCustomerTempService extends MybatisBaseService