移动端加入

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.oa.domain.SysOaAttendance;
 import com.ruoyi.oa.mapper.SysOaAttendanceMapper;
 import com.ruoyi.oa.service.ISysOaAttendanceService;
 
+import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -97,16 +98,14 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
         sysOaAttendanceBo.setProjectId(null);
         // 如果这个时间为空，则默认查询当月记录
         Date firstDay;
-        Date lastDay;
-        if (Objects.isNull(bo.getSelectTime())) {
-            firstDay = getFirstDay(new Date());
+        Date lastDay = getLastDay(bo.getSelectTime());
+        List<SysOaAttendanceVo> sysOaAttendanceVos;
 
-        } else {
-            firstDay = getFirstDay(bo.getSelectTime());
-        }
-        lastDay = getLastDay(firstDay);
 
-        List<SysOaAttendanceVo> sysOaAttendanceVos = baseMapper.queryListByTime(sysOaAttendanceBo.getUserId(), sysOaAttendanceBo.getAttendanceDay(), firstDay, lastDay);
+        Date day = getFirstDay(bo.getSelectTime());
+        firstDay = getFormatDay(bo.getSelectTime(), bo.getAttendanceDay());
+
+        sysOaAttendanceVos = baseMapper.queryListByTime(sysOaAttendanceBo.getUserId(), sysOaAttendanceBo.getAttendanceDay(), day, lastDay);
 
         if (sysOaAttendanceVos.isEmpty()) {
             bo.setCreateTime(firstDay);
@@ -120,7 +119,11 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
         } else {
             SysOaAttendanceVo sysOaAttendanceVo = sysOaAttendanceVos.get(0);
             sysOaAttendanceVo.setProjectId(bo.getProjectId());
+            sysOaAttendanceVo.setCreateTime(firstDay);
             sysOaAttendanceVo.setDelFlag(0L);
+            sysOaAttendanceVo.setDayLength(bo.getDayLength()!=null?bo.getDayLength():0);
+            sysOaAttendanceVo.setHour(bo.getHour()!=null?bo.getHour():0);
+
 
             return baseMapper.updateDelAttendance(BeanUtil.toBean(sysOaAttendanceVo, SysOaAttendance.class)) > 0;
         }
@@ -260,6 +263,11 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
         return DateUtils.parseDate(firstDay);
     }
 
+    private Date getFormatDay(Date time, Long attendanceDay) {
+        String firstDay = DateUtils.parseDateToStr("yyyy-MM-" + attendanceDay, time);
+        return DateUtils.parseDate(firstDay);
+    }
+
     private Date getLastDay(Date time) {
         String format = "yyyy-MM-";
         // 计算某月的天数

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java

@@ -92,6 +92,7 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
         paramsMap.put("beginTime", params.get("beginTime"));
         paramsMap.put("endTime", params.get("endTime"));
         paramsMap.put("payType", params.get("payType"));
+        paramsMap.put("receiveAccountId",params.get("receiveAccountId"));
         List<SysOaFinance> financeByTime = baseMapper.findFinanceByTime(paramsMap);
         //遍历子表，将价格遍历为数组并用map方法求和，该方法类型使用map比较妥当
         ArrayList<BigDecimal> objects = new ArrayList<>();