basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
@@ -3,13 +3,10 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.ProductDto; import com.ruoyi.basic.dto.StructureTestObjectDto; import com.ruoyi.basic.dto.*; import com.ruoyi.basic.excel.ExcelMultiSheetImporter; import com.ruoyi.common.core.domain.Result; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.basic.dto.PageTestObjectDto; import com.ruoyi.basic.dto.ProductDTO1; import com.ruoyi.basic.excel.StructureTestObjectData; import com.ruoyi.basic.excel.StructureTestObjectListener; import com.ruoyi.basic.pojo.Product; @@ -152,6 +149,24 @@ return Result.success(capacityScopeService.getItemTreeProduct(structureTestObjectDto)); } /** * 根据产品获取型号 */ @ApiOperation(value = "获取检验对象树") @GetMapping("/getProductTypes") public Result getProductTypes(ModelDto modelDto) { return Result.success(capacityScopeService.getProductTypes(modelDto)); } /** * 根据产品获取零件号 */ @ApiOperation(value = "获取检验对象树") @GetMapping("/getPartNoList") public Result getPartNoList(ProductPartDto productPartDto) { return Result.success(capacityScopeService.getPartNoList(productPartDto)); } @PostMapping("/importEquipData") public Result importData(@RequestParam("file") MultipartFile file) { // 调用导入工具 basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
@@ -11,5 +11,7 @@ private String value; private Integer productId; } basic-server/src/main/java/com/ruoyi/basic/dto/ProductPartDto.java
@@ -6,5 +6,6 @@ public class ProductPartDto { private Integer id; private Integer productId; } basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
@@ -3,11 +3,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.basic.dto.PageTestObjectDto; import com.ruoyi.basic.dto.StructureTestObjectDto; import com.ruoyi.basic.dto.TestItemDto; import com.ruoyi.basic.dto.*; import com.ruoyi.basic.excel.StructureTestObjectData; import com.ruoyi.basic.pojo.Model; import com.ruoyi.basic.pojo.ProductPart; import com.ruoyi.basic.pojo.StructureItemParameter; import com.ruoyi.basic.pojo.StructureTestObject; @@ -48,5 +48,9 @@ void importPartExcel(List<StructureTestObjectData> list); List<TestItemDto> getItemTreeProduct(StructureTestObjectDto structureTestObjectDto); List<Model> getProductTypes(ModelDto modelDto); List<ProductPart> getPartNoList(ProductPartDto productPartDto); }
@@ -7,13 +7,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.basic.dto.StructureTestObjectDto; import com.ruoyi.basic.dto.*; import com.ruoyi.basic.excel.StructureTestObjectData; import com.ruoyi.basic.service.*; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.QueryWrappers; import com.ruoyi.basic.dto.PageTestObjectDto; import com.ruoyi.basic.dto.TestItemDto; import com.ruoyi.basic.mapper.*; import com.ruoyi.basic.pojo.*; import com.ruoyi.common.utils.StringUtils; @@ -57,7 +55,9 @@ private StructureItemParameterService structureItemParameterService; private WorkShopMapper workShopMapper; private ModelMapper modelMapper; @Override public IPage<StructureItemParameter> selectItemParameterList(Page page, StructureItemParameter itemParameter) { return structureItemParameterMapper.selectItemParameterList(page, QueryWrappers.queryWrappers(itemParameter)); @@ -68,8 +68,7 @@ if (itemParameter.getBsm().equals("") || itemParameter.getBsm() == null) { itemParameter.setBsm("0"); } int insert = structureItemParameterMapper.insert(itemParameter); return insert; return structureItemParameterMapper.insert(itemParameter); } @Override @@ -195,7 +194,17 @@ public List<TestItemDto> getItemTreeProduct(StructureTestObjectDto structureTestObjectDto) { return structureItemParameterMapper.getItemTreeProduct(structureTestObjectDto.getObjectType()); } @Override public List<Model> getProductTypes(ModelDto modelDto) { return modelMapper.selectList(Wrappers.<Model>lambdaQuery().eq(Model::getProductId,modelDto.getProductId())); } @Override public List<ProductPart> getPartNoList(ProductPartDto productPartDto) { return productPartMapper.selectList(Wrappers.<ProductPart>lambdaQuery().eq(ProductPart::getProductId,productPartDto.getProductId())); } @Transactional(rollbackFor = Exception.class) @Override public void importPartExcel(List<StructureTestObjectData> list) { inspect-server/src/main/java/com/ruoyi/inspect/pojo/ReliabilityPlanProduct.java
@@ -36,7 +36,7 @@ private String partNo; @ApiModelProperty("审核状态") private String state; private Integer state; @ApiModelProperty("是否通过") private String isPass; inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanProductServiceImpl.java
@@ -3,7 +3,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.QueryWrappers; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.inspect.dto.ReliabilityPlanProductDto; import com.ruoyi.inspect.pojo.ReliabilityPlanProduct; import com.ruoyi.inspect.mapper.ReliabilityPlanProductMapper; @@ -36,12 +35,13 @@ @Override public int addOrUpdateProduct(ReliabilityPlanProductDto reliabilityPlanProductDto) { if (Objects.isNull(reliabilityPlanProductDto.getId())) { reliabilityPlanProductDto.setState(null); reliabilityPlanProductDto.setState(0); return reliabilityPlanProductMapper.insert(reliabilityPlanProductDto); } else { //1已审核 if (!StringUtils.isNotBlank(reliabilityPlanProductDto.getState())) { reliabilityPlanProductDto.setState(null); // 审核状态 0.待提交1.待审核2.通过3.不通过 int state = reliabilityPlanProductDto.getState(); if (state != 0 && state != 1 && state != 2) { reliabilityPlanProductDto.setState(3); } return reliabilityPlanProductMapper.updateById(reliabilityPlanProductDto); }
