Browse Source

fix:岗位伴随从表更新

fix: 审批备注过长
checkBack
Yen 1 year ago
parent
commit
f19ce03f87
  1. 2
      src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java
  2. 13
      src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java
  3. 1
      src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java
  4. 2
      src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
  5. 4
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

2
src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java

@ -112,6 +112,7 @@ public class SysPostController {
return R.error2(); return R.error2();
} }
sysPostService.modify(param); sysPostService.modify(param);
sysPostService.flushPathIds();
return R.ok(); return R.ok();
} }
@ -135,6 +136,7 @@ public class SysPostController {
public R<?> save(@RequestBody @Valid SysPost param){ public R<?> save(@RequestBody @Valid SysPost param){
param.setId(null); param.setId(null);
sysPostService.modify(param); sysPostService.modify(param);
sysPostService.flushPathIds();
return R.ok(param); return R.ok(param);
} }

13
src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java

@ -11,6 +11,19 @@ import org.apache.ibatis.annotations.Update;
*/ */
public interface SysPostMapper extends BaseMapper<SysPost> { public interface SysPostMapper extends BaseMapper<SysPost> {
/**
* 修改post表 更关联表post_user
* @return
*/
@Update("update sys_post_user " +
" left join sys_post " +
" on sys_post_user.post_id = sys_post.id" +
" set " +
" sys_post_user.post_code = sys_post.post_code, " +
" sys_post_user.post_name = sys_post.post_name " +
" where sys_post_user.del_flag = 0 and sys_post.del_flag = 0 ")
int updatePostUserInfo();
/** /**
* 根据岗位更新员工的路径绑定ID * 根据岗位更新员工的路径绑定ID
* @return * @return

1
src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java

@ -100,6 +100,7 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
toFlushPathIds(pid, null,null); toFlushPathIds(pid, null,null);
//更新绑定的用户路径 //更新绑定的用户路径
baseMapper.updatePostUserIdPaths(); baseMapper.updatePostUserIdPaths();
baseMapper.updatePostUserInfo();
} }
/** /**

2
src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler; import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.JdbcType;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -47,6 +48,7 @@ public class TbsAffairCommitBo {
/** /**
* 评论 * 评论
*/ */
@Length(max = 800,message = "备注长度限制800字")
@NotNull @NotNull
private String comment; private String comment;

4
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -320,7 +320,9 @@ public class VtbVerificationController {
yard.setYardItemList(yardItemList); yard.setYardItemList(yardItemList);
SysUser sysUser = sysUserService.getById(yard.getCreateBy()); SysUser sysUser = sysUserService.getById(yard.getCreateBy());
yard.setUserInfo(sysUser.toSysUserVo()); if(sysUser!=null){
yard.setUserInfo(sysUser.toSysUserVo());
}
} }
Map<String,Object> result = new HashMap<>(2); Map<String,Object> result = new HashMap<>(2);
result.put("verification",verification); result.put("verification",verification);

Loading…
Cancel
Save