From 297983ced54777168127fedc12bfbef6963ddb8f Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 5 Mar 2025 14:30:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrCorpImportLogController.java | 7 +++++- .../controller/thrsys/ThrCorpsController.java | 9 ++----- .../ThrInvProductsExportLogController.java | 3 +-- .../glxp/api/dao/auth/SysUserRoleMapper.java | 2 -- .../com/glxp/api/dao/basic/BasicCorpDao.java | 3 --- .../basic/BasicProductsImportDetailDao.java | 1 - .../glxp/api/dao/basic/EntrustReceDao.java | 1 - .../com/glxp/api/dao/basic/UdiCompanyDao.java | 1 - .../com/glxp/api/dao/basic/UdiProductDao.java | 1 - .../glxp/api/dao/basic/UdiRelevanceDao.java | 5 ---- .../com/glxp/api/dao/basic/UdiRlSupDao.java | 3 --- .../com/glxp/api/dao/inout/IoCodeDao.java | 2 +- .../serviceClient/impl/ErpInvClientImpl.java | 25 +------------------ .../service/sync/SpsSyncDownloadService.java | 4 +-- .../mybatis/mapper/auth/AuthAdminDao.xml | 15 ++++++----- .../mapper/basic/BasicProductSetDao.xml | 2 +- 16 files changed, 20 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java index 668f61ed..60b5c968 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java @@ -1,5 +1,7 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -72,10 +74,13 @@ public class ThrCorpImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String id = deleteRequest.getId(); + if (StrUtil.isEmpty(id)){ + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } FilterThrCorpImportLogRequest filterInCodeLogRequest = new FilterThrCorpImportLogRequest(); filterInCodeLogRequest.setId(Integer.parseInt(id)); List thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterInCodeLogRequest); - if (thrCorpImportLogEntities != null && thrCorpImportLogEntities.size() > 0) { + if (CollUtil.isNotEmpty(thrCorpImportLogEntities)) { ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogEntities.get(0); thrCorpImportLogService.deleteById(thrCorpImportLogEntity.getId() + ""); thrCorpImportDetailService.deleteByGenkey(thrCorpImportLogEntity.getGenKey()); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index e1a09135..c3c86589 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -218,16 +218,11 @@ public class ThrCorpsController { ThrCorpsResponse thrCorpEntity = new ThrCorpsResponse(); BeanUtils.copyProperties(item, thrCorpEntity); ThrUnitMaintainResponse thrUnitMaintainResponse = thrCorpService.selectByThirdId(item.getUnitId(), thrUnitMaintainFilterRequest.getThirdSys()); - if (thrUnitMaintainResponse != null) { - thrCorpEntity.setChecked(true); - } else { - thrCorpEntity.setChecked(false); - } + thrCorpEntity.setChecked(thrUnitMaintainResponse != null); thrCorpEntity.setId(item.getUnitId()); return thrCorpEntity; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntityList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index 6f48c775..d3bbe416 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -178,8 +178,7 @@ public class ThrInvProductsExportLogController { erpInvProductResponse.setName(item.getInventoryName()); return erpInvProductResponse; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(erpInvProductResponseList); + PageInfo pageInfo = new PageInfo<>(erpInvProductResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpInvProductResponseList); diff --git a/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java index 5146c1ff..304dafea 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java @@ -15,8 +15,6 @@ public interface SysUserRoleMapper { int insertBatch(@Param("sysUserRoles") List sysUserRoles); - int insert(SysUserRole sysUserRole); - List selectUserRoleList(Long roleId); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 00d64259..a9d8ac4a 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -14,11 +14,8 @@ import java.util.List; public interface BasicCorpDao extends BaseMapperPlus { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); -// int insertEntity(BasicCorpEntity basicUnitMaintainEntity); - int updateEntityById(BasicCorpEntity basicUnitMaintainSaveRequest); BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java index 04aacb2c..495206c7 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java @@ -17,7 +17,6 @@ public interface BasicProductsImportDetailDao { boolean updateUdiInfoImport(BasicProductsImportDetailEntity udiInfoImportEntity); - boolean deleteById(@Param("id") String id); boolean deleteByGenkey(@Param("genKey") String genKey); diff --git a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java index 73354fa1..81a8d784 100644 --- a/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java @@ -21,7 +21,6 @@ public interface EntrustReceDao extends BaseMapperPlus ids); - List syncDlCompany(UdiCompanyRequest udiCompanyRequest); } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java index ee131fd3..8121048f 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -22,7 +22,6 @@ public interface UdiProductDao extends BaseMapperPlus findByOriginUuid(@Param("originUuid") String originUuid); - UdiProductEntity findById(@Param("id") String id); boolean insertUdiInfo(UdiProductEntity udiProductEntity); diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 9a640696..5f099693 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -25,23 +25,18 @@ public interface UdiRelevanceDao extends BaseMapperPlus filterUdiGp(FilterUdiRelRequest filterUdiRelRequest); - // UdiRelevanceResponse selectUdiByUUid List selectByUuid(@Param("uuid") String uuid); - List contrastJoinSelect(FilterUdiRelRequest filterUdiRelRequest); - UdiRelevanceEntity selectById(@Param("id") Long id); UdiRelevanceEntity selectByThirdId(FilterUdiRelRequest filterUdiRelRequest); List filterEntity(FilterUdiRelRequest filterUdiRelRequest); - boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); - boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean deleteById(@Param("id") String id); 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 3daebe9d..bf67fd28 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java @@ -20,21 +20,18 @@ public interface UdiRlSupDao extends BaseMapperPlus getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); - boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity); boolean importCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity); boolean deleteById(String id); - /** * 根据耗材ID查询供应商ID列表 * diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java index 7b155420..c7a33584 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java @@ -25,6 +25,7 @@ public interface IoCodeDao extends BaseMapperPlus filterList(FilterCodeRequest filterCodeRequest); + List filterDrugList(FilterCodeRequest filterCodeRequest); /** @@ -34,6 +35,5 @@ public interface IoCodeDao extends BaseMapperPlus findByCodeSumReCount(List codes); - List filterListexcelExport(FilterCodeRequest filterCodeRequest); } diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java b/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java index 7a0519b1..3e089e7c 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.httpClient.utils.HttpOkClient; import com.glxp.api.req.thrsys.ThrOnhandRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; +import com.glxp.api.util.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -23,30 +24,6 @@ public class ErpInvClientImpl implements ErpInvClient { @Override public BaseResponse> getInvPrdoductResponse(ThrOnhandRequest onhandRequest, String url) { - - Map paramMap = new HashMap<>(16); - if (onhandRequest.getBatchNo() != null && !onhandRequest.getBatchNo().equals("")) - paramMap.put("batchNo", onhandRequest.getBatchNo()); - if (onhandRequest.getWarehouseCode() != null && !onhandRequest.getWarehouseCode().equals("")) - paramMap.put("warehouseCode", onhandRequest.getWarehouseCode()); - if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals("")) - paramMap.put("inventoryCode", onhandRequest.getInventoryCode()); - if (onhandRequest.getInventoryName() != null && !onhandRequest.getInventoryName().equals("")) - paramMap.put("inventoryName", onhandRequest.getInventoryName()); - if (onhandRequest.getSpec() != null && !onhandRequest.getSpec().equals("")) - paramMap.put("spec", onhandRequest.getSpec()); - if (onhandRequest.getRegisterCertNo() != null && !onhandRequest.getRegisterCertNo().equals("")) - paramMap.put("registerCertNo", onhandRequest.getRegisterCertNo()); - if (onhandRequest.getManufactory() != null && !onhandRequest.getManufactory().equals("")) - paramMap.put("manufactory", onhandRequest.getManufactory()); - - if (onhandRequest.getFilterCount() != null && !onhandRequest.getFilterCount().equals("")) - paramMap.put("filterCount", onhandRequest.getFilterCount()); - if (onhandRequest.getPage() != null) - paramMap.put("page", onhandRequest.getPage()); - if (onhandRequest.getLimit() != null) - paramMap.put("limit", onhandRequest.getLimit()); - String response = httpOkClient.uCloudPost(url, onhandRequest); try { BaseResponse> onHandsResponse = diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 15c82556..69e17ed4 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -97,7 +97,6 @@ public class SpsSyncDownloadService { BasicExportService basicExportService; @Resource BasicExportTimeService basicExportTimeService; - @Resource IoOrderInvoiceService orderInvoiceService; @@ -135,9 +134,8 @@ public class SpsSyncDownloadService { orderStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); if (lastUpdateTime != null) { - String fileFullPath = null; try { - fileFullPath = writeFile(filePath, BasicProcessStatus.NEW_ALL_BUS_ORDER, JSONUtil.toJsonStr(baseResponse.getData())); + String fileFullPath = writeFile(filePath, BasicProcessStatus.NEW_ALL_BUS_ORDER, JSONUtil.toJsonStr(baseResponse.getData())); orderStatusEntity.setCacheFilePath(fileFullPath); orderStatusEntity.setRemark(baseResponse.getData().getSyncRemark()); } catch (IOException e) { diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 27d79b14..4c97ea56 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -6,8 +6,8 @@ resultType="com.glxp.api.entity.auth.AuthAdmin"> SELECT auth_user.*, auth_dept.name deptName, auth_warehouse.name warehouseName FROM auth_user - left join auth_dept on auth_user.locDeptCode = auth_dept.code - LEFT JOIN auth_warehouse on auth_user.locInvCode = auth_warehouse.code + left join auth_dept on auth_user.locDeptCode = auth_dept.code + LEFT JOIN auth_warehouse on auth_user.locInvCode = auth_warehouse.code AND id IN @@ -30,8 +30,8 @@ = DATE_FORMAT(#{lastUpdateTime} - , '%Y-%m-%d %H:%i:%S') + , '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime} + , '%Y-%m-%d %H:%i:%S') ]]> @@ -41,8 +41,7 @@ AND auth_user.CustomerId = #{CustomerId} - ORDER BY id - DESC + ORDER BY id DESC