From 58c18ed858c0c3eaaa95b6abceceb1f1ad320fcd Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 04 六月 2024 21:21:44 +0800
Subject: [PATCH] 部分功能小调整
---
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java | 18 ++--
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 7 +
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 149 +++++++++++++++++++++++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 44 ++++++++--
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 8 ++
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 5 +
7 files changed, 212 insertions(+), 20 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
index 19d990e..a6f221b 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -59,6 +59,7 @@
@Override
protected void addInterceptors(InterceptorRegistry registry) {
+ // TODO: 2024/6/4 璁块棶swagger闇�鍏充笅闈㈡嫤鎴櫒
// registry.addInterceptor(fiferConfig).addPathPatterns("/**");
// registry.addInterceptor(powerConfig).addPathPatterns("/**");
registry.addInterceptor(logConfig).addPathPatterns("/**");
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 56df2da..0c9ee1d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -61,6 +61,14 @@
public Result<?> doInsOrder(Integer id, String laboratory) {
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
+
+ @ValueAuth
+ @PostMapping("/getInsProduct")
+ @ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
+ public Result<?> getInsProduct(Integer id, Integer type, String laboratory) {
+ return Result.success(insOrderPlanService.getInsProduct(id, type, laboratory));
+ }
+
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "浠诲姟浜ゆ帴")
@PostMapping("/upPlanUser")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index 62edb36..54dc7ce 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
@@ -31,6 +32,12 @@
List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
String getSampleEn(String sample);
+
+ List<InsProduct> getInsProduct1(Integer id, String laboratory);
+
+ List<InsProduct> getInsProduct2(Integer id);
+
+ List<InsProduct> getInsProduct3(Integer id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
index bf1f1e5..48957a1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.pojo.InsProduct;
+import java.util.List;
import java.util.Map;
/**
@@ -24,4 +26,7 @@
int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
int submitPlan(Integer orderId, String laboratory, Integer verifyUser);
+
+ List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
index 232fe1c..df770da 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.BushingDto;
-import com.yuanchu.mom.dto.FiberDto;
import com.yuanchu.mom.dto.FibersDto;
import com.yuanchu.mom.mapper.InsBushingMapper;
import com.yuanchu.mom.pojo.InsBushing;
@@ -44,17 +43,18 @@
if(bushingDto.getFiber().size()==0){
bushingDto.setFibers(insBushingMapper.selectFibersByBushingId(insBushing.getId()));
for (FibersDto fibers : bushingDto.getFibers()) {
- getTemplateThing(fibers.getProductList());
+// getTemplateThing(fibers.getProductList());
fibers.setFiber(insBushingMapper.selectFiberByFibersId(fibers.getId()));
- for (FiberDto fiberDto : fibers.getFiber()) {
- getTemplateThing(fiberDto.getProductList());
- }
- }
- }else{
- for (FiberDto fiberDto : bushingDto.getFiber()) {
- getTemplateThing(fiberDto.getProductList());
+// for (FiberDto fiberDto : fibers.getFiber()) {
+// getTemplateThing(fiberDto.getProductList());
+// }
}
}
+// else{
+// for (FiberDto fiberDto : bushingDto.getFiber()) {
+// getTemplateThing(fiberDto.getProductList());
+// }
+// }
bushingDtos.add(bushingDto);
}
return bushingDtos;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index fe95792..7e312bd 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -160,16 +160,37 @@
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
}
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
- Set<Integer> set = new HashSet<>();
- Map<Integer, String> map2 = new HashMap<>();
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
for (SampleProductDto samples : list) {
+// Set<Integer> set = new HashSet<>();
+// Map<Integer, String> map2 = new HashMap<>();
if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
- getTemplateThing(set, map2, samples);
+// getTemplateThing(set, map2, samples.getInsProduct());
}
map.put("sampleProduct", list);
return map;
+ }
+
+ @Override
+ public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory) {
+ List<InsProduct> insProducts = new ArrayList<>();
+ switch (type){
+ case 0:
+ insProducts = insSampleMapper.getInsProduct1(id, laboratory);
+ break;
+ case 1:
+ insProducts = insSampleMapper.getInsProduct2(id);
+ break;
+ case 2:
+ insProducts = insSampleMapper.getInsProduct3(id);
+ break;
+ }
+ Set<Integer> set = new HashSet<>();
+ Map<Integer, String> map2 = new HashMap<>();
+ if (BeanUtil.isEmpty(insProducts)) return null;
+ getTemplateThing(set, map2, insProducts);
+ return insProducts;
}
@Override
@@ -361,7 +382,7 @@
}
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
- List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId2(orderId);
+ List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
insReport.setCode(insOrder.getEntrustCode());
insReport.setInsOrderId(orderId);
@@ -381,7 +402,7 @@
models.add(a.getModel());
standardMethod.add(baseMapper.getStandardMethodCode(a.getStandardMethodListId()));
Set<String> templateSet = new HashSet<>();
- getTemplateThing(set, map2, a);
+ getTemplateThing(set, map2, a.getInsProduct());
for (InsProduct b : a.getInsProduct()) {
if (b.getInsProductResult() != null) {
List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
@@ -399,8 +420,8 @@
}
templateSet.add(JSON.toJSONString(b.getTemplate()));
}
- AtomicInteger index = new AtomicInteger();
templateSet.forEach(tem -> {
+ AtomicInteger index = new AtomicInteger();
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
@@ -436,6 +457,8 @@
List<JSONObject> temp = JSON.parseArray(JSON.toJSONString(excelDtos), JSONObject.class);
Map<String, InsProduct> pMap = new HashMap<>();
Set<String> delRSet = new HashSet<>();
+ delRSet.add("0");
+ delRSet.add("1");
for (JSONObject jo1 : temp) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
if (Integer.parseInt(jo1.get("c") + "") > 9) {
@@ -575,7 +598,8 @@
textRenderData.setText(textRenderData.getText() + "鈭�" + jo1.get("mc"));
}
Style style = new Style();
- style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
+// style.setFontFamily(v.get("ff") == null ? "瀹嬩綋" : v.get("ff") + "");
+ style.setFontFamily("瀹嬩綋");
if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
} else {
@@ -760,8 +784,6 @@
}
}
}
- maps.forEach((k, v) -> {
- });
List<String> list = new ArrayList<>();
for (String s : maps.keySet()) {
list.add(s);
@@ -790,8 +812,8 @@
return 1;
}
- private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, SampleProductDto a) {
- for (InsProduct product : a.getInsProduct()) {
+ private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
+ for (InsProduct product : insProducts) {
if (product.getTemplateId() == null) {
product.setTemplate(new ArrayList<>());
continue;
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 50ed614..bfe50f1 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -262,6 +262,155 @@
where ins_order_id = #{id}
and state = 1
</select>
+ <select id="getInsProduct1" resultMap="product">
+ select ip.id ip_id,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_classify,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
+ son_laboratory,
+ ip.unit ip_unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ device_group,
+ checkout_number,
+ section,
+ value_type,
+ method,
+ man_day,
+ bsm,
+ ask,
+ `last_value`,
+ ip.ins_result ip_ins_result,
+ state,
+ ins_sample_id,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
+ template_id,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ipr.equip_name,
+ ip.method_s,
+ ip.tell,
+ ip.dic
+ from ins_product ip
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ where ins_sample_id = #{id}
+ and state = 1
+ and ip.son_laboratory = #{laboratory}
+ and ins_fiber_id is null
+ and ins_fibers_id is null
+ </select>
+ <select id="getInsProduct2" resultMap="product">
+ select ip.id ip_id,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_classify,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
+ son_laboratory,
+ ip.unit ip_unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ device_group,
+ checkout_number,
+ section,
+ value_type,
+ method,
+ man_day,
+ bsm,
+ ask,
+ `last_value`,
+ ip.ins_result ip_ins_result,
+ state,
+ ins_sample_id,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
+ template_id,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ipr.equip_name,
+ ip.method_s,
+ ip.tell,
+ ip.dic
+ from ins_product ip
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ where ins_fibers_id = #{id}
+ and state = 1
+ and ins_fiber_id is null
+ </select>
+ <select id="getInsProduct3" resultMap="product">
+ select ip.id ip_id,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_classify,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
+ son_laboratory,
+ ip.unit ip_unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ device_group,
+ checkout_number,
+ section,
+ value_type,
+ method,
+ man_day,
+ bsm,
+ ask,
+ `last_value`,
+ ip.ins_result ip_ins_result,
+ state,
+ ins_sample_id,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
+ template_id,
+ ipr.ins_value,
+ ipr.com_value,
+ ipr.equip_value,
+ ipr.equip_name,
+ ip.method_s,
+ ip.tell,
+ ip.dic
+ from ins_product ip
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ where ins_fiber_id = #{id}
+ and state = 1
+ and ins_fibers_id is null
+ </select>
<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
<id property="id" column="id" jdbcType="INTEGER"/>
--
Gitblit v1.9.3