From 8c150bdd3b240a5441ef95f46b1b3e1926cba933 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 6 Mar 2024 18:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 8 ++++---- .../controller/basic/UdiRlSupController.java | 7 ++----- .../com/glxp/api/dao/basic/UdiRlSupDao.java | 3 ++- .../glxp/api/entity/basic/UdiRlSupEntity.java | 1 + .../api/service/basic/UdiRlSupService.java | 9 +++++---- .../basic/impl/UdiRlSupServiceImpl.java | 13 +++++++------ .../thrsys/impl/ThrInvOrderServiceImpl.java | 18 +++++++++--------- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index ce8b5d697..3bccceb0f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -541,7 +541,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/udirel/thirdSys/filterOptimize") public BaseResponse getThirdSysfilterOptimize(FilterUdiRelRequest filterUdiRelRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -731,7 +731,7 @@ public class UdiRelevanceController extends BaseController { } boolean falg = udiProductService.updateUdiInfoById(udiProductEntity); if (udiProductEntity.getRelSupId() != null) { - UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); + CompanyProductRelevanceEntity udiRlSupEntity = new CompanyProductRelevanceEntity(); udiRlSupEntity.setUpdateTime(new Date()); udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice())); udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId())); @@ -775,8 +775,8 @@ public class UdiRelevanceController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } List ggxhList = udiProductService.getGgxhList(relId); - List reList = ggxhList.stream().map(s-> { - DictDto dictDto = new DictDto(s,s); + List reList = ggxhList.stream().map(s -> { + DictDto dictDto = new DictDto(s, s); return dictDto; }).collect(Collectors.toList()); return ResultVOUtils.success(reList); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 900fbce90..92aa8328a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -12,10 +12,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.basic.UdiRlSupEntity; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.http.sync.SpGetHttpClient; @@ -355,7 +352,7 @@ public class UdiRlSupController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanyProductRelevance") @Log(title = "供应商字典管理", businessType = BusinessType.UPDATE) - public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { + public BaseResponse updateCompanyProductRelevance(@RequestBody CompanyProductRelevanceEntity udiRlSupEntity) { udiRlSupEntity.setUpdateTime(new Date()); int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); return ResultVOUtils.success("修改成功"); diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java index e7ed0d6bb..c8576a183 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; @@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface UdiRlSupDao extends BaseMapperPlus { +public interface UdiRlSupDao extends BaseMapperPlus { List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java index cbdb02e7f..0d538023a 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java index a237aa94d..93e9438fb 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; @@ -10,7 +11,7 @@ import com.glxp.api.res.basic.UdiRlSupResponse; import java.util.List; -public interface UdiRlSupService extends IService { +public interface UdiRlSupService extends IService { List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); @@ -26,15 +27,15 @@ public interface UdiRlSupService extends IService { List findByUdiRlId(Long udiRlIdFk); - UdiRlSupEntity selOneByRlId(Long udiRlIdFk); + CompanyProductRelevanceEntity selOneByRlId(Long udiRlIdFk); UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity); List getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); - int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity); + int updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity); - int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity); + int updateCompanyProductRelevanceByUdiFk(CompanyProductRelevanceEntity companyCertEntity); boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index 0014d0e9e..c9f4df46a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.entity.auth.InvBusUserEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; @@ -24,7 +25,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class UdiRlSupServiceImpl extends ServiceImpl implements UdiRlSupService { +public class UdiRlSupServiceImpl extends ServiceImpl implements UdiRlSupService { @Resource UdiRlSupDao udiRlSupDao; @@ -102,8 +103,8 @@ public class UdiRlSupServiceImpl extends ServiceImpl().eq("udiRlIdFk", udiRlIdFk).last("limit 1")); + public CompanyProductRelevanceEntity selOneByRlId(Long udiRlIdFk) { + return udiRlSupDao.selectOne(new QueryWrapper().eq("udiRlIdFk", udiRlIdFk).last("limit 1")); } @Override @@ -112,13 +113,13 @@ public class UdiRlSupServiceImpl extends ServiceImpl ew = new QueryWrapper<>(); + public int updateCompanyProductRelevanceByUdiFk(CompanyProductRelevanceEntity companyCertEntity) { + QueryWrapper ew = new QueryWrapper<>(); ew.eq("udiRlIdFk", companyCertEntity.getUdiRlIdFk()); return udiRlSupDao.update(companyCertEntity, ew); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index c1bc4aaac..87a97bc4a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -210,7 +210,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { thrInvOrderDetail.setNameCode(nameCode); thrInvOrderDetail.setRelId(relId); //校验产品是否被供应商关联 - UdiRlSupEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); + CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); if (udiRlSupEntity != null) thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); else @@ -576,7 +576,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { updateThrInvOrderDetails.add(item); //校验产品是否被供应商关联 - UdiRlSupEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); + CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); if (udiRlSupEntity != null) item.setSupId(udiRlSupEntity.getCustomerId()); else @@ -674,8 +674,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { log.info("手动抓取第三方收费出入库明细生成单据定时任务开始"); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); - filterInvProductRequest.setStartDate(stringToDate(filterInvProductRequest.getStartDate() + " 00:00:00")); - filterInvProductRequest.setEndDate(stringToDate(filterInvProductRequest.getEndDate() + " 23:59:59")); + filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00")); + filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59")); handleExternalThrInvSfOrder(filterInvProductRequest); log.info("手动抓取第三方收费出入库明细生成单据定时任务结束"); } @@ -685,8 +685,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { log.info("手动抓取第三方高耗出入库明细生成单据定时任务开始"); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); - filterInvProductRequest.setStartDate(stringToDate(filterInvProductRequest.getStartDate() + " 00:00:00")); - filterInvProductRequest.setEndDate(stringToDate(filterInvProductRequest.getEndDate() + " 23:59:59")); + filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00")); + filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59")); handleExternalThrInvSfOrder(filterInvProductRequest); log.info("手动抓取第三方高耗出入库明细生成单据定时任务结束"); } @@ -696,8 +696,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { log.info("手动抓取第三方普耗出入库明细生成单据定时任务开始"); FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); - filterInvProductRequest.setStartDate(stringToDate(filterInvProductRequest.getStartDate() + " 00:00:00")); - filterInvProductRequest.setEndDate(stringToDate(filterInvProductRequest.getEndDate() + " 23:59:59")); + filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00")); + filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59")); handleExternalThrInvSfOrder(filterInvProductRequest); log.info("手动抓取第三方普耗出入库明细生成单据定时任务结束"); } @@ -880,7 +880,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { exmsg.append(thrCode + ","); } //校验产品是否被供应商关联 - UdiRlSupEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); + CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId); if (udiRlSupEntity != null) thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); else