From 3a583ac09f217667cb00276ccf66c750c9e931b8 Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Sun, 25 Jun 2023 15:28:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=BD=9C=E4=B8=9A=20?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InspectionSheetServiceImpl.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
index 6ff548f..0399913 100644
--- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
+++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
@@ -39,10 +39,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -79,6 +77,12 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         String batchNumber = (String) params.get("batchNumber");
 
         QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        if(params.get("startTime")!=null && params.get("endTime")!=null){
+            LocalDateTime startTime = LocalDate.parse(params.get("startTime").toString(),df).atStartOfDay();
+            LocalDateTime endTime = LocalDate.parse(params.get("endTime").toString(),df).atStartOfDay();
+            wrapper.between(startTime!=null && endTime!=null,"create_time", startTime, endTime);
+        }
         wrapper.like(ObjectUtils.isNotNull(id), "id", id);
         wrapper.like(StringUtils.isNotBlank(inspectionSite), "inspection_stage", inspectionSite);
         wrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
-- 
2.45.2


From 32647c035c43bdf8429f9862ee7b0389edf6e44f Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Sun, 25 Jun 2023 16:34:35 +0800
Subject: [PATCH 2/2] CommonField

---
 .../com/cnbm/basic/service/impl/FactoryServiceImpl.java     | 3 +++
 .../impl/FeaturesStageProcedureRelationServiceImpl.java     | 4 ++++
 .../com/cnbm/basic/service/impl/MachineServiceImpl.java     | 3 +++
 .../com/cnbm/basic/service/impl/MeasureToolServiceImpl.java | 3 +++
 .../com/cnbm/basic/service/impl/PlatformServiceImpl.java    | 3 +++
 .../service/impl/ProductFactoryRelationServiceImpl.java     | 4 ++++
 .../basic/service/impl/ProductFeaturesHisServiceImpl.java   | 3 +++
 .../cnbm/basic/service/impl/ProductFeaturesServiceImpl.java | 4 ++++
 .../com/cnbm/basic/service/impl/ProductServiceImpl.java     | 3 +++
 .../com/cnbm/basic/service/impl/ProductTypeServiceImpl.java | 3 +++
 .../impl/ProductWorkingprocedureRelationServiceImpl.java    | 4 ++++
 .../java/com/cnbm/basic/service/impl/ShiftServiceImpl.java  | 3 +++
 .../java/com/cnbm/basic/service/impl/TeamServiceImpl.java   | 3 +++
 .../java/com/cnbm/basic/service/impl/UnitServiceImpl.java   | 3 +++
 .../basic/service/impl/WorkingProcedureServiceImpl.java     | 3 +++
 .../basic/service/impl/WorkingProcedureTypeServiceImpl.java | 3 +++
 .../service/impl/InspectionSheetServiceImpl.java            | 6 +++++-
 17 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java
