ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -68,7 +67,6 @@ 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);
     }
 
@@ -76,7 +74,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -65,7 +64,6 @@ 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);
     }
 
@@ -73,7 +71,6 @@ 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);
     }
 
@@ -89,7 +86,6 @@ 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);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java

@@ -4,7 +4,6 @@ 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;
@@ -96,7 +95,6 @@ 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);
     }
 
@@ -104,7 +102,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -62,7 +61,6 @@ 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);
     }
 
@@ -70,7 +68,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -65,7 +64,6 @@ private PlatformMapper mapper;
     @Transactional(rollbackFor = Exception.class)
     public void save(PlatformDTO dto) {
         Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
-        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -73,7 +71,6 @@ private PlatformMapper mapper;
     @Transactional(rollbackFor = Exception.class)
     public void update(PlatformDTO dto) {
         Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
-        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java

@@ -2,7 +2,6 @@ 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;
@@ -59,7 +58,6 @@ 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);
     }
 
@@ -67,7 +65,6 @@ 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);
     }
 
@@ -83,7 +80,6 @@ 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);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java

@@ -2,7 +2,6 @@ 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;
@@ -56,7 +55,6 @@ 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);
     }
 
@@ -64,7 +62,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java

@@ -4,7 +4,6 @@ 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;
@@ -67,7 +66,6 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
     public void save(ProductFeaturesDTO dto) {
 
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
-        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -95,7 +93,6 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         productFeaturesHisServiceImpl.save(history);
         //更新
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
-        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
 
     }
@@ -149,7 +146,6 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         for(ProductFeaturesDTO dto:lists){
             //效验数据
             ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-            BaseSupportUtils.setUpdateCommonField(dto);
             update(dto);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java

@@ -4,7 +4,6 @@ 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;
@@ -97,7 +96,6 @@ 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();
@@ -107,7 +105,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java

@@ -6,7 +6,6 @@ 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;
@@ -69,7 +68,6 @@ 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);
     }
 
@@ -77,7 +75,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java

@@ -4,7 +4,6 @@ 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;
@@ -86,7 +85,6 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
                 Integer lastSequence = lastDto.getSequence();
                 entity.setSequence(lastSequence + 1);
             }
-            BaseSupportUtils.setCommonField(entity);
             insert(entity);
         }
         else{
@@ -98,7 +96,6 @@ 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);
     }
 
@@ -146,7 +143,6 @@ 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);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java

@@ -2,7 +2,6 @@ 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;
@@ -61,7 +60,6 @@ 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);
     }
 
@@ -69,7 +67,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java

@@ -2,7 +2,6 @@ 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;
@@ -61,7 +60,6 @@ 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);
     }
 
@@ -69,7 +67,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -65,7 +64,6 @@ 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);
     }
 
@@ -73,7 +71,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -108,7 +107,6 @@ 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);
     }
 
@@ -116,7 +114,6 @@ 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);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java

@@ -3,7 +3,6 @@ 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;
@@ -60,7 +59,6 @@ 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);
     }
 
@@ -68,7 +66,6 @@ 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);
     }
 

ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java

@@ -5,7 +5,6 @@ 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.*;
@@ -40,8 +39,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import java.time.*;
+import java.time.Instant;
-import java.time.format.DateTimeFormatter;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -78,12 +79,6 @@ 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( 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);
-        }
         wrapper.like(ObjectUtils.isNotNull(id), "id", id);
         wrapper.like(StringUtils.isNotBlank(inspectionSite), "inspection_stage", inspectionSite);
         wrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
@@ -192,7 +187,6 @@ 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;
     }
 
@@ -200,7 +194,6 @@ 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);
     }
 
@@ -396,7 +389,6 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
             updateDto.setId(inspectionSheetId);
             updateDto.setNumberOfDefects(numberOfDefects);
             updateDto.setDefectiveQuantity(defectiveQuantity);
-            BaseSupportUtils.setUpdateCommonField(updateDto);
             update(updateDto);
         }
     }