diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/entity/EightMembersVacancyVo.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/entity/EightMembersVacancyVo.java index 9480862..f03151f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/entity/EightMembersVacancyVo.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/entity/EightMembersVacancyVo.java @@ -52,45 +52,47 @@ public class EightMembersVacancyVo { @Data public static class VacancyDetail { + private Long id; + /** * 项目部名称 */ - public String orgName; + private String orgName; /** * 项目经理 */ - public String projectManager; + private String projectManager; /** * 安全员 */ - public String safetyOfficer; + private String safetyOfficer; /** * 质检员 */ - public String qualityInspector; + private String qualityInspector; /** * 项目总工 */ - public String projectChiefEngineer; + private String projectChiefEngineer; /** * 机械员 */ - public String machinist; + private String machinist; /** * 资料员 */ - public String document; + private String document; /** * 施工员 */ - public String constructionWorker; + private String constructionWorker; /** * 材料员 */ - public String materialMan; + private String materialMan; /** * 其他 */ - public String other; + private String other; } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java index 4a99f1b..a7535d0 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java @@ -1286,7 +1286,7 @@ public class ExportFileController { for (int i = 0; i < list.size(); i++) { list.get(i).setSerialNumber(i + 1); } - extracted(list, WechatLeaveReportingBean.class, "八大员缺员兼职查询", "八大员缺员兼职查询", "八大员缺员兼职查询", response); + extracted(list, EightMembersVacancyVo.class, "八大员缺员兼职查询", "八大员缺员兼职查询", "八大员缺员兼职查询", response); } catch (IOException e) { log.error(e.toString(),e); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java index 491eea9..a723f0c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/controller/HolidayController.java @@ -241,5 +241,18 @@ public class HolidayController extends BaseController { return error("系统异常"); } + @PostMapping("batchLxCheckStatus") + @Log(title = "流程相关->轮休审批->一键审批", businessType = BusinessType.UPDATE) + public AjaxResult batchCheckStatus(@Validated @RequestBody HolidayBean o) { + return holidayService.batchCheckStatus(o); + } + + @PostMapping("batchLsCheckStatus") + @Log(title = "流程相关->临时外出审核->一键审批", businessType = BusinessType.UPDATE) + public AjaxResult batchLsCheckStatus(@Validated @RequestBody HolidayBean o) { + return holidayService.batchCheckStatus(o); + } + + } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/dao/HolidayDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/dao/HolidayDao.java index f271d05..f56ebc3 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/dao/HolidayDao.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/dao/HolidayDao.java @@ -88,4 +88,13 @@ public interface HolidayDao { List getHolidayData(LocalDate previousMonthDate); List getHolidayDataByType(@Param("startDate") String leaveStartDate,@Param("endDate") String leaveEndDate); + + /** + * 流程相关->轮休审批->一键审批 + * @param o + * @return void + * @author cwchen + * @date 2025/2/11 14:34 + */ + void batchCheckStatus(HolidayBean o); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/entity/HolidayBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/entity/HolidayBean.java index 23c6623..d46f0f8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/entity/HolidayBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/entity/HolidayBean.java @@ -5,6 +5,8 @@ import com.bonus.common.core.web.domain.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -152,4 +154,7 @@ public class HolidayBean extends BaseBean { private String roleType; private String[] orgListId; + /**一键审批ID*/ + private List ids; + } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayService.java index d3e67e1..ab73590 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayService.java @@ -64,4 +64,13 @@ public interface HolidayService { AjaxResult excelUpload(MultipartFile file, HttpServletRequest request, HttpServletResponse response); List getHolidayListCheck(HolidayBean bean); + + /** + * 流程相关->轮休审批->一键审批 + * @param o + * @return void + * @author cwchen + * @date 2025/2/11 14:19 + */ + AjaxResult batchCheckStatus(HolidayBean o); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java index 32b6c6d..4870c64 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java @@ -20,9 +20,12 @@ import com.bonus.system.holiday.dao.HolidayDao; import com.bonus.system.holiday.entity.HolidayBean; import com.bonus.system.holiday.entity.HolidayImportBean; import com.bonus.system.holiday.entity.HolidayKeyBean; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.spring.web.json.Json; @@ -42,6 +45,7 @@ import java.util.stream.Collectors; * @author fly */ @Service("HolidayService") +@Slf4j public class HolidayServiceImpl implements HolidayService { @Resource(name = "HolidayDao") @@ -116,6 +120,38 @@ public class HolidayServiceImpl implements HolidayService { return i; } + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult batchCheckStatus(HolidayBean o) { + try { + if(CollectionUtils.isEmpty(o.getIds())){ + return AjaxResult.error("未选择审批数据"); + } + if(StringUtils.isEmpty(o.getExamineStatus())){ + return AjaxResult.error("未选择审批状态"); + } + Long updateUserId = SecurityUtils.getLoginUser().getSysUser().getUserId(); + o.setUpdateUserId(updateUserId); + o.setExamineUserId(updateUserId); + SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); + String userName =sysUser.getUserName(); + String orgName = sysUser.getOrgName(); + String now = DateUtil.now(); + if(Objects.equals(o.getExamineStatus(),"1")){ + o.setExamineOpinion("同意 " + orgName + " "+userName+" "+ now); + }else if(Objects.equals(o.getExamineStatus(),"2")){ + o.setExamineOpinion("不同意 " + orgName + " "+userName+" "+ now); + } + o.setExamineTime(DateUtil.date()); + holidayDao.batchCheckStatus(o); + } catch (Exception e) { + log.error(e.toString(),e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + return AjaxResult.success(); + } + @Override public HolidayBean selectHolidayById(Long id) { return holidayDao.selectHolidayById(id); @@ -205,7 +241,7 @@ public class HolidayServiceImpl implements HolidayService { o.setUpdateUserId(updateUserId); } i = holidayDao.changeHolidayStatus(o); - if (i > 0 && examineStatus.contains(o.getExamineStatus())) { + if (i > 0 && Objects.equals("0", o.getExamineStatus())) { //获取提交请假的人 List userList =holidayDao.getUserIdById(o.getId()); // 将 List 转换为数组 diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml index 5b622a1..3158e0a 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/holiday/HolidayMapper.xml @@ -70,6 +70,25 @@ where id = #{id} + + + update leave_apply + + + examine_opinion = #{examineOpinion}, + examine_user_id = #{examineUserId}, + examine_time = #{examineTime}, + + + update_user_id = #{updateUserId}, + + examine_status = #{examineStatus} + + WHERE id IN + + #{item} + + update leave_apply SET is_active = '0' WHERE id = #{id}