From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 17
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 41 ++
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 126 ++++++--
base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 44 ++
standard-server/src/main/resources/mapper/MaterialMapper.xml | 20 -
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 81 ++---
inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java | 6
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java | 6
base-server/src/main/resources/mapper/DeviceMapper.xml | 8
standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java | 9
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java | 31 +
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java | 23
standard-server/src/main/java/com/yuanchu/mom/service/SpecificationsService.java | 8
inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java | 5
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java | 35 -
standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java | 6
base-server/src/main/resources/mapper/TechniqueModelMapper.xml | 6
standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java | 17 -
base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 19
base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 6
standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java | 20 -
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 6
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 269 ++++++++++-------
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java | 15
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java | 8
base-server/src/main/resources/mapper/TechnicalModelMapper.xml | 2
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 39 ++
inspect-server/src/main/resources/mapper/RawInsProductMapper.xml | 19 +
30 files changed, 518 insertions(+), 378 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 69e31a0..2451288 100644
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/base-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -31,4 +31,7 @@
//鎵归噺鍒犻櫎
void delAllDevice(String ids);
+ //鍘熸潗鏂欐楠�-->閫夋嫨璁惧
+ List<Map<String, Object>> chooseDevice();
+
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 44e6c75..9508727 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -33,17 +33,6 @@
*/
List<Map<String, Object>> selectTreeDevice(Integer type, String father, Integer deviceStatus, String message);
- /**
- * 鏌ヨ鎵�鏈夎澶�
- * @return
- */
- List<Device> selectDevice();
-
- /**
- * 鏍规嵁璁惧id鏌ヨ璁惧鍚嶇О
- * @param id
- */
- String getDeviceNameById(Integer id);
/**
* 鏂板浠櫒璁惧
@@ -76,4 +65,10 @@
* @param ids
*/
void delAllDevice(String ids);
+
+ /**
+ * 鍘熸潗鏂欐楠�-->閫夋嫨璁惧
+ * @return
+ */
+ List<Map<String,Object>> chooseDevice();
}
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index b4e582b..ee1d437 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -40,19 +40,6 @@
return deviceMapper.selectTreeDevice(type, father, deviceStatus, message);
}
- //鏌ヨ鎵�鏈夎澶�
- @Override
- public List<Device> selectDevice() {
- return deviceMapper.selectList(new QueryWrapper<>());
- }
-
- //鏍规嵁璁惧id鑾峰彇璁惧鍚嶇О
- @Override
- public String getDeviceNameById(Integer id) {
- Device device = deviceMapper.selectById(id);
- return device.getName();
- }
-
//鏂板浠櫒璁惧
@Override
public Integer addDevice(DeviceDto deviceDto) {
@@ -90,4 +77,10 @@
public void delAllDevice(String ids) {
deviceMapper.delAllDevice(ids);
}
+
+ //鍘熸潗鏂欐楠�-->閫夋嫨璁惧
+ @Override
+ public List<Map<String, Object>> chooseDevice() {
+ return deviceMapper.chooseDevice();
+ }
}
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 8da494e..e58d369 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -48,6 +48,14 @@
where state = 1
and device_status in (1, 5)
</select>
+
+ <!--鍘熸潗鏂欐楠�-閫夋嫨璁惧-->
+ <select id="chooseDevice" resultType="java.util.Map">
+ select id, name
+ from mom_ocean.device
+ where state = 1
+ and device_status in (1, 5)
+ </select>
<!--鎵归噺鍒犻櫎-->
<update id="delAllDevice">
update mom_ocean.device
diff --git a/base-server/src/main/resources/mapper/TechnicalModelMapper.xml b/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
index 62485d2..7effd0b 100644
--- a/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
@@ -30,7 +30,7 @@
<resultMap id="selectAllTechNamTowMap" type="map">
<id property="id" column="id"/>
<result property="name" column="name"/>
- <result property="name" column="unit"/>
+ <result property="unit" column="unit"/>
</resultMap>
<select id="selectAllTechNam" resultMap="selectAllTechNamMap">
select id,
diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index aed3cf0..0ec473a 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -8,8 +8,8 @@
</resultMap>
<resultMap id="selectAllTequeMaps" type="map">
<id property="id" column="id"/>
- <result property="name" column="father"/>
- <result property="name" column="unit"/>
+ <result property="father" column="father"/>
+ <result property="unit" column="unit"/>
<result property="name" column="name"/>
</resultMap>
<select id="selectAllTeque" resultMap="selectAllTequeMap">
@@ -37,7 +37,7 @@
<resultMap id="chooseProMaps" type="map">
<id property="id" column="technicalModelId"/>
<result property="name" column="name"/>
- <result property="name" column="unit"/>
+ <result property="unit" column="unit"/>
</resultMap>
<select id="choosePro" resultMap="chooseProMap">
select father,
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 2a8d27f..1f593da 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -49,10 +49,10 @@
<!--鏍规嵁id鏌ョ湅璇︽儏-->
<resultMap id="selecTechByIdMap" type="map">
- <id property="id" column="type"/>
- <result property="name" column="father"/>
+ <id property="type" column="type"/>
+ <result property="father" column="father"/>
<result property="name" column="name"/>
- <result property="name" column="device_group"/>
+ <result property="deviceGroup" column="device_group"/>
<collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
</resultMap>
<resultMap id="selecTechByIdsMap" type="map">
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
index eb96345..0e75f40 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
@@ -22,7 +22,7 @@
* @author zss
* @since 2023-08-01 13:52:30
*/
-@Api(tags = "QMS绠＄悊-->鍘熸潗鏂欐楠�-->妫�楠岄」鐩�")
+@Api(tags = "QMS绠＄悊-->鍘熸潗鏂欐楠�")
@RestController
@RequestMapping("/rawInsProduct")
public class RawInsProductController {
@@ -36,30 +36,25 @@
@Resource
Jwt jwt;
- @ApiOperation(value = "鏌ヨ鎵�鏈夎澶�")
+ @ApiOperation(value = "閫夋嫨璁惧")
@GetMapping("/selectDevice")
public Result selectDevice() {
- return Result.success(deviceService.selectDevice());
+ return Result.success(deviceService.chooseDevice());
}
- @ApiOperation("閫夋嫨璁惧淇℃伅")
+ @ApiOperation(value = "鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "rpId", value = "鍘熸潗鏂欐楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "testValue", value = "妫�娴嬪��", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "DevId", value = "璁惧id", dataTypeClass = Integer.class,required = true)
})
- @GetMapping("/selectDeviceById")
- public Result selectDeviceById(Integer id) {
- return Result.success( deviceService.getDeviceNameById(id));
- }
-
-
- @ApiOperation(value = "鏇存柊妫�楠岄」鐩�")
@PostMapping("/updaterawInsProduct")
- public Result updaterawInsProduct(@RequestHeader("token") String token, @RequestBody RawInsProduct rawInsProduct) throws Exception {
+ public Result updaterawInsProduct(@RequestHeader("token") String token,Integer rpId ,String testValue,Integer devId) throws Exception {
Map<String, String> map = jwt.readJWT(token);
String data = map.get("data");
JSONObject jsonObject = new JSONObject(data);
int userId = Integer.parseInt(jsonObject.getString("id"));
- rawInsProductService.updaterawInsProduct(userId,rawInsProduct);
+ rawInsProductService.updaterawInsProduct(userId,rpId,testValue,devId);
return Result.success();
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index efbfcdb..399a283 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -1,8 +1,11 @@
package com.yuanchu.mom.controller;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.pojo.vo.RawInsProductVo;
+import com.yuanchu.mom.pojo.vo.RawInspectVo;
import com.yuanchu.mom.service.*;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
@@ -12,7 +15,10 @@
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@@ -27,24 +33,30 @@
@Resource
Jwt jwt;
- @Resource
- MaterialService materialService;
- @Resource
- SpecificationsService specificationsService;
+ @ApiOperation(value = "鏂板鍘熸潗鏂欐楠屽崟")
+ @PostMapping("/addRawInspects")
+ public Result addRawInspects(@RequestHeader("token") String token, @RequestBody RawInspectVo rawInspectVo) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ return Result.success(rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
+ }
- @ApiOperation(value = "鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "formTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class),
- @ApiImplicitParam(name = "createTime", value = "鎶ユ鏃ユ湡", dataTypeClass = String.class),
- @ApiImplicitParam(name = "insState", value = "妫�娴嬬姸鎬�: 鍏ㄩ儴榛樿2", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "judgeState", value = "鍚堟牸鐘舵��: 鍏ㄩ儴榛樿2", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "code", value = "鍘熸潗鏂欑紪鐮�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "insState", value = "妫�娴嬬姸鎬�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "name", value = "鍘熸潗鏂欏悕绉�", dataTypeClass = String.class)
})
@PostMapping("/selectRawInspectsList")
- public Result selectRawInspectsList(Integer pageSize, Integer countSize, String formTime, String createTime, Integer insState, Integer judgeState) {
- return Result.success(rawInspectService.selectRawInspectsList(pageSize, countSize, formTime, createTime, insState, judgeState));
+ public Result selectRawInspectsList(Integer pageSize, Integer countSize, String formTime, String code, Integer insState, String name) {
+ IPage<Map<String, Object>> page = rawInspectService.selectRawInspectsList(new Page<Object>(pageSize, countSize), formTime, code, insState, name);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", page.getTotal());
+ map.put("row", page.getRecords());
+ return Result.success(map);
}
@ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏")
@@ -70,46 +82,23 @@
return Result.success(rawInspectService.updateRawInspectsById(id));
}
- @ApiOperation(value = "鏌ヨ鎵�鏈夊師鏉愭枡淇℃伅")
- @GetMapping("/selectMaterial")
- public Result selectMaterial() {
- return Result.success(materialService.selectMaterial());
- }
-
- @ApiOperation(value = "閫夋嫨鐗╂枡鍚嶇О鏌ヨ鐗╂枡淇℃伅(鐗╂枡id鍜岀紪鐮�)")
+ @ApiOperation(value = "鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "name", value = "鍘熸潗鏂欏悕绉�(鐗╂枡鍚嶇О)", dataTypeClass = String.class, required = true)
+ @ApiImplicitParam(name = "id", value = "鍘熸潗鏂欐楠屽崟id", dataTypeClass = Integer.class, required = true)
})
- @GetMapping("/selectMcodeId")
- public Result selectMcodeId(String name) {
- return Result.success(materialService.selectMcodeId(name));
+ @PostMapping("/delRawInsById")
+ public Result delRawInsById(Integer id) {
+ rawInspectService.delRawInsById(id);
+ return Result.success("鍒犻櫎" + id + "鎴愬姛!");
}
- @ApiOperation(value = "閫夋嫨鐗╂枡缂栫爜(鑾峰彇鐗╂枡瑙勬牸id.鍚嶇О鍜屽瀷鍙峰悕绉�)")
+ @ApiOperation(value = "鎵归噺鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "name", value = "鍘熸潗鏂欏悕绉�(鐗╂枡鍚嶇О)", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "code", value = "鍘熸潗鏂欑紪鍙�(鐗╂枡缂栧彿)", dataTypeClass = String.class, required = true)
+ @ApiImplicitParam(name = "ids", value = "鍘熸潗鏂欐楠屽崟id", dataTypeClass = String.class, required = true)
})
- @GetMapping("/selectIdByCoNa")
- public Result selectIdByCoNa(String name, String code) {
- return Result.success(materialService.selectIdByCoNa(name, code));
+ @PostMapping("/delAllRawIns")
+ public Result delAllRawIns(String ids) {
+ rawInspectService.delAllRawIns(ids);
+ return Result.success("鎵归噺鍒犻櫎鎴愬姛!");
}
-
- @ApiOperation(value = "閫夋嫨鐗╂枡瑙勬牸(鏍规嵁瑙勬牸id鑾峰彇鐗╂枡鍨嬪彿)")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鐗╂枡瑙勬牸id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/selectSpBySt")
- public Result selectSpBySt(Integer id) {
- return Result.success(specificationsService.selectSpecificationIdAndName(id));
- }
-
-
- @ApiOperation(value = "鏂板妫�楠屽崟")
- @PostMapping("/addRawInspects")
- public Result addRawInspects(@RequestHeader("token") String token, @RequestBody RawInspect rawInspect) throws Exception {
- Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- return Result.success(rawInspectService.addRawInspects(data.get("name").replaceAll("\"", ""), rawInspect));
- }
-
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
index 6dab012..2a109be 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
@@ -18,6 +18,12 @@
//鏌ヨ鎴愬搧妫�楠屼腑涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState);
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�
+ void updaRawIns(Integer id);
+
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�
+ void delAllRawIns(String ids);
+
IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
index a875079..74ac78c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
@@ -16,5 +16,13 @@
public interface RawInsProductMapper extends BaseMapper<RawInsProduct> {
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�
+ List<Integer> getresult(Integer id);
+
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
+ void updaRawInsById(Integer id);
+
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩�
+ void delAllRawIns(String ids);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
index b9a04f5..a536bd6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
@@ -1,10 +1,13 @@
package com.yuanchu.mom.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.RawInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.time.LocalDate;
import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -14,14 +17,20 @@
*/
public interface RawInspectMapper extends BaseMapper<RawInspect> {
- List<RawInspect> selectRawInspectsByLimit(int pageSize, int countSize, String formTime, String createTime,int insState,int judgeState);
-
-
//璁＄畻鍘熸潗鏂欏湪鏌愪釜鑼冨洿鍐呯殑鍚堟牸鎴栦笉鍚堟牸鏁伴噺
Integer selCountRaw(String begin, String end,Integer judgeState);
//璁＄畻鏈堟�讳骇閲�
Long seAllCount(String begin, String end);
+
+ //鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+ IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name);
+
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏
+ List<Map<String, Object>> selectRawInspectsListById(Integer id);
+
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎
+ void delAllRawIns(String ids);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index 48384ad..ac1fe5f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -36,6 +36,11 @@
private Integer type;
/**
+ * 绫诲瀷0锛氬師鏉愭枡妫�楠屽崟锛�1锛氭垚鍝佹楠屽崟锛�2锛氬崐鎴愬搧妫�楠屽崟
+ **/
+ private Integer type;
+
+ /**
* 缂洪櫡鍚嶇О(鐞嗙敱)
**/
private String reason;
@@ -58,7 +63,6 @@
private Date dealTime;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
index 5c142db..ed42d76 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
@@ -63,7 +63,6 @@
private Integer testState;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
index 3aeb2d5..32511d9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
@@ -55,6 +55,11 @@
private Integer number;
/**
+ * 渚涘簲鍟�
+ */
+ private String supplier;
+
+ /**
* 妫�楠岀姸鎬� 0锛氭湭妫�楠岋紱1锛氬凡妫�楠�
*/
private Integer insState;
@@ -77,7 +82,6 @@
private String userName;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
/**
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
index f85aa74..154df8d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
@@ -3,15 +3,20 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
@Data
+//鏂板鍘熸潗鏂欐楠屽崟鍙傛暟
public class RawInsProductVo implements Serializable {
/**
* 椤圭洰鍚嶇О
**/
+ @NotBlank(message = "椤圭洰鍚嶇О涓嶈兘涓虹┖!")
@JsonSerialize
private String name;
@@ -24,43 +29,25 @@
/**
* 鏍囧噯鍊�
**/
+ @NotBlank(message = "鏍囧噯鍊间笉鑳戒负绌�!")
@JsonSerialize
private String required;
/**
* 鍐呮帶鍊�
**/
+ @NotBlank(message = "鍐呮帶鍊间笉鑳戒负绌�!")
@JsonSerialize
private String internal;
/**
* 妫�娴嬪��
- **/
- @JsonSerialize
+ */
private String testValue;
/**
- * 缁撹 0锛氫笉鍚堟牸锛�1锛氬悎鏍�
- **/
- @JsonSerialize
- private Integer testState;
+ * 璁惧id
+ */
+ private Integer deviceId;
-
- /**
- * 璁惧鍚嶇О
- **/
- @JsonSerialize
- private String deviceName;
-
- /**
- * 鍏宠仈 鐢宠鍗昳d
- **/
- @JsonSerialize
- private Integer rawInspectId;
-
- /**
- * 妫�楠屽憳
- **/
- @JsonSerialize
- private String userName;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
index ce5224f..839ff67 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
@@ -8,18 +8,21 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
-//鏌ヨ妫�楠屽崟璇︽儏(妫�楠屽熀鏈俊鎭互鍙婃楠岄」鐩俊鎭�)
+//鏂板鍘熸潗鏂欐楠屽崟鍙傛暟
public class RawInspectVo implements Serializable {
/* 妫�楠岃鎯� */
/**
* 鏉ユ枡鏃ユ湡
*/
+ @NotNull(message = "鏉ユ枡鏃ユ湡涓嶈兘涓虹┖!")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date formTime;
@@ -27,44 +30,49 @@
/**
* 鍨嬪彿瑙勬牸
*/
+ @NotBlank(message = "鍨嬪彿瑙勬牸涓嶈兘涓虹┖!")
@JsonSerialize
private String specifications;
/**
* 鍘熸潗鏂欑紪鐮�
*/
+ @NotBlank(message = "鍘熸潗鏂欑紪鐮佷笉鑳戒负绌�!")
@JsonSerialize
private String code;
/**
* 鍘熸潗鏂欏悕绉�
*/
+ @NotBlank(message = "鍘熸潗鏂欏悕绉颁笉鑳戒负绌�!")
@JsonSerialize
private String name;
- /**
- * 鎶ユ鏃ユ湡
- */
- @TableField(fill = FieldFill.INSERT)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date createTime;
/**
* 鍗曚綅
*/
+ @NotBlank(message = "鍗曚綅涓嶈兘涓虹┖!")
@JsonSerialize
private String unit;
/**
* 鏁伴噺
*/
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖!")
@JsonSerialize
private Integer number;
/**
+ * 渚涘簲鍟�
+ */
+ @NotBlank(message = "渚涘簲鍟嗕笉鑳戒负绌�!")
+ private String supplier;
+
+ /**
* 鎶ユ浜猴紙褰撳墠鐢ㄦ埛鍚嶏級
*/
+ @NotBlank(message = "鎶ユ浜轰笉鑳戒负绌�!")
@JsonSerialize
private String userName;
@@ -72,10 +80,5 @@
@JsonSerialize
private List<RawInsProductVo> rawInsProducts;
- /* 妫�楠岀粨璁� */
- /**
- * 鍚堟牸鐘舵�� 0锛氫笉鍚堟牸锛�1锛氬悎鏍�
- */
- @JsonSerialize
- private Integer judgeState;
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
index c2b2f25..3b4f62d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
@@ -16,11 +16,10 @@
public interface RawInsProductService extends IService<RawInsProduct> {
/**
- * 鏇存柊妫�楠岄」鐩�
+ * 鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)
* @param userId
- * @param rawInsProduct
*/
- void updaterawInsProduct(int userId, RawInsProduct rawInsProduct);
+ void updaterawInsProduct(int userId, Integer rpId ,String testValue,Integer devId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index 994e554..ba303c1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -1,9 +1,12 @@
package com.yuanchu.mom.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.RawInspect;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.vo.RawInspectVo;
+import java.util.List;
import java.util.Map;
/**
@@ -12,25 +15,47 @@
* @createDate 2023-07-31 14:43:15
*/
public interface RawInspectService extends IService<RawInspect> {
- Map<String, Object> selectRawInspectsList(int pageSize, int countSize, String formTime, String createTime, int insState, int judgeState);
+
+ /**
+ * 鏂板鍘熸潗鏂欐楠屽崟
+ * @param userId
+ * @param rawInspectVo
+ */
+ String addRawInspects(String userId, RawInspectVo rawInspectVo);
+
+ /**
+ * 鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+ * @param formTime
+ * @param code
+ * @param insState
+ * @param name
+ * @return
+ */
+ IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name);
+
/**
* 鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
* @param id
* @return
*/
- RawInspectVo selectRawInspectsListById(Integer id);
+ List<Map<String,Object>> selectRawInspectsListById(Integer id);
/**
* 鏇存柊妫�楠岀姸鎬�
* @param id
*/
- boolean updateRawInspectsById(Integer id);
+ String updateRawInspectsById(Integer id);
/**
- * 鏂板妫�楠屽崟
- * @param userName
- * @param rawInspect
+ * 鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
+ * @param id
*/
- Integer addRawInspects(String userName, RawInspect rawInspect);
+ void delRawInsById(Integer id);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ */
+ void delAllRawIns(String ids);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 23e7853..31bc55f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -1,17 +1,19 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.RawInsProductMapper;
+import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
+import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
-import com.yuanchu.mom.utils.MyUtil;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鍘熸潗鏂欑敵璇峰崟涓殑椤圭洰鍒楄〃(RawInsProduct)琛ㄦ湇鍔″疄鐜扮被
@@ -25,21 +27,37 @@
@Resource
RawInsProductMapper rawInsProductMapper;
- //鏇存柊妫�楠岄」鐩�
+ @Resource
+ RawInspectMapper rawInspectMapper;
+
+ //鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)
@Override
- public void updaterawInsProduct(int userId, RawInsProduct rawInsProduct) {
+ public void updaterawInsProduct(int userId,Integer rpId ,String testValue,Integer devId) {
+ RawInsProduct rawInsProduct = rawInsProductMapper.selectById(rpId);
+ //璧嬪�艰澶�
+ rawInsProduct.setDeviceId(devId);
//璧嬪�兼楠屽憳id
rawInsProduct.setUserId(userId);
//鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
- String testValue = rawInsProduct.getTestValue();//妫�楠屽��
String required = rawInsProduct.getRequired();//鏍囧噯鍊�
String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
- rawInsProduct.setTestState(checkValues(required, internal, testValue));
- //鏍规嵁妫�楠岄」鐩悕鍜屽叧鑱旂殑妫�楠屽崟id鏉ユ煡璇㈡楠岄」鐩殑鏁版嵁
- LambdaUpdateWrapper<RawInsProduct> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(RawInsProduct::getRawInspectId, rawInsProduct.getRawInspectId())
- .eq(RawInsProduct::getName, rawInsProduct.getName());
- rawInsProductMapper.update(rawInsProduct, updateWrapper);
+ rawInsProduct.setTestValue(testValue);
+ List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
+ int values = checkValues(required, internal, s);
+ return values;
+ }).collect(Collectors.toList());
+ if (list.contains(0)) {
+ //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ rawInsProduct.setTestState(0);
+ }else {
+ rawInsProduct.setTestState(1);
+ }
+ /*鏇存柊鍘熸潗鏂欐楠岄」鐩〃*/
+ rawInsProductMapper.updateById(rawInsProduct);
+ /*鏇存柊鍘熸潗鏂欐楠屽崟*/
+ RawInspect rawInspect = new RawInspect();
+ rawInspect.setId(rawInsProduct.getRawInspectId());
+ rawInspectMapper.updateById(rawInspect);
}
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index aa55ef8..72b3615 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
@@ -14,6 +16,7 @@
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -25,8 +28,7 @@
* @createDate 2023-07-31 14:43:15
*/
@Service
-public class RawInspectServiceImpl extends ServiceImpl<RawInspectMapper, RawInspect>
- implements RawInspectService {
+public class RawInspectServiceImpl extends ServiceImpl<RawInspectMapper, RawInspect> implements RawInspectService {
@Resource
RawInspectMapper rawInspectMapper;
@@ -41,127 +43,184 @@
InspectUnacceptedMapper inspectUnacceptedMapper;
@Resource
- DeviceService deviceService;
+ UserMapper userMapper;
- @Resource
- MaterialMapper materialMapper;
-
- @Resource
- UserService userService;
-
- @Resource
- SpecificationsService specificationsService;
-
- @Resource
- StandardService standardService;
-
- @Resource
- ProductMapper productMapper;
-
+ //鏂板鍘熸潗鏂欐楠屽崟
@Override
- public Map<String, Object> selectRawInspectsList(int pageSize, int countSize, String formTime, String createTime, int insState, int judgeState) {
- Map<String, Object> map = new HashMap<>();
- map.put("count", rawInspectMapper.selectCount(new QueryWrapper<RawInspect>().eq("state", 1)));
- map.put("data", rawInspectMapper.selectRawInspectsByLimit((pageSize - 1) * countSize, pageSize * countSize, formTime, createTime, insState, judgeState));
- return map;
+ @Transactional(rollbackFor = Exception.class)
+ public String addRawInspects(String userId, RawInspectVo rawInspectVo) {
+ //鎶ユ浜�(鏂板妫�楠屽崟鐨勪汉)
+ rawInspectVo.setUserName(userMapper.selectById(userId).getName());
+ //鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
+ List<RawInsProductVo> rawInsProductVos = rawInspectVo.getRawInsProducts();
+ for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
+ char internal = rawInsProductVo.getInternal().charAt(0);
+ char required = rawInsProductVo.getRequired().charAt(0);
+ if (internal != '>' && internal != '<' && internal != '=') {
+ return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+ if (required != '>' && required != '<' && required != '=') {
+ return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+ }
+ /*鏂板鍘熸潗鏂欐楠屽崟*/
+ RawInspect rawInspect = new RawInspect();
+ BeanUtils.copyProperties(rawInspectVo, rawInspect);
+ rawInspectMapper.insert(rawInspect);
+ /*鏂板鍘熸潗鏂欐楠岄」鐩崟*/
+ List<RawInsProduct> rawInsProductList = rawInsProductVos.stream().map(rawInsProVo -> {
+ RawInsProduct rawInsProduct = new RawInsProduct();
+ BeanUtils.copyProperties(rawInsProVo, rawInsProduct);
+ if (ObjectUtils.isNotEmpty(rawInsProduct.getTestValue())) {
+ //鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
+ String required = rawInsProduct.getRequired();//鏍囧噯鍊�
+ String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
+ String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
+ List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
+ int values = checkValues(required, internal, s);
+ return values;
+ }).collect(Collectors.toList());
+ if (list.contains(0)) {
+ //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ rawInsProduct.setTestState(0);
+ } else {
+ rawInsProduct.setTestState(1);
+ }
+ rawInsProduct.setUserId(Integer.parseInt(userId));
+ }
+ rawInsProduct.setRawInspectId(rawInspect.getId());
+ return rawInsProduct;
+ }).collect(Collectors.toList());
+ //妫�楠岄」鐩壒閲忔坊鍔�
+ rawInsProductService.saveBatch(rawInsProductList);
+ return "鏂板妫�楠屽崟鎴愬姛!";
+ }
+
+
+ //鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+ @Override
+ public IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name) {
+ return rawInspectMapper.selectRawInspectsList(page, formTime, code, insState, name);
}
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
- public RawInspectVo selectRawInspectsListById(Integer id) {
- //灏嗘楠屽崟鍩烘湰淇℃伅鏌ヨ鍑烘潵骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�
- RawInspect rawInspect = rawInspectMapper.selectById(id);
- RawInspectVo rawInspectVo = new RawInspectVo();
- BeanUtils.copyProperties(rawInspect, rawInspectVo);
- //鏌ヨ妫�楠屽崟閲岄潰鐨勬楠岄」鐩�,骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�
- LambdaQueryWrapper<RawInsProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(RawInsProduct::getRawInspectId, id);
- List<RawInsProduct> rawInsProducts = rawInsProductMapper.selectList(queryWrapper);
- //杩欓噷鏌ュ埌鐨勮澶噄d鍜屾楠屽憳id瑕佹煡璇㈠悕绉�
- List<RawInsProductVo> rawInsProductVos = rawInsProducts.stream().map(rawInsProduct -> {
- //灏嗕竴涓璞＄殑鍊艰祴鍊肩粰鍙︿竴涓璞�
- RawInsProductVo rawInsProductVo = new RawInsProductVo();
- BeanUtils.copyProperties(rawInsProduct, rawInsProductVo);
- //鑾峰彇璁惧鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
- if (rawInsProduct.getDeviceId() != null) {
- String deviceName = deviceService.getDeviceNameById(rawInsProduct.getDeviceId());
- rawInsProductVo.setDeviceName(deviceName);
- }
- //鑾峰彇鐢ㄦ埛鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
- if (rawInsProduct.getUserId() != null) {
- String userName = userService.selectNameById(rawInsProduct.getUserId());
- rawInsProductVo.setUserName(userName);
- }
- return rawInsProductVo;
- }).collect(Collectors.toList());
- rawInspectVo.setRawInsProducts(rawInsProductVos);
- return rawInspectVo;
+ public List<Map<String, Object>> selectRawInspectsListById(Integer id) {
+ return rawInspectMapper.selectRawInspectsListById(id);
}
//鏇存柊妫�楠岀姸鎬�(涓婃姤)
@Override
- public boolean updateRawInspectsById(Integer id) {
- //鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀姸鎬佸拰妫�楠岀粨璁�
- RawInspectVo rawInspectVo = selectRawInspectsListById(id);
- RawInspect rawInspect = RawInspect.builder()
- .id(id)
- .insState(1)
- .insTime(new Date())
- .judgeState(rawInspectVo.getJudgeState())
- .build();
- rawInspectMapper.updateById(rawInspect);
- //涓嶇妫�楠屽悎鏍间笌涓嶅悎鏍�,閮借鏂板鍒板師鏉愭枡搴撳瓨
-
- /* //濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟
- if (rawInspectVo.getJudgeState() == 0) {
+ @Transactional(rollbackFor = Exception.class)
+ public String updateRawInspectsById(Integer id) {
+ /*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
+ //鍏堝垽鏂楠岀粨鏋�
+ List<Integer> results = rawInsProductMapper.getresult(id);
+ int count = 0;
+ for (Integer result : results) {
+ if (result != null && result == 1) {
+ count++;
+ }
+ }
+ RawInspect rawInspect = new RawInspect();
+ rawInspect.setId(id);
+ rawInspect.setInsState(1);
+ rawInspect.setInsTime(new Date());
+ //濡傛灉妫�楠岄」鐩腑鐨勭粨璁哄寘鍚笉鍚堟牸鍒欐楠屽崟涓嶅悎鏍�
+ if (results.contains(0)) {
+ rawInspect.setJudgeState(0);
+ //鏇存柊妫�楠屽崟
+ rawInspectMapper.updateById(rawInspect);
+ } else if (count == results.size()) {
+ rawInspect.setJudgeState(1);
+ rawInspectMapper.updateById(rawInspect);
+ } else return "椤圭洰鏈楠屽畬!";
+ /*濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟*/
+ if (rawInspect.getJudgeState() == 0) {
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
- .reason(rawInspectVo.getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
+ .reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
.rawInspectId(id)
- .type(2) //绫诲瀷涓哄師鏉愭枡
+ .type(0) //绫诲瀷涓哄師鏉愭枡
.build();
inspectUnacceptedMapper.insert(rawUnaccepted);
- }*/
- return true;
+ }
+ return "涓婃姤鎴愬姛!";
+ }
+
+ //鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delRawInsById(Integer id) {
+ /*鍒犻櫎鍘熸潗鏂欐楠屽崟*/
+ RawInspect rawInspect = new RawInspect();
+ rawInspect.setId(id);
+ rawInspect.setState(0);
+ rawInspectMapper.updateById(rawInspect);
+ /*鍒犻櫎鍘熸潗鏂欐楠岄」鐩〃*/
+ rawInsProductMapper.updaRawInsById(id);
+ /*鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍗�*/
+ inspectUnacceptedMapper.updaRawIns(id);
+ }
+
+ //鎵归噺鍒犻櫎
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delAllRawIns(String ids) {
+ /*鎵归噺鍒犻櫎鍘熸潗鏂欐楠屽崟*/
+ rawInspectMapper.delAllRawIns(ids);
+ /*鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩〃*/
+ rawInsProductMapper.delAllRawIns(ids);
+ /*鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍗�*/
+ inspectUnacceptedMapper.delAllRawIns(ids);
+
}
- //鏂板妫�楠屽崟
- @Override
- public Integer addRawInspects(String userName, RawInspect rawInspect) {
- rawInspect.setUserName(userName);
- //鏂板妫�楠屽崟
- rawInspectMapper.insert(rawInspect);
- //鑾峰彇鐗╂枡id
- Material material = materialMapper.selectOne(Wrappers.<Material>query()
- .eq("name", rawInspect.getName())
- .eq("code", rawInspect.getCode()));
- //鑾峰彇瑙勬牸鍚嶇О鍜屽瀷鍙峰悕绉�
- String specification = rawInspect.getSpecifications();
- String[] strings = specification.split("-");
- String stName = strings[0];//瑙勬牸鍚嶇О
- String spName = strings[1];//鍨嬪彿鍚嶇О
- //鑾峰彇瑙勬牸id
- Standard standard = standardService.getOne(Wrappers.<Standard>query()
- .eq("name", stName)
- .eq("material_id", material.getId()));
- //鑾峰彇鍨嬪彿id
- Specifications specifications = specificationsService.selectSpIdByname(standard.getId(), spName);
- //鏍规嵁鍨嬪彿id鏌ヨ椤圭洰淇℃伅
- List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specifications.getId()));
- ArrayList<RawInsProduct> list = new ArrayList<>();
- for (Product product : productList) {
- RawInsProduct rawInsProduct = RawInsProduct.builder()
- .name(product.getName())
- .unit(product.getUnit())
- .required(product.getRequired())
- .internal(product.getInternal())
- .rawInspectId(rawInspect.getId())
- .build();
- list.add(rawInsProduct);
+ /*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
+ private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+ boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
+
+ if (isStandardValueSatisfied && isControlValueSatisfied) {
+ return 1;
+ } else {
+ return 0;
}
- //妫�楠岄」鐩壒閲忔坊鍔�
- rawInsProductService.saveBatch(list);
- return rawInspect.getId();
+ }
+
+ private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
+ String substring = valueStr.substring(1, 2);
+ if (substring.equals("=")) {
+ String operator = valueStr.substring(0, 2);
+ Double standardValue = Double.parseDouble(valueStr.substring(2));
+ Double detectionValue = Double.parseDouble(detectionValueStr);
+ switch (operator) {
+ case ">=":
+ return detectionValue >= standardValue;
+ case "<=":
+ return detectionValue <= standardValue;
+ default:
+ return false;
+ }
+ } else {
+ String operator = valueStr.substring(0, 1);
+ Double standardValue = Double.parseDouble(valueStr.substring(1));
+ Double detectionValue = Double.parseDouble(detectionValueStr);
+ switch (operator) {
+ case ">":
+ return detectionValue > standardValue;
+ case "鈮�":
+ return detectionValue >= standardValue;
+ case "鈮�":
+ return detectionValue <= standardValue;
+ case "<":
+ return detectionValue < standardValue;
+ case "=":
+ return detectionValue.equals(standardValue);
+ default:
+ return false;
+ }
+ }
}
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 7f46410..1e74cb7 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,7 +1,48 @@
<?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.mom.mapper.InspectUnacceptedMapper">
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�-->
+ <update id="updaRawIns">
+ update mom_ocean.inspect_unaccepted
+ set state=0
+ where raw_inspect_id = #{id}
+ and type = 0
+ </update>
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�-->
+ <update id="delAllRawIns">
+ update mom_ocean.inspect_unaccepted
+ set state=0
+ where raw_inspect_id in (${ids})
+ and type = 0
+ </update>
+ <select id="selectUnRawInspectsList" resultType="java.util.Map">
+ select ru.id,
+ DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
+ reason,
+ code,
+ name,
+ specifications,
+ unit,
+ number,
+ DATE_FORMAT(ri.create_time, '%Y-%m-%d') '鎶ユ鏃ユ湡',
+ user_name,
+ DATE_FORMAT(ins_time, '%Y-%m-%d') '妫�楠屾棩鏈�',
+ deal_state,
+ deal_reasult,
+ DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
+ from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
+ <where>
+ <if test="dealState!=null and dealState!=''">
+ and deal_state=#{dealState}
+ </if>
+ <if test="formTime!=null and formTime!=''">
+ and form_time=#{formTime}
+ </if>
+ and ru.state=1
+ </where>
+ order by ru.id desc
+ </select>
<select id="selectInsList" resultType="java.util.Map">
SELECT ru.id,
DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
diff --git a/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml b/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
index f2dda01..d8e0d2a 100644
--- a/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
@@ -1,4 +1,23 @@
<?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.mom.mapper.RawInsProductMapper">
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎-->
+ <update id="updaRawInsById">
+ update mom_ocean.raw_ins_product
+ set state=0
+ where raw_inspect_id = #{id}
+ </update>
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欐楠岄」鐩�-->
+ <update id="delAllRawIns">
+ update mom_ocean.raw_ins_product
+ set state=0
+ where raw_inspect_id in (${ids})
+ </update>
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�-->
+ <select id="getresult" resultType="java.lang.Integer">
+ select test_state
+ from mom_ocean.raw_ins_product
+ where state = 1
+ and raw_inspect_id = #{id}
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index a5b294b..327ba05 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -3,42 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.RawInspect">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="code" column="code" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="specifications" column="specifications" jdbcType="VARCHAR"/>
- <result property="unit" column="unit" jdbcType="VARCHAR"/>
- <result property="number" column="number" jdbcType="INTEGER"/>
- <result property="insState" column="ins_state" jdbcType="INTEGER"/>
- <result property="judgeState" column="judge_state" jdbcType="INTEGER"/>
- <result property="insTime" column="ins_time" jdbcType="DATE"/>
- <result property="userName" column="user_name" jdbcType="VARCHAR"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="DATE"/>
- <result property="updateTime" column="update_time" jdbcType="DATE"/>
- <result property="formTime" column="form_time" jdbcType="DATE"/>
- </resultMap>
- <select id="selectRawInspectsByLimit" resultType="com.yuanchu.mom.pojo.RawInspect">
- select id, code, name, specifications, unit, number, ins_state, judge_state, ins_time, user_name, create_time,
- form_time
- from mom_ocean.raw_inspect
- where state = 1
- <if test="formTime!=null and formTime!=''">
- and form_time = #{formTime}
- </if>
- <if test="createTime!=null and createTime!=''">
- and create_time = #{createTime}
- </if>
- <if test="insState!=2">
- and ins_state = #{insState}
- </if>
- <if test="judgeState!=2">
- and judge_state = #{judgeState}
- </if>
- order by id desc
- limit #{pageSize},#{countSize}
- </select>
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎-->
+ <update id="delAllRawIns">
+ update mom_ocean.raw_inspect
+ set state=0
+ where id in (${ids})
+ </update>
<select id="selCountRaw" resultType="java.lang.Integer">
select count(id)
from mom_ocean.raw_inspect
@@ -63,4 +33,88 @@
and raw_inspect.create_time <= #{end}
</if>
</select>
+
+ <!--鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃-->
+ <select id="selectRawInspectsList" resultType="java.util.Map">
+ select id,
+ DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
+ code,
+ name,
+ specifications,
+ unit,
+ number,
+ DATE_FORMAT(create_time, '%Y-%m-%d') createTime,
+ user_name,
+ DATE_FORMAT(ins_time, '%Y-%m-%d') insTime,
+ ins_state,
+ judge_state
+ from mom_ocean.raw_inspect
+ where state=1
+ <if test="formTime!=null and formTime!=''">
+ and form_time=#{formTime}
+ </if>
+ <if test="code!=null and code!=''">
+ and code like concat('%',#{code},'%')
+ </if>
+ <if test="insState!=null">
+ and ins_state=#{insState}
+ </if>
+ <if test="name!=null and name!=''">
+ and name like concat('%',#{name},'%')
+ </if>
+ </select>
+
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏-->
+ <resultMap id="oneMap" type="map">
+ <id property="rcode" column="rcode"/>
+ <result property="formTime" column="formTime"/>
+ <result property="rname" column="rname"/>
+ <result property="specifications" column="specifications"/>
+ <result property="runit" column="runit"/>
+ <result property="number" column="number"/>
+ <result property="supplier" column="supplier"/>
+ <result property="judgeState" column="judge_state"/>
+ <result property="userName" column="user_name"/>
+ <collection property="children" resultMap="twoMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="twoMap" type="map">
+ <id property="rpId" column="rpId"/>
+ <result property="rpName" column="rpName"/>
+ <result property="rpUnit" column="rpUnit"/>
+ <result property="required" column="required"/>
+ <result property="internal" column="internal"/>
+ <result property="testValue" column="test_value"/>
+ <result property="testState" column="test_state"/>
+ <result property="devName" column="devName"/>
+ <result property="uName" column="uName"/>
+ </resultMap>
+
+ <select id="selectRawInspectsListById" resultMap="oneMap">
+ select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
+ r.code rcode,
+ r.name rname,
+ specifications,
+ r.unit runit,
+ number,
+ supplier,
+ judge_state,
+ user_name,
+ rp.id rpId,
+ rp.name rpName,
+ rp.unit rpUnit,
+ required,
+ internal,
+ test_value,
+ test_state,
+ device.name devName,
+ user.name uName
+ from mom_ocean.raw_ins_product rp
+ left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
+ left join mom_ocean.device
+ on rp.device_id = device.id
+ left join mom_ocean.user on rp.user_id = user.id
+ where r.state = 1
+ and rp.state = 1
+ and r.id = #{id}
+ </select>
</mapper>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java
index 47d4ae2..8b18fae 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/MaterialMapper.java
@@ -19,12 +19,6 @@
//鏍囧噯MOM-->宸︿晶浜旂骇鏍戝睍绀�
List<Map<String,Object>> selectTreeByMaterial();
- //鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
- List<Material> selectMcodeId(String name);
-
- //鏍规嵁鐗╂枡鍚嶇О鍜岀墿鏂欑紪鐮佹煡璇㈢墿鏂檌d,瑙勬牸淇℃伅鍜屽瀷鍙蜂俊鎭�
- List<Map> selectIdByCoNa(String name, String code);
-
//鏍规嵁鏍囧噯id鏌ヨ鐗╂枡
Material selFath(Integer id);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
index 1951cea..7102da9 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
@@ -28,30 +28,12 @@
*/
void addMaterial(MaterialDto materialDto);
- /**
- * 鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
- * @param name
- * @return
- */
- List<Material> selectMcodeId(String name);
-
- /**
- * 鏍规嵁鐗╂枡鍚嶇О鍜岀墿鏂欑紪鐮佹煡璇㈢墿鏂檌d
- * @param name
- * @param code
- * @return
- */
- List<Map> selectIdByCoNa(String name, String code);
/**
* 妫�楠屾ā鍧�-->QMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(椤圭洰鍚嶇О涓嬫媺妗嗭細Id涓庡悕绉帮紝缂栫爜)
*/
List<Map<String, Object>> selectMaterialIdAndNameAndCode();
- /**
- * 鏌ヨ鎵�鏈夌墿鏂欎俊鎭�
- * @return
- */
- List<Material> selectMaterial();
+
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/SpecificationsService.java b/standard-server/src/main/java/com/yuanchu/mom/service/SpecificationsService.java
index a89d774..38e22e8 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/SpecificationsService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/SpecificationsService.java
@@ -20,14 +20,6 @@
/**
- * 鏍规嵁瑙勬牸id鍜屽瀷鍙峰悕绉版煡璇㈠瀷鍙蜂俊鎭�
- * @param id
- * @param name
- * @return
- */
- Specifications selectSpIdByname(Integer id, String name);
-
- /**
* 妫�楠屾ā鍧�-->OMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(闇�瑕佽鏍煎瀷鍙风殑Id涓庡悕绉�)
*/
List<Map<String, Object>> selectSpecificationIdAndName(Integer materialId);
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java
index ed84a91..924383c 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java
@@ -163,23 +163,6 @@
return materialMapper.selectMaps(wrapper);
}
- //鏌ヨ鎵�鏈夌墿鏂欎俊鎭�
- @Override
- public List<Material> selectMaterial() {
- return materialMapper.selectList(Wrappers.<Material>query());
- }
-
- //鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
- @Override
- public List<Material> selectMcodeId(String name) {
- return materialMapper.selectMcodeId(name);
- }
-
- //鏍规嵁鐗╂枡鍚嶇О鍜岀墿鏂欑紪鐮佹煡璇㈢墿鏂檌d,瑙勬牸淇℃伅鍜屽瀷鍙蜂俊鎭�
- @Override
- public List<Map> selectIdByCoNa(String name, String code) {
- return materialMapper.selectIdByCoNa(name, code);
- }
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java
index 1c418b5..9b37d8c 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/SpecificationsServiceImpl.java
@@ -146,15 +146,6 @@
return maps;
}
-
- //鏍规嵁瑙勬牸id鍜屽瀷鍙峰悕绉版煡璇㈠瀷鍙蜂俊鎭�
- @Override
- public Specifications selectSpIdByname(Integer id, String name) {
- Specifications specifications = specificationsMapper.selectOne(Wrappers.<Specifications>query()
- .eq("standard_id", id)
- .eq("name", name));
- return specifications;
- }
}
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 53e1662..50a30ae 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -42,26 +42,6 @@
on sp.standard_id = s.id
</select>
- <select id="selectMcodeId" resultType="com.yuanchu.mom.pojo.Material">
- select id, code
- from mom_ocean.material
- where name = #{name}
- </select>
-
- <select id="selectIdByCoNa" resultType="java.util.Map">
- select m.id '鐗╂枡id',
- st.id '瑙勬牸id',
- st.name '瑙勬牸鍚嶇О',
- sp.name '鍨嬪彿鍚嶇О'
- from mom_ocean.material m,
- mom_ocean.standard st,
- mom_ocean.specifications sp
- where m.id = material_id
- and material_id = standard_id
- and m.name = #{name}
- and code = #{code}
- </select>
-
<!--鏍规嵁鏍囧噯id鏌ヨ鐗╂枡-->
<select id="selFath" resultType="com.yuanchu.mom.pojo.Material">
select *
--
Gitblit v1.9.3