From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java | 41 ++
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 17 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java | 49 +++
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 38 ++
inspection-server/src/main/resources/mapper/PlanMapper.xml | 21 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java | 23 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java | 9
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java | 58 +++
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 14
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 2
inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml | 35 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java | 99 ------
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 9
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 9
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 25 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 25 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 19
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 7
user-server/src/main/resources/mapper/UserMapper.xml | 36 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java | 69 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 40 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 11
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 38 +
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 76 ----
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java | 39 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 15
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java | 22 +
inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml | 4
39 files changed, 605 insertions(+), 280 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 d5419af..c0295d4 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
@@ -29,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -52,10 +52,7 @@
})
@PostMapping("/addInspection")
public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
- System.out.println(token);
- System.out.println(type);
Object object = RedisUtil.get(token);
- System.out.println(object);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
}
@@ -99,7 +96,7 @@
return Result.success(materialService.selectMaterialById(materialId));
}
- @ApiOperation("鎻愪氦鐢宠")
+ @ApiOperation("鎻愪氦妫�楠屽崟鐢宠")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
})
@@ -108,7 +105,7 @@
return Result.success(inspectionService.subInspectionByInsId(inspectionId));
}
- @ApiOperation("浣滃簾鐢宠")
+ @ApiOperation("浣滃簾妫�楠屽崟鐢宠")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
})
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
index b59d454..09bb02e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
@@ -1,9 +1,7 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -12,11 +10,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import java.util.Map;
/**
@@ -27,7 +22,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟-->鏍峰搧鐩稿叧")
@RestController
@RequestMapping("/inspectionMaterialList")
public class InspectionMaterialListController {
@@ -35,7 +30,7 @@
@Autowired
InspectionMaterialListService inspectionMaterialListService;
- @ApiOperation("娣诲姞鏍峰搧")
+ @ApiOperation("娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�")
@PostMapping("/addInspectionMaterialList")
public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
inspectionMaterialList.setState(1);
@@ -62,7 +57,7 @@
return Result.success(inspectionMaterialListService.getById(inspectionMaterialListId));
}
- @ApiOperation("淇敼鏍峰搧淇℃伅")
+ @ApiOperation("鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
index ecad45c..e9d023e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
@@ -1,14 +1,16 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.UserService;
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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
/**
* <p>
@@ -18,9 +20,26 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Api(tags = "妫�楠屾ā鍧�-->鍒嗛厤璁″垝-->妫�楠岄」鐩�")
@RestController
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {
+ @Resource
+ UserService userService;
+ @ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
+ @GetMapping("/selectUser")
+ public Result selectUser() {
+ return Result.success(userService.selectUser());
+ }
+
+ @ApiOperation("閫夋嫨璇曢獙鍛樹俊鎭�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鐢ㄦ埛ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectUserById")
+ public Result selectUserById(Integer id) {
+ return Result.success(userService.selectByUserId(id));
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
new file mode 100644
index 0000000..a1391b5
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
@@ -0,0 +1,69 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
+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 lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yuanchu.limslaboratory.service.InspectionRecordsService;
+
+
+
+/**
+ * 妫�娴嬭褰�(InspectionRecords)琛ㄦ帶鍒跺眰
+ *
+ * @author zss
+ * @since 2023-07-24 14:05:11
+ */
+@Api(tags = "妫�楠屾ā鍧�-->妫�娴嬭褰�")
+@RestController
+@RequestMapping("/inspectionRecords")
+@Slf4j
+public class InspectionRecordsController {
+
+ @Autowired
+ private InspectionRecordsService inspectionRecordsService;
+
+
+ @ApiOperation("鏍规嵁鏍峰搧鐨勯」鐩甶d浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "productId", value = "鏍峰搧涓嬬殑椤圭洰ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "submitState", value = "鐘舵��(涓虹┖=寰呮彁浜�)", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectByProductId/{productId}")
+ public Result selectByProductId(@PathVariable Integer productId, Integer submitState) {
+ return Result.success(inspectionRecordsService.selectByProductId(productId,submitState));
+ }
+
+ @ApiOperation("鏍规嵁鏍峰搧鐨勯」鐩甶d浠ュ強鐘舵��(寰呮彁浜�)淇敼妫�娴嬭褰�")
+ @PutMapping("/upByProductId")
+ public Result upByProductId(@RequestBody InspectionRecordsDto inspectionRecordsDto) {
+ inspectionRecordsService.upByProductId(inspectionRecordsDto);
+ return Result.success("淇敼鎴愬姛!");
+ }
+
+
+
+ /**
+ * 灏嗗緟鎻愪氦鐨勭殑妫�楠岄」鐩殑妫�娴嬭褰曠殑鐘舵�佽浆涓哄緟瀹℃牳
+ * @param id
+ * @return
+ */
+ @ApiOperation("淇濆瓨骞舵彁浜ゆ楠屾姤鍛�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠岃褰旾D", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/submitRecords/{id}")
+ public Result submitRecords(@PathVariable Integer id) {
+ inspectionRecordsService.submitRecords(id);
+ return Result.success("鎻愪氦鎴愬姛!");
+ }
+
+
+}
+
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 4067891..665a37e 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
@@ -1,7 +1,7 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.Plan;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -20,7 +20,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠岃鍒�")
@RestController
@RequestMapping("/plan")
public class PlanController {
@@ -28,7 +28,7 @@
@Resource
private PlanService planService;
- @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掕〃")
+ @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@@ -39,21 +39,39 @@
return Result.success(planService.selectAllPlan(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑鍒嗛厤淇℃伅")
+ @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鏍峰搧缂栧彿", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
})
- @PutMapping("/selectPlanById/{id}")
- public Result selectPlanById(@PathVariable Integer id) {
- return Result.success(planService.selectById(id));
+ @GetMapping("/selectProductById/{id}")
+ public Result selectProductById(@PathVariable Integer id) {
+ return Result.success(planService.selectProductById(id));
+ }
+
+ @ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
+ @PostMapping("/upPlan")
+ public Result upPlan(@RequestBody InspectionProductList inspectionProductList) {
+ planService.upPlan(inspectionProductList);
+ return Result.success();
}
@ApiOperation("浣滃簾妫�楠岃鍒�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠岃鍒扞D", dataTypeClass = Integer.class, required = true),
})
- @PostMapping("/delPlan")
- public Result delPlan(Integer id) {
+ @PutMapping("/delPlan/{id}")
+ public Result delPlan(@PathVariable Integer id) {
return Result.success(planService.delPlan(id));
}
+
+ @ApiOperation("鏌ヨ鎴愬搧妫�楠�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectInspection")
+ public Result selectInspection(int pageSize, int countSize, Integer state) {
+ return Result.success(planService.selectInspection(pageSize,countSize,state));
+ }
}
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 106c79a..194aa4a 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
@@ -17,8 +17,7 @@
*/
public interface InspectionMapper extends BaseMapper<Inspection> {
+ //鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
-
- int selectInspectToCount(Integer state);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
index 964cc98..06632a5 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
@@ -15,6 +15,7 @@
*/
public interface InspectionMaterialListMapper extends BaseMapper<InspectionMaterialList> {
+ //鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
index da82355..678d663 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
@@ -19,6 +19,7 @@
*/
public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
+ //娣诲姞妫�楠岄」鐩�
int addInspectionProductList(List<InspectionProductList> list);
//鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鐩�
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java
new file mode 100644
index 0000000..6bc8c1e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java
@@ -0,0 +1,22 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionRecords;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+
+/**
+ * 妫�娴嬭褰�(InspectionRecords)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author zss
+ * @since 2023-07-24 14:05:11
+ */
+public interface InspectionRecordsMapper extends BaseMapper<InspectionRecords> {
+
+ //鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�
+ InspectionRecordsDto selectByProductId(Integer productId,Integer submitState);
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
index 444fcf7..71d375c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -16,5 +17,9 @@
*/
public interface PlanMapper extends BaseMapper<Plan> {
- List<PlanDto> selectAllPlan(int pageSize, int countSize, Integer state);
+ //鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
+ Map selectAllPlan(int pageSize, int countSize, Integer state);
+
+ //鏌ヨ鎴愬搧妫�楠�
+ List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
index b362524..dca2648 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
@@ -27,7 +27,7 @@
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id", hidden = true)
- private Integer id;
+ private int id;
@ApiModelProperty(value = "materialId")
private String materialId;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index 104c16a..7978c0d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -52,9 +52,11 @@
private String internal;
@ApiModelProperty(value = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty(value = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@TableLogic(value = "1", delval = "0")
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
index 9593346..f7cc10f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
@@ -61,5 +61,7 @@
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)")
private Integer userId;
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
+ private Integer deviceId;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
index cf7f25e..067c428 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
@@ -1,18 +1,9 @@
package com.yuanchu.limslaboratory.pojo.dto;
import com.yuanchu.limslaboratory.pojo.Inspection;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
import java.io.Serializable;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel(value="InspectionDto妫�楠屽崟瀵硅薄", description="")
public class InspectionDto extends Inspection implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java
new file mode 100644
index 0000000..d0d18d2
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java
@@ -0,0 +1,49 @@
+package com.yuanchu.limslaboratory.pojo.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+public class InspectionRecordsDto implements Serializable {
+
+ //妫�娴嬮」鐩�
+ @JsonSerialize
+ private String name;
+
+ //璇曢獙鍛�
+ @JsonSerialize
+ private String userName;
+
+ //璇曢獙寮�濮嬫棩鏈�
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
+
+ //璇曢獙缁撴潫鏃ユ湡
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endTime;
+
+ //璇曢獙鏂规硶
+ @JsonSerialize
+ private String method;
+
+ //璇曢獙瑕佹眰
+ @JsonSerialize
+ private String ask;
+
+ //鏍峰搧缂栧彿
+ @JsonSerialize
+ private int mid;
+
+ //鏍峰搧鍚嶇О
+ @JsonSerialize
+ private String materialName;
+
+ //瑙勬牸鍨嬪彿
+ @JsonSerialize
+ private String specificationsSerialNumber;
+
+ //鏍峰搧鏁伴噺
+ @JsonSerialize
+ private Integer materialNum;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
index 7492631..95bbc4d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
@@ -1,17 +1,48 @@
package com.yuanchu.limslaboratory.pojo.dto;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yuanchu.limslaboratory.pojo.Plan;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
+import java.util.Date;
-public class PlanDto extends Plan implements Serializable {
+public class PlanDto implements Serializable {
- private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "璁″垝缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
- @ApiModelProperty(value = "鎶ユ绫诲瀷")
- private Integer type;
- @ApiModelProperty(value = "鎶ユ浜�")
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private int mid;
+
+ @ApiModelProperty(value = "鍏宠仈 鎶ユid(鐢宠鍗曠紪鍙�)")
+ @JsonSerialize
+ private String inspectionId;
+
+ @ApiModelProperty(value = "1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
+ @JsonSerialize
+ private Integer state;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鐧昏鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+
+ @ApiModelProperty(value = "璇曢獙璐熻矗浜�")
+ @JsonSerialize
private String userName;
+
+ @ApiModelProperty(value = "鍏宠仈 妫�楠屼汉")
+ @JsonSerialize
+ private String inspectUserName;
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
index b6c72a1..b709916 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
@@ -15,11 +15,34 @@
* @since 2023-07-17
*/
public interface InspectionMaterialListService extends IService<InspectionMaterialList> {
+
+ /**
+ * 鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
+ * @param insId
+ * @return
+ */
List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
+ /**
+ * 娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�
+ * @param inspectionMaterialList
+ * @param userId
+ * @return
+ */
InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
+ /**
+ * 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧淇℃伅
+ * @param inspectionMaterialListId
+ * @return
+ */
boolean delInspectionMaterialListByInsId(int inspectionMaterialListId);
+ /**
+ *鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
+ * @param inspectionMaterialListId
+ * @param inspectionMaterialList
+ * @return
+ */
boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
index 4703c1f..726f8bd 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
@@ -16,8 +16,12 @@
*/
public interface InspectionProductListService extends IService<InspectionProductList> {
- int addInspectionProductList(List<InspectionProductList> list);
+ /**
+ * 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧閲岀殑妫�楠岄」鐩�
+ * @param inspectionMaterialListId
+ * @return
+ */
int delInspectionProductList(int inspectionMaterialListId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java
new file mode 100644
index 0000000..ae7b079
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java
@@ -0,0 +1,39 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.InspectionRecords;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 妫�娴嬭褰�(InspectionRecords)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author zss
+ * @since 2023-07-24 14:05:12
+ */
+public interface InspectionRecordsService extends IService<InspectionRecords> {
+
+ /**
+ * 鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�
+ * @param productId
+ * @return
+ */
+ InspectionRecordsDto selectByProductId(Integer productId, Integer submitState);
+
+ /**
+ * 鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)淇敼妫�娴嬭褰�
+ * @param inspectionRecordsDto
+ */
+ void upByProductId(InspectionRecordsDto inspectionRecordsDto);
+
+ /**
+ * 鏍规嵁妫�楠岃褰昳d淇敼鎻愪氦鐘舵��
+ * @param id
+ */
+ void submitRecords(Integer 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 ac69116..71e4486 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
@@ -17,12 +17,35 @@
*/
public interface InspectionService extends IService<Inspection> {
+ /**
+ * 娣诲姞妫�楠屽崟
+ * @param userName
+ * @param type
+ * @return
+ */
Inspection addInspection(String userName,int type);
- Map selectAllInspection(int pageSize, int countSize, Integer state);
+ /**
+ * 鍒嗛〉鏌ヨ鎵�鏈夋楠屽崟
+ * @param pageSize
+ * @param countSize
+ * @param state
+ * @return
+ */
+ List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
+ /**
+ *鏍规嵁妫�楠屽崟id浣滃簾妫�楠屽崟鐢宠
+ * @param inspectionId
+ * @return
+ */
boolean delInspectionByInsId(String inspectionId);
+ /**
+ * 鏍规嵁妫�楠屽崟id鎻愪氦妫�楠岀敵璇�
+ * @param inspectionId
+ * @return
+ */
boolean subInspectionByInsId(String inspectionId);
}
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 485acd4..264093d 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
@@ -4,8 +4,8 @@
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
-
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,9 +17,41 @@
*/
public interface PlanService extends IService<Plan> {
- List<PlanDto> selectAllPlan(int pageSize, int countSize, Integer state);
+ /**
+ * 鍒嗛〉鏌ヨ鎵�鏈夋楠岃鍒�
+ * @param pageSize
+ * @param countSize
+ * @param state
+ * @return
+ */
+ Map selectAllPlan(int pageSize, int countSize, Integer state);
+ /**
+ * 鏍规嵁璁″垝id浣滃簾妫�楠岃鍒�
+ * @param id
+ * @return
+ */
boolean delPlan(Integer id);
- List<InspectionProductList> selectById(Integer id);
+ /**
+ * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掗噷闈㈡楠岄」鐩�
+ * @param id
+ * @return
+ */
+ List<InspectionProductList> selectProductById(Integer id);
+
+ /**
+ * 缁欐楠岃鍒掍腑鐨勬楠岄」鐩垎閰嶈瘯楠屽憳,璁惧,浠ュ強鏃ユ湡
+ * @param inspectionProductList
+ */
+ void upPlan(InspectionProductList inspectionProductList);
+
+ /**
+ * 鏌ヨ鎴愬搧妫�楠�
+ * @param pageSize
+ * @param countSize
+ * @param state
+ * @return
+ */
+ List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
index 4d916d9..0538298 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
@@ -37,13 +37,18 @@
ProductMapper productMapper;
@Resource
+ InspectionProductListService inspectionProductListService;
+
+ @Resource
InspectionProductListMapper inspectionProductListMapper;
+ //鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
@Override
public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
}
+ //娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�
@Override
@Transactional(rollbackFor = Exception.class)
public InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId) {
@@ -61,6 +66,7 @@
.setUserId(Integer.parseInt(userId));
list1.add(inspectionProductList);
});
+ //娣诲姞妫�楠岄」鐩�
int judge2 = inspectionProductListMapper.addInspectionProductList(list1);
return judge>0&&judge2>0?inspectionMaterialList:null;
}
@@ -74,19 +80,16 @@
list.setState(0);
list.setId(inspectionMaterialListId);
int judge1 = inspectionMaterialListMapper.updateById(list);
- //鍒犻櫎鏍峰搧妫�楠岄」鐩�
- UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
- wrapper.eq("inspection_material_list_id", inspectionMaterialListId).set("state", 0);
- int judge2 = inspectionProductListMapper.update(new InspectionProductList(), wrapper);
+ //鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝佷腑鐨勬楠岄」鐩�
+ int judge2 = inspectionProductListService.delInspectionProductList(inspectionMaterialListId);
return judge1>0&&judge2>0;
}
- //淇敼鏍峰搧淇℃伅
+ //鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList) {
LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
- //鏍规嵁鏍峰搧id鏌ヨ
updateWrapper.eq(InspectionMaterialList::getId,inspectionMaterialListId);
int judge = inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
return judge>0;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
index ff46f33..988f939 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
@@ -25,11 +25,9 @@
@Resource
InspectionProductListMapper inspectionProductListMapper;
- @Override
- public int addInspectionProductList(List<InspectionProductList> list) {
- return inspectionProductListMapper.addInspectionProductList(list);
- }
+
+ //鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧閲岀殑妫�楠岄」鐩�
@Override
public int delInspectionProductList(int inspectionMaterialListId) {
UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java
new file mode 100644
index 0000000..67a4946
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java
@@ -0,0 +1,58 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.InspectionRecordsMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionRecords;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
+import com.yuanchu.limslaboratory.service.InspectionRecordsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.Wrapper;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 妫�娴嬭褰�(InspectionRecords)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author zss
+ * @since 2023-07-24 14:05:12
+ */
+@Service("inspectionRecordsService")
+public class InspectionRecordsServiceImpl extends ServiceImpl<InspectionRecordsMapper, InspectionRecords> implements InspectionRecordsService {
+
+ @Resource
+ InspectionRecordsMapper inspectionRecordsMapper;
+
+ //鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�
+ @Override
+ public InspectionRecordsDto selectByProductId(Integer productId, Integer submitState) {
+ //鐘舵�佷负绌虹殑鏃跺�欓粯璁や负寰呮彁浜�
+ if (submitState==null){
+ submitState=0;
+ }
+ return inspectionRecordsMapper.selectByProductId(productId,submitState);
+ }
+
+ //鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)淇敼妫�娴嬭褰�
+ @Override
+ public void upByProductId(InspectionRecordsDto inspectionRecordsDto) {
+ //???
+ }
+
+ //鏍规嵁妫�楠岃褰昳d淇敼鎻愪氦鐘舵��
+ @Override
+ public void submitRecords(Integer id) {
+ //鏇存柊妫�楠岃褰曡〃
+ InspectionRecords inspectionRecords = inspectionRecordsMapper.selectById(id);
+ inspectionRecords.setSubmitState(1);
+ inspectionRecords.setUpdateTime(LocalDateTime.now());
+ inspectionRecordsMapper.updateById(inspectionRecords);
+ //鏂板涓�涓楠屾姤鍛�
+ }
+
+}
+
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 d548a76..058dd0b 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
@@ -12,12 +12,9 @@
import com.yuanchu.limslaboratory.service.InspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+
/**
* <p>
@@ -32,27 +29,25 @@
@Resource
private InspectionMapper inspectionMapper;
+
@Resource
private PlanMapper planMapper;
+
@Resource
InspectionMaterialListMapper inspectionMaterialListMapper;
+ //娣诲姞妫�楠岀敵璇峰崟
@Override
public Inspection addInspection(String userName,int type) {
Inspection inspection = new Inspection(type, 0,1,1, userName);
- System.out.println(inspection);
int judge = inspectionMapper.insert(inspection);
- System.out.println(judge);
return judge>0?inspection:null;
}
//鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
@Override
- public Map selectAllInspection(int pageSize, int countSize, Integer state) {
- Map map = new HashMap();
- map.put("data",inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state));
- map.put("count", inspectionMapper.selectInspectToCount(state));
- return map;
+ public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
+ return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
}
//浣滃簾鐢宠妫�楠屽崟
@@ -62,7 +57,7 @@
Inspection inspection = inspectionMapper.selectById(inspectionId);
inspection.setState(0);
int judge1 = inspectionMapper.updateById(inspection);
- //妫�楠屾牱鍝佷綔搴�
+ //妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)
UpdateWrapper<InspectionMaterialList> wrapper = new UpdateWrapper<>();
wrapper.eq("inspection_id", inspectionId).set("state", 0);
int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(),wrapper);
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 e3e23a9..45da709 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
@@ -1,5 +1,7 @@
package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
@@ -13,10 +15,11 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -29,15 +32,15 @@
PlanMapper planMapper;
@Resource
- InspectionMaterialListMapper inspectionMaterialListMapper;
-
- @Resource
InspectionProductListMapper inspectionProductListMapper;
- //鏌ヨ鎵�鏈夋楠岃鍒�
+ //鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
@Override
- public List<PlanDto> selectAllPlan(int pageSize, int countSize, Integer state) {
- return planMapper.selectAllPlan((pageSize - 1) * countSize,pageSize * countSize, state);
+ public Map selectAllPlan(int pageSize, int countSize, Integer state) {
+ if (state == null) {
+ state = 2;
+ }
+ return planMapper.selectAllPlan((pageSize - 1) * countSize, pageSize * countSize, state);
}
//浣滃簾妫�楠岃鍒�
@@ -47,12 +50,27 @@
//鐘舵�佹敼涓轰綔搴�0
plan.setState(0);
int judge = planMapper.updateById(plan);
- return judge>0;
+ return judge > 0;
}
- //鏌ヨ妫�楠岃鍒掗噷闈㈢殑鍒嗛厤淇℃伅
+ //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�
@Override
- public List<InspectionProductList> selectById(Integer id) {
- return inspectionProductListMapper.selectByMaterId(id);
+ public List<InspectionProductList> selectProductById(Integer id) {
+ return inspectionProductListMapper.selectByMaterId(id);
+ }
+
+ //淇敼妫�楠岃鍒掗噷鍒嗛厤璁″垝鐨勪俊鎭�
+ @Override
+ public void upPlan(InspectionProductList inspectionProductList) {
+ LambdaUpdateWrapper<InspectionProductList> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
+ .eq(InspectionProductList::getMethod, inspectionProductList.getMethod());
+ inspectionProductListMapper.update(inspectionProductList, updateWrapper);
+ }
+
+ //鏌ヨ鎴愬搧妫�楠�
+ @Override
+ public List<PlanDto> selectInspection(int pageSize, int countSize, Integer state) {
+ return planMapper.selectInspection((pageSize - 1) * countSize, pageSize * countSize, state);
}
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 8ba9919..41ca226 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -2,8 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionMapper">
<select id="selectAllInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionDto">
- select i.id, type, inspection_status, qualified_state, i.create_time, user_name, inspect_start_time, inspect_end_time, u.name inspectUserName
- from inspection i left join user u
+ select i.id, type, inspection_status, qualified_state, i.state, i.create_time, user_name, inspect_user_id,
+ inspect_start_time, inspect_end_time, u.name inspectUserName
+ from lims_laboratory.inspection i left join lims_laboratory.user u
on i.inspect_user_id = u.id
<if test="state!=null">
where state = #{state}
@@ -11,13 +12,4 @@
order by i.create_time desc
limit #{pageSize},#{countSize}
</select>
- <select id="selectInspectToCount" resultType="java.lang.Integer">
- select count(*)
- from inspection i left join user u
- on i.inspect_user_id = u.id
- <if test="state!=null">
- where state = #{state}
- </if>
- </select>
-
</mapper>
diff --git a/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
index e907133..4838f4e 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
@@ -1,7 +1,7 @@
<?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.InspectionMaterialListMapper">
- <select id="selectInspectionMaterialListByInsId" resultType="InspectionMaterialList">
+ <select id="selectInspectionMaterialListByInsId" resultType="com.yuanchu.limslaboratory.pojo.InspectionMaterialList">
select id,
material_id,
material_num,
@@ -16,7 +16,7 @@
specifications_number_of_cores,
specifications_instruct,
notes
- from inspection_material_list
+ from lims_laboratory.inspection_material_list
where state = 1
and inspection_id = #{insId}
</select>
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index d323a95..ed388bb 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -12,7 +12,22 @@
</insert>
<select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.InspectionProductList">
- select name,method,ask,unit,required,internal, start_time, end_time, user_id, instrument_id
+ select id,
+ name,
+ method,
+ ask,
+ unit,
+ required,
+ internal,
+ start_time,
+ end_time,
+ state,
+ create_time,
+ update_time,
+ version,
+ inspection_material_list_id,
+ user_id,
+ instrument_id
from lims_laboratory.inspection_product_list
where inspection_material_list_id = #{id}
</select>
diff --git a/inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml b/inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml
new file mode 100644
index 0000000..4e5e92a
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml
@@ -0,0 +1,35 @@
+<?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.InspectionRecordsMapper">
+ <select id="selectByProductId" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto">
+ select yp.name,
+ yp.username,
+ ir.create_time,
+ ir.update_time,
+ ir.method,
+ yp.ask,
+ yp.mid,
+ yp.material_name,
+ yp.specifications_serial_number,
+ yp.material_num
+ from lims_laboratory.inspection_records ir
+ left join (select ipl.id id,
+ ipl.name,
+ u.name username,
+ ipl.ask,
+ iml.id mid,
+ iml.material_name,
+ iml.specifications_serial_number,
+ iml.material_num
+ from lims_laboratory.inspection_product_list ipl
+ left join lims_laboratory.inspection_material_list iml on ipl.inspection_material_list_id = iml.id left join
+ lims_laboratory.user u on ipl.user_id = u.id) yp
+ on ir.inspection_product_list_id = yp.id
+ <where>
+ <if test="productId != null">
+ AND inspection_product_list_id = #{productId}
+ </if>
+ AND submit_state = #{submitState}
+ </where>
+ </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 275cc2f..8234fc3 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,9 +1,9 @@
<?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.PlanMapper">
- <select id="selectAllPlan" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
+ <select id="selectAllPlan" resultType="Map">
select p.id,results,p.state,p.create_time,p.inspection_id,user_id,results,type,user_name
- from lims_laboratory.plan p right join lims_laboratory.inspection i
+ from lims_laboratory.plan p left join lims_laboratory.inspection i
on i.id=p.inspection_id
<if test="state!=null">
where p.state = #{state}
@@ -11,4 +11,21 @@
order by p.create_time desc
limit #{pageSize},#{countSize}
</select>
+
+ <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
+ select i.mid , p.inspection_id , p.state, p.create_time, p.name userName, i.name inspectUserName
+ from (select inspection_id, state, plan.create_time, name
+ from lims_laboratory.plan
+ left join lims_laboratory.user on plan.user_id = user.id) p
+ left join (select inspection.id, name, iml.id mid
+ from lims_laboratory.inspection
+ left join lims_laboratory.user on user.id = inspection.inspect_user_id
+ left join lims_laboratory.inspection_material_list iml on inspection.id = iml.inspection_id) i
+ on p.inspection_id = i.id
+ <if test="state!=null">
+ where p.state = #{state}
+ </if>
+ order by p.create_time desc
+ limit #{pageSize},#{countSize}
+ </select>
</mapper>
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
index 3c95351..3b1ee87 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
@@ -1,24 +1,9 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.Instrument;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateInstrumentDto;
-import com.yuanchu.limslaboratory.service.InstrumentService;
-import com.yuanchu.limslaboratory.service.UserService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-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.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -28,88 +13,8 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->2銆佷华鍣ㄦā鍧�")
@RestController
@RequestMapping("/instrument")
public class InstrumentController {
- @Autowired
- private InstrumentService instrumentService;
-
- @Autowired
- private UserService userService;
-
- @ApiOperation("娣诲姞浠櫒璁惧")
- @PostMapping("/add")
- public Result<?> addInstrumentInformation(@RequestBody Instrument instrument) {
- Integer isInsertSuccess = instrumentService.addInstrumentInformation(instrument);
- if (isInsertSuccess == 1){
- return Result.success("娣诲姞銆�" + instrument.getEquipmentName() + "銆戞垚鍔�!");
- }
- return Result.fail("浠櫒璁惧缂栧彿閲嶅锛屾坊鍔犮��" + instrument.getEquipmentName() + "銆戝け璐�! ");
- }
-
- @ApiOperation("鏍规嵁鍒嗙被Id锛氬垎椤靛垪琛ㄥ睍绀�")
- @GetMapping("/list")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "classifyId", value = "鍒嗙被Id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "conditions", value = "鏌ヨ鐘舵��:榛樿鍏ㄩ儴", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "whetherWhether", value = "鏄惁宸茶繃鏈�", dataTypeClass = Boolean.class),
- @ApiImplicitParam(name = "numberOrNameOrSpecifications", value = "缂栧彿/璁惧鍚嶇О/瑙勬牸鍨嬪彿", dataTypeClass = String.class)
- })
- public Result<?> getListInstrumentInformation(Integer pageNo,
- Integer pageSize,
- Integer conditions,
- Integer classifyId,
- Boolean whetherWhether,
- String numberOrNameOrSpecifications) {
- IPage<Map<String, Object>> pageList = instrumentService.getListInstrumentInformation(conditions, whetherWhether, numberOrNameOrSpecifications,
- classifyId, new Page<Objects>(pageNo, pageSize));
- Map<String, Object> map = new HashMap<>();
- map.put("row", pageList.getRecords());
- map.put("total", pageList.getTotal());
- return Result.success(map);
- }
-
- @ApiOperation("鍒犻櫎浠櫒鏁版嵁")
- @DeleteMapping("/delete")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "instrumentId", value = "浠櫒Id", dataTypeClass = String.class, required = true)
- })
- public Result<?> deleteInstrumentInformation(String instrumentId) {
- Boolean isDeleteSuccess = instrumentService.deleteInstrumentInformation(instrumentId);
- if (isDeleteSuccess){
- return Result.success("鍒犻櫎浠櫒鎴愬姛锛�");
- }
- return Result.fail("鍒犻櫎浠櫒澶辫触锛�");
- }
-
- @ApiOperation("娣诲姞浠櫒鏃朵繚绠′汉涓嬫媺妗嗘暟鎹�")
- @GetMapping("/get_user")
- public Result<?> getMapUserInformation() {
- return Result.success(userService.getUserNameAndId());
- }
-
- @ApiOperation("鏍规嵁浠櫒Id鑾峰彇淇℃伅鐢ㄤ簬缂栬緫")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "InstrumentId", value = "鍒嗙被Id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/get_instrument")
- public Result<?> getIdInstrumentInformation(Integer InstrumentId) {
- Instrument idInstrumentInformation = instrumentService.getIdInstrumentInformation(InstrumentId);
- return Result.success(idInstrumentInformation);
- }
-
- @ApiOperation("鏍规嵁浠櫒Id鏇存柊鏁版嵁")
- @PutMapping("/update")
- public Result<?> updateEquipmentPointInformation(@RequestBody UpdateInstrumentDto updateInstrumentDto) throws Exception {
- Instrument instrument = JackSonUtil.unmarshal(JackSonUtil.marshal(updateInstrumentDto), Instrument.class);
- Integer isUpdateSuccess = instrumentService.updateEquipmentPointInformation(instrument);
- if (isUpdateSuccess == 1){
- return Result.success("鏇存柊銆�" + instrument.getEquipmentName() + "銆戞垚鍔�!");
- }
- return Result.fail("浠櫒璁惧缂栧彿閲嶅锛屾洿鏂般��" + instrument.getEquipmentName() + "銆戝け璐�! ");
- }
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
index 658b589..6b7ceb6 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
@@ -1,24 +1,9 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.EquipmentPoint;
-import com.yuanchu.limslaboratory.pojo.MetricalInformation;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateEquipmentPointDto;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateMetricalInformationDto;
-import com.yuanchu.limslaboratory.service.MetricalInformationService;
-import com.yuanchu.limslaboratory.service.UserService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
-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.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -28,63 +13,8 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->4銆佽閲忎俊鎭�")
@RestController
@RequestMapping("/metrical-information")
public class MetricalInformationController {
- @Autowired
- private MetricalInformationService metricalInformationService;
-
- @Autowired
- private UserService userService;
-
- @ApiOperation("娣诲姞璁￠噺淇℃伅")
- @PostMapping("/add")
- public Result<?> addMetricalInformation(MetricalInformation metricalInformation,
- @RequestPart(value = "file", required = false) MultipartFile file) {
- Integer isInsertSuccess = metricalInformationService.addEquipmentPointInformation(metricalInformation, file);
- if (isInsertSuccess == 1){
- return Result.success("娣诲姞銆�"+ metricalInformation.getMeasurementUnit() +"銆戞垚鍔燂紒");
- }
- return Result.fail("娣诲姞銆�"+ metricalInformation.getMeasurementUnit() +"銆戝け璐ワ紒璁惧鐮佺偣缂栫爜閲嶅锛�");
- }
-
- @ApiOperation("鏌ヨ鎵�鏈夎閲忎俊鎭暟鎹�")
- @GetMapping("/list")
- public Result<?> getListMetricalInformation() {
- List<Map<String, Object>> list = metricalInformationService.getListEquipmentPointInformation();
- return Result.success(list);
- }
-
- @ApiOperation("鏍规嵁璁￠噺淇℃伅Id鍒犻櫎鏁版嵁")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "metricalInformationId", value = "璁￠噺淇℃伅Id", dataTypeClass = Integer.class, required = true)
- })
- @DeleteMapping("/delete")
- public Result<?> deleteMetricalInformation(Integer metricalInformationId) {
- Integer isDeleteSuccess = metricalInformationService.deleteMetricalInformation(metricalInformationId);
- if (isDeleteSuccess == 1){
- return Result.success("鍒犻櫎鎴愬姛锛�");
- }
- return Result.fail("鍒犻櫎澶辫触锛�");
- }
-
- @ApiOperation("鏍规嵁璁￠噺淇℃伅Id鏇存柊鏁版嵁")
- @PutMapping("/update")
- public Result<?> updateMetricalInformation(UpdateMetricalInformationDto updateMetricalInformationDto,
- @RequestPart(value = "file", required = false) MultipartFile file) throws Exception {
- MetricalInformation metricalInformation = JackSonUtil.unmarshal(JackSonUtil.marshal(updateMetricalInformationDto), MetricalInformation.class);
- Integer isUpdateSuccess = metricalInformationService.updateMetricalInformation(metricalInformation, file);
- if (isUpdateSuccess == 1){
- return Result.success("鏇存柊鎴愬姛锛�");
- }
- return Result.fail("鏇存柊澶辫触锛�");
- }
-
- @ApiOperation("娣诲姞璁￠噺淇℃伅鏃惰礋璐ｄ汉涓嬫媺妗嗘暟鎹�")
- @GetMapping("/get_user")
- public Result<?> getMapUserInformation() {
- return Result.success(userService.getUserNameAndId());
- }
}
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 ebd51aa..63a2e7e 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
@@ -15,7 +15,10 @@
* @since 2023-07-17
*/
public interface MaterialMapper extends BaseMapper<Material> {
+
+ //鏌ヨ鐗╂枡淇℃伅
List<Material> selectMaterialLimit(int num1,int num2);
+ //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
Map selectMaterialById(String materialId);
}
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 02ac399..a373c2a 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
@@ -29,11 +29,13 @@
@Resource
MaterialMapper materialMapper;
+ //鏌ヨ鐗╂枡淇℃伅
@Override
public List<Material> selectMaterialLimit(int pageSize, int countSize) {
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize);
}
+ //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
@Override
public Map selectMaterialById(String materialId) {
return materialMapper.selectMaterialById(materialId);
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 9be0eee..d0623da 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -24,4 +25,6 @@
Map<String, String> selectUserByUserId(int userId);
IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+
+ List<User> selectUser();
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index ac8d757..3b9df69 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -7,9 +7,13 @@
import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -72,7 +76,8 @@
String selectByUserId(Integer userId);
/**
- * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
+ * 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+ * @return
*/
- List<Map<String, Object>> getUserNameAndId();
+ List<User> selectUser();
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 899c9cf..eb7b820 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -75,10 +75,8 @@
}
@Override
- public List<Map<String, Object>> getUserNameAndId() {
- LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(User::getId, User::getName);
- return userMapper.selectMaps(wrapper);
+ public List<User> selectUser() {
+ return userMapper.selectUser();
}
@Override
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 65aa6bb..d5d6190 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -1,12 +1,20 @@
<?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.UserMapper">
-
<select id="selectUserByUserId" parameterType="int" resultType="Map">
- SELECT u.account account,u.name uname,u.phone,u.email,u.info,e.byname e_byname,e.`name` e_name,e.link_name e_link_name,e.link_phone e_phone
- FROM enterprise e,`user` u
+ SELECT u.account account,
+ u.name uname,
+ u.phone,
+ u.email,
+ u.info,
+ e.byname e_byname,
+ e.`name` e_name,
+ e.link_name e_link_name,
+ e.link_phone e_phone
+ FROM enterprise e,
+ `user` u
WHERE e.`id` = u.`enterprise_id`
- AND u.id = #{userId}
+ AND u.id = #{userId}
</select>
<resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.vo.PagePersonnelVo">
@@ -21,11 +29,29 @@
</resultMap>
<select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, IFNULL(u.`age`, '---') age,
- IFNULL(u.`phone`, '---') phone, IFNULL(u.`email`, '---') email, u.`job_state`
+ IFNULL(u.`phone`, '---') phone, IFNULL(u.`email`, '---') email, u.`job_state`
FROM `user` u, role r
WHERE u.`role_id` = r.`id`
<if test="name != null">
AND u.name = #{name}
</if>
</select>
+
+ <select id="selectUser" resultType="com.yuanchu.limslaboratory.pojo.User">
+ select id,
+ account,
+ password,
+ name,
+ phone,
+ email,
+ age,
+ job_state,
+ info,
+ create_time,
+ update_time,
+ version,
+ role_id,
+ enterprise_id
+ from lims_laboratory.user
+ </select>
</mapper>
--
Gitblit v1.9.3