外部报验操作记录

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -507,14 +507,33 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
 //            }
 //        }
         String reTime = DateUtil.format(oldItp.getReservationinspectiontime(), "yyyy-MM-dd HH:mm:ss");
-        if(!reTime.equals(updatecolumns.get("RESERVATIONINSPECTIONTIME").toString())) {
-            String reservationinspectiontime = StrUtil.concat(true, "预约报验时间："
-                    , DateUtil.format(oldItp.getReservationinspectiontime(), "yyyy-MM-dd HH:mm")
-                    , " 变更为："
-                    , updatecolumns.get("RESERVATIONINSPECTIONTIME").toString()
-            );
-
-            editDataList.add(reservationinspectiontime);
+        if(ObjectUtil.isNotNull(reTime)
+                && ObjectUtil.isNotNull(updatecolumns.get("RESERVATIONINSPECTIONTIME"))) {
+            if(!reTime.equals(updatecolumns.get("RESERVATIONINSPECTIONTIME").toString())) {
+                String reservationinspectiontime = StrUtil.concat(true, "预约报验时间："
+                        , DateUtil.format(oldItp.getReservationinspectiontime(), "yyyy-MM-dd HH:mm")
+                        , " 变更为："
+                        , updatecolumns.get("RESERVATIONINSPECTIONTIME").toString()
+                );
+                editDataList.add(reservationinspectiontime);
+            }
+
+        } else if(ObjectUtil.isNotNull(reTime)) {
+            if(!reTime.equals(updatecolumns.get("RESERVATIONINSPECTIONTIME").toString())) {
+                String reservationinspectiontime = StrUtil.concat(true, "预约报验时间："
+                        , DateUtil.format(oldItp.getReservationinspectiontime(), "yyyy-MM-dd HH:mm")
+                        , " 变更为："
+                );
+                editDataList.add(reservationinspectiontime);
+            }
+        } else if(ObjectUtil.isNotNull(updatecolumns.get("RESERVATIONINSPECTIONTIME"))) {
+            if(!updatecolumns.get("RESERVATIONINSPECTIONTIME").toString().equals(reTime)) {
+                String reservationinspectiontime = StrUtil.concat(true, "预约报验时间："
+                        , " 变更为："
+                        , updatecolumns.get("RESERVATIONINSPECTIONTIME").toString()
+                );
+                editDataList.add(reservationinspectiontime);
+            }
         }
 
         //项目工号