添加 社会及行业职务 和 工作业绩

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentPerformanceInfoController.java

@@ -0,0 +1,71 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentPerformanceInfoService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentSocietyInfoService;
+import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api("工作业绩")
+@RequestMapping(value = "/performanceInfo")
+public class EnrollmentPerformanceInfoController {
+
+    @Resource
+    private EnrollmentPerformanceInfoService service;
+
+
+    /**
+     * 保存工作业绩
+     * @return
+     */
+    @ApiLog(value = "保存工作业绩", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentPerformanceInfo info) throws Exception {
+        service.saveOrUpdateWorkInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除工作业绩
+     * @return
+     */
+    @ApiLog(value = "删除工作业绩", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentPerformanceInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 工作业绩列表
+     * @return
+     */
+    @ApiLog(value = "工作业绩列表", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentPerformanceInfo>> findList(EnrollmentPerformanceInfo info) throws Exception {
+        List<EnrollmentPerformanceInfo> list = service.findByUserId(info.getUserId(),"5");
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询工作业绩信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询工作业绩信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentPerformanceInfo> findById(EnrollmentPerformanceInfo info) throws Exception {
+        EnrollmentPerformanceInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentSocietyInfoController.java

@@ -0,0 +1,71 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentSocietyInfoService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentWorkInfoService;
+import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api("社会及行业职务")
+@RequestMapping(value = "/societyInfo")
+public class EnrollmentSocietyInfoController {
+
+    @Resource
+    private EnrollmentSocietyInfoService service;
+
+
+    /**
+     * 保存社会及行业职务
+     * @return
+     */
+    @ApiLog(value = "保存社会及行业职务", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentSocietyInfo info) throws Exception {
+        service.saveOrUpdateWorkInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除社会及行业职务
+     * @return
+     */
+    @ApiLog(value = "删除社会及行业职务", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentSocietyInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 社会及行业职务列表
+     * @return
+     */
+    @ApiLog(value = "社会及行业职务列表", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentSocietyInfo>> findList(EnrollmentSocietyInfo info) throws Exception {
+        List<EnrollmentSocietyInfo> list = service.findByUserId(info.getUserId(),"5");
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询社会及行业职务信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询社会及行业职务信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentSocietyInfo> findById(EnrollmentSocietyInfo info) throws Exception {
+        EnrollmentSocietyInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentPerformanceInfo.java

@@ -0,0 +1,33 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 社会及行业职务
+ * @version 1.0
+ * @date
+ */
+@Data
+@TableName("human_resources_enrollment_performance_info")
+public class EnrollmentPerformanceInfo extends BaseEntity {
+    /**
+     * 关联id
+     */
+    private String enrollmentRegistrationId;
+    private String name;
+    private String client;
+    private String type;
+    private String info;
+    private String position;
+    private String participateContent;
+
+    /** 用户id */
+    private String userId;
+
+    /** 状态 */
+    private String status;
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentRegistration.java

@@ -152,8 +152,11 @@ public class EnrollmentRegistration extends BaseEntity {
     @TableField(exist = false)
     private List<EnrollmentRewardInfo> rewardInfoList; //奖项信息
     @TableField(exist = false)
-    private List<EnrollmentLaborContractInfo> laborContractInfoList; //奖项信息
-
+    private List<EnrollmentLaborContractInfo> laborContractInfoList; //劳动合同
+    @TableField(exist = false)
+    private List<EnrollmentSocietyInfo> societyInfoList; //社会及行业职务
+    @TableField(exist = false)
+    private List<EnrollmentPerformanceInfo> performanceInfoList; //工作业绩
     @TableField(exist = false)
     private List<WorkAttachmentInfoDTO> idCardFront; //身份证正面
     @TableField(exist = false)

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentSocietyInfo.java

@@ -0,0 +1,47 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 社会及行业职务
+ * @version 1.0
+ * @date
+ */
+@Data
+@TableName("human_resources_enrollment_society_info")
+public class EnrollmentSocietyInfo extends BaseEntity {
+    /**
+     * 关联id
+     */
+    private String enrollmentRegistrationId;
+
+    /**
+     * 职务名称
+     */
+    private String name;
+
+    /**
+     * 任职机构
+     */
+    private String institution;
+
+    /**
+     * 开始时间
+     */
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    private Date endDate;
+
+    /** 用户id */
+    private String userId;
+
+    /** 状态 */
+    private String status;
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentUserInfoAudit.java

@@ -63,8 +63,11 @@ public class EnrollmentUserInfoAudit extends BaseEntity {
     private List<EnrollmentFamilyInfo> familyInfoList; //家庭成员
     @TableField(exist = false)
     private List<EnrollmentRewardInfo> rewardInfoList; //奖项信息
-
     @TableField(exist = false)
     private List<EnrollmentLaborContractInfo> laborContractInfoList; //劳动合同
+    @TableField(exist = false)
+    private List<EnrollmentSocietyInfo> societyInfoList; //社会及行业职务
+    @TableField(exist = false)
+    private List<EnrollmentPerformanceInfo> performanceInfoList; //工作业绩
 
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/EnrollmentPerformanceInfoMapper.java

@@ -0,0 +1,24 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @date
+ */
+@Mapper
+@InterceptorIgnore(tenantLine = "true")
+public interface EnrollmentPerformanceInfoMapper extends BaseMapper<EnrollmentPerformanceInfo> {
+    EnrollmentPerformanceInfo getById(@Param("id") String id);
+
+    List<EnrollmentPerformanceInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/EnrollmentSocietyInfoMapper.java

@@ -0,0 +1,23 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @date
+ */
+@Mapper
+@InterceptorIgnore(tenantLine = "true")
+public interface EnrollmentSocietyInfoMapper extends BaseMapper<EnrollmentSocietyInfo> {
+    EnrollmentSocietyInfo getById(@Param("id") String id);
+
+    List<EnrollmentSocietyInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentPerformanceInfoMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentPerformanceInfoMapper">
+
+    <sql id="Base_Column_List">
+        a.id,
+        a.create_by_id,
+        a.create_time,
+        a.update_by_id,
+        a.update_time,
+        a.del_flag,
+        a.name,
+        a.client,
+        a.type,
+        a.info,
+        a.position,
+        a.participate_content,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_performance_info a
+        where a.del_flag = '0'
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_performance_info a
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_society_info
+        WHERE enrollment_registration_id = #{enrollmentRegistrationId}
+    </delete>
+
+</mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentSocietyInfoMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSocietyInfoMapper">
+
+    <sql id="Base_Column_List">
+        a.id,
+        a.create_by_id,
+        a.create_time,
+        a.update_by_id,
+        a.update_time,
+        a.del_flag,
+        a.name,
+        a.institution,
+        a.start_date,
+        a.end_date,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_society_info a
+        where a.del_flag = '0'
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_society_info a
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_society_info
+        WHERE enrollment_registration_id = #{enrollmentRegistrationId}
+    </delete>
+
+</mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentPerformanceInfoService.java

@@ -0,0 +1,89 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.service;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentPerformanceInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSocietyInfoMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @date 2023-10-17 8:57
+ */
+@Service
+@Transactional
+public class EnrollmentPerformanceInfoService extends ServiceImpl<EnrollmentPerformanceInfoMapper, EnrollmentPerformanceInfo> {
+
+    @Resource
+    private EnrollmentPerformanceInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id) {
+        QueryWrapper<EnrollmentPerformanceInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id", id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentPerformanceInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentPerformanceInfo info = mapper.getById(id);
+        return info;
+    }
+
+    public List<EnrollmentPerformanceInfo> findByUserId(String id,String status) {
+        QueryWrapper<EnrollmentPerformanceInfo> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id",id);
+        }
+        if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
+            if("5".equals(status)){
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                );
+            }else{
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2").or().eq("status", "4")
+                );
+            }
+        }
+        List<EnrollmentPerformanceInfo> workInfos = mapper.selectList(queryWrapper);
+        return workInfos;
+    }
+
+    public void saveOrUpdateWorkInfo(EnrollmentPerformanceInfo workInfo) {
+        if (workInfo == null) {
+            return;
+        }
+
+        if (!StringUtils.isNotBlank(workInfo.getId())) {
+            // 新增
+            add(workInfo);
+        } else {
+            // 更新
+            update(workInfo);
+        }
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param workInfo
+     */
+    public void add(EnrollmentPerformanceInfo workInfo) {
+        mapper.insert(workInfo);
+    }
+
+    public void update(EnrollmentPerformanceInfo workInfo) {
+        mapper.updateById(workInfo);
+    }
+}
+
+

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -103,6 +103,11 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     @Resource
     private EnrollmentLaborContractInfoService laborContractInfoService;
 
+    @Resource
+    private EnrollmentSocietyInfoService societyInfoService;
+
+    @Resource
+    private EnrollmentPerformanceInfoService performanceInfoService;
 
     @Resource
     private EnrollmentUserInfoAuditService userInfoAuditService;
@@ -722,6 +727,16 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //查询劳动合同
             List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId, "5");
             info.setLaborContractInfoList(laborContractInfoList);
+
+            //查询社会及行业职务
+            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "5");
+            info.setSocietyInfoList(societyInfoList);
+
+            //工作业绩
+            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "5");
+            info.setPerformanceInfoList(performanceInfoList);
+
+
         }
 
         return info;
@@ -776,6 +791,14 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //查询劳动合同
             List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId, "5");
             info.setLaborContractInfoList(laborContractInfoList);
+
+            //查询社会及行业职务
+            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "2");
+            info.setSocietyInfoList(societyInfoList);
+
+            //工作业绩
+            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "2");
+            info.setPerformanceInfoList(performanceInfoList);
         }
         return info;
     }
@@ -852,12 +875,20 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             info.setFamilyInfoList(familyInfoList);
 
             //查询奖项信息
-            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(id, "5");
+            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "5");
             info.setRewardInfoList(rewardInfoList);
 
             //查询劳动合同
             List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId, "5");
             info.setLaborContractInfoList(laborContractInfoList);
+
+            //查询社会及行业职务
+            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "5");
+            info.setSocietyInfoList(societyInfoList);
+
+            //工作业绩
+            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "5");
+            info.setPerformanceInfoList(performanceInfoList);
         }
 
         return info;
