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 6c4762f9..a0be69ff 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -36,32 +36,8 @@ 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); - - /** - * 根据code查询* - */ - DeptEntity selectByCodeAll(@Param("code") String code); - /** * 根据编码查询部门名称 * diff --git a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java index 154ca84a..5bad967f 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java @@ -10,10 +10,8 @@ import java.util.List; @Mapper public interface SysMenuDao { - SysMenu selectById(Long id); - int insert(SysMenu menu); int updateById(SysMenu menu); 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 397f9015..bc38f2e8 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/basic/BasicNewUploadDiDao.java b/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java index 19c2ac3e..6718d8c2 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java @@ -12,6 +12,5 @@ public interface BasicNewUploadDiDao { boolean insertNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity); - boolean updateNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity); } 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 f27a11e1..d96eb262 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 insert(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean updateById(BasicUnitMaintainEntity basicUnitMaintainSaveRequest); diff --git a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java index 84ba52b2..d7b30ea1 100644 --- a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.basic; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.req.basic.ProductInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,46 +9,27 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface ProductInfoDao { +public interface ProductInfoDao extends BaseMapperPlus { List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); List 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); boolean deleteById(@Param("id") String id); boolean deleteAll(@Param("ids") List 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); List syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest); - List filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); - - List selectAllByUuid(@Param("ids") List ids); } 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 bf67fd28..1746cd63 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRlSupDao.java @@ -32,14 +32,6 @@ public interface UdiRlSupDao extends BaseMapperPlus selectUnitFkByRelId(@Param("relId") Long relId); - /** * 统计供应商配送产品数量 * diff --git a/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 0a0c644a..09faff46 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -84,15 +84,12 @@ group by auth_dept.code - - - - - - select * from auth_dept @@ -233,7 +224,6 @@ #{item} - UPDATE auth_dept @@ -288,57 +278,21 @@ WHERE id = #{id} - - - replace into auth_dept (id, pid, code, `name`, advanceType, isDefault, status, - updateTime, remark, `level`, pcode, thirdId, thirdId1, thirdId2, thirdId3, - thirdId4, spUse) values - - (#{item.id}, - #{item.pid}, - #{item.code}, - #{item.name}, - #{item.advanceType}, - #{item.isDefault}, - #{item.status}, - #{item.updateTime}, - #{item.remark}, #{item.level}, - #{item.pcode}, #{item.thirdId}, - #{item.thirdId1}, #{item.thirdId2}, - #{item.thirdId3}, #{item.thirdId4}, #{item.spUse}) - - - - - update auth_dept - set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR} - where id = #{id} - - update auth_dept SET updateTime = #{updateTime} where code = #{code} - - - - - - - - - - - - - - - - - - - REPLACE - INTO productinfo - (id, nameCode, packRatio, packLevel, bhxjsl, - bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy, - thirdProductName, - cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm, - versionNumber - , diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, - ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, cplx, hchzsb - , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs, - categoryName) - values (#{id}, - #{nameCode}, - #{packRatio}, - #{packLevel}, - #{bhxjsl}, - #{bhzxxsbzsl}, - #{zxxsbzbhsydysl}, - #{bhxjcpbm}, - #{bzcj}, - #{thirdProductNo}, - #{addType}, - #{deviceRecordKey}, - #{isUseDy}, - #{thirdProductName}, - #{cpmctymc}, - #{cplb}, - #{flbm}, - #{ggxh}, - #{qxlb}, - #{tyshxydm}, - #{ylqxzcrbarmc}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarywmc}, - #{uuid}, - #{sjcpbm}, - #{versionNumber}, - #{diType}, - #{scbssfbhph}, - #{scbssfbhxlh}, - #{scbssfbhscrq}, - #{scbssfbhsxrq}, - #{ybbm}, - #{spmc}, - #{cphhhbh}, - #{cpms}, - #{cpbsbmtxmc}, - #{isNewest}, - #{updateTime}, - #{cplx}, - #{hchzsb}, - #{sfwblztlcp}, - #{cgzmraqxgxx}, - #{sfbjwycxsy}, - #{zdcfsycs}, - #{sfwwjbz}, - #{syqsfxyjxmj}, - #{qtxxdwzlj}, - #{mjfs}, #{categoryName}) - - REPLACE INTO productinfo @@ -537,197 +287,5 @@ - - UPDATE productinfo - - - nameCode=#{nameCode}, - - - packRatio=#{packRatio}, - - - packLevel=#{packLevel}, - - - bhxjsl=#{bhxjsl}, - - - bhzxxsbzsl=#{bhzxxsbzsl}, - - - zxxsbzbhsydysl=#{zxxsbzbhsydysl}, - - - bhxjcpbm=#{bhxjcpbm}, - - - bzcj=#{bzcj}, - - - thirdProductNo=#{thirdProductNo}, - - - addType=#{addType}, - - - deviceRecordKey=#{deviceRecordKey}, - - - isUseDy=#{isUseDy}, - - - thirdProductName=#{thirdProductName}, - - - cpmctymc=#{cpmctymc}, - - - cplb=#{cplb}, - - - flbm=#{flbm}, - - - ggxh=#{ggxh}, - - - qxlb=#{qxlb}, - - - tyshxydm=#{tyshxydm}, - - - ylqxzcrbarmc=#{ylqxzcrbarmc}, - - - ylqxzcrbarywmc=#{ylqxzcrbarywmc}, - - - uuid=#{uuid}, - - - sjcpbm=#{sjcpbm}, - - - versionNumber=#{versionNumber}, - - - diType=#{diType}, - - - isNewest=#{isNewest}, - - - updateTime=#{updateTime}, - - - cplx=#{cplx}, - - - hchzsb=#{hchzsb}, - - - sfwblztlcp=#{sfwblztlcp}, - - - cgzmraqxgxx=#{cgzmraqxgxx}, - - - sfbjwycxsy=#{sfbjwycxsy}, - - - zdcfsycs=#{zdcfsycs}, - - - sfwwjbz=#{sfwwjbz}, - - - syqsfxyjxmj=#{syqsfxyjxmj}, - - - qtxxdwzlj=#{qtxxdwzlj}, - - - mjfs=#{mjfs}, - - - categoryName=#{categoryName}, - - - WHERE id = #{id} - - - UPDATE productinfo - - - scbssfbhph=#{scbssfbhph}, - - - scbssfbhxlh=#{scbssfbhxlh}, - - - scbssfbhscrq=#{scbssfbhscrq}, - - - scbssfbhsxrq=#{scbssfbhsxrq}, - - - ybbm=#{ybbm}, - - - spmc=#{spmc}, - - - cphhhbh=#{cphhhbh}, - - - cpms=#{cpms}, - - - cpbsbmtxmc=#{cpbsbmtxmc}, - - - isNewest=#{isNewest}, - - - updateTime=#{updateTime}, - - - cplx=#{cplx}, - - - hchzsb=#{hchzsb}, - - - sfwblztlcp=#{sfwblztlcp}, - - - cgzmraqxgxx=#{cgzmraqxgxx}, - - - sfbjwycxsy=#{sfbjwycxsy}, - - - zdcfsycs=#{zdcfsycs}, - - - sfwwjbz=#{sfwwjbz}, - - - syqsfxyjxmj=#{syqsfxyjxmj}, - - - qtxxdwzlj=#{qtxxdwzlj}, - - - mjfs=#{mjfs}, - - - categoryName=#{categoryName}, - - - WHERE uuid = #{uuid} - diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 13a5ec0a..de32d72c 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -418,16 +418,7 @@ FROM company_product_relevance WHERE id = #{id} - - - - - - +