Forráskód Böngészése

提交 修改审核时间bug

Min 1 éve
szülő
commit
d89e3c7454

+ 10 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportLogController.java

@@ -293,10 +293,12 @@ public class ReportLogController {
                             msg.setError("第"+row+"行审核时间格式错误,请检查审核时间数据");
                             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 finalCreateTimeTime = createTimeTime;
                         reports.forEach(r->{
                             r.setProjectAuditTime(finalAuditDateTime);
                         });
@@ -309,8 +311,11 @@ public class ReportLogController {
                             msg.setError("第"+row+"行填报时间格式错误,请检查审核时间数据");
                             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;
                         reports.forEach(r->{
                             r.setCreateTime(finalCreateTimeTime);