From d2ce4553e18131b9a60d7be53c496f0cbce699ca Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 08 九月 2023 14:47:47 +0800
Subject: [PATCH] 修改bug
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 4 -
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 2 +
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 14 +++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 14 +++++++
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java | 9 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 4 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 16 ++++++++
standard-server/src/main/resources/mapper/MaterialMapper.xml | 34 +++++++++++++++++
sys/src/main/resources/application-dev.yml | 4 +-
9 files changed, 92 insertions(+), 9 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index 61d5a17..d2a5876 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -180,5 +180,19 @@
return Result.success(inspectionService.delInspect(id));
}
+ @ApiOperation(value = "鑾峰彇鎴愬搧淇℃伅")
+ @PostMapping("/getMaterielTypeIsOne")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.inspectionApplication,isAdd = true)
+ public Result getMaterielTypeIsOne(){
+ return Result.success(inspectionService.getMaterielTypeIsOne());
+ }
+
+
+ @ApiOperation(value = "鏍规嵁鎴愬搧鑾峰彇瑙勬牸鍨嬪彿")
+ @PostMapping("/getSpecificationByMaterielId")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.inspectionApplication,isAdd = true)
+ public Result getSpecification(Integer id){
+ return Result.success(inspectionService.getSpecification(id));
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index 943e0fe..0c29740 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
@@ -86,5 +87,8 @@
*/
boolean chooseEquipment(Integer id, Integer equipmentId);
+ List<Material> getMaterielTypeIsOne();
+
+ Map<String, Object> getSpecification(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 6494553..3431a35 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -321,6 +322,21 @@
return inspectionProductMapper.update(null,inspectionProductUpdateWrapper)>0;
}
+ @Override
+ public List<Material> getMaterielTypeIsOne() {
+ QueryWrapper<Material>queryWrapper=new QueryWrapper<>();
+ queryWrapper.lambda()
+ .select(Material::getName,Material::getId,Material::getCode)
+ .eq(Material::getType,1)
+ .eq(Material::getState,1);
+ return materialMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public Map<String, Object> getSpecification(Integer id) {
+ return materialMapper.getTreeByMaterialId(id);
+ }
+
/*鏍规嵁鏍峰搧鍚嶇О,鏍峰搧缂栧彿,鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id*/
private Integer getSpecificationId(String name, String mcode, String specification) {
//鑾峰彇鐗╂枡id
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
index 807bfe6..ab83b48 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -1,6 +1,8 @@
package com.yuanchu.limslaboratory.controller;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -70,4 +72,11 @@
List<Map<String, Object>> fourLevelInformation = materialService.getFourLevelInformation();
return Result.success(fourLevelInformation);
}
+
+ @ApiOperation(value = "鏍囧噯搴�-->涓嬫媺鍩虹鏁版嵁鏍峰搧")
+ @GetMapping("/getSample")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.index,isAdd = true)
+ public Result<?> getSample() {
+ return Result.success(materialService.getSample());
+ }
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
index f7ed23e..4bcbb29 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
@@ -27,7 +27,5 @@
List<Map<String, Object>> FourTree();
-
-
-
+ Map<String, Object> getTreeByMaterialId(Integer id);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index b267d29..48ac847 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.Material;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.ProductModel;
import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import org.springframework.transaction.annotation.Transactional;
@@ -47,4 +48,5 @@
*/
List<String> selectmater();
+ List<ProductModel> getSample();
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 6650cf6..96d6a64 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -1,21 +1,20 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
-import com.yuanchu.limslaboratory.pojo.Material;
+import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
-import com.yuanchu.limslaboratory.pojo.Product;
-import com.yuanchu.limslaboratory.pojo.Specifications;
-import com.yuanchu.limslaboratory.pojo.Standard;
import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.service.SpecificationsService;
import com.yuanchu.limslaboratory.service.StandardService;
+import com.yuanchu.limslaboratory.utils.ArrayListUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -130,5 +129,12 @@
return productModelMapper.selectmater();
}
+ @Override
+ public List<ProductModel> getSample() {
+ QueryWrapper<ProductModel>queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().select(ProductModel::getMaterial,ProductModel::getId).eq(ProductModel::getState,1);
+ return ArrayListUtil.oneObjectsDistinctByProperty(ProductModel::getMaterial,productModelMapper.selectList(queryWrapper));
+ }
+
}
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 1d1cfe7..3c1d7a9 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -64,4 +64,38 @@
ORDER BY f.create_time DESC
</select>
+ <select id="getTreeByMaterialId" resultMap="getTreeById">
+ SELECT
+ m.id mId,
+ m.`name` mName,
+ sd.id sdId,
+ sd.`name` sdName,
+ ss.id ssId,
+ ss.`name` ssName
+ FROM
+ material m,
+ standard sd,
+ specifications ss
+ WHERE
+ m.id = sd.material_id
+ AND sd.id = ss.standard_id
+ AND m.id = #{id}
+ AND m.state != 0
+ AND sd.state != 0
+ AND ss.state !=0
+ </select>
+<resultMap id="getTreeById" type="map">
+ <result property="id" column="mId"/>
+ <result property="name" column="mName"/>
+ <collection property="children" resultMap="getStan" javaType="List"/>
+</resultMap>
+ <resultMap id="getStan" type="map">
+ <result property="id" column="sdId"/>
+ <result property="name" column="sdName"/>
+ <collection property="children" resultMap="getModel" javaType="List"/>
+ </resultMap>
+ <resultMap id="getModel" type="map">
+ <result property="id" column="ssId"/>
+ <result property="name" column="ssName"/>
+ </resultMap>
</mapper>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index c596122..9c767c3 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -40,7 +40,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.218.113:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.0.22:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: user
password: 123456
# url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
@@ -69,7 +69,7 @@
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
# host: 192.168.110.209
- host: 192.168.218.113
+ host: 192.168.0.22
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3