Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -127,7 +127,12 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 if ("1".equals(grid.getDelFlag()) || grid.getAbandonFlag().compareTo(1) == 0) {
                     LambdaQueryWrapper<ScreenCustomerGridEntity> w = new LambdaQueryWrapper<>();
                     w.eq(ScreenCustomerGridEntity::getGridId, grid.getId());
-                    screenCustomerGridDao.delete(w);
+                    ScreenCustomerGridEntity e = new ScreenCustomerGridEntity();
+                    e.setDataEndTime(NumConstant.ONE_STR);
+                    e.setUpdatedTime(new Date());
+                    screenCustomerGridDao.update(e,w);
+                    // 此delete不更新 updatedTime
+//                    screenCustomerGridDao.delete(w);
                 }
             }
         }