Merge remote-tracking branch 'origin/master'

master
mengjiao 9 months ago
commit ef694dcc8f

@ -17,7 +17,7 @@ public class SysNoticeGroup extends BaseEntity {
/**
* ID
*/
private Long id;
private String id;
/**
*
@ -46,11 +46,11 @@ public class SysNoticeGroup extends BaseEntity {
private String[] groupNames;
public void setId(Long id) {
public void setId(String id) {
this.id = id;
}
public Long getId() {
public String getId() {
return id;
}

@ -61,10 +61,10 @@ public class SysNoticeGroupController extends BaseController {
/**
* -
*/
@RequiresPermissions("noticeGroup:noticeGroup:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(sysNoticeGroupService.selectSysNoticeGroupById(id));
public TableDataInfo getInfo(@PathVariable("id") String id) {
List<SysNoticeGroup> list = sysNoticeGroupService.selectByNoticeId(id);
return getDataTable(list);
}
/**
@ -90,11 +90,10 @@ public class SysNoticeGroupController extends BaseController {
/**
* -
*/
@RequiresPermissions("noticeGroup:noticeGroup:remove")
@Log(title = "通知公告-班组", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(sysNoticeGroupService.deleteSysNoticeGroupByIds(ids));
@PostMapping("/delNoticeGroup")
public AjaxResult delNoticeGroup(@RequestBody SysNoticeGroup sysNoticeGroup) {
return toAjax(sysNoticeGroupService.deleteByNoticeId(sysNoticeGroup));
}
@PostMapping("/teamBind")

@ -19,7 +19,7 @@ public interface SysNoticeGroupMapper {
* @param id -
* @return -
*/
public SysNoticeGroup selectSysNoticeGroupById(Long id);
public List<SysNoticeGroup> selectByNoticeId(String id);
/**
* -
@ -62,4 +62,8 @@ public interface SysNoticeGroupMapper {
public int deleteSysNoticeGroupByIds(Long[] ids);
public int getSerialNumber();
public List<SysNoticeGroup> validData(SysNoticeGroup sysNoticeGroup);
public int deleteByNotice(SysNoticeGroup sysNoticeGroup);
}

@ -17,7 +17,7 @@ public interface ISysNoticeGroupService {
* @param id -
* @return -
*/
public SysNoticeGroup selectSysNoticeGroupById(Long id);
public List<SysNoticeGroup> selectByNoticeId(String id);
/**
* -
@ -59,4 +59,7 @@ public interface ISysNoticeGroupService {
*/
public int deleteSysNoticeGroupById(Long id);
public List<SysNoticeGroup> validData(SysNoticeGroup sysNoticeGroup);
public int deleteByNoticeId(SysNoticeGroup sysNoticeGroup);
}

@ -4,7 +4,6 @@ import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.system.api.domain.SysNoticeGroup;
import org.springframework.beans.factory.annotation.Autowired;
@ -32,8 +31,9 @@ public class SysNoticeGroupServiceImpl implements ISysNoticeGroupService {
* @return -
*/
@Override
public SysNoticeGroup selectSysNoticeGroupById(Long id) {
return sysNoticeGroupMapper.selectSysNoticeGroupById(id);
@DS("#header.poolName")
public List<SysNoticeGroup> selectByNoticeId(String id) {
return sysNoticeGroupMapper.selectByNoticeId(id);
}
/**
@ -57,17 +57,19 @@ public class SysNoticeGroupServiceImpl implements ISysNoticeGroupService {
@DS("#header.poolName")
public int insertSysNoticeGroup(SysNoticeGroup sysNoticeGroup) {
String[] groupCodes = sysNoticeGroup.getGroupCodes();
if (groupCodes == null){
if (groupCodes == null) {
return 0;
}
String[] groupNames = sysNoticeGroup.getGroupNames();
Long noticeId = sysNoticeGroup.getNoticeId();
String username = SecurityUtils.getUsername();
// 绑定前先清空旧数据
sysNoticeGroupMapper.deleteByNotice(sysNoticeGroup);
Long serialId = getSerialId();
int count = 0;
for (int i = 0; i < groupCodes.length; i++) {
sysNoticeGroup.setId(serialId++);
sysNoticeGroup.setId(String.valueOf(serialId++));
sysNoticeGroup.setNoticeId(noticeId);
sysNoticeGroup.setGroupCode(groupCodes[i]);
sysNoticeGroup.setGroupName(groupNames[i]);
@ -112,6 +114,17 @@ public class SysNoticeGroupServiceImpl implements ISysNoticeGroupService {
return sysNoticeGroupMapper.deleteSysNoticeGroupById(id);
}
@Override
public List<SysNoticeGroup> validData(SysNoticeGroup sysNoticeGroup) {
return sysNoticeGroupMapper.validData(sysNoticeGroup);
}
@Override
@DS("#header.poolName")
public int deleteByNoticeId(SysNoticeGroup sysNoticeGroup) {
return sysNoticeGroupMapper.deleteByNotice(sysNoticeGroup);
}
@DS("#header.poolName")
private Long getSerialId() {
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());

@ -36,10 +36,10 @@
</where>
</select>
<select id="selectSysNoticeGroupById" parameterType="Long"
<select id="selectByNoticeId" parameterType="String"
resultMap="SysNoticeGroupResult">
<include refid="selectSysNoticeGroupVo"/>
where id = #{id}
where del_flag = '0' and notice_id = #{id}
</select>
<insert id="insertSysNoticeGroup" parameterType="SysNoticeGroup">
@ -125,19 +125,31 @@
</update>
<delete id="deleteSysNoticeGroupById" parameterType="Long">
delete from sys_notice_group where id = #{id}
update sys_notice_group set del_flag = '1' where id = #{id}
</delete>
<delete id="deleteSysNoticeGroupByIds" parameterType="String">
delete from sys_notice_group where id in
update sys_notice_group set del_flag = "1" where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="validData" parameterType="SysNoticeGroup" resultMap="SysNoticeGroupResult">
<include refid="selectSysNoticeGroupVo"/>
WHERE del_flag = 0 and notice_id = #{noticeId} and group_code = #{groupCode}
</select>
<select id="getSerialNumber" resultType="java.lang.Integer">
select count(0)+1
from sys_notice_group
where
CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
</select>
<delete id="deleteByNotice" parameterType="String">
update sys_notice_group set del_flag = '1' where notice_id = #{noticeId} and group_code in
<foreach item="groupCode" collection="groupCodes" open="(" separator="," close=")">
#{groupCode}
</foreach>
</delete>
</mapper>

@ -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)

@ -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")
public String selectUserName(BaseTeamUser baseTeamUser);
@DS("#master")
public BaseTeamUser selectUserDetail(@Param("userId") String userId);
//批量删除
public void deleteBaseTeamUserByTeamId(String teamId);

@ -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.setUserName(userName);
BaseTeamUser user = baseTeamUserMapper.selectUserDetail(baseTeamUser.getUserId());
if(user != null){
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.setUserName(userName);
BaseTeamUser user = baseTeamUserMapper.selectUserDetail(userId);
if(user != null){
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
*/

@ -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_name,
nick_name,
CONCAT(nick_name,user_name) AS teamUserName
user_id,
user_name,
nick_name,
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 user_name
<select id="selectUserDetail" parameterType="String" resultType="com.op.wms.domain.BaseTeamUser">
select
user_id AS userId ,
user_name AS userName,
wx_id AS wxId
from sys_user
where user_id = #{userId}
</select>

Loading…
Cancel
Save