From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java | 2
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 48 ++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 8
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java | 26 +
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 24 -
inspection-server/src/main/resources/mapper/PlanMapper.xml | 59 +++-
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 7
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java | 9
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 13
standard-server/src/main/resources/mapper/MaterialMapper.xml | 13
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 8
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 4
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java | 7
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java | 7
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 8
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 40 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 57 +++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 10
user-server/src/main/resources/mapper/UserMapper.xml | 17 -
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 8
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java | 2
/dev/null | 48 ----
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 5
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 85 +++++--
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 35 ++
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 36 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 7
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 67 ++--
36 files changed, 417 insertions(+), 262 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 6906e8d..f13bb17 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
@@ -69,7 +69,7 @@
return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+ @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
})
@@ -104,7 +104,8 @@
})
@PostMapping("/submitInspection")
public Result submitInspection(String inspectionId) {
- return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ inspectionService.subInspectionByInsId(inspectionId);
+ return Result.success();
}
@ApiOperation("浣滃簾妫�楠屽崟鐢宠")
@@ -113,6 +114,7 @@
})
@PostMapping("/delInspection")
public Result delInspection(String inspectionId) {
- return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ inspectionService.delInspectionByInsId(inspectionId);
+ return Result.success();
}
}
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 0405b39..0a2467c 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,8 +1,11 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -13,6 +16,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
import java.util.Map;
/**
@@ -31,13 +36,24 @@
@Autowired
InspectionMaterialListService inspectionMaterialListService;
+ @Resource
+ InspectionMapper inspectionMapper;
+
@ApiOperation("娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�")
@PostMapping("/addInspectionMaterialList")
public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
- inspectionMaterialList.setState(1);
- Object object = RedisUtil.get(token);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- return Result.success(inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id")));
+ //濡傛灉妫�楠屽崟宸蹭綔搴�,鐘舵�佷负0,鍒欐棤娉曟坊鍔犳牱鍝�
+ Inspection inspection = inspectionMapper.selectById(inspectionMaterialList.getInspectionId());
+ if (inspection.getState()==0) {
+ return Result.fail("妫�楠屽崟宸蹭綔搴熸棤娉曟坊鍔犳楠屾牱鍝�");
+ }
+ else {
+ inspectionMaterialList.setState(1);
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id"));
+ return Result.success();
+ }
}
@ApiOperation("鍒犻櫎鏍峰搧")
@@ -46,10 +62,11 @@
})
@PostMapping("/delInspectionMaterialList")
public Result delInspectionMaterialList(int inspectionMaterialListId) {
- return Result.success(inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId));
+ inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId);
+ return Result.success();
}
- @ApiOperation("鏍规嵁Id鏌ヨ鏍峰搧淇℃伅")
+ @ApiOperation("鏍规嵁鏍峰搧Id鏌ヨ鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "鏍峰搧ID", dataTypeClass = String.class, required = true),
})
@@ -63,8 +80,8 @@
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
@PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
- public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
- return Result.success(inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList));
+ public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialListDto inspectionMaterialListDto) {
+ inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialListDto);
+ return Result.success();
}
-
}
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 e9d023e..7002ef8 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,7 +1,8 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import com.yuanchu.limslaboratory.service.InstrumentService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -9,7 +10,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-
import javax.annotation.Resource;
/**
@@ -20,13 +20,19 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�-->鍒嗛厤璁″垝-->妫�楠岄」鐩�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屾牱鍝�-->妫�楠岄」鐩�")
@RestController
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {
@Resource
UserService userService;
+
+ @Resource
+ InstrumentService instrumentService;
+
+ @Resource
+ InspectionProductListService inspectionProductListService;
@ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
@GetMapping("/selectUser")
@@ -42,4 +48,30 @@
public Result selectUserById(Integer id) {
return Result.success(userService.selectByUserId(id));
}
+
+ @ApiOperation("鏌ヨ璁惧淇℃伅")
+ @GetMapping("/selectInstrument")
+ public Result selectInstrument() {
+ return Result.success(instrumentService.selectInstrument());
+ }
+
+ @ApiOperation("閫夋嫨璁惧淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectInstrumentById")
+ public Result selectInstrumentById(Integer id) {
+ Instrument instrument = instrumentService.getById(id);
+ return Result.success(instrument.getEquipmentName());
+ }
+
+ @ApiOperation("鏍规嵁妫�楠岃鍒掓牱鍝乮d鏌ヨ妫�楠岄」鐩�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectProductById/{id}")
+ public Result selectProductById(@PathVariable Integer id) {
+ return Result.success(inspectionProductListService.selectProductById(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
index a1391b5..2f0d707 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
@@ -47,8 +47,6 @@
return Result.success("淇敼鎴愬姛!");
}
-
-
/**
* 灏嗗緟鎻愪氦鐨勭殑妫�楠岄」鐩殑妫�娴嬭褰曠殑鐘舵�佽浆涓哄緟瀹℃牳
* @param id
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 665a37e..3d2fb9e 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
@@ -2,7 +2,11 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -28,6 +32,9 @@
@Resource
private PlanService planService;
+ @Resource
+ ProductService productService;
+
@ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -39,19 +46,29 @@
return Result.success(planService.selectAllPlan(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�")
+ @ApiOperation("鏍规嵁椤圭洰鍚嶆煡璇㈡墍鏈夎瘯楠屾柟娉�")
+ @GetMapping("/selectInstrumentByProname")
+ public Result selectInstrumentByProname(String name) {
+ return Result.success(productService.selectInstrumentByProname(name));
+ }
+
+ @ApiOperation("閫夋嫨璇曢獙鏂规硶")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "椤圭洰id", dataTypeClass = Integer.class, required = true),
})
- @GetMapping("/selectProductById/{id}")
- public Result selectProductById(@PathVariable Integer id) {
- return Result.success(planService.selectProductById(id));
+ @PostMapping("/selectProMethodById")
+ public Result selectProMethodById(Integer id) {
+ Product product = productService.getById(id);
+ return Result.success(product.getMethod());
}
@ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
- @PostMapping("/upPlan")
- public Result upPlan(@RequestBody InspectionProductList inspectionProductList) {
- planService.upPlan(inspectionProductList);
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾牱鍝両D", dataTypeClass = Integer.class, required = true),
+ })
+ @PutMapping("/upPlan/{id}")
+ public Result upPlan(@PathVariable Integer id ,@RequestBody InspectionProductListDto inspectionProductListDto) {
+ planService.upPlan(id,inspectionProductListDto);
return Result.success();
}
@@ -61,7 +78,8 @@
})
@PutMapping("/delPlan/{id}")
public Result delPlan(@PathVariable Integer id) {
- return Result.success(planService.delPlan(id));
+ planService.delPlan(id);
+ return Result.success();
}
@ApiOperation("鏌ヨ鎴愬搧妫�楠�")
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 06632a5..6c8d8f7 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,7 +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 678d663..1423320 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
@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +21,7 @@
*/
public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
- //娣诲姞妫�楠岄」鐩�
- int addInspectionProductList(List<InspectionProductList> list);
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鐩�
- List<InspectionProductList> selectByMaterId(Integer id);
+ //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
+ List<InspectionProductListVo> selectByMaterId(Integer id);
}
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 71d375c..c453761 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
@@ -2,14 +2,14 @@
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import java.util.List;
-import java.util.Map;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -18,8 +18,8 @@
public interface PlanMapper extends BaseMapper<Plan> {
//鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
- Map selectAllPlan(int pageSize, int countSize, Integer state);
+ List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
//鏌ヨ鎴愬搧妫�楠�
- List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
+ List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
}
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 7978c0d..8afabf1 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
@@ -75,12 +75,12 @@
private Integer version;
- @ApiModelProperty(value = "鍏宠仈 鎶ユid")
+ @ApiModelProperty(value = "鍏宠仈 鎶ユ鐗╂枡id")
private int inspectionMaterialListId;
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
@ApiModelProperty(value = "鍏宠仈 璁惧id")
- private Integer instrument_id;
+ private Integer instrumentId;
}
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 f7cc10f..9593346 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,7 +61,5 @@
@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 067c428..1378035 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
@@ -2,8 +2,10 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
+@Data
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
index d0d18d2..bf3ab30 100644
--- 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
@@ -2,48 +2,54 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+//(淇敼)(鏌ヨ)妫�娴嬭褰�
+@Data
public class InspectionRecordsDto implements Serializable {
- //妫�娴嬮」鐩�
+
+ @ApiModelProperty(value = "妫�娴嬮」鐩�")
@JsonSerialize
private String name;
- //璇曢獙鍛�
+ @ApiModelProperty(value = "璇曢獙鍛�")
@JsonSerialize
private String userName;
- //璇曢獙寮�濮嬫棩鏈�
+ @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;
- //璇曢獙鏂规硶
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
@JsonSerialize
private String method;
- //璇曢獙瑕佹眰
+ @ApiModelProperty(value = "璇曢獙瑕佹眰")
@JsonSerialize
private String ask;
- //鏍峰搧缂栧彿
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
@JsonSerialize
private int mid;
- //鏍峰搧鍚嶇О
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
@JsonSerialize
private String materialName;
- //瑙勬牸鍨嬪彿
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
@JsonSerialize
private String specificationsSerialNumber;
- //鏍峰搧鏁伴噺
+ @ApiModelProperty(value = "鏍峰搧鏁伴噺")
@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
deleted file mode 100644
index 95bbc4d..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
+++ /dev/null
@@ -1,48 +0,0 @@
-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 implements Serializable {
-
- @ApiModelProperty(value = "璁″垝缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @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 b709916..8a022fd 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.Plan;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import java.util.List;
@@ -29,20 +30,20 @@
* @param userId
* @return
*/
- InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
+ void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
/**
* 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧淇℃伅
* @param inspectionMaterialListId
* @return
*/
- boolean delInspectionMaterialListByInsId(int inspectionMaterialListId);
+ void delInspectionMaterialListByInsId(int inspectionMaterialListId);
/**
*鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
* @param inspectionMaterialListId
- * @param inspectionMaterialList
+ * @param inspectionMaterialListDto
* @return
*/
- boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
+ void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto);
}
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 726f8bd..7b792f4 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
@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import java.util.List;
@@ -18,10 +20,10 @@
/**
- * 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧閲岀殑妫�楠岄」鐩�
- * @param inspectionMaterialListId
+ * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
+ * @param id
* @return
*/
- int delInspectionProductList(int inspectionMaterialListId);
+ List<InspectionProductListVo> selectProductById(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 71e4486..7c17380 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
@@ -39,13 +39,13 @@
* @param inspectionId
* @return
*/
- boolean delInspectionByInsId(String inspectionId);
+ void delInspectionByInsId(String inspectionId);
/**
* 鏍规嵁妫�楠屽崟id鎻愪氦妫�楠岀敵璇�
* @param inspectionId
* @return
*/
- boolean subInspectionByInsId(String inspectionId);
+ void 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 264093d..397c3f9 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
@@ -1,11 +1,12 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -24,27 +25,22 @@
* @param state
* @return
*/
- Map selectAllPlan(int pageSize, int countSize, Integer state);
+ List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
/**
* 鏍规嵁璁″垝id浣滃簾妫�楠岃鍒�
* @param id
* @return
*/
- boolean delPlan(Integer id);
+ void delPlan(Integer id);
- /**
- * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掗噷闈㈡楠岄」鐩�
- * @param id
- * @return
- */
- List<InspectionProductList> selectProductById(Integer id);
+
/**
* 缁欐楠岃鍒掍腑鐨勬楠岄」鐩垎閰嶈瘯楠屽憳,璁惧,浠ュ強鏃ユ湡
- * @param inspectionProductList
+ * @param inspectionProductListDto
*/
- void upPlan(InspectionProductList inspectionProductList);
+ void upPlan(Integer id ,InspectionProductListDto inspectionProductListDto);
/**
* 鏌ヨ鎴愬搧妫�楠�
@@ -53,5 +49,5 @@
* @param state
* @return
*/
- List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
+ List<FinPlanVo> 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 0538298..52ddc13 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
@@ -3,14 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
-import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
-import com.yuanchu.limslaboratory.mapper.PlanMapper;
-import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.vo.Result;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +21,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -39,10 +39,8 @@
@Resource
InspectionProductListService inspectionProductListService;
- @Resource
- InspectionProductListMapper inspectionProductListMapper;
- //鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
+ //鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�
@Override
public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
@@ -51,47 +49,48 @@
//娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�
@Override
@Transactional(rollbackFor = Exception.class)
- public InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId) {
- int judge = inspectionMaterialListMapper.insert(inspectionMaterialList);
- List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
- List<InspectionProductList> list1 = new ArrayList<>();
- list.forEach(a-> {
- InspectionProductList inspectionProductList = new InspectionProductList();
- inspectionProductList.setName(a.getName())
- .setUnit(a.getUnit())
- .setRequired(a.getRequired())
- .setInternal(a.getInternal())
- .setState(1)
- .setInspectionMaterialListId(inspectionMaterialList.getId())
- .setUserId(Integer.parseInt(userId));
- list1.add(inspectionProductList);
- });
- //娣诲姞妫�楠岄」鐩�
- int judge2 = inspectionProductListMapper.addInspectionProductList(list1);
- return judge>0&&judge2>0?inspectionMaterialList:null;
+ public void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList, String userId) {
+ inspectionMaterialListMapper.insert(inspectionMaterialList);
+ List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
+ List<InspectionProductList> list1 = new ArrayList<>();
+ list.forEach(a -> {
+ InspectionProductList inspectionProductList = new InspectionProductList();
+ inspectionProductList.setName(a.getName())
+ .setUnit(a.getUnit())
+ .setRequired(a.getRequired())
+ .setInternal(a.getInternal())
+ .setState(1)
+ .setInspectionMaterialListId(inspectionMaterialList.getId())
+ .setUserId(Integer.parseInt(userId));
+ list1.add(inspectionProductList);
+ });
+ //娣诲姞妫�楠岄」鐩�
+ inspectionProductListService.saveBatch(list1);
}
//鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝�
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean delInspectionMaterialListByInsId(int inspectionMaterialListId) {
+ public void delInspectionMaterialListByInsId(int inspectionMaterialListId) {
//鍒犻櫎妫�楠屾牱鍝�
InspectionMaterialList list = new InspectionMaterialList();
list.setState(0);
list.setId(inspectionMaterialListId);
- int judge1 = inspectionMaterialListMapper.updateById(list);
+ inspectionMaterialListMapper.updateById(list);
//鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝佷腑鐨勬楠岄」鐩�
- int judge2 = inspectionProductListService.delInspectionProductList(inspectionMaterialListId);
- return judge1>0&&judge2>0;
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialListId).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
}
//鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList) {
+ public void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto) {
+ InspectionMaterialList inspectionMaterialList = new InspectionMaterialList();
+ BeanUtils.copyProperties(inspectionMaterialListDto,inspectionMaterialList);
LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(InspectionMaterialList::getId,inspectionMaterialListId);
- int judge = inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
- return judge>0;
+ updateWrapper.eq(InspectionMaterialList::getId, inspectionMaterialListId);
+ inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
}
}
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 988f939..e34d36e 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
@@ -1,9 +1,12 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -27,11 +30,11 @@
- //鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧閲岀殑妫�楠岄」鐩�
+ //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
@Override
- public int delInspectionProductList(int inspectionMaterialListId) {
- UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
- wrapper.eq("inspectionMaterialListId", inspectionMaterialListId).set("state", 0);
- return inspectionProductListMapper.update(new InspectionProductList(),wrapper);
+ public List<InspectionProductListVo> selectProductById(Integer id) {
+ return inspectionProductListMapper.selectByMaterId(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 058dd0b..ebfb650 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
@@ -1,24 +1,32 @@
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.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
+import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
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.util.Date;
import java.util.List;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -36,44 +44,59 @@
@Resource
InspectionMaterialListMapper inspectionMaterialListMapper;
+ @Resource
+ InspectionProductListService inspectionProductListService;
+
//娣诲姞妫�楠岀敵璇峰崟
@Override
- public Inspection addInspection(String userName,int type) {
- Inspection inspection = new Inspection(type, 0,1,1, userName);
+ public Inspection addInspection(String userName, int type) {
+ Inspection inspection = new Inspection(type, 0, 1, 1, userName);
int judge = inspectionMapper.insert(inspection);
- return judge>0?inspection:null;
+ return judge > 0 ? inspection : null;
}
//鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
@Override
public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
- return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
+ return inspectionMapper.selectAllInspection((pageSize - 1) * countSize, pageSize * countSize, state);
}
//浣滃簾鐢宠妫�楠屽崟
@Override
- public boolean delInspectionByInsId(String inspectionId) {
- //妫�楠屽崟浣滃簾
+ public void delInspectionByInsId(String inspectionId) {
+ /*妫�楠屽崟浣滃簾*/
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);
- return judge1>0&&judge2>0;
+ inspectionMapper.updateById(inspection);
+ /*妫�楠岃鍒掍綔搴�*/
+ UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
+ planMapper.update(new Plan(), updateWrapper);
+ /*妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)*/
+ UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
+ wrapper1.eq("inspection_id", inspectionId).set("state", 0);
+ inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+ /*妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�*/
+ //鏌ュ嚭妫�楠屾牱鍝乮d
+ LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InspectionMaterialList::getInspectionId,inspectionId);
+ List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
+ for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
+ }
}
//鎻愪氦鐢宠妫�楠屽崟
@Override
- public boolean subInspectionByInsId(String inspectionId) {
+ public void subInspectionByInsId(String inspectionId) {
Inspection inspection = inspectionMapper.selectById(inspectionId);
//鐘舵�佹敼涓哄凡鎻愪氦2
inspection.setState(2);
- int judge = inspectionMapper.updateById(inspection);
+ inspectionMapper.updateById(inspection);
//璁″垝琛ㄦ柊澧�
- Plan plan = Plan.builder().inspectionId(inspectionId).state(1).build();
+ Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
planMapper.insert(plan);
- return judge>0;
}
}
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 45da709..ef612f3 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,21 +1,24 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.Plan;
-import com.yuanchu.limslaboratory.mapper.PlanMapper;
-import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yuanchu.limslaboratory.mapper.*;
+import com.yuanchu.limslaboratory.pojo.*;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
+
/**
* <p>
@@ -34,9 +37,15 @@
@Resource
InspectionProductListMapper inspectionProductListMapper;
+ @Resource
+ InspectionMaterialListMapper inspectionMaterialListMapper;
+
+ @Resource
+ InspectionProductListService inspectionProductListService;
+
//鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
@Override
- public Map selectAllPlan(int pageSize, int countSize, Integer state) {
+ public List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state) {
if (state == null) {
state = 2;
}
@@ -45,32 +54,60 @@
//浣滃簾妫�楠岃鍒�
@Override
- public boolean delPlan(Integer id) {
+ public void delPlan(Integer id) {
Plan plan = planMapper.selectById(id);
+
+ /*妫�楠岃鍒掍綔搴�*/
//鐘舵�佹敼涓轰綔搴�0
plan.setState(0);
- int judge = planMapper.updateById(plan);
- return judge > 0;
+ planMapper.updateById(plan);
+
+ /*妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)*/
+ UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
+ wrapper1.eq("inspection_id", plan.getInspectionId()).set("state", 0);
+ inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+
+ /*妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�*/
+ //鏌ュ嚭妫�楠屾牱鍝乮d
+ LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InspectionMaterialList::getInspectionId, plan.getInspectionId());
+ List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
+ for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
+ }
}
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�
+ //淇敼(鍒嗛厤)妫�楠岃鍒掗噷鍒嗛厤璁″垝鐨勪俊鎭�
@Override
- public List<InspectionProductList> selectProductById(Integer id) {
- return inspectionProductListMapper.selectByMaterId(id);
- }
+ public void upPlan(Integer id, InspectionProductListDto inspectionProductListDto) {
+ /*鏇存柊璁″垝琛ㄤ腑鐨勭姸鎬�(3:宸插垎閰�),鏇存柊鏃堕棿*/
+ //鏌ヨ鎶ユ鍗昳d
+ InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(id);
+ LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Plan::getInspectionId, inspectionMaterialList.getInspectionId());
+ Plan plan = planMapper.selectOne(queryWrapper);
+ plan.setState(3).setUpdateTime(new Date());
+ //鏍规嵁鎶ユ鍗昳d杩涜鏇存柊璁″垝琛�
+ LambdaUpdateWrapper<Plan> updateWrapper1 = new LambdaUpdateWrapper<>();
+ updateWrapper1.eq(Plan::getInspectionId, plan.getInspectionId());
+ planMapper.update(plan, updateWrapper1);
- //淇敼妫�楠岃鍒掗噷鍒嗛厤璁″垝鐨勪俊鎭�
- @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);
+ /*鏇存柊妫�楠岄」鐩〃涓殑椤圭洰妫�楠屽紑濮嬫棩鏈�,椤圭洰妫�楠岀粨鏉熸棩鏈�,椤圭洰璇曢獙鍛�,璇曢獙瑕佹眰,鏇存柊鏃堕棿,璁惧id*/
+ InspectionProductList inspectionProductList = new InspectionProductList();
+ BeanUtils.copyProperties(inspectionProductListDto, inspectionProductList);
+ inspectionProductList.setInspectionMaterialListId(id);
+ //鏍规嵁鎶ユ鏍峰搧id鍜岄」鐩悕绉拌繘琛屾洿鏂版楠岄」鐩〃
+ LambdaUpdateWrapper<InspectionProductList> updateWrapper2 = new LambdaUpdateWrapper<>();
+ updateWrapper2.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
+ .eq(InspectionProductList::getName, inspectionProductList.getName());
+ inspectionProductListMapper.update(inspectionProductList, updateWrapper2);
}
//鏌ヨ鎴愬搧妫�楠�
@Override
- public List<PlanDto> selectInspection(int pageSize, int countSize, Integer state) {
+ public List<FinPlanVo> 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/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index ed388bb..1eed103 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -1,19 +1,12 @@
<?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.InspectionProductListMapper">
- <insert id="addInspectionProductList">
- INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time,
- update_time,inspection_material_list_id, user_id) VALUES
- <foreach collection="list" separator="," item="i">
- (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime},
- #{i.updateTime}, #{i.inspectionMaterialListId},
- #{i.userId})
- </foreach>
- </insert>
- <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.InspectionProductList">
- select id,
- name,
+ <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo">
+ select inspection_material_list_id,
+ inspect_start_time inspectStartTime,
+ inspect_end_time inspectEndTime,
+ ipl.name,
method,
ask,
unit,
@@ -21,14 +14,27 @@
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}
+ uname userName,
+ equipment_name instrumentName
+ from (select inspection_material_list_id,
+ pl.name name,
+ user.name uname,
+ method,
+ ask,
+ unit,
+ required,
+ internal,
+ start_time,
+ end_time,
+ equipment_name
+ from lims_laboratory.inspection_product_list pl
+ left join lims_laboratory.user on pl.user_id = user.id
+ left join lims_laboratory.instrument on pl.instrument_id = instrument.id) ipl
+ , lims_laboratory.inspection_material_list iml
+ , lims_laboratory.inspection i
+ where iml.id = ipl.inspection_material_list_id
+ and iml.id = ipl.inspection_material_list_id
+ and i.id = iml.inspection_id
+ and ipl.inspection_material_list_id = #{id}
</select>
</mapper>
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 8234fc3..788786a 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,27 +1,60 @@
<?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="Map">
- select p.id,results,p.state,p.create_time,p.inspection_id,user_id,results,type,user_name
- from lims_laboratory.plan p left join lims_laboratory.inspection i
- on i.id=p.inspection_id
+ <select id="selectAllPlan" resultType="com.yuanchu.limslaboratory.pojo.vo.PlanVo">
+ select mid ,
+ p.inspection_id ,
+ state ,
+ create_time ,
+ name ,
+ material_name ,
+ specifications_serial_number ,
+ material_id ,
+ material_supplier ,
+ start_time ,
+ end_time ,
+ results ,
+ material_location ,
+ method ,
+ material_batch ,
+ material_reel_number ,
+ material_num
+ from (select plan.user_id, plan.state, plan.create_time, plan.results, plan.inspection_id, name
+ from lims_laboratory.plan
+ join lims_laboratory.user u on plan.user_id = u.id) p
+ left join (select iml.id mid,
+ iml.specifications_serial_number,
+ iml.material_id,
+ iml.material_supplier,
+ ipl.start_time,
+ ipl.end_time,
+ iml.material_location,
+ iml.material_name,
+ ipl.method,
+ iml.material_batch,
+ iml.material_reel_number,
+ iml.material_num,
+ iml.inspection_id
+ from lims_laboratory.inspection_material_list iml
+ left join lims_laboratory.inspection_product_list ipl on iml.id = ipl.inspection_material_list_id) il
+ on p.inspection_id = il.inspection_id
<if test="state!=null">
- where p.state = #{state}
+ where state = #{state}
</if>
order by p.create_time desc
limit #{pageSize},#{countSize}
</select>
- <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
+ <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.vo.FinPlanVo">
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
+ 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>
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
index 64b717a..711a7be 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -16,7 +18,12 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
+@Mapper
public interface InstrumentMapper extends BaseMapper<Instrument> {
IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);
+
+ //鏌ヨ鎵�鏈夎澶囦俊鎭�
+ List<Map> selectInstrument();
+
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
index 9d492b5..14f5c05 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -33,4 +34,10 @@
Instrument getIdInstrumentInformation(Integer instrumentId);
Integer updateEquipmentPointInformation(Instrument instrument);
+
+ /**
+ * 鏌ヨ鎵�鏈夎澶囦俊鎭�
+ * @return
+ */
+ List<Map> selectInstrument();
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
index fc776d2..5e91307 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -79,4 +80,10 @@
}
return 0;
}
+
+ //鏌ヨ鎵�鏈夎澶囦俊鎭�
+ @Override
+ public List<Map> selectInstrument() {
+ return instrumentMapper.selectInstrument();
+ }
}
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index ccf1794..ee31f57 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -19,4 +19,7 @@
</if>
AND i.`user_id` = u.`id`
</select>
+ <select id="selectInstrument" resultType="Map">
+ select id,equipment_name from lims_laboratory.instrument
+ </select>
</mapper>
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 69ac1ec..6df4b19 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
@@ -17,7 +17,7 @@
public interface MaterialMapper extends BaseMapper<Material> {
//鏌ヨ鐗╂枡淇℃伅
- List<Material> selectMaterialLimit(int num1,int num2, int type);
+ List<Map> selectMaterialLimit(int num1,int num2, int type);
//鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
Map selectMaterialById(String materialId);
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index feb1d02..10e6bb1 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -25,4 +25,9 @@
IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
Map<String, Object> selectOneChildren(Object father);
+
+ Map<String, Object> getProductInformation(Integer productId);
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ List<Map> selectInstrumentByProname(String name);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index 7786a38..8fbb6af 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -24,4 +24,11 @@
IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);
+
+ /**
+ * 閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ * @param name
+ * @return
+ */
+ List<Map> selectInstrumentByProname(String name);
}
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 feb1a9e..15fcd8d 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
@@ -47,7 +47,7 @@
//鏌ヨ鐗╂枡淇℃伅
@Override
- public List<Material> selectMaterialLimit(int pageSize, int countSize, int type) {
+ public List<Map> selectMaterialLimit(int pageSize, int countSize, int type) {
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize, type);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index 4af7a12..5b7371d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -22,7 +22,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -71,4 +71,10 @@
wrapper.select(Product::getId, Product::getName, Product::getUnit, Product::getRequired, Product::getInternal);
return productMapper.selectMaps(wrapper);
}
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ @Override
+ public List<Map> selectInstrumentByProname(String name) {
+ return productMapper.selectInstrumentByProname(name);
+ }
}
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index d3281fd..8853a62 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -2,15 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
- <select id="selectMaterialLimit" resultType="com.yuanchu.limslaboratory.pojo.Material">
+ <select id="selectMaterialLimit" resultType="Map">
select id, name
- from material
+ from lims_laboratory.material
where state = 1
and type = #{type}
order by create_time desc
limit #{num1},#{num2}
</select>
- <select id="selectMaterialById" resultType="java.util.Map">
+ <select id="selectMaterialById" resultType="Map">
select m.id,
m.num,
m.supplier,
@@ -23,10 +23,11 @@
s.cross_section crossSection,
s.number_of_cores numberOfCores,
s.instruct
- from material m,
- specifications s,
- serial_number sn
+ from lims_laboratory.material m,
+ lims_laboratory.specifications s,
+ lims_laboratory.serial_number sn
where m.specifications_id = s.id
and s.serial_id = sn.id
+ and m.id=#{materialId}
</select>
</mapper>
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 d0623da..232f21d 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
@@ -26,5 +26,5 @@
IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
- List<User> selectUser();
+ List<Map> 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 7b87483..744ad7e 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
@@ -74,7 +74,7 @@
}
@Override
- public List<User> selectUser() {
+ public List<Map> selectUser() {
return userMapper.selectUser();
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index d5d6190..54ecc0e 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -37,21 +37,8 @@
</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
+ <select id="selectUser" resultType="Map">
+ select id, name
from lims_laboratory.user
</select>
</mapper>
--
Gitblit v1.9.3