inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -524,6 +524,7 @@ } result.setInsProductId(Integer.parseInt(k)); InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, Integer.parseInt(k))); //检验值 if (jo.get("insValue") != null) { JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue"))); List<Map<String, Object>> iv = new ArrayList<>(); @@ -546,6 +547,7 @@ } result.setInsValue(JSON.toJSONString(iv)); } //计算值 if (jo.get("comValue") != null && !Objects.equals(jo.get("comValue"), "")) { JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue"))); List<Map<String, Object>> cv = new ArrayList<>(); @@ -557,6 +559,7 @@ } result.setComValue(JSON.toJSONString(cv)); } //最终值 try { JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue"))); if (resValue.get("v") != null) { @@ -566,6 +569,7 @@ } catch (Exception e) { insProduct.setLastValue("");//'' } //设备编号 if (jo.get("equipValue") != null) { JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue"))); List<Map<String, Object>> ev = new ArrayList<>(); @@ -577,6 +581,7 @@ } result.setEquipValue(JSON.toJSONString(ev)); } //设备名称 if (jo.get("equipName") != null) { JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipName"))); List<Map<String, Object>> ev = new ArrayList<>(); @@ -588,6 +593,7 @@ } result.setEquipName(JSON.toJSONString(ev)); } //结论 try { JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult"))); String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + ""; @@ -608,7 +614,6 @@ /*如果是第一次选择设备信息,且还有其余样品也有同一个经验项目,那么所有样品的该项目都用这个设备信息*/ //先查询是否还有其余样品 InsProduct product = insProductMapper.selectById(insProduct.getId()); Integer insSampleId = product.getInsSampleId(); List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId())); if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) { inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -235,28 +235,28 @@ } } //都为空 只配置了套管 这种情况只限于项目是含有松套管的 else { String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(",")); if (collect.contains("松套管")){ //获取检验项目中包含松套管的检验项目 List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("松套管")).collect(Collectors.toList()); for (InsProduct product : products) { product.setInsBushId(bushingDto.getId()); product.setId(null); product.setCreateTime(null); product.setUpdateTime(null); product.setUpdateTime(null); product.setUpdateUser(null); product.setInsSampleId(a.getId()); if (product.getInspectionItemSubclass() == null) { product.setInspectionItemSubclass(""); } insProductMapper.insert(product); } }else { throw new ErrorException("样品的光纤配置信息里面没有配置光纤带信息也没有光纤信息,请重新配置保存再提交下单!!!"); } } // else { // String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(",")); // if (collect.contains("松套管")){ // //获取检验项目中包含松套管的检验项目 // List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("松套管")).collect(Collectors.toList()); // for (InsProduct product : products) { // product.setInsBushId(bushingDto.getId()); // product.setId(null); // product.setCreateTime(null); // product.setCreateUser(null); // product.setUpdateTime(null); // product.setUpdateUser(null); // product.setInsSampleId(a.getId()); // if (product.getInspectionItemSubclass() == null) { // product.setInspectionItemSubclass(""); // } // insProductMapper.insert(product); // } // }else { // throw new ErrorException("样品的光纤配置信息里面没有配置光纤带信息也没有光纤信息,请重新配置保存再提交下单!!!"); // } // } } } } @@ -340,9 +340,9 @@ InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId()); String name = insSampleMapper.selMethodById(sampleId); for (InsProduct product : productList) { if (product.getInspectionItem().contains("松套管")){ continue; } // if (product.getInspectionItem().contains("松套管")){ // continue; // } if (product.getState() == 1 && !product.getInspectionItem().equals("光纤接头损耗")) { //判断光缆的温度循环项目添加 if (insOrder.getSampleType().equals("光缆") && product.getInspectionItem().equals("温度循环") && type != 0) { @@ -468,7 +468,7 @@ } product.setId(null); product.setCreateTime(null); product.setUpdateTime(null); product.setCreateUser(null); product.setUpdateTime(null); product.setUpdateUser(null); product.setInsSampleId(sampleId); inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -271,7 +271,8 @@ and state = 1 and ins_fiber_id is null and ins_fibers_id is null and isa.sample_code NOT REGEXP '/' and <!--isa.sample_code NOT REGEXP '/'--> isa.id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s ) </select> <select id="getInsOrderAndSample" resultMap="sampleDto"> select isa.*,
