From 06a95411d39106167f8889950260fe76201606e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 19 四月 2024 16:57:43 +0800
Subject: [PATCH] 设备添加检验项目
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureItemParameterMapper.java | 5 +++++
cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java | 6 ++++++
cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java | 3 +++
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 6 ++++++
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 17 +++++++++++++++--
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 8 ++++++--
6 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 449c60a..9b01b9d 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -87,5 +87,11 @@
public Result selectTestObjectByName() {
return Result.success(capacityScopeService.selectTestObjectByName());
}
+
+ @ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
+ @PostMapping("/getInsProduction")
+ public Result getInsProduction(){
+ return Result.success(capacityScopeService.getInsProduction());
+ }
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureItemParameterMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureItemParameterMapper.java
index 890714f..1132eab 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureItemParameterMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/StructureItemParameterMapper.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.StructureItemParameter;
+import java.util.List;
+import java.util.Map;
+
/**
* 妫�楠岄」鐩弬鏁�(StructureItemParameter)琛ㄦ暟鎹簱璁块棶灞�
*
@@ -15,5 +18,7 @@
public interface StructureItemParameterMapper extends BaseMapper<StructureItemParameter> {
IPage<StructureItemParameter> selectItemParameterList(Page page, QueryWrapper<StructureItemParameter> ew);
+
+ List<Map<String, Object>> getInsProduction();
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index d667591..b67eb1b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -21,7 +21,7 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(2)
+ //@ValueTableShow(2)
@ApiModelProperty(value = "澶х被")
private String largeCategory;
@@ -68,7 +68,7 @@
private String subclass;
@ValueTableShow(13)
- @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ @ApiModelProperty(value = "璁惧缂栫爜")
private String factoryNo;
@ValueTableShow(14)
@@ -149,4 +149,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "妫�楠岄」鐩�")
+ private String insProductIds;
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java
index 26c1d07..8c364a5 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java
@@ -34,5 +34,8 @@
int upTestObject(StructureTestObject testObject);
List<StructureTestObject> selectTestObjectByName();
+
+ //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
+ List<Map<String, Object>> getInsProduction();
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
index ecce8e3..7a0f451 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
@@ -106,5 +106,11 @@
public List<StructureTestObject> selectTestObjectByName() {
return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId));
}
+
+ //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
+ @Override
+ public List<Map<String, Object>> getInsProduction() {
+ return structureItemParameterMapper.getInsProduction();
+ }
}
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 4999d55..9db70b9 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -3,8 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.StructureItemParameterMapper">
-
-
<select id="selectItemParameterList" resultType="com.yuanchu.mom.pojo.StructureItemParameter">
select id,
inspection_item,
@@ -39,4 +37,19 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <resultMap id="getInsProductions" type="map">
+ <result property="name" column="inspection_item"/>
+ <collection property="children" resultMap="seProInsListByIdmaps" javaType="List"/>
+ </resultMap>
+ <resultMap id="seProInsListByIdmaps" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="subclass"/>
+ </resultMap>
+ <select id="getInsProduction" resultMap="getInsProductions">
+ select id, inspection_item,
+ case when inspection_item_subclass='' then inspection_item
+ else inspection_item_subclass end as subclass
+ from structure_item_parameter
+ </select>
</mapper>
--
Gitblit v1.9.3