|
@@ -149,7 +149,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
httpRespMsg.setError("进度必须大于上次报工进度("+beforeTodayReport.getProgress()+"%)");
|
|
httpRespMsg.setError("进度必须大于上次报工进度("+beforeTodayReport.getProgress()+"%)");
|
|
return httpRespMsg;
|
|
return httpRespMsg;
|
|
}
|
|
}
|
|
- lastProgress = report.getProgress();
|
|
|
|
|
|
+ //去上次报工的进度
|
|
|
|
+ lastProgress = beforeTodayReport.getProgress();
|
|
} else {
|
|
} else {
|
|
//今天之前没有报过工
|
|
//今天之前没有报过工
|
|
if (todayReport == null) {
|
|
if (todayReport == null) {
|