2024-5-15 基础信息-班组-增加关于微信号逻辑

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamUser.java

@@ -56,12 +56,16 @@ public class BaseTeamUser extends BaseEntity {
     private String teamUserName;
 
     //电话
+    @Excel(name = "电话")
     private String phonenumber;
 
+    //微信
+    @Excel(name = "微信")
+    private String wxId;
+
     public void setId(String id) {
         this.id = id;
     }
-
     public String getId() {
         return id;
     }
@@ -69,7 +73,6 @@ public class BaseTeamUser extends BaseEntity {
     public void setTeamId(String teamId) {
         this.teamId = teamId;
     }
-
     public String getTeamId() {
         return teamId;
     }
@@ -77,7 +80,6 @@ public class BaseTeamUser extends BaseEntity {
     public void setTeamCode(String teamCode) {
         this.teamCode = teamCode;
     }
-
     public String getTeamCode() {
         return teamCode;
     }
@@ -85,7 +87,6 @@ public class BaseTeamUser extends BaseEntity {
     public void setUserId(String userId) {
         this.userId = userId;
     }
-
     public String getUserId() {
         return userId;
     }
@@ -93,7 +94,6 @@ public class BaseTeamUser extends BaseEntity {
     public void setUserName(String userName) {
         this.userName = userName;
     }
-
     public String getUserName() {
         return userName;
     }
@@ -101,7 +101,6 @@ public class BaseTeamUser extends BaseEntity {
     public String getNickName() {
         return nickName;
     }
-
     public void setNickName(String nickName) {
         this.nickName = nickName;
     }
@@ -109,7 +108,6 @@ public class BaseTeamUser extends BaseEntity {
     public String getTeamUserName() {
         return teamUserName;
     }
-
     public void setTeamUserName(String teamUserName) {
         this.teamUserName = teamUserName;
     }
@@ -117,11 +115,17 @@ public class BaseTeamUser extends BaseEntity {
     public void setPhonenumber(String phonenumber) {
         this.phonenumber = phonenumber;
     }
-
     public String getPhonenumber() {
         return phonenumber;
     }
 
+    public void setWxId(String wxId) {
+        this.wxId = wxId;
+    }
+    public String getWxId() {
+        return wxId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamUserMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.wms.domain.BaseTeamUser;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 班组人员Mapper接口
@@ -69,8 +70,8 @@ public interface BaseTeamUserMapper {
     //查询人员ID
     public String selectId(BaseTeamUser baseTeamUser);
 
-    @DS("master")
+    @DS("#master")
-    public String selectUserName(BaseTeamUser baseTeamUser);
+    public BaseTeamUser selectUserDetail(@Param("userId") String userId);
 
     //批量删除
     public void deleteBaseTeamUserByTeamId(String teamId);

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java

@@ -82,9 +82,11 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
             list = baseTeamT.getRightData();
             String userId = list.get(i);
             baseTeamUser.setUserId(userId);
-            String userName = baseTeamUserMapper.selectUserName(baseTeamUser);
+            BaseTeamUser user = baseTeamUserMapper.selectUserDetail(baseTeamUser.getUserId());
-            //判断班组人员有没有变动 挨个遍历
+            if(user != null){
-            baseTeamUser.setUserName(userName);
+                baseTeamUser.setUserName(user.getUserName());
+                baseTeamUser.setWxId(user.getWxId());
+            }
             baseTeamUserMapper.insertBaseTeamUser(baseTeamUser);
         }
         return 1;
@@ -114,19 +116,12 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
             list = baseTeamT.getRightData();
             String userId = list.get(i);
             baseTeamUser.setUserId(userId);
-            String userName = baseTeamUserMapper.selectUserName(baseTeamUser);
+            BaseTeamUser user = baseTeamUserMapper.selectUserDetail(userId);
-            //判断班组人员有没有变动 挨个遍历
+            if(user != null){
-            baseTeamUser.setUserName(userName);
+                baseTeamUser.setUserName(user.getUserName());
+                baseTeamUser.setWxId(user.getWxId());
+            }
             baseTeamUserMapper.insertBaseTeamUser(baseTeamUser);
-//			BaseTeamUser baseTeamUser1 = new BaseTeamUser();
-//			List<String> members = baseTeamUserMapper.selectTeamMembersIds(baseTeamUser1);
-//			boolean bool = members.contains(userId);
-            //倒查id
-//			String id = baseTeamUserMapper.selectId(baseTeamUser);
-//			baseTeamUser.setUpdateTime(DateUtils.getNowDate());
-//			baseTeamUser.setUpdateBy(SecurityUtils.getUsername());
-//			baseTeamUserMapper.updateBaseTeamUser(baseTeamUser);
-            //如果过来的班组成员ID不存在于表中，直接新增
         }
         return baseTeamTMapper.updateBaseTeamT(baseTeamT);
     }
@@ -158,7 +153,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
     }
 
     /**
-     * 判断仓库信息
+     * 判断班组Code
      *
      * @return 结果
      */
@@ -174,7 +169,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
     }
 
     /**
-     * 判断仓库信息
+     * 判断班组名称
      *
      * @return 结果
      */

op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml

@@ -14,10 +14,11 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="wxId" column="wx_id"/>
     </resultMap>
 
     <sql id="selectBaseTeamUserVo">
-		select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time from base_team_user
+		select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time, wx_id from base_team_user
 	</sql>
 
     <select id="selectBaseTeamUserList" parameterType="BaseTeamUser" resultMap="BaseTeamUserResult">
@@ -47,6 +48,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="wxId != null">wx_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -58,6 +60,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="wxId != null">#{wxId},</if>
         </trim>
     </insert>
 
@@ -72,6 +75,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="wxId != null">wx_id = #{wxId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -93,10 +97,11 @@
 
     <select id="selectTeamMembers" parameterType="BaseTeamUser" resultMap="BaseTeamUserResult">
 		select
-		user_id,
+		    user_id,
-		user_name,
+		    user_name,
-		nick_name,
+		    nick_name,
-		CONCAT(nick_name,user_name) AS teamUserName
+		    CONCAT(nick_name,user_name) AS teamUserName,
+		    wx_id
 		from sys_user
 	</select>
 
@@ -118,8 +123,11 @@
 		and team_id = #{teamId}
 	</select>
 
-    <select id="selectUserName" parameterType="BaseTeamUser" resultType="java.lang.String">
+    <select id="selectUserDetail" parameterType="String" resultType="com.op.wms.domain.BaseTeamUser">
-		select user_name
+		select
+		    user_id AS userId ,
+		    user_name AS userName,
+		    wx_id AS wxId
 		from sys_user
 		where user_id = #{userId}
 	</select>