Merge remote-tracking branch 'origin/master'

zss

2024-06-28 c3e4a95cc4ada32b0ac7f14fcd5469bd1bbd1c09

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -276,9 +276,9 @@
                List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
                InsProductResult result;
                if (CollectionUtils.isEmpty(results)) {
                    result = new InsProductResult();
                     result = new InsProductResult();
                } else {
                    result = results.get(0);
                     result = results.get(0);
                }
                result.setInsProductId(Integer.parseInt(k));
                if (jo.get("insValue") != null) {
@@ -514,8 +514,9 @@
                    }
                    templateSet.add(JSON.toJSONString(b.getTemplate()));
                }
                AtomicInteger index = new AtomicInteger();
                Set<String> itemSet = new HashSet<>();
                templateSet.forEach(tem -> {
                    AtomicInteger index = new AtomicInteger();
                    Set<Integer> set2 = new HashSet<>();
                    List<RowRenderData> rows = new ArrayList<>();
                    List<TextRenderData> text = new ArrayList<>();
@@ -638,14 +639,9 @@
                                        break;
                                }
                            } else if (value.equals("序号")) {
                                /*if (i == 0 ){
                                if(itemSet.add(p.getInspectionItem())){
                                    index.getAndIncrement();
                                }else if (pMap.get(temp.get(i-1).get("r") + "")!= null && JSON.parseObject(JSON.toJSONString(temp.get(i-1).get("v"))).get("ps") != null){
                                    if (pMap.get(temp.get(i-1).get("")).getInspectionItem()!=p.getInspectionItem()) {
                                        index.getAndIncrement();
                                    }
                                }*/
                                index.getAndIncrement();
                                }
                                textRenderData.setText(index + "");
                            } else if (value.equals("计算值")) {
                                JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());

 inspect-server/src/main/resources/static/report-template.docx

Binary files differ