招聘需求字段添加

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/controller/vo/RecruitPageReqVO.java

@@ -96,8 +96,23 @@ public class RecruitPageReqVO extends PageParam {
     @Schema(description = "所属类别 1新增 2替补 3储备")
     private Integer type;
 
-    @Schema(description = "备注")
+    @Schema(description = "落实情况")
     private String remark;
 
+    /**
+     * 替补人员
+     */
+    private String changer;
+
+    /**
+     * 替补人员名称
+     */
+    private String changerName;
+
+    /**
+     * 备注
+     */
+    private String bz;
+
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/controller/vo/RecruitVO.java

@@ -66,4 +66,13 @@ public class RecruitVO {
     private String remark;
 
 
+    /**
+     * 替补人员
+     */
+    private String changer;
+    /**
+     * 备注
+     */
+    private String bz;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/service/impl/RecruitDemandServiceImpl.java

@@ -170,6 +170,20 @@ public class RecruitDemandServiceImpl implements RecruitDemandService {
         PageRecruitVO res = new PageRecruitVO();
         Page<RecruitDetailDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         res.setPage(recruitDetailDAO.getRecruitPage(page, pageReqVO));
+
+        /**
+         * 根据替补人员id查询替补人员名称
+         */
+        Set<String> changeIds = res.getPage().getRecords().stream().map(RecruitPageReqVO::getChanger).filter(StrUtil::isNotEmpty).collect(Collectors.toSet());
+        if (CollectionUtil.isNotEmpty(changeIds)) {
+            Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(changeIds);
+            res.getPage().getRecords().forEach(v -> {
+                if (v.getChanger() != null && userMap.get(v.getChanger()) != null) {
+                    v.setChangerName(userMap.get(v.getChanger()).getNickname());
+                }
+            });
+        }
+
         RecruitNumVO vo = recruitDetailDAO.getSum(pageReqVO);
         res.setTotal(vo);
         return res;

zjugis-business/src/main/resources/mapper/oracle/RecruitMapper.xml

@@ -13,7 +13,10 @@
         t2.USER_ID,
         t2.USER_NICKNAME,
         t2.DEPT_ID,
-        t2.DEPT_NAME
+        t2.DEPT_NAME,
+        T1.REMARK,
+        t1.CHANGER,
+        t1.BZ
         from WF_RECRUIT_DEMAND_DETAIL t1
         left join WF_RECRUIT_DEMAND t2 on t1.RECRUIT_ID = t2.ID