From ae109368840949390c027b52dcf1885639b7370e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 29 Mar 2024 11:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E9=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=EF=BC=8C=E7=94=B3=E8=AF=B7=E4=B8=8E=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BA=E5=90=8E=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/SpsSyncBasicController.java | 18 ++++++++++++++++++ src/main/resources/application-dev.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java index 09bf8c0d..0f2b75c2 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -13,11 +13,13 @@ import com.glxp.api.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.thrsys.ThrProductsAddDao; import com.glxp.api.dao.thrsys.ThrProductsAddDiDao; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.req.sync.SpsSyncBasicRlRequest; import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.service.basic.CompanyProductRelevanceService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.thrsys.ThrProductsAddService; import com.glxp.api.util.IntUtil; @@ -29,6 +31,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Date; @RestController @Api(tags = "内网基础信息同步修改") @@ -42,6 +46,8 @@ public class SpsSyncBasicController { private final UdiProductService udiProductService; @Resource ThrProductsAddDiDao thrProductsAddDiDao; + @Resource + CompanyProductRelevanceService companyProductRelevanceService; @AuthRuleAnnotation("") @PostMapping("/spssync/basic/udirl/update") @@ -64,6 +70,18 @@ public class SpsSyncBasicController { thrProductsAddDiEntity.setRemark(udiProductEntity.getRemark()); thrProductsAddDiEntity.setStatus(2); thrProductsAddDiDao.update(thrProductsAddDiEntity, new QueryWrapper().eq("code", udiProductEntity.getRemark())); + + + CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); + companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId() + ""); + companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId()); + companyProductRelevanceEntity.setCreateTime(new Date()); + companyProductRelevanceEntity.setUpdateTime(new Date()); + companyProductRelevanceEntity.setUnitFk(thrProductsAddDiEntity.getCustomerId().toString()); + companyProductRelevanceEntity.setAuditStatus("1"); + if (StrUtil.isNotEmpty(thrProductsAddDiEntity.getPrice())) + companyProductRelevanceEntity.setPrice(new BigDecimal(thrProductsAddDiEntity.getPrice())); + companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); } if (b > 0) return ResultVOUtils.success("更新成功！"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f0db8fbc..a2bd2805 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: