报验点状态

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

@@ -170,11 +170,11 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      * @param updateCols
      */
     private void diffCheckerRemark(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String, Object> updatecolumns, List<String> updateCols) {
-        if(ObjectUtil.isEmpty(core.getCheckremark()) && ObjectUtil.isNull(updatecolumns.get("CHECKREMARK"))) {
+        if(ObjectUtil.isEmpty(core.getCheckremark()) && ObjectUtil.isEmpty(updatecolumns.get("CHECKREMARK"))) {
             return ;
         }
 
-        if(ObjectUtil.isEmpty(core.getCheckremark()) && ObjectUtil.isNotNull(updatecolumns.get("CHECKREMARK"))) {
+        if(ObjectUtil.isEmpty(core.getCheckremark()) && ObjectUtil.isNotEmpty(updatecolumns.get("CHECKREMARK"))) {
             String reservationinspectiontime = StrUtil.concat(true, "检验员备注："
                     , "空变更为："
                     , updatecolumns.get("CHECKREMARK").toString()
@@ -183,7 +183,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
             return ;
         }
 
-        if(ObjectUtil.isNotEmpty(core.getCheckremark()) && ObjectUtil.isNull(updatecolumns.get("CHECKREMARK"))) {
+        if(ObjectUtil.isNotEmpty(core.getCheckremark()) && ObjectUtil.isEmpty(updatecolumns.get("CHECKREMARK"))) {
             String reservationinspectiontime = StrUtil.concat(true, "检验员备注："
                     , core.getCheckremark()
                     , "变更为空"
@@ -213,11 +213,11 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      * @param updateCols
      */
     private void diffCheckerResult(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String, Object> updatecolumns, List<String> updateCols) {
-        if(ObjectUtil.isEmpty(core.getCheckresult()) && ObjectUtil.isNull(updatecolumns.get("CHECKRESULT"))) {
+        if(ObjectUtil.isEmpty(core.getCheckresult()) && ObjectUtil.isEmpty(updatecolumns.get("CHECKRESULT"))) {
             return ;
         }
 
-        if(ObjectUtil.isEmpty(core.getCheckresult()) && ObjectUtil.isNotNull(updatecolumns.get("CHECKRESULT"))) {
+        if(ObjectUtil.isEmpty(core.getCheckresult()) && ObjectUtil.isNotEmpty(updatecolumns.get("CHECKRESULT"))) {
             String reservationinspectiontime = StrUtil.concat(true, "检验员结果判定："
                     , "空变更为："
                     , updatecolumns.get("CHECKRESULT").toString()
@@ -226,7 +226,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
             return ;
         }
 
-        if(ObjectUtil.isNotEmpty(core.getCheckresult()) && ObjectUtil.isNull(updatecolumns.get("CHECKRESULT"))) {
+        if(ObjectUtil.isNotEmpty(core.getCheckresult()) && ObjectUtil.isEmpty(updatecolumns.get("CHECKRESULT"))) {
             String reservationinspectiontime = StrUtil.concat(true, "检验员结果判定："
                     , core.getCheckresult()
                     , "变更为空"
@@ -255,11 +255,11 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      * @param updateCols
      */
     private void diffCheckerActualRecord(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String, Object> updatecolumns, List<String> updateCols) {
-        if(ObjectUtil.isEmpty(core.getCheckactualrecord()) && ObjectUtil.isNull(updatecolumns.get("CHECKACTUALRECORD"))) {
+        if(ObjectUtil.isEmpty(core.getCheckactualrecord()) && ObjectUtil.isEmpty(updatecolumns.get("CHECKACTUALRECORD"))) {
             return ;
         }
 
-        if(ObjectUtil.isEmpty(core.getCheckactualrecord()) && ObjectUtil.isNotNull(updatecolumns.get("CHECKACTUALRECORD"))) {
+        if(ObjectUtil.isEmpty(core.getCheckactualrecord()) && ObjectUtil.isNotEmpty(updatecolumns.get("CHECKACTUALRECORD"))) {
             String reservationinspectiontime = StrUtil.concat(true, "检验员实测记录："
                     , "空变更为："
                     , updatecolumns.get("CHECKACTUALRECORD").toString()
@@ -268,7 +268,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
             return ;
         }
 
-        if(ObjectUtil.isNotEmpty(core.getCheckactualrecord()) && ObjectUtil.isNull(updatecolumns.get("CHECKACTUALRECORD"))) {
+        if(ObjectUtil.isNotEmpty(core.getCheckactualrecord()) && ObjectUtil.isEmpty(updatecolumns.get("CHECKACTUALRECORD"))) {
             String reservationinspectiontime = StrUtil.concat(true, "检验员实测记录："
                     , core.getCheckactualrecord()
                     , "变更为空"
@@ -343,11 +343,11 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      * @param result
      */
     private void diffSelfActualRecord(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
-        if(ObjectUtil.isEmpty(core.getSelfactualrecord()) && ObjectUtil.isNull(updatecolumns.get("SELFACTUALRECORD"))) {
+        if(ObjectUtil.isEmpty(core.getSelfactualrecord()) && ObjectUtil.isEmpty(updatecolumns.get("SELFACTUALRECORD"))) {
             return ;
         }
 
-        if(ObjectUtil.isEmpty(core.getSelfactualrecord()) && ObjectUtil.isNotNull(updatecolumns.get("SELFACTUALRECORD"))) {
+        if(ObjectUtil.isEmpty(core.getSelfactualrecord()) && ObjectUtil.isNotEmpty(updatecolumns.get("SELFACTUALRECORD"))) {
             String reservationinspectiontime = StrUtil.concat(true, "自检员实测记录："
                     , "空变更为："
                     , updatecolumns.get("SELFACTUALRECORD").toString()
@@ -356,7 +356,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
             return ;
         }
 
-        if(ObjectUtil.isNotEmpty(core.getSelfactualrecord()) && ObjectUtil.isNull(updatecolumns.get("SELFACTUALRECORD"))) {
+        if(ObjectUtil.isNotEmpty(core.getSelfactualrecord()) && ObjectUtil.isEmpty(updatecolumns.get("SELFACTUALRECORD"))) {
             String reservationinspectiontime = StrUtil.concat(true, "自检员实测记录："
                     , core.getSelfactualrecord()
                     , "变更为空"
@@ -385,11 +385,11 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      * @param result
      */
     private void diffSelfResult(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
-        if(ObjectUtil.isEmpty(core.getSelfresult()) && ObjectUtil.isNull(updatecolumns.get("SELFRESULT"))) {
+        if(ObjectUtil.isEmpty(core.getSelfresult()) && ObjectUtil.isEmpty(updatecolumns.get("SELFRESULT"))) {
             return ;
         }
 
-        if(ObjectUtil.isEmpty(core.getSelfresult()) && ObjectUtil.isNotNull(updatecolumns.get("SELFRESULT"))) {
+        if(ObjectUtil.isEmpty(core.getSelfresult()) && ObjectUtil.isNotEmpty(updatecolumns.get("SELFRESULT"))) {
             String reservationinspectiontime = StrUtil.concat(true, "自检员结果判定："
                     , "空变更为："
                     , updatecolumns.get("SELFRESULT").toString()
@@ -398,7 +398,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
             return ;
         }
 
-        if(ObjectUtil.isNotEmpty(core.getSelfresult()) && ObjectUtil.isNull(updatecolumns.get("SELFRESULT"))) {
+        if(ObjectUtil.isNotEmpty(core.getSelfresult()) && ObjectUtil.isEmpty(updatecolumns.get("SELFRESULT"))) {
             String reservationinspectiontime = StrUtil.concat(true, "自检员结果判定："
                     , core.getSelfresult()
                     , "变更为空"
@@ -427,11 +427,11 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
      * @param result
      */
     private void diffSelfRemark(ZhcxInsideInspectionCoreIndicatorsDo core, Map<String,Object> updatecolumns, List<String> result) {
-        if(ObjectUtil.isEmpty(core.getSelfremark()) && ObjectUtil.isNull(updatecolumns.get("SELFREMARK"))) {
+        if(ObjectUtil.isEmpty(core.getSelfremark()) && ObjectUtil.isEmpty(updatecolumns.get("SELFREMARK"))) {
             return ;
         }
 
-        if(ObjectUtil.isEmpty(core.getSelfremark()) && ObjectUtil.isNotNull(updatecolumns.get("SELFREMARK"))) {
+        if(ObjectUtil.isEmpty(core.getSelfremark()) && ObjectUtil.isNotEmpty(updatecolumns.get("SELFREMARK"))) {
             String reservationinspectiontime = StrUtil.concat(true, "自检员备注："
                     , "空变更为："
                     , updatecolumns.get("SELFREMARK").toString()
@@ -440,7 +440,7 @@ public class ZhcxInsideInspectionCoreIndicatorsServiceImpl extends ServiceImpl<Z
             return ;
         }
 
-        if(ObjectUtil.isNotEmpty(core.getSelfremark()) && ObjectUtil.isNull(updatecolumns.get("SELFREMARK"))) {
+        if(ObjectUtil.isNotEmpty(core.getSelfremark()) && ObjectUtil.isEmpty(updatecolumns.get("SELFREMARK"))) {
             String reservationinspectiontime = StrUtil.concat(true, "自检员备注："
                     , core.getSelfremark()
                     , "变更为空"