1.年假

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageDetailController.java

@@ -57,13 +57,13 @@ public class NjBalanceManageDetailController extends BaseController {
 
 
     /**
-     * 删除站点产品管理
+     * 撤销年假申请
      *
      * @param ids 主键串
      */
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+    public R<Void> cancelByIds(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(njBalanceManageDetailService.deleteByIds(Arrays.asList(ids)));
+        return toAjax(njBalanceManageDetailService.cancelByIds(Arrays.asList(ids)));
     }
 }

zs-manager/src/main/java/com/ruoyi/zhushi/entity/NjBalanceManageDetail.java

@@ -44,7 +44,16 @@ public class NjBalanceManageDetail extends BaseEntity {
     @TableField(value = "`apply_dates`")
     private String applyDates;
 
-    /** 状态 */
-    @TableField(value = "`is_enable`")
-    private Boolean isEnable;
+    /** 状态
+     * 0 待提交：员工发起请假申请，但还未提交给上级审批。
+     *
+     * 1 待审批：请假申请已提交，等待上级审批。
+     *
+     * 2 审批通过：上级已批准该请假申请。
+     *
+     * 3 驳回：上级未批准该请假申请，申请被驳回。
+     *
+     * 4 已作废：请假申请在审批过程中被取消或作废    */
+    @TableField(value = "`status`")
+    private String status;
 }

zs-manager/src/main/java/com/ruoyi/zhushi/entity/NjBalanceManageDetailDTO.java

@@ -28,6 +28,15 @@ public class NjBalanceManageDetailDTO extends BaseEntity {
     private BigDecimal usedDay;
     /** 申请日期 可能是多个日期的拼接 */
     private String applyDates;
-    /** 状态 */
-    private Boolean isEnable;
+    /** 状态
+     * 0 待提交：员工发起请假申请，但还未提交给上级审批。
+     *
+     * 1 待审批：请假申请已提交，等待上级审批。
+     *
+     * 2 审批通过：上级已批准该请假申请。
+     *
+     * 3 驳回：上级未批准该请假申请，申请被驳回。
+     *
+     * 4 已作废：请假申请在审批过程中被取消或作废    */
+    private String status;
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/NjBalanceManageDetailService.java

@@ -6,6 +6,7 @@ import com.ruoyi.zhushi.entity.NjBalanceManageDTO;
 import com.ruoyi.zhushi.entity.NjBalanceManageDetail;
 import com.ruoyi.zhushi.entity.NjBalanceManageDetailDTO;
 
+import java.time.LocalDate;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -17,5 +18,5 @@ public interface NjBalanceManageDetailService {
     boolean insert(NjBalanceManageDetailDTO njBalanceManageDetailDTO);
     List<Map<String, String>> calendarQuery();
 
-    boolean deleteByIds( Collection<Long> ids);
+    boolean cancelByIds( Collection<Long> ids);
 }

zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/NjBalanceManageDetailServiceImpl.java

@@ -11,9 +11,12 @@ import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.zhushi.entity.NjBalanceManage;
 import com.ruoyi.zhushi.entity.NjBalanceManageDetail;
 import com.ruoyi.zhushi.entity.NjBalanceManageDetailDTO;
+import com.ruoyi.zhushi.entity.NjRuleConfigDTO;
 import com.ruoyi.zhushi.mapper.NjBalanceManageDetailMapper;
 import com.ruoyi.zhushi.mapper.NjBalanceManageMapper;
+import com.ruoyi.zhushi.mapper.NjRuleConfigAndUserMapper;
 import com.ruoyi.zhushi.service.NjBalanceManageDetailService;
+import com.ruoyi.zhushi.service.NjBalanceManageService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.*;
 @Service
-@Transactional()
+@Transactional(rollbackFor = Exception.class)
 public class NjBalanceManageDetailServiceImpl implements NjBalanceManageDetailService {
 
     @Autowired
@@ -35,6 +38,8 @@ public class NjBalanceManageDetailServiceImpl implements NjBalanceManageDetailSe
     private NjBalanceManageDetailMapper njBalanceManageDetailMapper;
     @Autowired
     private ISysUserService iSysUserService;
+
+
     //查询年假申请信息
     @Override
     public TableDataInfo<NjBalanceManageDetailDTO> queryPageList(NjBalanceManageDetailDTO njBalanceManageDetailDTO, PageQuery pageQuery) {
@@ -54,7 +59,7 @@ public class NjBalanceManageDetailServiceImpl implements NjBalanceManageDetailSe
         njBalanceManageDetail.setUserName(sysUser.getUserName());
         njBalanceManageDetail.setNickName(sysUser.getNickName());
         njBalanceManageDetail.setDeptName(sysUser.getDept().getDeptName());
-        njBalanceManageDetail.setIsEnable(true);
+        njBalanceManageDetail.setStatus("2");//审核通过
         //年假申请明细 插入
         int i = njBalanceManageDetailMapper.insert(njBalanceManageDetail);
         int j = 0;
@@ -83,7 +88,7 @@ public class NjBalanceManageDetailServiceImpl implements NjBalanceManageDetailSe
         }
 
     }
-
+    //日历查询
     @Override
     public List<Map<String, String>> calendarQuery() {
         // 用一个 Map 记录每个日期对应的人员
@@ -92,6 +97,7 @@ public class NjBalanceManageDetailServiceImpl implements NjBalanceManageDetailSe
         int currentYear = LocalDate.now().getYear();
         QueryWrapper<NjBalanceManageDetail> queryWrapper = new QueryWrapper();
         queryWrapper.eq(" YEAR(create_time)",currentYear);
+        queryWrapper.eq("status","2");//审核通过的
         List<NjBalanceManageDetail> list =  njBalanceManageDetailMapper.selectList(queryWrapper);
 
 
@@ -120,8 +126,25 @@ public class NjBalanceManageDetailServiceImpl implements NjBalanceManageDetailSe
     }
 
     @Override
-    public boolean deleteByIds(Collection<Long> ids) {
-        return njBalanceManageDetailMapper.deleteBatchIds(ids)>0;
+    public boolean cancelByIds(Collection<Long> ids) {
+        QueryWrapper <NjBalanceManageDetail> queryWrapper =new QueryWrapper();
+        queryWrapper.in("id",ids);
+        List<NjBalanceManageDetail> list = njBalanceManageDetailMapper.selectList(queryWrapper);
+        if (list!=null&&list.size()>0) {
+            //还原 年假
+            for (NjBalanceManageDetail njBalanceManageDetail:list) {
+                Long userId = njBalanceManageDetail.getUserId();
+                UpdateWrapper<NjBalanceManage> updateWrapper = new UpdateWrapper();
+                updateWrapper.setSql("used_day=used_day-"+njBalanceManageDetail.getUsedDay());
+                updateWrapper.setSql("unused_day = unused_day+"+njBalanceManageDetail.getUsedDay());
+                updateWrapper.eq("user_id",userId);
+                njBalanceManageMapper.update(null,updateWrapper);
+            }
+        }
+        UpdateWrapper <NjBalanceManageDetail> queryDetailWrapper =new UpdateWrapper();
+        queryDetailWrapper.set("status","4");//作废（撤销）
+        queryDetailWrapper.in("id",ids);
+        return njBalanceManageDetailMapper.update(null,queryDetailWrapper)>0;
     }
 
 }