Commit e9485db8 authored by cq990612's avatar cq990612

优化代码结构

parent bf236d01
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, user_id, work_day, total_time, status,reject_time,create_time,modify_time id, user_id, work_day, total_time, status,reject_time, create_time, modify_time,
</sql> </sql>
<sql id="cols_exclude_id"> <sql id="cols_exclude_id">
user_id, work_day, total_time, status,reject_time,create_time,modify_time user_id, work_day, total_time, status,reject_time, create_time, modify_time
</sql> </sql>
<sql id="table"> <sql id="table">
......
package cn.wisenergy.service.impl; package cn.wisenergy.service.impl;
import cn.wisenergy.common.utils.DateUtil; import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM; import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException; import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkCollectMapper; import cn.wisenergy.mapper.WorkCollectMapper;
import cn.wisenergy.mapper.WorkTimeOrderMapper; import cn.wisenergy.mapper.WorkTimeOrderMapper;
import cn.wisenergy.model.app.WorkCollect; import cn.wisenergy.model.app.WorkCollect;
import cn.wisenergy.model.app.WorkSubmitAdopt; import cn.wisenergy.model.app.WorkSubmitAdopt;
import cn.wisenergy.model.app.WorkTimeOrder; import cn.wisenergy.model.app.WorkTimeOrder;
import cn.wisenergy.model.dto.CalendarDto; import cn.wisenergy.model.dto.CalendarDto;
import cn.wisenergy.model.dto.SubtotalDto; import cn.wisenergy.model.dto.SubtotalDto;
...@@ -104,9 +106,10 @@ public class WorkCollectServiceImpl implements WorkCollectService { ...@@ -104,9 +106,10 @@ public class WorkCollectServiceImpl implements WorkCollectService {
int modifyTime = 1; int modifyTime = 1;
Date date = new Date(); Date date = new Date();
WorkSubmitAdopt submitAdopt = workSubmitAdoptService.getById(1); WorkSubmitAdopt submitAdopt = workSubmitAdoptService.getById(1);
if (null != workCollect.getRejectTime()) { if (3 == workCollect.getStatus()) {
Date rejectTime = workCollect.getRejectTime(); Date rejectTime = workCollect.getRejectTime();
rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime, "yyyy-MM-dd"), "yyyy-MM-dd"); rejectTime = DateUtil.convertStrToDate(DateUtil.convertDateToStr(rejectTime, "yyyy-MM-dd"), "yyyy-MM-dd");
System.out.println(modifyTime);
if (date.getTime() - rejectTime.getTime() > submitAdopt.getSubmitTime() * 24 * 60 * 60 * 1000) { if (date.getTime() - rejectTime.getTime() > submitAdopt.getSubmitTime() * 24 * 60 * 60 * 1000) {
modifyTime = 0; modifyTime = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment