zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
罗成
2025-02-27 16:13:22 +08:00
parent 4f6598b23b
commit 5d1c3b39e2
5 changed files with 107 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java
View File

@ -10,6 +10,7 @@ import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
import com.ruoyi.wgz.bo.req.WgzAppDailyClockReq;
import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
import com.ruoyi.wgz.bo.res.WgzAppCheckDailyNewspaperRes;
import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
import com.ruoyi.wgz.domain.WgzDailyClock;
@ -88,7 +89,7 @@ public interface IWgzDailyClockService extends IServicePlus<WgzDailyClock> {
/**
* 日报日历·查看日报
*/
WgzDailyClock userCheckDailyNewspaper(Long id);
WgzAppCheckDailyNewspaperRes userCheckDailyNewspaper(Long id);
/**

16
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java
View File

@ -24,6 +24,7 @@ import com.ruoyi.wgz.bo.WgzDailyClockQueryBo;
import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq;
import com.ruoyi.wgz.bo.req.WgzAppDailyClockReq;
import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq;
import com.ruoyi.wgz.bo.res.WgzAppCheckDailyNewspaperRes;
import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes;
import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes;
import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo;
@ -170,9 +171,11 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
setId(wgzDailyClock.getId()).
setDilyTime(wgzDailyClock.getDilyTime()).
setPnchOsition(wgzDailyClock.getPnchOsition());
if (ll.get(clockDate).equals(clockDate)) {
if (ll.get(date) !=null && ll.get(date).equals(clockDate)) {
wgzAppAttachmentAcquisitionTwo.setStatus("2"); //全天请假
}
fh.put(date.toString(),wgzAppAttachmentAcquisitionTwo);
}
});
@ -218,8 +221,15 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
}
@Override
public WgzDailyClock userCheckDailyNewspaper(Long id) {
return getById(id);
public WgzAppCheckDailyNewspaperRes userCheckDailyNewspaper(Long id) {
WgzAppCheckDailyNewspaperRes res = new WgzAppCheckDailyNewspaperRes();
//1、获取当前日报的信息
WgzDailyClock byId = getById(id);
BeanUtils.copyProperties(byId,res);
//2、获取日报的审核人信息
BgtUser by = userService.selectUserByUserId(byId.getAuditorUserId());
res.setAvatarName(by.getAvatarName()).setUsername(by.getUsername());
return res;
}
@Override