index 88db7a0..6a45608 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.MachineDTO;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.basic.entity.ProductType;
@@ -67,6 +68,7 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
     @Transactional(rollbackFor = Exception.class)
     public void save(FactoryDTO dto) {
         Factory entity = ConvertUtils.sourceToTarget(dto, Factory.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -74,6 +76,7 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
     @Transactional(rollbackFor = Exception.class)
     public void update(FactoryDTO dto) {
         Factory entity = ConvertUtils.sourceToTarget(dto, Factory.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java
index 942ed6e..15f4957 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -64,6 +65,7 @@ public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<F
     @Transactional(rollbackFor = Exception.class)
     public void save(FeaturesStageProcedureRelationDTO dto) {
         FeaturesStageProcedureRelation entity = ConvertUtils.sourceToTarget(dto, FeaturesStageProcedureRelation.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +73,7 @@ public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<F
     @Transactional(rollbackFor = Exception.class)
     public void update(FeaturesStageProcedureRelationDTO dto) {
         FeaturesStageProcedureRelation entity = ConvertUtils.sourceToTarget(dto, FeaturesStageProcedureRelation.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -86,6 +89,7 @@ public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<F
     public void batchInsert(FeaturesStageProcedureRelationDTO[] lists) {
         for(FeaturesStageProcedureRelationDTO dto:lists){
             ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setCommonField(dto);
             save(dto);
         }
     }
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java
index eab19dc..4934296 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.entity.Platform;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -95,6 +96,7 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
     @Transactional(rollbackFor = Exception.class)
     public void save(MachineDTO dto) {
         Machine entity = ConvertUtils.sourceToTarget(dto, Machine.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -102,6 +104,7 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
     @Transactional(rollbackFor = Exception.class)
     public void update(MachineDTO dto) {
         Machine entity = ConvertUtils.sourceToTarget(dto, Machine.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java
index 9a242b8..4511cf1 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.MeasureToolDTO;
@@ -61,6 +62,7 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
     @Transactional(rollbackFor = Exception.class)
     public void save(MeasureToolDTO dto) {
         MeasureTool entity = ConvertUtils.sourceToTarget(dto, MeasureTool.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -68,6 +70,7 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
     @Transactional(rollbackFor = Exception.class)
     public void update(MeasureToolDTO dto) {
         MeasureTool entity = ConvertUtils.sourceToTarget(dto, MeasureTool.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java
index b0a1cf9..eb64807 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -64,6 +65,7 @@ private PlatformMapper mapper;
     @Transactional(rollbackFor = Exception.class)
     public void save(PlatformDTO dto) {
         Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +73,7 @@ private PlatformMapper mapper;
     @Transactional(rollbackFor = Exception.class)
     public void update(PlatformDTO dto) {
         Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java
index 5444d46..b8351c9 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java
@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductWorkingprocedureRelationDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -58,6 +59,7 @@ public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFa
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductFactoryRelationDTO dto) {
         ProductFactoryRelation entity = ConvertUtils.sourceToTarget(dto, ProductFactoryRelation.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -65,6 +67,7 @@ public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFa
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductFactoryRelationDTO dto) {
         ProductFactoryRelation entity = ConvertUtils.sourceToTarget(dto, ProductFactoryRelation.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -80,6 +83,7 @@ public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFa
     public void batchInsertFactory(ProductFactoryRelationDTO[] lists) {
         for(ProductFactoryRelationDTO dto:lists){
             ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setCommonField(dto);
             save(dto);
         }
     }
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java
index 68887e6..99913eb 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java
@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.ProductFeaturesHisDTO;
@@ -55,6 +56,7 @@ public class ProductFeaturesHisServiceImpl extends CrudServiceImpl<ProductFeatur
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductFeaturesHisDTO dto) {
         ProductFeaturesHis entity = ConvertUtils.sourceToTarget(dto, ProductFeaturesHis.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -62,6 +64,7 @@ public class ProductFeaturesHisServiceImpl extends CrudServiceImpl<ProductFeatur
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductFeaturesHisDTO dto) {
         ProductFeaturesHis entity = ConvertUtils.sourceToTarget(dto, ProductFeaturesHis.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java
index 8e71884..116ee4d 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.cnbm.admin.params.IdParam;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.*;
 import com.cnbm.basic.entity.ProductFeaturesHis;
 import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
@@ -66,6 +67,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
     public void save(ProductFeaturesDTO dto) {
 
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -93,6 +95,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         productFeaturesHisServiceImpl.save(history);
         //更新
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
 
     }
@@ -146,6 +149,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         for(ProductFeaturesDTO dto:lists){
             //效验数据
             ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setUpdateCommonField(dto);
             update(dto);
         }
     }
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java
index 0633942..8eb20ff 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.entity.ProductType;
 import com.cnbm.basic.mapper.ProductFactoryRelationMapper;
 import com.cnbm.common.page.PageData;
@@ -96,6 +97,7 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
     @Transactional(rollbackFor = Exception.class)
     public IdVo add(ProductDTO dto) {
         Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
         //返回新增产品id
         return IdVo.builder().id(entity.getId()).build();
@@ -105,6 +107,7 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductDTO dto) {
         Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
index a3e6200..f1124cb 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.admin.dto.SysDictDataDTO;
 import com.cnbm.admin.entity.SysDictDataEntity;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -68,6 +69,7 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductTypeDTO dto) {
         ProductType entity = ConvertUtils.sourceToTarget(dto, ProductType.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -75,6 +77,7 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductTypeDTO dto) {
         ProductType entity = ConvertUtils.sourceToTarget(dto, ProductType.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java
index 06c3518..6744aab 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.dto.SequenceDTO;
 import com.cnbm.basic.dto.WorkingProcedureDTO;
@@ -85,6 +86,7 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
                 Integer lastSequence = lastDto.getSequence();
                 entity.setSequence(lastSequence + 1);
             }
+            BaseSupportUtils.setCommonField(entity);
             insert(entity);
         }
         else{
@@ -96,6 +98,7 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductWorkingprocedureRelationDTO dto) {
         ProductWorkingprocedureRelation entity = ConvertUtils.sourceToTarget(dto, ProductWorkingprocedureRelation.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -143,6 +146,7 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
     public void batchInsertWorkingprocedure(ProductWorkingprocedureRelationDTO[] lists) {
         for(ProductWorkingprocedureRelationDTO dto:lists){
             ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setCommonField(dto);
             save(dto);
         }
     }
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java
index af50143..3133813 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java
@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.ShiftDTO;
@@ -60,6 +61,7 @@ public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftD
     @Transactional(rollbackFor = Exception.class)
     public void save(ShiftDTO dto) {
         Shift entity = ConvertUtils.sourceToTarget(dto, Shift.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -67,6 +69,7 @@ public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftD
     @Transactional(rollbackFor = Exception.class)
     public void update(ShiftDTO dto) {
         Shift entity = ConvertUtils.sourceToTarget(dto, Shift.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java
index 18921ac..37cbef8 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java
@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.TeamDTO;
@@ -60,6 +61,7 @@ public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO>
     @Transactional(rollbackFor = Exception.class)
     public void save(TeamDTO dto) {
         Team entity = ConvertUtils.sourceToTarget(dto, Team.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -67,6 +69,7 @@ public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO>
     @Transactional(rollbackFor = Exception.class)
     public void update(TeamDTO dto) {
         Team entity = ConvertUtils.sourceToTarget(dto, Team.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java
index d8ead65..0022850 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -64,6 +65,7 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
     @Transactional(rollbackFor = Exception.class)
     public void save(UnitDTO dto) {
         Unit entity = ConvertUtils.sourceToTarget(dto, Unit.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +73,7 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
     @Transactional(rollbackFor = Exception.class)
     public void update(UnitDTO dto) {
         Unit entity = ConvertUtils.sourceToTarget(dto, Unit.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java
index 07008f9..76ec41c 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
 import com.cnbm.basic.entity.Machine;
@@ -107,6 +108,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
     @Transactional(rollbackFor = Exception.class)
     public void save(WorkingProcedureDTO dto) {
         WorkingProcedure entity = ConvertUtils.sourceToTarget(dto, WorkingProcedure.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -114,6 +116,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkingProcedureDTO dto) {
         WorkingProcedure entity = ConvertUtils.sourceToTarget(dto, WorkingProcedure.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java
index 2615258..cba6de5 100644
--- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java
+++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
@@ -59,6 +60,7 @@ public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProc
     @Transactional(rollbackFor = Exception.class)
     public void save(WorkingProcedureTypeDTO dto) {
         WorkingProcedureType entity = ConvertUtils.sourceToTarget(dto, WorkingProcedureType.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -66,6 +68,7 @@ public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProc
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkingProcedureTypeDTO dto) {
         WorkingProcedureType entity = ConvertUtils.sourceToTarget(dto, WorkingProcedureType.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
index 0399913..026695c 100644
--- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
+++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.dto.WorkingProcedureDTO;
 import com.cnbm.basic.entity.*;
@@ -78,7 +79,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
 
         QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        if(params.get("startTime")!=null && params.get("endTime")!=null){
+        if( ObjectUtils.isNotNull(params.get("startTime")) &&  ObjectUtils.isNotNull(params.get("endTime"))){
             LocalDateTime startTime = LocalDate.parse(params.get("startTime").toString(),df).atStartOfDay();
             LocalDateTime endTime = LocalDate.parse(params.get("endTime").toString(),df).atStartOfDay();
             wrapper.between(startTime!=null && endTime!=null,"create_time", startTime, endTime);
@@ -191,6 +192,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         //InspectionSheet entity = ConvertUtils.sourceToTarget(dto, InspectionSheet.class);
         InspectionSheet entity =  new InspectionSheet();
         BeanUtils.copyProperties(dto, entity);
+        BaseSupportUtils.setCommonField(entity);
         return entity;
     }
 
@@ -198,6 +200,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
     @Transactional(rollbackFor = Exception.class)
     public void update(InspectionSheetDTO dto) {
         InspectionSheet entity = ConvertUtils.sourceToTarget(dto, InspectionSheet.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -393,6 +396,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
             updateDto.setId(inspectionSheetId);
             updateDto.setNumberOfDefects(numberOfDefects);
             updateDto.setDefectiveQuantity(defectiveQuantity);
+            BaseSupportUtils.setUpdateCommonField(updateDto);
             update(updateDto);
         }
     }
-- 
2.45.2