@@ -1096,7 +1127,27 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 item.setStatus("2");
                 rewardInfoService.add(item);
             });
+        }
+
 
+        // 社会及行业职务
+        List<EnrollmentSocietyInfo> societyInfoList = dto.getSocietyInfoList();
+        if (CollectionUtils.isNotEmpty(societyInfoList)) {
+            societyInfoList.forEach(item -> {
+                item.setId("");
+                item.setStatus("2");
+                societyInfoService.add(item);
+            });
+        }
+
+        // 工作业绩
+        List<EnrollmentPerformanceInfo> performanceInfoList = dto.getPerformanceInfoList();
+        if (CollectionUtils.isNotEmpty(performanceInfoList)) {
+            performanceInfoList.forEach(item -> {
+                item.setId("");
+                item.setStatus("2");
+                performanceInfoService.add(item);
+            });
         }
     }
 
@@ -1181,6 +1232,25 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             });
 
         }
+
+        // 社会及行业职务
+        List<EnrollmentSocietyInfo> societyInfoList = dto.getSocietyInfoList();
+        if (CollectionUtils.isNotEmpty(societyInfoList)) {
+            societyInfoList.forEach(item -> {
+                item.setStatus(status);
+                societyInfoService.saveOrUpdate(item);
+            });
+        }
+
+        // 工作业绩
+        List<EnrollmentPerformanceInfo> performanceInfoList = dto.getPerformanceInfoList();
+        if (CollectionUtils.isNotEmpty(performanceInfoList)) {
+            performanceInfoList.forEach(item -> {
+                item.setStatus(status);
+                performanceInfoService.saveOrUpdate(item);
+            });
+
+        }
     }
 
 

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentSocietyInfoService.java

