|
@@ -293,10 +293,12 @@ public class ReportLogController {
|
|
msg.setError("第"+row+"行审核时间格式错误,请检查审核时间数据");
|
|
msg.setError("第"+row+"行审核时间格式错误,请检查审核时间数据");
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
- reportLog.setOperateDate(auditDateTime);
|
|
|
|
- needUpdateReportLogList.add(reportLog);
|
|
|
|
|
|
+ String creatorId = reports.get(0).getCreatorId();
|
|
|
|
+ if(!creatorId.equals(reportLog.getOperatorId())){
|
|
|
|
+ reportLog.setOperateDate(auditDateTime);
|
|
|
|
+ needUpdateReportLogList.add(reportLog);
|
|
|
|
+ }
|
|
LocalDateTime finalAuditDateTime = auditDateTime;
|
|
LocalDateTime finalAuditDateTime = auditDateTime;
|
|
- LocalDateTime finalCreateTimeTime = createTimeTime;
|
|
|
|
reports.forEach(r->{
|
|
reports.forEach(r->{
|
|
r.setProjectAuditTime(finalAuditDateTime);
|
|
r.setProjectAuditTime(finalAuditDateTime);
|
|
});
|
|
});
|
|
@@ -309,8 +311,11 @@ public class ReportLogController {
|
|
msg.setError("第"+row+"行填报时间格式错误,请检查审核时间数据");
|
|
msg.setError("第"+row+"行填报时间格式错误,请检查审核时间数据");
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
- reportLog.setOperateDate(createTimeTime);
|
|
|
|
- needUpdateReportLogList.add(reportLog);
|
|
|
|
|
|
+ String creatorId = reports.get(0).getCreatorId();
|
|
|
|
+ if(creatorId.equals(reportLog.getOperatorId())){
|
|
|
|
+ reportLog.setOperateDate(createTimeTime);
|
|
|
|
+ needUpdateReportLogList.add(reportLog);
|
|
|
|
+ }
|
|
LocalDateTime finalCreateTimeTime = createTimeTime;
|
|
LocalDateTime finalCreateTimeTime = createTimeTime;
|
|
reports.forEach(r->{
|
|
reports.forEach(r->{
|
|
r.setCreateTime(finalCreateTimeTime);
|
|
r.setCreateTime(finalCreateTimeTime);
|