From bec56f4968d09755b324c39af12da4ce6e02bf0b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Mar 2025 14:25:13 +0800 Subject: [PATCH] =?UTF-8?q?3/4=20basic=20=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/basic/BasicBussinessTypeRoleDao.java | 8 ---- .../com/glxp/api/dao/basic/BasicCorpDao.java | 2 - .../api/dao/basic/BasicNewUploadDiDao.java | 1 - .../glxp/api/dao/basic/BasicProductsDao.java | 7 --- .../basic/BasicProductsImportDetailDao.java | 1 - .../api/dao/basic/BasicUnitMaintainDao.java | 2 - .../dao/basic/CompanyProductRelevanceDao.java | 1 - .../glxp/api/dao/basic/EntrustReceDao.java | 1 - .../com/glxp/api/dao/basic/UdiCompanyDao.java | 4 -- .../glxp/api/dao/basic/UdiRelevanceDao.java | 10 ---- .../com/glxp/api/dao/basic/UdiRlSupDao.java | 2 - .../mybatis/mapper/basic/BasicCorpDao.xml | 46 ------------------- .../mapper/basic/BasicNewUploadDiDao.xml | 27 +---------- .../BasicProductsDao.xml} | 2 +- .../basic/BasicProductsImportDetailDao.xml | 17 +------ .../mapper/basic/BasicUnitMaintainDao.xml | 44 ------------------ .../mapper/basic/BussinessTypeRoleDao.xml | 12 ----- .../basic/CompanyProductRelevanceDao.xml | 7 --- .../mybatis/mapper/basic/EntrustReceDao.xml | 21 --------- .../mybatis/mapper/basic/UdiCompanyDao.xml | 41 ----------------- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 42 ----------------- .../mybatis/mapper/basic/UdiRlSupDao.xml | 16 ------- 22 files changed, 3 insertions(+), 311 deletions(-) rename src/main/resources/mybatis/mapper/{system/SysServerLogDao.xml => basic/BasicProductsDao.xml} (72%) diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeRoleDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeRoleDao.java index 5af75836..adca3b12 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeRoleDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeRoleDao.java @@ -9,14 +9,6 @@ import java.util.List; @Mapper public interface BasicBussinessTypeRoleDao { - public List getListByRoleId(@Param("roleId") Long roleId); - - /** - * 删除此角色下所有的扫码单据类型授权数据 - * - * @param roleId - */ - void deleteByRoleId(@Param("roleId") 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 e1012bbe..8c033aa2 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -14,7 +14,6 @@ import java.util.List; public interface BasicCorpDao extends BaseMapperPlus { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse); @@ -30,7 +29,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/BasicNewUploadDiDao.java b/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java index 574dd9b3..9a674fa4 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java @@ -10,7 +10,6 @@ import java.util.List; @Mapper public interface BasicNewUploadDiDao { - List filterNewUploads(FilterBasicNewUploadDiRequest filterNewUploadDiRequest); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java index 545b610b..5072b672 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java @@ -1,17 +1,10 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicProductSetEntity; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.thrsys.ThrProductTypeEntity; -import com.glxp.api.req.basic.FilterBasicProductSetrequest; -import com.glxp.api.req.thrsys.FilterBasicProducstRequest; -import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; import org.apache.ibatis.annotations.Mapper; -import java.util.List; @Mapper public interface BasicProductsDao extends BaseMapperPlus { 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 6e2d65c1..04aacb2c 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/BasicUnitMaintainDao.java b/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java index 2ce35334..f27a11e1 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java @@ -13,7 +13,6 @@ public interface BasicUnitMaintainDao { boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); - boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); @@ -27,7 +26,6 @@ public interface BasicUnitMaintainDao { List batchSelectByIds(@Param("ids") List id); - List batchSelectByErpIds(@Param("erpIds") List erpIds); BasicUnitMaintainEntity selectByName(@Param("name") String name); 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 8c103ba5..5641bea0 100644 --- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -19,5 +19,4 @@ public interface CompanyProductRelevanceDao extends BaseMapperPlus 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/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 70212d0d..469050c7 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -41,7 +41,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); 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 9636c900..3daebe9d 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java @@ -20,7 +20,6 @@ public interface UdiRlSupDao extends BaseMapperPlus - - 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} - ) - @@ -228,15 +191,6 @@ - - - - SELECT * FROM basic_new_udi_upload - - - AND id = #{id} - - - AND relId = #{relId} - - - AND thirdSysFk = #{thirdSysFk} - - - AND uploadStatus = #{uploadStatus} - - - AND uploadCode = #{uploadCode} - - - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> - - - ORDER BY updateTime DESC - @@ -62,4 +37,4 @@ WHERE id = #{id} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/system/SysServerLogDao.xml b/src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml similarity index 72% rename from src/main/resources/mybatis/mapper/system/SysServerLogDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml index c1c7c880..d1c7ecb8 100644 --- a/src/main/resources/mybatis/mapper/system/SysServerLogDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mybatis/mapper/basic/BasicProductsImportDetailDao.xml b/src/main/resources/mybatis/mapper/basic/BasicProductsImportDetailDao.xml index 67c64c3b..b2219455 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicProductsImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicProductsImportDetailDao.xml @@ -38,21 +38,6 @@ ) - - insert INTO basic_products_import_detail - (udiCode,ybbm,sptm,thirdId1,thirdId2, - thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk,isUseDy) - values - - ( - #{item.udiCode}, #{item.ybbm},#{item.sptm}, - #{item.thirdId1}, #{item.thirdId2},#{item.thirdId3}, - #{item.thirdId4}, #{item.thirdId},#{item.status}, - #{item.updateTime},#{item.remark}, #{item.genKeyFk},#{item.isUseDy} - ) - - DELETE FROM basic_products_import_detail WHERE id = #{id} @@ -79,4 +64,4 @@ WHERE id = #{id} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 06fa11a7..3dee4b0f 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -102,43 +102,6 @@ ) - - - insert - ignore - 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) - values - ( - #{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{thirdName}, - #{thirdName1}, - #{thirdName2}, - #{thirdName3}, - #{thirdName4}, - #{updateTime}, - #{corpType}, - #{outType} - ) - - - insert INTO basic_corp(thirdId, erpId, `name`, spell, addr, status, `type`, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, @@ -269,13 +232,6 @@ - - select * - from basic_bussiness_type_role - where role_id = #{roleId} - - - - delete - from basic_bussiness_type_role - where role_id = #{roleId} - - insert into basic_bussiness_type_role (role_id, action) diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index c642ee2a..b20a28a6 100644 --- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -28,13 +28,6 @@ WHERE id = #{id} - - - DELETE - FROM company_product_relevance - WHERE udiRlIdFk = #{id} - - - - 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/UdiCompanyDao.xml b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml index fc1c3323..e76d3b28 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml @@ -3,15 +3,6 @@ - - - - - - REPLACE - INTO udicompany - ( - id,tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh, - qylxrcz,qylxryx - ) - values - ( - #{id}, - #{tyshxydm}, - #{ylqxzcrbarmc}, - #{ylqxzcrbarywmc}, - #{qylxrdh}, - #{qylxrcz}, - #{qylxryx} - ) - - replace INTO udicompany(id, tyshxydm,ylqxzcrbarmc,ylqxzcrbarywmc,qylxrdh, @@ -88,18 +59,6 @@ - - UPDATE udicompany - - tyshxydm=#{tyshxydm}, - ylqxzcrbarmc=#{ylqxzcrbarmc}, - ylqxzcrbarywmc=#{ylqxzcrbarywmc}, - qylxrdh=#{qylxrdh}, - qylxrcz=#{qylxrcz}, - qylxryx=#{qylxryx}, - - WHERE id = #{id} - - - - select unitFk - from company_product_relevance - where udiRlIdFk = #{udiRlIdFk} -