@@ -0,0 +1,89 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.service;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSocietyInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentWorkInfoMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @date 2023-10-17 8:57
+ */
+@Service
+@Transactional
+public class EnrollmentSocietyInfoService extends ServiceImpl<EnrollmentSocietyInfoMapper, EnrollmentSocietyInfo> {
+
+    @Resource
+    private EnrollmentSocietyInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id) {
+        QueryWrapper<EnrollmentSocietyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id", id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentSocietyInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentSocietyInfo info = mapper.getById(id);
+        return info;
+    }
+
+    public List<EnrollmentSocietyInfo> findByUserId(String id,String status) {
+        QueryWrapper<EnrollmentSocietyInfo> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id",id);
+        }
+        if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
+            if("5".equals(status)){
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                );
+            }else{
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2").or().eq("status", "4")
+                );
+            }
+        }
+        List<EnrollmentSocietyInfo> workInfos = mapper.selectList(queryWrapper);
+        return workInfos;
+    }
+
+    public void saveOrUpdateWorkInfo(EnrollmentSocietyInfo workInfo) {
+        if (workInfo == null) {
+            return;
+        }
+
+        if (!StringUtils.isNotBlank(workInfo.getId())) {
+            // 新增
+            add(workInfo);
+        } else {
+            // 更新
+            update(workInfo);
+        }
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param workInfo
+     */
+    public void add(EnrollmentSocietyInfo workInfo) {
+        mapper.insert(workInfo);
+    }
+
+    public void update(EnrollmentSocietyInfo workInfo) {
+        mapper.updateById(workInfo);
+    }
+}
+
+

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentUserInfoAuditService.java

