inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +25,7 @@ * 主键id */ @TableId(type = IdType.AUTO) private Integer id; private Long id; @ApiModelProperty("项目参数id") private Integer structureItemParameterId; @@ -180,7 +181,7 @@ private Integer insBushId; @ApiModelProperty("标准方法id") private Integer standardMethodListId; private Long standardMethodListId; //返回的20度常温的计算值(温度循环) @TableField(exist = false ,select = false) inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -359,7 +359,7 @@ insContext.forEach((k, v) -> { JSONObject jo = JSON.parseObject(JSON.toJSONString(v)); InsProduct insProduct = new InsProduct(); insProduct.setId(Integer.parseInt(k)); insProduct.setId(Long.valueOf(Integer.parseInt(k))); InsProduct product = insProductMapper.selectById(insProduct.getId()); if (currentTable.equals(product.getTemplateId()) && currentSampleId.equals(product.getInsSampleId())) { List<InsProductResult> oldResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery() @@ -466,7 +466,7 @@ insProduct.setUpdateUser(userId); insProductMapper.updateById(insProduct); insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId())); insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), Math.toIntExact(insProduct.getId()))); insSample.setInsState(1); Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery() @@ -823,8 +823,8 @@ // 7.校验一下result表(避免出现多个检验项结果) threadPoolTaskExecutor.execute(() -> { List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList()); for (Integer ip : ips) { List<Long> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList()); for (Long ip : ips) { List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery() .eq(InsProductResult::getInsProductId, ip)); if (insProductResults.size() > 1) { @@ -879,7 +879,7 @@ InsOrderRates insOrderRates = new InsOrderRates(); insOrderRates.setInsOrderId(orderId); insOrderRates.setInsSampleId(insProduct.getInsSampleId()); insOrderRates.setInsProductId(insProduct.getId()); insOrderRates.setInsProductId(Math.toIntExact(insProduct.getId())); insOrderRates.setSampleCode(insProduct.getSampleCode()); insOrderRates.setEntrustCode(order.getEntrustCode()); insOrderRates.setInspectionItemClass(insProduct.getInspectionItemClass()); inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -210,14 +210,14 @@ auxiliaryOutputWorkingHours.setCheck(userId);//检测人 auxiliaryOutputWorkingHours.setPrice(insProduct.getPrice());//单价 auxiliaryOutputWorkingHours.setSampleId(insProduct.getInsSampleId());//样品id auxiliaryOutputWorkingHours.setInsProductId(insProduct.getId());//检验项id auxiliaryOutputWorkingHours.setInsProductId(Math.toIntExact(insProduct.getId()));//检验项id return auxiliaryOutputWorkingHours; }).collect(Collectors.toList()); // 初次分配检验人，各个检验项默认订单的检验人 List<Integer> insProductIds = insProductList.stream().map(insproduct -> { return insproduct.getId(); return Math.toIntExact(insproduct.getId()); }).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(insProductIds)){ insProductMapper.batchUpdateInsProductCheckUserId(insProductIds, userId); @@ -327,7 +327,7 @@ ip2.addAll(insProducts); } for (InsProduct product : ip2) { product.setStandardMethodListId(a.getInsulating().getStandardMethodListId()); product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId())); } addInsProductMethod(a.getId(), ip2); } @@ -345,7 +345,7 @@ ip2.addAll(insProducts); } for (InsProduct product : ip2) { product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId()); product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId())); } addInsProductMethod(a.getId(), ip2); } inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -182,7 +182,7 @@ for (InsProduct product : insProducts) { for (InsProduct insProduct1 : insProductBindingList) { insProduct1.setId(null); insProduct1.setBindingProductId(product.getId()); insProduct1.setBindingProductId(Math.toIntExact(product.getId())); insProduct1.setCableTag(product.getCableTag()); } this.saveBatch(insProductBindingList); @@ -232,7 +232,7 @@ List<InsProductDto> insProductDtoList = insProductDto.getInsProductDtoList(); for (InsProductDto productDto : insProductDtoList) { InsProduct insProduct = new InsProduct(); insProduct.setId(productDto.getInsProductId()); insProduct.setId(Long.valueOf(productDto.getInsProductId())); insProduct.setCheckUserId(productDto.getCheckUserId()); insProductMapper.updateById(insProduct); }
