1.修改主页面版近日事项字段

zeroerr_oa-admin/src/main/resources/application-druid.yml

@@ -5,14 +5,14 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-#            master:
-#                url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: zeoa
-#                password: dHahLWNYB7tD2Mia
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: zero
+                url: jdbc:mysql://192.168.1.165:3306/zeoa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: zeoa
+                password: dHahLWNYB7tD2Mia
+#            master:
+#                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: zero
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

zeroerr_oa-admin/src/main/resources/application.yml

@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/zeroerr/uploadPath
-  #profile: /home/zeroerr_oa/uploadPath
+  #profile: D:/zeroerr/uploadPath
+  profile: /home/zeroerr_oa/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -69,15 +69,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    #host: 192.168.1.189
-    host: localhost
+    host: 192.168.1.189
+    #host: localhost
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    #password: 123456
-    password:
+    password: 123456
+    #password:
     # 连接超时时间
     timeout: 10s
     lettuce:

zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/HomePageController.java

@@ -646,6 +646,19 @@ public class HomePageController extends BaseController {
                 }
             }
 
+            if(resumeFollowRecord.getIsAttend()!=null){
+                if (resumeFollowRecord.getIsAttend().equals("1")) {
+                    announcementNode.setIsAttend("参与");
+                } else if (resumeFollowRecord.getIsAttend().equals("0")) {
+                    announcementNode.setIsAttend("不参与");
+                } else if (resumeFollowRecord.getIsAttend().equals("2")) {
+                    announcementNode.setIsAttend("待定");
+                }
+            }
+            if(resumeFollowRecord.getManagerTime()!=null){
+                announcementNode.setManagerTime(resumeFollowRecord.getManagerTime().toLocalTime().toString());
+            }
+
             if (tip.equals("first")) {
                 //面试-时间
                 announcementNode.setInterviewTime(getFormattedTime(resumeFollowRecord.getFirstDate()));

zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitFollowController.java

@@ -251,7 +251,8 @@ public class RecruitFollowController extends BaseController {
             if (followVO.getDeptName() == null) followVO.setDeptName(handleDeptName(followVO.getPostId()));
             if (followVO.getHrId() == null) followVO.setHrId(0L);
             if (followVO.getHrName() == null) followVO.setHrName("");
-            if (followVO.getPostCount() == null) followVO.setPostCount(0);
+            //如果需求的岗位是空，则是突发生成的岗位，没有绑定jd的，所以默认为1
+            if (followVO.getPostCount() == null||followVO.getPostCount()==0) followVO.setPostCount(1);
             if (followVO.getLookResumeCount() == null) followVO.setLookResumeCount(0);
             if (followVO.getInviteInterviewCount() == null) followVO.setInviteInterviewCount(0);
             if (followVO.getPassResumeCount() == null) followVO.setPassResumeCount(0);

zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/dto/AnnouncementDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -50,6 +51,12 @@ public class AnnouncementDTO {
         @ApiModelProperty(value = "面试-终试")
         private String interviewFinalResult;
 
+        @ApiModelProperty(value = "面试-总经理预计面试时间")
+        private String managerTime;
+
+        @ApiModelProperty(value = "总经理参与否")
+        private String isAttend;
+
     }
 
     @Data

zeroerr_oa-recruit/src/main/java/cn/zeroerr/domain/entity/ResumeFollowRecord.java

@@ -348,6 +348,24 @@ public class ResumeFollowRecord implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endFinalDate;
 
+    /**
+     * 预计总经理参与时间
+     */
+    @TableField(value = "manager_time",updateStrategy = FieldStrategy.IGNORED)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "预计总经理参与时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
+    private LocalDateTime managerTime;
+
+
+    /**
+     * 总经理是否参与
+     */
+    @TableField(value = "is_attend")
+    @Excel(name = "总经理是否参与", dictType = "recruit_interview_pass")
+    private String isAttend;
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

zeroerr_oa-recruit/src/main/resources/mapper/ResumeFollowRecordMapper.xml

@@ -44,6 +44,8 @@
         <result property="topping" column="topping" />
         <result property="toppingTime" column="topping_time" />
         <result property="file" column="file" />
+        <result property="isAttend" column="is_attend"/>
+        <result property="managerTime" column="manager_time"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -58,7 +60,7 @@
         second_reach,second_interviewer_ids,second_pass,
         final_date,final_reach,final_interviewer_ids,
         final_pass,accept_offer,join_date,create_date,update_date,actual_join_date,
-        fail_reason,special_reason,file,topping,topping_time,tags
+        fail_reason,special_reason,file,topping,topping_time,tags,is_attend,manager_time
     </sql>
 
     <select id="listByQuery" resultMap="BaseResultMap">