@@ -66,6 +66,12 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
     private EnrollmentRewardInfoService rewardInfoService;
 
     @Resource
+    private EnrollmentSocietyInfoService societyInfoService;
+
+    @Resource
+    private EnrollmentPerformanceInfoService performanceInfoService;
+
+    @Resource
     private EnrollmentRegistrationMapper registrationMapper;
 
     @Resource
@@ -191,6 +197,27 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                                         .or().eq("status", "")
                         )
         );
+
+        societyInfoService.remove(
+                new QueryWrapper<EnrollmentSocietyInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "5")
+                                        .or().isNull("status")
+                                        .or().eq("status", "")
+                        )
+        );
+
+        performanceInfoService.remove(
+                new QueryWrapper<EnrollmentPerformanceInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "5")
+                                        .or().isNull("status")
+                                        .or().eq("status", "")
+                        )
+        );
+
         //  修改数据状态
         eduInfoService.update(
                 new LambdaUpdateWrapper<EnrollmentEduInfo>()
@@ -246,6 +273,21 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq(EnrollmentRewardInfo::getStatus, status)
                         .set(EnrollmentRewardInfo::getStatus, "5")
         );
+
+        societyInfoService.update(
+                new LambdaUpdateWrapper<EnrollmentSocietyInfo>()
+                        .eq(EnrollmentSocietyInfo::getUserId, userId)
+                        .eq(EnrollmentSocietyInfo::getStatus, status)
+                        .set(EnrollmentSocietyInfo::getStatus, "5")
+        );
+
+        performanceInfoService.update(
+                new LambdaUpdateWrapper<EnrollmentPerformanceInfo>()
+                        .eq(EnrollmentPerformanceInfo::getUserId, userId)
+                        .eq(EnrollmentPerformanceInfo::getStatus, status)
+                        .set(EnrollmentPerformanceInfo::getStatus, "5")
+        );
+
     }
 
     public void updateInfoReject(EnrollmentUserInfoAudit registration) throws ApiException {
@@ -313,6 +355,20 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq(EnrollmentRewardInfo::getStatus, "2")
                         .set(EnrollmentRewardInfo::getStatus, status)
         );
+
+        societyInfoService.update(
+                new LambdaUpdateWrapper<EnrollmentSocietyInfo>()
+                        .eq(EnrollmentSocietyInfo::getUserId, userId)
+                        .eq(EnrollmentSocietyInfo::getStatus, "2")
+                        .set(EnrollmentSocietyInfo::getStatus, status)
+        );
+
+        performanceInfoService.update(
+                new LambdaUpdateWrapper<EnrollmentPerformanceInfo>()
+                        .eq(EnrollmentPerformanceInfo::getUserId, userId)
+                        .eq(EnrollmentPerformanceInfo::getStatus, "2")
+                        .set(EnrollmentPerformanceInfo::getStatus, status)
+        );
     }
 
     private void saveAttachments(List<WorkAttachmentInfoDTO> attachmentList, String flag, String attachmentId, UserDTO userDTO, IWorkAttachmentApi workAttachmentApi) {