From dbf918e9554cea55ab1762f794495d08f3e8572a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 1 Dec 2022 15:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2basicUdirel=E8=A1=A8=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 17 ++++++++++--- .../basic/UdiRelevanceController.java | 12 ++++++--- .../thrsys/ThrProductsAddController.java | 5 +++- .../thrsys/ThrProductsAddDiController.java | 11 +++----- .../sale/admin/dao/basic/UdiRelevanceDao.java | 3 ++- .../service/basic/UdiRelevanceService.java | 3 ++- .../basic/impl/UdiRelevanceServiceImpl.java | 25 ++++++++++--------- .../thread/BasicUdiInfoImportService.java | 5 +++- .../thread/CompanyProductsRelService.java | 5 +++- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- 10 files changed, 56 insertions(+), 32 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index efd672d..0f4895d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -15,6 +15,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.RemoveRelRequest; import com.glxp.sale.admin.req.basic.UdiInfoRequest; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -163,7 +164,9 @@ public class UdiContrastController { String time = DateUtil.formatDateTime(new Date()); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); return ResultVOUtils.success("切换成功！"); } @@ -189,7 +192,9 @@ public class UdiContrastController { return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); } else { try { - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); } catch (Exception e) { return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); } @@ -241,7 +246,9 @@ public class UdiContrastController { udiRelevanceEntity.setPrice(""); udiRelevanceEntity.setManufactory(""); udiRelevanceEntity.setMeasname(""); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); } catch (Exception e) { e.printStackTrace(); return ResultVOUtils.error(500, "解除绑定失败！"); @@ -367,7 +374,9 @@ public class UdiContrastController { String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); insertUdiInfos(udiInfoEntities); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index d46b399..52bd86e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -293,7 +293,9 @@ public class UdiRelevanceController { if (udiRelevanceResponse.getIsUseDy() == 1) { udiRelevanceEntity.setIsUseDy(true); } else udiRelevanceEntity.setIsUseDy(false); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); if (!customerId.equals("110")) { if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { @@ -707,7 +709,9 @@ public class UdiRelevanceController { String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); return ResultVOUtils.success("解除绑定成功！"); } @@ -727,7 +731,9 @@ public class UdiRelevanceController { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(id); udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus()); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); } return ResultVOUtils.success("更新成功！"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index f294914..0ee08fb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -125,7 +126,9 @@ public class ThrProductsAddController { String time = DateUtil.formatDateTime(new Date()); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index a783e61..1ba7ce6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java @@ -13,10 +13,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.sale.admin.exception.JsonException; -import com.glxp.sale.admin.req.basic.CombineRequest; -import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.basic.SupplementRequest; -import com.glxp.sale.admin.req.basic.UdiInfoRequest; +import com.glxp.sale.admin.req.basic.*; import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; @@ -204,9 +201,9 @@ public class ThrProductsAddDiController { udiInfoRequest.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiInfoRequest.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); udiInfoService.updateUdiInfo(udiInfoRequest); - - - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); // udiInfoService.updateUdiInfo(udiInfoEntity); //回填关联关系到关联表 CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java index ef37c84..06d62c2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.basic; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,7 +37,7 @@ public interface UdiRelevanceDao { boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); - boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest); boolean deleteById(@Param("id") String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java index f9a0baa..79f9065 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.basic; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Param; @@ -54,7 +55,7 @@ public interface UdiRelevanceService { boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); - boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest); boolean deleteById(String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 512e465..0dd5d8e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.sale.admin.dao.basic.UdiRelevanceDao; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; @@ -268,26 +269,26 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } @Override - public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + public boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest) { BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); String mainSys = basicThirdSysEntity.getThirdId(); if (mainSys.equals("thirdId")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); - udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName()); + udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId()); + udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName()); } else if (mainSys.equals("thirdId1")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); - udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1()); + udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId1()); + udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName1()); } else if (mainSys.equals("thirdId2")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); - udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2()); + udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId2()); + udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName2()); } else if (mainSys.equals("thirdId3")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); - udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3()); + udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId3()); + udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName3()); } else if (mainSys.equals("thirdId4")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); - udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4()); + udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId4()); + udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName4()); } - return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); + return udiRelevanceDao.updateUdiRelevance(udiRelevanceRequest); } @Override diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java index eaa4f5d..d435442 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java @@ -9,6 +9,7 @@ import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.basic.UdiInfoRequest; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.*; @@ -163,7 +164,9 @@ public class BasicUdiInfoImportService { UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(udiInfoEntity.getUuid(), mainId); if (temp != null) { updateValue(temp, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); - udiRelevanceService.updateUdiRelevance(temp); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + BeanUtils.copyProperties(temp,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); } else { UdiRelevanceEntity mTemp = udiRelevanceService.selectUpdateByThirdId(mainId); if (mTemp != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java index 7c0b381..aa7d3f8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java @@ -6,6 +6,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.basic.UdiInfoRequest; +import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; @@ -44,7 +45,9 @@ public class CompanyProductsRelService { SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); + org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); udiInfoService.updateUdiInfo(udiInfoRequest); companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date()); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index f05143e..09f857b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -532,7 +532,7 @@ WHERE uuid = #{uuid} - + UPDATE basic_udirel thirdId=#{thirdId},