提交 329823c7 authored 作者: 000516's avatar 000516 提交者: Coding

修改岗位-考勤规则信息,同步修改user

Merge Request: 修改岗位-考勤规则信息,同步修改user Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-sfa-module-system/git/merge/27?initial=true
package com.sfa.system.controller.query; package com.sfa.system.controller.query;
import java.util.List; import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.exception.WXLSQLException;
import com.sfa.system.domain.dao.ISysPostDao; import com.sfa.system.domain.dao.ISysPostDao;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -97,6 +102,7 @@ public class SysPostController extends BaseController ...@@ -97,6 +102,7 @@ public class SysPostController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysPost post) public AjaxResult edit(@Validated @RequestBody SysPost post)
{ {
Assert.notNull(post.getPostId(),String.format(ECode.PARAM_ID_ISNULL_ERROR.getMsg(), "岗位"));
if (!sysPostDao.checkPostNameUnique(post)) if (!sysPostDao.checkPostNameUnique(post))
{ {
return error("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在"); return error("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在");
...@@ -115,7 +121,7 @@ public class SysPostController extends BaseController ...@@ -115,7 +121,7 @@ public class SysPostController extends BaseController
*/ */
@RequiresPermissions("system:post:remove") @RequiresPermissions("system:post:remove")
@Log(title = "岗位管理", businessType = BusinessType.DELETE) @Log(title = "岗位管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}") // @DeleteMapping("/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds) public AjaxResult remove(@PathVariable Long[] postIds)
{ {
return toAjax(sysPostDao.deletePostByIds(postIds)); return toAjax(sysPostDao.deletePostByIds(postIds));
......
...@@ -7,10 +7,12 @@ import com.sfa.common.core.utils.bean.BeanUtils; ...@@ -7,10 +7,12 @@ import com.sfa.common.core.utils.bean.BeanUtils;
import com.sfa.system.domain.dao.ISysPostDao; import com.sfa.system.domain.dao.ISysPostDao;
import com.sfa.system.domain.entity.SysPost; import com.sfa.system.domain.entity.SysPost;
import com.sfa.system.domain.mapper.SysPostMapper; import com.sfa.system.domain.mapper.SysPostMapper;
import com.sfa.system.domain.mapper.SysUserMapper;
import com.sfa.system.domain.mapper.SysUserPostMapper; import com.sfa.system.domain.mapper.SysUserPostMapper;
import com.sfa.system.pojo.response.SysPostDto; import com.sfa.system.pojo.response.SysPostDto;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -29,6 +31,8 @@ public class SysPostDaoImpl implements ISysPostDao ...@@ -29,6 +31,8 @@ public class SysPostDaoImpl implements ISysPostDao
private SysPostMapper postMapper; private SysPostMapper postMapper;
@Autowired @Autowired
private SysUserPostMapper userPostMapper; private SysUserPostMapper userPostMapper;
@Autowired
private SysUserMapper sysUserMapper;
/** /**
* 查询岗位信息集合 * 查询岗位信息集合
...@@ -175,11 +179,14 @@ public class SysPostDaoImpl implements ISysPostDao ...@@ -175,11 +179,14 @@ public class SysPostDaoImpl implements ISysPostDao
* @param post 岗位信息 * @param post 岗位信息
* @return 结果 * @return 结果
*/ */
@Transactional(rollbackFor = Exception.class)
@Override @Override
public int updatePost(SysPost post) public int updatePost(SysPost post)
{ {
// return postMapper.updatePost(post); // 修改岗位、user绑定的岗位信息
return postMapper.updateById(post); postMapper.updateById(post);
sysUserMapper.updateUserPostByPostId(post.getPostId(),post.getPostName(),post.getRuleId(),post.getRuleName());
return 1;
} }
@Override @Override
......
package com.sfa.system.domain.entity; package com.sfa.system.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sfa.common.core.annotation.Excel; import com.sfa.common.core.annotation.Excel;
import com.sfa.common.core.annotation.Excel.ColumnType; import com.sfa.common.core.annotation.Excel.ColumnType;
import com.sfa.common.core.web.domain.BaseDo; import com.sfa.common.core.web.domain.BaseDo;
...@@ -38,9 +35,11 @@ public class SysPost extends BaseDo ...@@ -38,9 +35,11 @@ public class SysPost extends BaseDo
private Integer postSort; private Integer postSort;
/** 考勤规则ID */ /** 考勤规则ID */
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long ruleId; private Long ruleId;
/** 考勤规则名称 */ /** 考勤规则名称 */
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String ruleName; private String ruleName;
/** 状态(0正常 1停用) */ /** 状态(0正常 1停用) */
......
...@@ -133,4 +133,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> ...@@ -133,4 +133,5 @@ public interface SysUserMapper extends BaseMapper<SysUser>
List<SysUser> selectUserPage(); List<SysUser> selectUserPage();
void updateUserPostByPostId(@Param("postId") Long postId, @Param("postName") String postName, @Param("ruleId") Long ruleId, @Param("ruleName") String ruleName);
} }
...@@ -246,4 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -246,4 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
</select> </select>
<update id="updateUserPostByPostId">
update sys_user set post_name =#{postName} ,rule_id =#{ruleId} ,rule_name =#{ruleName} where post_id =#{postId}
</update>
</mapper> </mapper>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论