1、用印信息管理添加字段post_id

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampinfo/OaStampInfoController.java

@@ -11,10 +11,12 @@ import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampinfo.vo.OaStampIn
 import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampinfo.vo.OaStampInfoSaveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampinfo.OaStampInfoDO;
 import cn.iocoder.yudao.module.bpm.service.stamp.stampinfo.OaStampInfoService;
+import cn.iocoder.yudao.module.employee.api.EmployeeApi;
+import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.PostApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -41,11 +44,14 @@ public class OaStampInfoController {
     private OaStampInfoService oaStampInfoService;
 
     @Resource
-    private AdminUserApi adminUserApi;
+    private EmployeeApi employeeApi;
 
     @Resource
     private DeptApi deptApi;
 
+    @Resource
+    private PostApi postApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建用印信息")
     // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-info:create')")
@@ -114,14 +120,20 @@ public class OaStampInfoController {
         }
         // 创建人名字
         Long createEmployeeId = oaStampInfoRespVO.getCreateEmployeeId();
-        AdminUserRespDTO createEmployee = adminUserApi.getUser(createEmployeeId);
-        oaStampInfoRespVO.setCreateEmployeeName(createEmployee.getNickname());
+        EmployeeRespDTO createEmployee = employeeApi.getEmployeeById(createEmployeeId);
+        oaStampInfoRespVO.setCreateEmployeeName(createEmployee.getName());
         // 用印人信息
         Long employeeId = oaStampInfoRespVO.getEmployeeId();
-        AdminUserRespDTO employee = adminUserApi.getUser(employeeId);
-        oaStampInfoRespVO.setEmployeeName(employee.getNickname());
-        oaStampInfoRespVO.setEmployeePhone(employee.getMobile());
-        oaStampInfoRespVO.setPosition("职位信息");
+        // AdminUserRespDTO employee = adminUserApi.getUser(employeeId);
+        EmployeeRespDTO employee = employeeApi.getEmployeeById(employeeId);
+        oaStampInfoRespVO.setEmployeeName(employee.getName());
+        oaStampInfoRespVO.setEmployeePhone(employee.getPhone());
+        // 职位
+        Long postId = oaStampInfoRespVO.getPostId();
+        PostRespDTO post = postApi.getPost(postId);
+        if (Objects.nonNull(post)) {
+            oaStampInfoRespVO.setPosition(post.getName());
+        }
         // 部门名称
         Long deptId = oaStampInfoRespVO.getDeptId();
         DeptRespDTO dept = deptApi.getDept(deptId);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampinfo/vo/OaStampInfoRespVO.java

@@ -49,6 +49,10 @@ public class OaStampInfoRespVO {
     @ExcelProperty("部门名称")
     private String deptName;
 
+    @Schema(description = "员工职位id")
+    @ExcelProperty("员工职位id")
+    private Long postId;
+
     @Schema(description = "员工职位")
     @ExcelProperty("员工职位")
     private String position;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/stamp/stampinfo/OaStampInfoServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampinfo.OaStampInfoDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.stamp.stampinfo.OaStampInfoMapper;
 import cn.iocoder.yudao.module.employee.api.EmployeeApi;
 import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
+import cn.iocoder.yudao.module.system.api.dept.PostApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -25,6 +26,7 @@ import java.util.stream.Collectors;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_LOGIN_USER_NOT_EXISTS;
 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_STAMP_INFO_NOT_EXISTS;
+import static cn.iocoder.yudao.module.employee.enums.ErrorCodeConstants.EMPLOYEE_INFO_NOT_EXISTS;
 
 /**
  * 用印信息 Service 实现类
@@ -44,6 +46,9 @@ public class OaStampInfoServiceImpl implements OaStampInfoService {
     @Resource
     private EmployeeApi employeeApi;
 
+    @Resource
+    private PostApi postApi;
+
     @Override
     public Long createOaStampInfo(OaStampInfoSaveReqVO createReqVO) {
         // 登录人
@@ -57,13 +62,21 @@ public class OaStampInfoServiceImpl implements OaStampInfoService {
         oaStampInfo.setStampUuid(IdUtil.fastSimpleUUID());
         // 创建员工
         EmployeeRespDTO createEmployee = employeeApi.getEmployeeByUserId(loginUser.getId());
+        if (Objects.isNull(createEmployee)) {
+            throw exception(EMPLOYEE_INFO_NOT_EXISTS);
+        }
         oaStampInfo.setCreateEmployeeId(createEmployee.getId());
         // 用印员工
         EmployeeRespDTO employee = employeeApi.getEmployeeById(createReqVO.getEmployeeId());
+        if (Objects.isNull(employee)) {
+            throw exception(EMPLOYEE_INFO_NOT_EXISTS);
+        }
         // 部门
         oaStampInfo.setDeptId(employee.getDeptId());
+        // 职位id
+        oaStampInfo.setPostId(employee.getPostId());
         // 职位
-        oaStampInfo.setPosition(String.valueOf(employee.getPostId()));
+        oaStampInfo.setPosition(employee.getPosition());
         // 印章
         List<Long> stampSealId = createReqVO.getStampSealId();
         if (CollUtil.isNotEmpty(stampSealId)) {
@@ -94,6 +107,17 @@ public class OaStampInfoServiceImpl implements OaStampInfoService {
         validateOaStampInfoExists(updateReqVO.getId());
         // 更新准备
         OaStampInfoDO updateObj = BeanUtils.toBean(updateReqVO, OaStampInfoDO.class);
+        // 用印员工
+        EmployeeRespDTO employee = employeeApi.getEmployeeById(updateReqVO.getEmployeeId());
+        if (Objects.isNull(employee)) {
+            throw exception(EMPLOYEE_INFO_NOT_EXISTS);
+        }
+        // 部门
+        updateObj.setDeptId(employee.getDeptId());
+        // 职位id
+        updateObj.setPostId(employee.getPostId());
+        // 职位
+        updateObj.setPosition(employee.getPosition());
         // 印章
         List<Long> stampSealId = updateReqVO.getStampSealId();
         if (CollUtil.isNotEmpty(stampSealId)) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/stamp/stampinfo/OaStampInfoMapper.xml

@@ -14,7 +14,7 @@
         FROM
         bpm_oa_stamp_info si
         LEFT JOIN employee_info ei ON si.employee_id = ei.id and ei.deleted = 0
-        LEFT JOIN system_post sp ON sp.id = ei.post_id and sp.deleted = 0
+        LEFT JOIN system_post sp ON sp.id = si.post_id and sp.deleted = 0
         LEFT JOIN employee_info ei2 ON si.create_employee_id = ei2.id and ei2.deleted = 0
         LEFT JOIN system_dept sd ON si.dept_id = sd.id and sd.deleted = 0
         WHERE si.deleted = 0
@@ -25,7 +25,7 @@
             AND si.dept_id = #{page.deptId}
         </if>
         <if test="page.postId != null">
-            AND sp.id = #{page.postId}
+            AND si.post_id = #{page.postId}
         </if>
         <if test="page.employeePhone != null and page.employeePhone != ''">
             AND ei.phone like concat('%',#{page.employeePhone},'%')
@@ -63,7 +63,7 @@
         FROM
         bpm_oa_stamp_info si
         LEFT JOIN employee_info ei ON si.employee_id = ei.id and ei.deleted = 0
-        LEFT JOIN system_post sp ON sp.id = ei.post_id and sp.deleted = 0
+        LEFT JOIN system_post sp ON sp.id = si.post_id and sp.deleted = 0
         LEFT JOIN employee_info ei2 ON si.create_employee_id = ei2.id and ei2.deleted = 0
         LEFT JOIN system_dept sd ON si.dept_id = sd.id and sd.deleted = 0
         WHERE si.deleted = 0
@@ -74,7 +74,7 @@
             AND si.dept_id = #{page.deptId}
         </if>
         <if test="page.postId != null">
-            AND sp.id = #{page.postId}
+            AND si.post_id = #{page.postId}
         </if>
         <if test="page.employeePhone != null and page.employeePhone != ''">
             AND ei.phone like concat('%',#{page.employeePhone},'%')