CaiXiang/SPC
1
0
Форкнуть 0
Код Задачи Запросы на слияние Релизы Вики Активность

Merge pull request 'yanyang' (#20) from yanyang into master

Просмотр исходного кода 
Reviewed-on: #20
Этот коммит содержится в:
闫阳 2023-06-25 16:36:43 +08:00
родитель e149150b1d 32647c035c
Коммит e4b8d773af
17 изменённых файлов: 64 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
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);
}

4
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);
}
}

3
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);
}

3
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);
}

3
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);
}

4
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);
}
}

3
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);
}

4
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);
}
}

3
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);
}

3
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);
}

4
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);
}
}

3
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);
}

3
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);
}

3
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);
}

3
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);
}

3
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);
}

16
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.*;
@ -39,10 +40,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 +78,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( 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);
@ -187,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;
}
@ -194,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);
}
@ -389,6 +396,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
updateDto.setId(inspectionSheetId);
updateDto.setNumberOfDefects(numberOfDefects);
updateDto.setDefectiveQuantity(defectiveQuantity);
BaseSupportUtils.setUpdateCommonField(updateDto);
update(updateDto);
}
}