DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移动端加入

Browse Source
This commit is contained in:
wangyu
2025-02-15 10:45:23 +08:00
parent 324b01042f
commit 75acf69848
10 changed files with 216 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java
View File

@@ -88,8 +88,6 @@ public class SysOaFinanceController extends BaseController {
BigDecimal finance0 = iSysOaFinanceService.findFinanceByTime(bo, params0);
Map<String, Object> ajax = new HashMap<>();
ajax.put("income", finance1);
ajax.put("out", finance0);
@@ -155,6 +153,7 @@ public class SysOaFinanceController extends BaseController {
outMap.put("beginTime", firstDay);
outMap.put("endTime", lastDay);
outMap.put("payType",bo.getPayType());
outMap.put("receiveAccountId",bo.getReceiveAccountId());
BigDecimal financeOutReduce = iSysOaFinanceService.findFinanceByTime(bo, outMap);
//收入
@@ -163,6 +162,7 @@ public class SysOaFinanceController extends BaseController {
comeMap.put("beginTime", firstDay);
comeMap.put("endTime", lastDay);
comeMap.put("payType",bo.getPayType());
comeMap.put("receiveAccountId",bo.getReceiveAccountId());
BigDecimal financeComeReduce = iSysOaFinanceService.findFinanceByTime(bo, comeMap);
//收入减支出
BigDecimal subtract = financeComeReduce.subtract(financeOutReduce);

1
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java
View File

@@ -62,6 +62,7 @@ public interface SysOaFinanceMapper extends BaseMapperPlus<SysOaFinanceMapper, S
* @param params
* @return
*/
List<SysOaFinance> findFinanceByTime(Map params);
/**

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

@@ -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-";
// 计算某月的天数

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

@@ -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<>();