From f53a4ab7b03d963ab444250516acea46df1e8770 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, 6 Apr 2023 17:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AE=A1=E6=A0=B8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=EF=BC=88=E4=BF=AE=E5=A4=8D=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...stemPDFTemplateRelevanceBizController.java | 15 ++- .../thrsys/ThrProductsAddDiController.java | 104 ++++++++++++++++++ .../api/dao/thrsys/ThrProductsAddDiDao.java | 2 + .../req/thrsys/FilterThrProductsRequest.java | 1 + .../api/service/basic/UdiContrastService.java | 32 ++++-- .../thrsys/ThrProductsAddDiService.java | 2 + .../impl/ThrProductsAddDiServiceImpl.java | 5 + .../system/SysPdfTemplateRelevanceBizDao.xml | 14 ++- .../mapper/thrsys/ThrProductsAddDiDao.xml | 21 +++- src/main/resources/schemas/schema_v2.1.sql | 4 + 10 files changed, 177 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java index 807cee65..caae0545 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java @@ -4,14 +4,18 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.entity.thrsys.ThrDeptEntity; +import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.service.basic.IBasicBusTypeChangeService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService; import com.glxp.api.service.system.impl.SystemPDFTemplateRelevanceBizServiceImpl; @@ -32,16 +36,19 @@ public class SystemPDFTemplateRelevanceBizController { @Resource IBasicBussinessTypeService basicBussinessTypeService; + @Resource + IBasicBusTypeChangeService basicBusTypeChangeService; + @PostMapping("/system/pdf/templateRelevanceBiz/getListByModelId") public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest(); + FilterBusTypeChangeRequest filterBussinessTypeRequest = new FilterBusTypeChangeRequest(); filterBussinessTypeRequest.setEnable(true); - List bussinessLocalTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest); - for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessLocalTypeEntities) { + List bussinessLocalTypeEntities = basicBusTypeChangeService.filterList(filterBussinessTypeRequest); + for (BasicBusTypeChangeResponse basicBussinessTypeEntity : bussinessLocalTypeEntities) { SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity = new SysPdfTemplateRelevanceBizEntity(); - systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getAction()); + systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getOriginAction()); systemPDFTemplateRelevanceEntity.setModuleId(filterPdfTemplateRelevanceRequest.getModuleId()); systemPDFTemplateRelevanceEntity.setModelKey(filterPdfTemplateRelevanceRequest.getModelKey()); systemPDFTemplateRelevanceBizService.insert(systemPDFTemplateRelevanceEntity); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index f6c82c0c..6713308d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -345,4 +345,108 @@ public class ThrProductsAddDiController { return ResultVOUtils.success(); } + + + /** + * 更新DI产品信息 + * + * @param + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("udiwms/thrsys/updateThrAddDiProductsList") + @Log(title = "DI产品信息", businessType = BusinessType.UPDATE) + public BaseResponse updateThrAddDiProductsList() { + + FilterThrProductsRequest filterThrProductsRequest=new FilterThrProductsRequest(); + filterThrProductsRequest.setStatus(2); + List thrProductsAddDiEntityList=thrProductsAddDiService.filterThrProductsDiLists(filterThrProductsRequest); + + for (ThrProductsAddDiEntity thrProductsAddDiEntity:thrProductsAddDiEntityList){ + thrProductsAddDiEntity.setAuditTime(new Date()); + thrProductsAddDiEntity.setAuditUser(customerService.getUserId() + ""); + thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity); + + thrProductsAddDiEntity = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId()); + + //自增的数据就再到第三方产品里面 + ThrProductsAddDiResponse thrProductsAddDiResponse = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId()); + + if (thrProductsAddDiEntity.getStatus() == 2) { //审核通过 + //第三方产品审核通过 + if (thrProductsAddDiEntity.getType() == 2) { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(thrProductsAddDiEntity, thrProductsEntity); + thrProductsService.insertThrProducts(thrProductsEntity); + ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys(); + if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk())) + if (!udiContrastService.isExit(null, thrProductsAddDiEntity.getCode(), null)) { + udiContrastService.createOnlyMainId(thrProductsAddDiEntity.getCode()); + } + + } else { //选入DI信息审核通过 + //审核通过后追加到耗材字典中 + UdiCombineRequest combineRequest = new UdiCombineRequest(); + combineRequest.setCustomerId(Long.valueOf(thrProductsAddDiEntity.getCustomerId())); + //插入数据，并获取关联主键 + if (udiContrastService.isExit(thrProductsAddDiEntity.getUuid(), null, null)) { + Long udiRelIdFk = udiContrastService.createOnlyUuid(combineRequest, thrProductsAddDiEntity.getUuid()); + + //回填关联关系到关联表 + CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); + companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId()); + companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk); + 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); + } else { +// Long udiRelIdFk = udiContrastService.createOnlyUuid(combineRequest, thrProductsAddDiEntity.getUuid()); +// //字段更新 +// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiRelIdFk); +// //更新产品信息 +// UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid()); +// udiProductEntity.setSptm(thrProductsAddDiResponse.getSptm()); +// udiProductEntity.setYbbm(thrProductsAddDiResponse.getYbbm()); +// udiProductEntity.setMeasname(thrProductsAddDiResponse.getMeasname()); +// udiProductEntity.setManufactory(thrProductsAddDiResponse.getManufactory()); +// udiProductEntity.setSpmc(thrProductsAddDiResponse.getSpmc()); +// udiProductEntity.setCpms(thrProductsAddDiResponse.getCpms()); +// udiProductEntity.setPrice(thrProductsAddDiResponse.getPrice()); +// udiProductEntity.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1()); +// udiProductEntity.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2()); +// udiProductEntity.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3()); +// udiProductEntity.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4()); +// udiProductEntity.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5()); +// udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); +// udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); +// udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); +// udiProductEntity.setNameCode(null); +// udiProductService.updateUdiInfoByUuid(udiProductEntity); +// UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); +// BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); +// udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1); +// udiInfoService.updateUdiInfo(udiInfoEntity); + //回填关联关系到关联表 +// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); +// companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId()); +// companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk); +// 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); + } + } + } + } + return ResultVOUtils.success("更新成功"); + } + + } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java index 6f3acc10..478f52cd 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java @@ -43,4 +43,6 @@ public interface ThrProductsAddDiDao { boolean insert(ThrProductsAddDiEntity thrProductsAddDiEntity); List filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest); + + List filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest); } diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index 13ff679c..79fc4b96 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -24,6 +24,7 @@ public class FilterThrProductsRequest extends ListPageRequest { private String lastUpdateTime; private String companyName; private Boolean isDownThrSys; + private Integer status; private List codes; diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 3992a4be..82b835cc 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -187,19 +187,27 @@ public class UdiContrastService { public Long createOnlyUuid(UdiCombineRequest udiCombineRequest, String key) { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - udiRelevanceEntity.setUpdateTime(new Date()); - udiRelevanceEntity.setModifyTime(new Date()); - udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); - if (StrUtil.isNotBlank(udiCombineRequest.getSupName())) { - udiRelevanceEntity.setSupName(udiCombineRequest.getSupName()); + + if(udiInfoEntities==null || udiInfoEntities.size()==0){ + //为了处理审核时的线上问题 + int a=9999; + return Long.valueOf(a); + }else{ + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setUpdateTime(new Date()); + udiRelevanceEntity.setModifyTime(new Date()); + udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); + if (StrUtil.isNotBlank(udiCombineRequest.getSupName())) { + udiRelevanceEntity.setSupName(udiCombineRequest.getSupName()); + } + Long relId = gennerOrderUtils.getRelId(); + udiRelevanceEntity.setId(relId); + udiRelevanceEntity.setIsDisable(false); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + insertUdiInfos(udiInfoEntities); + return relId; } - Long relId = gennerOrderUtils.getRelId(); - udiRelevanceEntity.setId(relId); - udiRelevanceEntity.setIsDisable(false); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - insertUdiInfos(udiInfoEntities); - return relId; + } public void insertUdiInfos(List udiInfoEntities) { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java index 95bfaf7d..f9b1aedc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java @@ -36,4 +36,6 @@ public interface ThrProductsAddDiService { boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity); List filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest); + + List filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 9bc359a5..be32c993 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -137,4 +137,9 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { public List filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest) { return thrProductsAddDiDao.filterThrProductsDiList(filterThrProductsRequest); } + + @Override + public List filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest) { + return thrProductsAddDiDao.filterThrProductsDiLists(filterThrProductsRequest); + } } diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml index 61aac4e2..d034b81c 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml @@ -25,19 +25,21 @@ + + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 9bb9af2e..87e59a91 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -117,7 +117,11 @@ CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1); CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sup_manufacturer', 'agentName', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_module', 'modelKey', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessType', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1); INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据');