切换到jsh的版本

src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java

@@ -25,6 +25,7 @@ public interface AccountHeadMapperEx {
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime);
 
+    Long getMaxId();
 
     BigDecimal findAllMoney(
             @Param("supplierId") Integer supplierId,
@@ -42,7 +43,4 @@ public interface AccountHeadMapperEx {
     List<AccountHead> getAccountHeadListByOrganIds(@Param("organIds") String[] organIds);
 
     List<AccountHead> getAccountHeadListByHandsPersonIds(@Param("handsPersonIds") String[] handsPersonIds);
-
-    int addAccountHead(AccountHead accountHead);
-    int updateAccountHead(AccountHead accountHead);
 }

src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java

@@ -38,6 +38,7 @@ public interface DepotHeadMapperEx {
             @Param("materialParam") String materialParam,
             @Param("depotIds") String depotIds);
 
+    Long getMaxId();
 
     String findMaterialsListByHeaderId(
             @Param("id") Long id);
@@ -110,6 +111,7 @@ public interface DepotHeadMapperEx {
      * */
     void updatedepotHead(DepotHead depotHead);
 
+    void updateBuildOnlyNumber();
     /**
      * 获得一个全局唯一的数作为订单号的追加
      * */

src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java

@@ -36,15 +36,6 @@ public interface DepotItemMapperEx {
     Long findDetailByTypeAndMaterialIdCounts(
             @Param("mId") Long mId);
 
-
-    int findByTypeAndDepotIdAndMaterialIdIn(
-            @Param("depotId") Long depotId,
-            @Param("mId") Long mId);
-
-    int findByTypeAndDepotIdAndMaterialIdOut(
-            @Param("depotId") Long depotId,
-            @Param("mId") Long mId);
-
     List<DepotItemVo4WithInfoEx> getDetailList(
             @Param("headerId") Long headerId);
 
@@ -115,6 +106,4 @@ public interface DepotItemMapperEx {
     int findStockWarningCountTotal( @Param("pid") Integer pid);
 
     BigDecimal getFinishNumber(@Param("mid") Long mid, @Param("linkNumber") String linkNumber);
-
-    BigDecimal getCurrentRepByMaterialIdAndDepotId(@Param("materialId") Long materialId, @Param("depotId") Long depotId,@Param("tenantId")Long tenantId);
 }

src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java

@@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 public interface RoleMapperEx {
 
@@ -19,5 +18,4 @@ public interface RoleMapperEx {
             @Param("name") String name);
 
     int batchDeleteRoleByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
-    List<Role> getRoleList(Map<String, String> parameterMap);
 }

src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java

@@ -93,4 +93,4 @@ public interface TenantMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(Tenant record);
-}
+}

src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java

@@ -14,4 +14,4 @@ public interface TenantMapperEx {
 
     Long countsByTenant(
             @Param("loginName") String loginName);
-}
+}

src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java

@@ -1,6 +1,5 @@
 package com.jsh.erp.datasource.mappers;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.entities.UserEx;
 import com.jsh.erp.datasource.entities.UserExample;
@@ -29,18 +28,12 @@ public interface UserMapperEx {
     int addUser(UserEx ue);
 
     int updateUser(UserEx ue);
-    /**
-     * 这个查询不添加租户id，保证登录名全局唯一
-     * */
-    List<User> getUserListByLoginName(@Param("loginame") String loginame);
+
+    List<User> getUserListByUserNameOrLoginName(@Param("userName") String userName,
+                                                @Param("loginame") String loginame);
 
     int batDeleteOrUpdateUser(@Param("ids") String ids[], @Param("status") byte status);
 
     List<TreeNodeEx> getNodeTree();
     List<TreeNodeEx> getNextNodeTree(Map<String, Object> parameterMap);
-
-    List<User> getUserListByUserNameAndTenantId(@Param("userName")String userName, @Param("tenantId")Long tenantId);
-
-    String addRegisterUserNotInclueUser(@Param("userId") Long userId,@Param("tenantId") Long tenantId,@Param("roleId") Long roleId);
-    List<User> getUserListByloginNameAndPassword(@Param("loginame")String loginame, @Param("password")String password);
 }