From 828704f29bdff28ff83bb0ed76e87a49793df860 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Mar 2025 14:12:55 +0800 Subject: [PATCH] =?UTF-8?q?3/7=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=811.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/auth/AuthAdminDao.java | 3 - .../java/com/glxp/api/dao/auth/DeptDao.java | 26 -- .../com/glxp/api/dao/auth/DeptUserDao.java | 2 - .../com/glxp/api/dao/auth/SysPdaKeyDao.java | 2 - .../dao/auth/WarehouseBussinessTypeDao.java | 1 - .../glxp/api/dao/auth/WarehouseUserDao.java | 17 - .../com/glxp/api/dao/basic/BasicCorpDao.java | 5 - .../basic/BasicProductsImportDetailDao.java | 1 - .../dao/basic/CompanyProductRelevanceDao.java | 1 - .../glxp/api/dao/basic/EntrustReceDao.java | 1 - .../glxp/api/dao/basic/ProductInfoDao.java | 21 - .../dao/basic/SysWorkplaceQueueMapper.java | 2 - .../com/glxp/api/dao/basic/UdiCompanyDao.java | 6 - .../com/glxp/api/dao/basic/UdiProductDao.java | 2 - .../glxp/api/dao/basic/UdiRelevanceDao.java | 21 - .../com/glxp/api/dao/basic/UdiRlSupDao.java | 12 - .../mybatis/mapper/auth/AuthAdminDao.xml | 65 --- .../resources/mybatis/mapper/auth/DeptDao.xml | 21 - .../mybatis/mapper/auth/DeptUserDao.xml | 11 - .../mapper/auth/WarehouseBussinessTypeDao.xml | 6 - .../mybatis/mapper/auth/WarehouseUserDao.xml | 30 -- .../mybatis/mapper/basic/BasicCorpDao.xml | 53 --- .../basic/BasicProductsImportDetailDao.xml | 17 +- .../basic/CompanyProductRelevanceDao.xml | 8 - .../mybatis/mapper/basic/EntrustReceDao.xml | 22 - .../mybatis/mapper/basic/ProductInfoDao.xml | 400 ------------------ .../mapper/basic/SysWorkplaceQueueMapper.xml | 23 - .../mybatis/mapper/basic/UdiCompanyDao.xml | 40 -- .../mybatis/mapper/basic/UdiProductDao.xml | 103 ----- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 61 --- .../mybatis/mapper/basic/UdiRlSupDao.xml | 28 -- .../mybatis/mapper/system/SysPdaKeyDao.xml | 36 -- 32 files changed, 1 insertion(+), 1046 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index c26f286f5..21aab6a29 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -87,7 +87,4 @@ public interface AuthAdminDao extends BaseMapperPlus companyUserList(@Param("param")FilterInvLinkDataRequest filterInvLinkDataRequest); - List getUserByIds(@Param("userIds") List ids,@Param("key") String key); - - List getDepts(FilterAuthUserRequest filterAuthUserRequest); } diff --git a/src/main/java/com/glxp/api/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java index 5ce6b2216..e348cac42 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -32,36 +32,10 @@ public interface DeptDao extends BaseMapperPlus Long getIdByCode(@Param("fromCorpId") Long fromCorpId); - - /** - * 批量导入仓库信息 - * - * @param invWarehouseEntities - */ - void importInvWarehouse(@Param("invWarehouseEntities") List invWarehouseEntities); - - /** - * 更新第三方仓库ID - * - * @param id - * @param thridWarehouseId - * @param sysId - * @return - */ - boolean updateThridId(@Param("id") String id, @Param("thridWarehouseId") String thridWarehouseId, @Param("sysId") String sysId); - boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime); - List getDeptById(@Param("ids") List ids); - List selectByPcode(@Param("pcode") String pcode); - - /** - * 根据code查询* - */ - DeptEntity selectByCodeAll(@Param("code") String code); - /** * 根据编码查询部门名称 * diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index 80054e875..513c7145d 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -25,8 +25,6 @@ public interface DeptUserDao extends BaseMapperPlus ids); - int insertBatch(List list); diff --git a/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java b/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java index 397f9015b..bc38f2e87 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java @@ -17,8 +17,6 @@ public interface SysPdaKeyDao { void updateDeviceKey(SysPdaKeyEntity sysPdaKeyEntity); - void updateDeviceKeyByImei(SysPdaKeyEntity sysPdaKeyEntity); - void deleteDeviceKey(DeleteRequest deleteRequest); } diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index 3a125db56..49de57bdd 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -12,7 +12,6 @@ import java.util.List; @Mapper public interface WarehouseBussinessTypeDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); List selectListByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 599cb6909..916b78bf5 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -18,33 +18,16 @@ public interface WarehouseUserDao extends BaseMapperPlus selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds") List userIds); List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); - /** - * 更新此仓库下的主管状态 - * - * @param code - * @param isDirector - */ - void updateDirector(@Param("code") String code, @Param("isDirector") int isDirector); - - /** - * 根据id更新主管状态 - * - * @param id - * @param isDirector - */ - void updateDirectorById(@Param("id") Long id, @Param("isDirector") int isDirector); /** * 根据分仓编码统计绑定的用户数 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 c553a099c..b4f73c061 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -15,7 +15,6 @@ public interface BasicCorpDao extends BaseMapperPlus filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); List filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse); @@ -27,10 +26,6 @@ public interface BasicCorpDao extends BaseMapperPlus batchSelectByIds(@Param("ids") List id); - - List batchSelectByErpIds(@Param("erpIds") List erpIds); - BasicCorpEntity selectByName(@Param("name") String name); 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 6e2d65c11..04aacb2c0 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 insertUdiInfoImports(@Param("udiInfos") List udiInfos); boolean deleteById(@Param("id") String id); diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java index ce3f28619..e6c39113f 100644 --- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -18,6 +18,5 @@ public interface CompanyProductRelevanceDao extends BaseMapperPlus filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest); - List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest); - - List selectByUpdateTime(@Param("startDate") String startDate, @Param("endDate") String endDate);//按更新时间查询 - boolean insertProductInfo(ProductInfoEntity productInfoEntity); boolean insertProductInfos(@Param("datas") List productInfoEntity); @@ -34,16 +24,8 @@ public interface ProductInfoDao extends BaseMapperPlus ids); - boolean updateProductInfo(ProductInfoEntity productInfoEntity); - - boolean updateProductByUuid(ProductInfoEntity productInfoEntity); - - List selectByUuid(@Param("uuid") String uuid); - List filterUdi(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest); Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest); @@ -51,9 +33,6 @@ public interface ProductInfoDao extends BaseMapperPlus syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest); - List filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); - - List selectAllByUuid(@Param("ids") List ids); } diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java index 690a46910..ba4853eb8 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java @@ -18,8 +18,6 @@ public interface SysWorkplaceQueueMapper extends BaseMapper { List filterList(SysWorkplaceQueueRequest request); List filterBindList(SysWorkplaceQueueRequest request); - Integer selectMaxGrid(@Param("freightCode") String freightCode,@Param("layer") Integer layer); - String selectMaxCode(String layerCode); SysWorkplaceQueue selectByLayerCode(String layerCode); diff --git a/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java b/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java index d1494f8e6..c4798cd48 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java @@ -10,20 +10,14 @@ import java.util.List; @Mapper public interface UdiCompanyDao { - List selectAllTyshxyh(); - List filterUdiCompany(UdiCompanyRequest udiCompanyRequest); boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity); - boolean insertUdiCompanys(@Param("udiCompanyEntities") List udiCompanyEntities); - boolean deleteById(@Param("id") String id); boolean deleteAll(@Param("ids") List ids); - boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); - 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 0c3fbaea5..8a8c2ddb5 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -55,8 +55,6 @@ public interface UdiProductDao extends BaseMapperPlus batchSelectByUuid(@Param("uuids") List uuids); - List filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest); - UdiRelevanceResponse filterUdiInfoById(String id); /** 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 832763160..498a28772 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -35,17 +35,14 @@ public interface UdiRelevanceDao extends BaseMapperPlus contrastJoinSelect(FilterUdiRelRequest filterUdiRelRequest); - UdiRelevanceEntity selectById(@Param("id") Long id); UdiRelevanceEntity selectByThirdId(FilterUdiRelRequest filterUdiRelRequest); List filterEntity(FilterUdiRelRequest filterUdiRelRequest); - boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); - boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); @@ -53,8 +50,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus id); - boolean deleteByUuid(@Param("uuid") String uuid); - /** * 根据UUID批量查询信息 * @@ -66,15 +61,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus batchSelectByIds(@Param("ids") List ids); - /** - * /** - * 查找产品UUID - * - * @param relId - * @return - */ - String selectUuidById(@Param("relId") String relId); - List selectGroupByNameCode(@Param("nameCode") String nameCode, @Param("isDisable") Boolean isDisable); @@ -104,13 +90,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus - - - - diff --git a/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 0efff38b7..5911d6e41 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -276,38 +276,17 @@ - - update auth_dept - set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR} - where id = #{id} - - update auth_dept SET updateTime = #{updateTime} where code = #{code} - - - diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index d5849b334..a714c20c8 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -19,25 +19,6 @@ isDirector, locSubInvCode - - delete @@ -122,15 +103,4 @@ where code = #{code} - - update auth_warehouse_user - set isDirector = #{isDirector} - where code = #{code} - - - - update auth_warehouse_user - set isDirector = #{isDirector} - where id = #{id} - diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 0a24162e4..6d65636c1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -106,41 +106,6 @@ limit 1 - - REPLACE - INTO basic_corp - (thirdId, erpId, name, spell, - addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, - thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType, createUser, - createTime, updateUser, remark) - values (#{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{thirdName}, - #{thirdName1}, - #{thirdName2}, - #{thirdName3}, - #{thirdName4}, - #{updateTime}, - #{corpType}, - #{outType}, - #{createUser}, - #{createTime}, - #{updateUser}, - #{remark}) - @@ -271,24 +236,6 @@ WHERE id = #{id} - - - - - - SELECT company_product_relevance.id, diff --git a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 6cf3a80a6..67d52bd71 100644 --- a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -130,28 +130,6 @@ order by updateTime desc - - - replace - INTO basic_entrust_accept(`action`, curDept, entrustInv, `entrustUser`, userId, - updateTime, remark, entrustAction, finishRece, curInv, entrustDept, entrustInv, - entrustEnd) - values (#{action}, - #{entrustInv}, - #{entrustUser}, - #{userId}, - #{updateTime}, - #{remark}, - #{entrustAction}, - #{finishRece}, - #{curInv}, - #{entrustDept}, - #{entrustInv}, - #{entrustEnd}) - - - DELETE FROM basic_entrust_accept diff --git a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index 0501567aa..b4b3b22b3 100644 --- a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -70,206 +70,12 @@ GROUP BY uuid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE sys_workplace_queue diff --git a/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml index fc1c3323e..d832496c9 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml @@ -3,15 +3,6 @@ - - - diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 974fbef2a..b5854e612 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -31,109 +31,6 @@ - - - - - - select count(*) - FROM company_product_relevance - inner JOIN basic_udirel - ON company_product_relevance.udiRlIdFk = basic_udirel.id - inner JOIN basic_products ON basic_udirel.uuid = basic_products.uuid - - - AND nameCode LIKE concat(#{nameCode}, '%') - - - and unitFk = #{unitFk} - - - diff --git a/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml b/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml index 413e6ac46..02d5ba71a 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml @@ -63,42 +63,6 @@ WHERE id = #{id} - - UPDATE sys_pda_check - - - isCheck=#{isCheck}, - - - companyName=#{companyName}, - - - phone=#{phone}, - - - contact=#{contact}, - - - imeiKey=#{imeiKey}, - - - date=#{date}, - - - imei=#{imei}, - - - creditNum=#{creditNum}, - - - rgType=#{rgType}, - - - remark=#{remark}, - - - WHERE imei = #{imei} - replace