From affabbd21802dacbf943692912a83e63106670e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 11:47:55 +0800
Subject: [PATCH] 改动
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java | 38 ++++++
inspection-server/src/main/resources/mapper/PlanMapper.xml | 5
standard-server/src/main/resources/mapper/MaterialMapper.xml | 7 -
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 18 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductModelMapper.java | 6
inspection-server/src/main/resources/mapper/InspectionProductMapper.xml | 20 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java | 13 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 10 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java | 13 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java | 6 +
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 9 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 24 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java | 7 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 6 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 8 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 11 +
user-server/src/main/resources/mapper/UserMapper.xml | 1
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java | 37 ++++++
inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml | 41 +++---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java | 6 +
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java | 9 -
26 files changed, 249 insertions(+), 60 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
new file mode 100644
index 0000000..04a96f4
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
@@ -0,0 +1,37 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.yuanchu.limslaboratory.pojo.ProjectNum;
+import com.yuanchu.limslaboratory.service.HomeService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 棣栭〉
+ * @author zss
+ * @since 2023-08-03 13:03:36
+ */
+@Api(tags = "棣栭〉")
+@RestController
+@RequestMapping("/home")
+public class HomeController {
+
+ @Resource
+ HomeService homeService;
+
+ @ApiOperation("璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛")
+ @GetMapping("/checkProjectNum")
+ public Result checkProjectNum() {
+ ProjectNum projectNum=homeService.checkProjectNum();
+ return Result.success(projectNum);
+ }
+}
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 bd72e5d..321f720 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
@@ -6,6 +6,7 @@
import java.util.*;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
@@ -45,6 +46,9 @@
@Resource
LinkBasicInformationService linkBasicInformationService;
+ @Resource
+ UserMapper userMapper;
+
@ApiOperation(value = "鏌ヨ妫�楠岀敵璇峰崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -71,10 +75,10 @@
case 0:
//鍘熸潗鏂�
return Result.success(rawMaterialService.selectRawmaAll());
- case 1:
+ case 2:
//濮旀墭鍗�
return Result.success(linkBasicInformationService.selectLinkAll());
- case 2:
+ case 1:
//鎴愬搧妫�楠�
return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
}
@@ -99,6 +103,22 @@
return Result.success(inspectionService.selectInspectsListById(id));
}
+ @ApiOperation(value = "閫夋嫨妫�楠岄」鐩殑璐ｄ换浜�")
+ @GetMapping("/selectUser")
+ public Result selectUser() {
+ return Result.success(userMapper.selectUser());
+ }
+
+ @ApiOperation(value = "淇濆瓨妫�楠岄」鐩矗浠讳汉")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟椤圭洰id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "userProId", value = "璐ｄ换浜篿d", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/chooseUseProId")
+ public Result chooseUseProId(Integer id,Integer userProId) {
+ return Result.success(inspectionService.chooseUseProId(id,userProId));
+ }
+
@ApiOperation(value = "浣滃簾妫�楠屽崟")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 70fd521..4f53cb3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -58,7 +58,7 @@
@ApiOperation("鍒嗛厤")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "userId", value = "妫�楠屼汉id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "userId", value = "鎵ц浜篿d", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "instrumentId", value = "璁惧id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/distribution")
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 89bfb3e..5ae9960 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -22,5 +22,11 @@
* @return
*/
IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
+
+ //璁＄畻宸叉楠屾楠屽崟鏁伴噺
+ Integer seleCountIns();
+
+ //璁＄畻鏈楠岀殑鏁伴噺
+ Integer seleCountUnIns();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
index 482c0b5..85a64d6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
@@ -21,5 +21,11 @@
//鏍规嵁妫�楠屾牱鍝乮d浣滃簾妫�楠岄」鐩�
void updat(Integer id);
+
+ //璁＄畻宸叉楠岄」鐩暟閲�
+ Integer seleCountInspro();
+
+ //璁＄畻鏈楠岄」鐩暟閲�
+ Integer seleCountUnInspro();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java
index 5ed3e80..1ed54cf 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java
@@ -24,12 +24,12 @@
@ApiModelProperty(value = "鍒嗛〉澶氬皯鏉�", example = "10", required = true)
private Long pageNum;
- @ApiModelProperty(value = "鏍峰搧缂栧彿", example = "1680929494813868034", required = true)
+ @ApiModelProperty(value = "鏍峰搧缂栧彿", example = "1680929494813868034")
private String materialCode;
- @ApiModelProperty(value = "鏍峰搧鍚嶇О", example = "鐢电嚎鐢电紗", required = true)
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О", example = "鐢电嚎鐢电紗")
private String materialName;
- @ApiModelProperty(value = "鐢宠鍗曞彿", example = "XG-UGYUGH", required = true)
+ @ApiModelProperty(value = "鐢宠鍗曞彿", example = "XG-UGYUGH")
private String inspectionCode;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
index 61d8e22..64d49bb 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
@@ -84,7 +84,7 @@
private Integer inspectionMaterialId;
/**
- * 鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�
+ * 鍏宠仈 鐢ㄦ埛id 鎵ц浜�
**/
private Integer userId;
@@ -92,5 +92,10 @@
* 鍏宠仈 璁惧id
**/
private Integer instrumentId;
+
+ /**
+ * 鍏宠仈 鐢ㄦ埛id 璐ｄ换浜�
+ **/
+ private Integer userProId;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java
index 845460b..29dffc2 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java
@@ -18,6 +18,8 @@
private static final long serialVersionUID = 1L;
+ private Integer id;
+
/**
* 鏍峰搧缂栧彿
*/
@@ -50,4 +52,8 @@
*/
private String specifications;
+ /**
+ * 缁撹0:涓嶅悎鏍� ; 1:鍚堟牸
+ */
+ private Integer result;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java
new file mode 100644
index 0000000..3f9c2e1
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProjectNum.java
@@ -0,0 +1,13 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import lombok.Data;
+
+@Data
+public class ProjectNum {
+
+ private int insNum; //宸叉楠岀殑妫�楠屽崟鏁伴噺
+ private int insUnNum; //鏈楠岀殑妫�楠屽崟鏁伴噺
+ private int insproNum; //宸叉楠岀殑妫�楠岄」鐩暟閲�
+ private int insproUnNum; //鏈楠岀殑妫�楠岄」鐩暟閲�
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
new file mode 100644
index 0000000..beb6b24
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.ProjectNum;
+
+public interface HomeService {
+
+ /**
+ * 璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛
+ * @return
+ */
+ ProjectNum checkProjectNum();
+
+}
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 d7b39ed..4c2fec0 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
@@ -50,5 +50,13 @@
* @return
*/
String delInspect(Integer id);
+
+ /**
+ * 淇濆瓨妫�楠岄」鐩矗浠讳汉
+ * @param id
+ * @param userProId
+ * @return
+ */
+ String chooseUseProId(Integer id, Integer userProId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
index a35195a..8c870a6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -46,7 +46,7 @@
/**
* 涓婃姤
- * @param code
+ * @param id
* @return
*/
String reported(Integer id);
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
new file mode 100644
index 0000000..e08a03e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
@@ -0,0 +1,38 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.ProjectNum;
+import com.yuanchu.limslaboratory.service.HomeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class HomeServiceImpl implements HomeService {
+
+ @Resource
+ InspectionMapper inspectionMapper;
+
+ @Resource
+ InspectionProductMapper inspectionProductMapper;
+
+
+ //璁＄畻妫�楠屼笌鏈楠岀殑鍗曞瓙涓庨」鐩殑鏁伴噺鎺ュ彛
+ @Override
+ public ProjectNum checkProjectNum() {
+ ProjectNum projectNum = new ProjectNum();
+ //宸叉楠岀殑妫�楠屽崟鏁伴噺
+ projectNum.setInsNum(inspectionMapper.seleCountIns());
+ //鏈楠岀殑妫�楠屽崟鏁伴噺
+ projectNum.setInsUnNum(inspectionMapper.seleCountUnIns());
+ //宸叉楠岀殑妫�楠岄」鐩暟閲�
+ projectNum.setInsproNum(inspectionProductMapper.seleCountInspro());
+ //鏈楠岀殑妫�楠岄」鐩暟閲�
+ projectNum.setInsproUnNum(inspectionProductMapper.seleCountUnInspro());
+ return projectNum;
+ }
+}
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 70809f8..9187912 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
@@ -15,6 +15,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -201,6 +202,16 @@
return "浣滃簾鎴愬姛!";
}
+ //淇濆瓨妫�楠岄」鐩矗浠讳汉
+ @Override
+ public String chooseUseProId(Integer id, Integer userProId) {
+ InspectionProduct inspectionProduct = new InspectionProduct();
+ inspectionProduct.setId(id);
+ inspectionProduct.setUserProId(userProId);
+ inspectionProductMapper.updateById(inspectionProduct);
+ return "淇濆瓨鎴愬姛!";
+ }
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index bb63d1a..94334c3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -65,6 +65,7 @@
public String distribution(Integer id, Integer userId, Integer instrumentId) {
InspectionProduct inspectionProduct = new InspectionProduct();
inspectionProduct.setId(id);
+ //鎵ц浜�
inspectionProduct.setUserId(userId);
inspectionProduct.setInstrumentId(instrumentId);
inspectionProductMapper.updateById(inspectionProduct);
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 6d7526d..5314b40 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -20,10 +20,26 @@
from lims_laboratory.inspection i
join lims_laboratory.user u on i.user_id = u.id
join lims_laboratory.inspection_material im on i.id = im.inspection_id
- where i.state=1
+ where i.state=1
<if test="message!=null">
and i.code like concat('%', #{message}, '%')
or im.name like concat('%', #{message}, '%')
</if>
</select>
+
+ <!--璁＄畻妫�楠岀殑妫�楠屽崟鏁伴噺-->
+ <select id="seleCountIns" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection
+ where state = 1
+ and inspection_status in (0, 1)
+ </select>
+
+ <!--璁＄畻鏈楠岀殑妫�楠屽崟鏁伴噺-->
+ <select id="seleCountUnIns" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection
+ where state = 1
+ and inspection_status is null
+ </select>
</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
index 594632c..a04eeab 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
@@ -18,7 +18,23 @@
<!--鏍规嵁妫�楠屾牱鍝乮d浣滃簾妫�楠岄」鐩�-->
<update id="updat">
update lims_laboratory.inspection_product
- set state=0
- where inspection_material_id=#{id}
+ set state=0
+ where inspection_material_id = #{id}
</update>
+
+ <!--璁＄畻宸叉楠岄」鐩暟閲�-->
+ <select id="seleCountInspro" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection_product
+ where state = 1
+ and test_state in (0, 1)
+ </select>
+
+ <!--璁＄畻鏈楠岄」鐩暟閲�-->
+ <select id="seleCountUnInspro" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection_product
+ where state = 1
+ and test_state is null
+ </select>
</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml b/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml
index 2fb25ac..dbc4fe2 100644
--- a/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml
+++ b/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml
@@ -1,35 +1,34 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.NonConformingFeedbackMapper">
-
- <select id="selectNonConformingFeedback" resultType="nonConformingFeedback" parameterType="com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto">
- SELECT
- im.`code` materialCode,
- im.`name` materialName,
- i.`code` inspectionCode,
- i.create_time createTime,
- u.`name` testManager,
- im.specifications specifications
+ <select id="selectNonConformingFeedback" resultType="nonConformingFeedback"
+ parameterType="com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto">
+ SELECT im.id,
+ im.`code` materialCode,
+ im.`name` materialName,
+ i.`code` inspectionCode,
+ i.create_time createTime,
+ u.`name` testManager,
+ im.specifications specifications,
+ inspection_status result
FROM
- inspection i,
- inspection_material im,
- `user` u
+ lims_laboratory.inspection i,
+ lims_laboratory.inspection_material im,
+ lims_laboratory.`user` u
WHERE
- 1 = 1
- AND i.id = im.inspection_id
- AND i.user_id = u.id
+ i.id = im.inspection_id
+ AND i.user_id = u.id
<if test="nonConformingFeedbackDto.materialCode!=null and nonConformingFeedbackDto.materialCode!=''">
- and im.`code` like concat("%",#{nonConformingFeedbackDto.materialCode},"%")
+ and im.`code` like concat('%',#{nonConformingFeedbackDto.materialCode},'%')
</if>
<if test="nonConformingFeedbackDto.materialName!=null and nonConformingFeedbackDto.materialName!=''">
- and im.`name` like concat("%",#{nonConformingFeedbackDto.materialName},"%")
+ and im.`name` like concat('%',#{nonConformingFeedbackDto.materialName},'%')
</if>
<if test="nonConformingFeedbackDto.inspectionCode!=null and nonConformingFeedbackDto.inspectionCode!=''">
- and im.specifications like concat("%",#{nonConformingFeedbackDto.inspectionCode},"%")
+ and im.specifications like concat('%',#{nonConformingFeedbackDto.inspectionCode},'%')
</if>
- and i.state=1
- and im.state=1
+ and i.state=1
+ and im.state=1
and i.inspection_status =0
</select>
-
</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 8b9eba4..bf79c9d 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -4,13 +4,10 @@
<resultMap id="selectAllPlanMap" type="map">
<id property="code" column="code"/>
<result property="id" column="id"/>
+ <result property="samplename" column="samplename"/>
<result property="inspectionStatus" column="inspectionStatus"/>
<result property="startTime" column="startTime"/>
<result property="endTime" column="endTime"/>
- <collection property="father" resultMap="selectAllPlanMapTowMap" javaType="List"/>
- </resultMap>
- <resultMap id="selectAllPlanMapTowMap" type="map">
- <id property="samplename" column="samplename"/>
<collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllPlanMapTowsMap" type="map">
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 08b370e..8769e0c 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
@@ -26,8 +26,7 @@
// 鍥涚骇鏍�
List<Map<String, Object>> FourTree(String specificationsName);
- //閫夋嫨鏍峰搧鍚嶇О
- List<String> selectmater();
+
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductModelMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductModelMapper.java
index 659a0c3..753ae1f 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductModelMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductModelMapper.java
@@ -23,10 +23,10 @@
//娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
List<String> selectfather();
-
-
-
//鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�
List<Map<String, Object>> seleMode(String name);
+
+ //閫夋嫨鏍峰搧鍚嶇О
+ List<String> selectmater();
}
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 4e3721e..3169392 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
@@ -85,9 +85,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Integer addMaterialInformation(AddMaterialDto addMaterialDto) {
- Material material = materialMapper.selectOne(Wrappers.<Material>query().eq("name", addMaterialDto.getMaterialName()));
- material.setType(addMaterialDto.getType());
- int isInsertSuccess = materialMapper.updateById(material);
+ Material material = new Material()
+ .setCode("BZ" + IdWorker.getIdStr())
+ .setName(addMaterialDto.getMaterialName())
+ .setType(addMaterialDto.getType());
+ int isInsertSuccess = materialMapper.insert(material);
if (isInsertSuccess > 0) {
Standard standard = new Standard()
.setMaterialId(material.getId())
@@ -125,7 +127,7 @@
//娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О
@Override
public List<String> selectmater() {
- return materialMapper.selectmater();
+ return productModelMapper.selectmater();
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
index d2bdf8c..a42754d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
@@ -28,13 +28,10 @@
@Resource
ProductModelMapper productModelMapper;
- @Resource
- MaterialMapper materialMapper;
-
//閫夋嫨鏍峰搧
@Override
public List<String> selectmater() {
- return materialMapper.selectmater();
+ return productModelMapper.selectmater();
}
//娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
@@ -58,10 +55,6 @@
BeanUtils.copyProperties(productModelDto, productModel);
productModelMapper.insert(productModel);
}
- //娣诲姞鐗╂枡浜у搧搴�
- Material material = new Material();
- material.setName(productModelDto.getMaterial()).setCode(MyUtil.getTimeSixNumberCode("CP", "CP"));
- materialMapper.insert(material);
}
//鏌ヨ鏍囧噯妯＄増鍒楄〃
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index bb41247..5f9c4bf 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -68,10 +68,5 @@
p.`specifications_id`
WHERE m.`state` = 1
</select>
- <!--娣诲姞鏍囧噯閫夋嫨鏍峰搧鍚嶇О-->
- <select id="selectmater" resultType="java.lang.String">
- select name
- from lims_laboratory.material
- where state = 1
- </select>
+
</mapper>
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 6af2685..74f5a68 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -47,6 +47,13 @@
unit
from lims_laboratory.product_model
where state = 1
- and material =#{name}
+ and material = #{name}
+ </select>
+
+ <!--娣诲姞鏍囧噯閫夋嫨鏍峰搧鍚嶇О-->
+ <select id="selectmater" resultType="java.lang.String">
+ select material
+ from lims_laboratory.product_model
+ where state = 1
</select>
</mapper>
\ No newline at end of file
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 4a8eb08..8220b5a 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -40,5 +40,6 @@
<select id="selectUser" resultType="Map">
select id, name
from lims_laboratory.user
+ where job_state!=0
</select>
</mapper>
--
Gitblit v1.9.3