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()); } } 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(); } 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; } 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(); } 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(); } } 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>