From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml | 6 -
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 34 ++++++
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 8 -
inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessInspectMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java | 3
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 21 +++
inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java | 5
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 69 ++++++++++---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java | 4
/dev/null | 50 ----------
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 22 ++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 1
inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java | 5 -
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 44 ++------
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java | 3
inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml | 6 -
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 4
19 files changed, 142 insertions(+), 151 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 7c686cf..940c536 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -3,18 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.Opinion;
-import com.yuanchu.mom.service.OpinionService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
-import com.yuanchu.mom.utils.MyUtil;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.InspectUnacceptedService;
@@ -37,9 +32,6 @@
@Autowired
private Jwt jwt;
-
- @Autowired
- private OpinionService opinionService;
@ApiOperation(value = "涓嶅悎鏍煎搧绠＄悊鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@@ -131,25 +123,6 @@
return Result.success(map);
}
- @ApiOperation(value = "缂栬緫鎰忚-->纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
- @PostMapping("/addOpinion")
- public Result<?> updateOpinion(@RequestHeader("token") String token, @RequestBody Map<String, Object> opinion) throws Exception {
- List<?> opinion1 = JackSonUtil.unmarshal(JackSonUtil.marshal(opinion.get("opinion")), List.class);
- Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- String id = data.get("id").replaceAll("\"", "");
- opinionService.updateOpinion(id, opinion1);
- return Result.success("娣诲姞鎴愬姛锛�");
- }
-
- @ApiOperation(value = "鏌ョ湅缂栬緫鎰忚", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/viewEditorial")
- public Result<?> viewEditorialComments(Integer rawUnacceptedId) {
- return Result.success(opinionService.viewEditorialComments(rawUnacceptedId));
- }
-
@ApiOperation(value = "澶辩劍鏇存柊鐜板儚鎻忚堪", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true),
@@ -164,13 +137,20 @@
return Result.fail("鏇存柊澶辫触");
}
- @ApiOperation(value = "鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiOperation(value = "缂栬緫澶勭疆鎰忚纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "opinionTell", value = "澶勭疆鎰忚", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "way", value = "澶勭悊鏂瑰紡", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "涓嶅悎鏍肩被鍨�", dataTypeClass = Integer.class, required = true),
})
- @GetMapping("/clickEditing")
- public Result<?> clickEditingTriggerQuery(@RequestParam("rawUnacceptedId") Integer rawUnacceptedId) {
- return Result.success(opinionService.clickEditingTriggerQuery(rawUnacceptedId));
+ @PostMapping("/editDisposalOpinion")
+ public Result<?> editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
+ Integer isUpdateSuccess = inspectUnacceptedService.editDisposalOpinionConfirmation(rawUnacceptedId, opinionTell, way, type);
+ if (isUpdateSuccess == 1) {
+ return Result.success("缂栬緫鎴愬姛");
+ }
+ return Result.fail("缂栬緫澶辫触");
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
index 74f011f..20e1362 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
@@ -26,7 +26,4 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏
List<Map<String, Object>> selectFinishInspectsListById(Integer id);
-
- //娓呯┖妫�楠岀姸鎬�
- void updById(Integer rawInspectId);
}
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 2ab9e78..bbd6cf7 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.InspectUnaccepted;
+import com.yuanchu.mom.pojo.vo.RawInspectVo;
+
import java.util.Map;
/**
@@ -21,5 +23,7 @@
IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state);
+
+ RawInspectVo editDisposalOpinionConfirmation(Integer rawUnacceptedId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java
deleted file mode 100644
index 2ff3d8b..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.mybatis_config.MyBaseMapper;
-import com.yuanchu.mom.pojo.Opinion;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.mom.pojo.dto.UpdateInspectUnacceptedDto;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 涓嶅悎鏍煎鐞嗘剰瑙佽〃 Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07 01:54:28
- */
-public interface OpinionMapper extends MyBaseMapper<Opinion> {
-
- List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId);
-
- Integer updateOpinion(List<Opinion> opinion);
-
- List<Map<String, Object>> viewEditorialComments(Integer rawUnacceptedId);
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessInspectMapper.java
index c3dd81e..c986c40 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessInspectMapper.java
@@ -24,8 +24,5 @@
//鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
IPage<Map<String, Object>> selectProcessInspectsList(Page<Object> page, String techfather, Integer result, String name);
-
- //灏嗘楠岀姸鎬佷慨鏀逛负null
- void updById(Integer rawInspectId);
}
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 1b9dc7f..ba9785b 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
import java.util.List;
@@ -13,7 +14,7 @@
* @author zss
* @since 2023-08-01 13:52:30
*/
-public interface RawInsProductMapper extends BaseMapper<RawInsProduct> {
+public interface RawInsProductMapper extends MyBaseMapper<RawInsProduct> {
//鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�
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 ded3510..6c0d49a 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
@@ -28,11 +28,6 @@
//鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏
Map<String, Object> selectRawInspectsListById(Integer id);
-
- //娓呯┖妫�楠岀粨璁�
- void updById(Integer rawInspectId);
-
-
}
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 0aaa0e6..e724eda 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
@@ -57,9 +57,22 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dealTime;
+ /**
+ * 鐜拌薄鎻忚堪
+ **/
+ private String tell;
+
+ @ApiModelProperty(value = "澶勭悊鏂瑰紡 1锛氳繑宸ヨ繑淇紱2锛氳姝ユ帴鏀讹紱3锛氭帴鏀讹紱4锛氶檷绾т娇鐢紱5锛氭姤搴�;6:閫�璐� 7:鎹㈣揣")
+ private Integer way;
+
+ @ApiModelProperty(value = "澶勭悊鎰忚")
+ private String opinionTell;
+
+ @ApiModelProperty(value = "鐟曠柕鍝� 1:鐟曠柕鍝侊紱鍏朵粬锛氱┖")
+ private Integer faultyMaterials;
+
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
-
@TableField(fill = FieldFill.INSERT)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -75,12 +88,5 @@
* 鍏宠仈 妫�楠屽崟id
**/
private Integer rawInspectId;
-
-
-
- /**
- * 鐜拌薄鎻忚堪
- **/
- private String tell;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java
deleted file mode 100644
index 59ff5bc..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-import reactor.util.annotation.NonNull;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * <p>
- * 涓嶅悎鏍煎鐞嗘剰瑙佽〃
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07 01:54:28
- */
-@Data
-@Accessors(chain = true)
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public class Opinion implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鎰忚id
- */
- @ApiModelProperty(value = "id", required = true, example = "1")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @NotNull(message = "閮ㄩ棬绫诲瀷涓嶈兘涓虹┖")
- @ApiModelProperty(value = "閮ㄩ棬绫诲瀷 0锛氭妧鏈儴锛�1锛氱敓浜ч儴锛�2锛氳川閲忛儴锛�3锛氭�荤粡鍔�", hidden = true, example = "0")
- private Integer type;
-
- @NotBlank(message = "澶勭悊鎰忚涓嶈兘涓虹┖锛�")
- @ApiModelProperty(value = "澶勭悊鎰忚", required = true, example = "杩斿伐")
- private String tell;
-
- @NotNull(message = "澶勭悊鏂瑰紡涓嶈兘涓虹┖锛�")
- @ApiModelProperty(value = "澶勭悊鏂瑰紡锛�0锛氳繑宸ワ紱1锛氳繑淇紱2锛氳姝ユ帴鏀讹紱3锛氭嫆鏀讹紱4锛氶檷绾т娇鐢紱5锛氭姤搴�", required = true, example = "0")
- private Integer way;
-
- @ApiModelProperty(value = "閫昏緫鍒犻櫎", hidden = true)
- @TableLogic(value = "1", delval = "0")
- private Integer state;
-
- @TableField(fill = FieldFill.INSERT)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
- private Date createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @ApiModelProperty(value = "鏇存柊鏃堕棿: 鍗冲～鍐欐棩鏈�", hidden = true)
- private Date updateTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @ApiModelProperty(value = "濉啓鏃ユ湡", hidden = true, example = "2023-09-05", dataType = "date")
- private Date fillDate;
-
- @ApiModelProperty(value = "濉啓浜篒d", hidden = true, example = "1")
- private Integer userId;
-
- @NotNull(message = "涓嶅悎鏍肩粺璁¤〃id鑳戒负绌�")
- @ApiModelProperty(value = "涓嶅悎鏍肩粺璁¤〃id", hidden = true, example = "2")
- private Integer rawUnacceptedId;
-}
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 50d0973..bc6a811 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
@@ -78,6 +78,4 @@
/* 妫�楠岄」鐩� */
@JsonSerialize
private List<RawInsProductVo> rawInsProducts;
-
-
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index 9c81d03..c79af35 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.InspectUnaccepted;
-import com.yuanchu.mom.vo.Result;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Map;
@@ -56,5 +56,8 @@
//璇勫
Integer rawEvaluate(Integer rawId, Integer passOrNo);
+
+ @Transactional(rollbackFor = Exception.class)
+ Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java
deleted file mode 100644
index 22d0316..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-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.Opinion;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.dto.UpdateInspectUnacceptedDto;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 涓嶅悎鏍煎鐞嗘剰瑙佽〃 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07 01:54:28
- */
-public interface OpinionService extends IService<Opinion> {
-
- @Transactional(rollbackFor = Exception.class)
- List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId);
-
- /**
- * 鎵归噺鏇存柊鎰忚
- * @param id
- * @param opinion
- * @return
- */
- @Transactional(rollbackFor = Exception.class)
- Integer updateOpinion(String id, List<?> opinion);
-
- /**
- * 鏌ョ湅澶勭疆鎰忚
- * @param rawUnacceptedId
- * @return
- */
- List<Map<String, Object>> viewEditorialComments(Integer rawUnacceptedId);
-}
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 7b18939..1634097 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.RawInsProduct;
+import com.yuanchu.mom.pojo.vo.RawInsProductVo;
import java.util.List;
import java.util.Map;
@@ -28,5 +29,7 @@
* @param devId
*/
void updateDevByRpId(Integer rpId, Integer devId);
+
+ void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts);
}
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 d75f8c6..b82b3eb 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
@@ -19,10 +19,10 @@
/**
* 鏂板鍘熸潗鏂欐楠屽崟
- * @param userId
+ * @param userName
* @param rawInspectVo
*/
- String addRawInspects(String userId, RawInspectVo rawInspectVo);
+ String addRawInspects(String userName, RawInspectVo rawInspectVo);
/**
* 鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 1146807..62abb6b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -6,17 +6,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
-import com.yuanchu.mom.mapper.OpinionMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
-import com.yuanchu.mom.pojo.Opinion;
-import com.yuanchu.mom.service.InspectUnacceptedService;
-import com.yuanchu.mom.service.OpinionService;
-import com.yuanchu.mom.vo.Result;
+import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.pojo.vo.RawInspectVo;
+import com.yuanchu.mom.service.*;
+import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
/**
@@ -31,8 +30,21 @@
@Resource
InspectUnacceptedMapper inspectUnacceptedMapper;
- @Resource
- OpinionService opinionService;
+ // 鍘熸潗鏂欐楠�
+ @Autowired
+ private RawInspectService rawInspectService;
+
+ // // 鍘熸潗鏂欐楠屽瓙鏁版嵁
+ @Autowired
+ private RawInsProductService rawInsProductService;
+
+ // 鍗婃垚鍝佹楠�
+ @Autowired
+ private FinishedInspectService finishedInspectService;
+
+ // 鍦ㄥ埗鍝佹楠�
+ @Autowired
+ private ProcessInspectService processInspectService;
//鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
@@ -64,16 +76,37 @@
LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
.eq(InspectUnaccepted::getId, rawId)
.set(InspectUnaccepted::getDealReasult, passOrNo);
- //濡傛灉鏄瘎瀹′笉閫氳繃鍒欐柊澧炰笉鍚堟牸澶勭悊鎰忚琛�
- if (passOrNo==0) {
- List<Opinion> opinions = new ArrayList<>();
- for (int i = 0; i <= 3; i++) {
- Opinion opinion = new Opinion();
- opinion.setType(i);
- opinion.setRawUnacceptedId(rawId);
- opinions.add(opinion);
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
+ }
+
+ @Override
+ public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
+ LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
+ .eq(InspectUnaccepted::getId, rawUnacceptedId)
+ .set(InspectUnaccepted::getWay, way)
+ .set(InspectUnaccepted::getOpinionTell, opinionTell);
+ if (way == 1){
+ // 绛変簬0锛氬師鏉愭枡
+ if (type == 0){
+ // 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭俊鎭�
+ RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
+ RawInspect rawInspect = new RawInspect();
+ BeanUtils.copyProperties(map, rawInspect);
+ // 淇濆瓨鐖剁骇
+ rawInspectService.save(rawInspect);
+ // 鎵归噺淇濆瓨瀛愮骇
+ rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
}
- opinionService.saveBatch(opinions);
+ // 绛変簬1锛氬崐鎴愬搧
+ else if (type == 1) {
+ // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+ }
+ // 绛変簬2锛氬湪鍒跺搧
+ else if (type == 2) {
+ // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+ }
+ } else if (way == 2 || way == 3 || way == 4){
+ updateWrapper.set(InspectUnaccepted::getFaultyMaterials, 1);
}
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
deleted file mode 100644
index 69fd347..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yuanchu.mom.mapper.*;
-import com.yuanchu.mom.pojo.*;
-import com.yuanchu.mom.pojo.dto.UpdateInspectUnacceptedDto;
-import com.yuanchu.mom.service.OpinionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.utils.JackSonUtil;
-import com.yuanchu.mom.vo.Result;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * <p>
- * 涓嶅悎鏍煎鐞嗘剰瑙佽〃 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07 01:54:28
- */
-@Service
-public class OpinionServiceImpl extends ServiceImpl<OpinionMapper, Opinion> implements OpinionService {
-
- @Resource
- private OpinionMapper opinionMapper;
-
- @Resource
- InspectUnacceptedMapper inspectUnacceptedMapper;
-
- @Resource
- RawInspectMapper rawInspectMapper;
-
- @Resource
- ProcessInspectMapper processInspectMapper;
-
- @Resource
- FinishedInspectMapper finishedInspectMapper;
-
- @Resource
- InspectionItemMapper inspectionItemMapper;
-
- @Resource
- RawInsProductMapper rawInsProductMapper;
-
-
- @Override
- public List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId) {
- List<UpdateInspectUnacceptedDto> mapList = opinionMapper.clickEditingTriggerQuery(rawUnacceptedId);
- if (mapList.size() == 0) {
- List<Opinion> list = new ArrayList<>();
- for (int i = 0; i <= 3; i++) {
- Opinion opinion = new Opinion()
- .setType(i)
- .setRawUnacceptedId(rawUnacceptedId);
- list.add(opinion);
- }
- opinionMapper.insertBatchSomeColumn(list);
- mapList = opinionMapper.clickEditingTriggerQuery(rawUnacceptedId);
- }
- return mapList;
- }
-
- //缂栬緫鎰忚
- @Override
- public Integer updateOpinion(String id, List<?> opinion) {
- List<Opinion> list = new ArrayList<>();
- AtomicInteger a= new AtomicInteger();
- AtomicInteger unId= new AtomicInteger();
- opinion.forEach(i -> {
- try {
- Opinion unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(i), Opinion.class);
- unmarshal.setUserId(Integer.valueOf(id));
- unmarshal.setFillDate(new Date());
- list.add(unmarshal);
- //璁板綍澶勭悊鐨勬柟寮忎负杩斾慨鐨勬鏁�
- if (unmarshal.getWay()==1){
- a.getAndIncrement();
- }
- //璁板綍杩欎釜澶勭悊鎰忚鍏宠仈鐨勪笉鍚堟牸璁㈠崟id
- unId.set(opinionMapper.selectById(unmarshal.getId()).getRawUnacceptedId());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- });
- //缂栬緫鎰忚涔嬪悗濮滃鐞嗙姸鎬佷慨鏀逛负1宸插鐞�
- InspectUnaccepted inspectUnaccepted = inspectUnacceptedMapper.selectById(unId.get());
- inspectUnaccepted.setDealState(1);
- inspectUnacceptedMapper.updateById(inspectUnaccepted);
- //濡傛灉鍏ㄩ儴閮芥槸杩斾慨鍒欒繑鍥炴楠�,灏嗘楠岀姸鎬佹竻绌�
- if (a.get()==opinion.size()){
- switch (inspectUnaccepted.getType()){
- case 1:
- //鎴愬搧妫�楠屽崟
- finishedInspectMapper.updById(inspectUnaccepted.getRawInspectId());
- //鎴愬搧妫�楠岄」鐩�
- List<InspectionItem> inspectionItemList = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
- .eq("type", 2)
- .eq("inspect_id", inspectUnaccepted.getRawInspectId()));
- inspectionItemMapper.updateBatch(inspectionItemList);
- break;
- case 2:
- //杩囩▼妫�楠屽崟
- processInspectMapper.updById(inspectUnaccepted.getRawInspectId());
- //杩囩▼妫�楠岄」鐩�
- List<InspectionItem> inspectionItems = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
- .eq("type", 1)
- .eq("inspect_id", inspectUnaccepted.getRawInspectId()));
- inspectionItemMapper.updateBatch(inspectionItems);
- break;
- case 0:
- //鍘熸潗鏂欐楠屽崟
- rawInspectMapper.updById(inspectUnaccepted.getRawInspectId());
- //鍘熸潗鏂欐楠岄」鐩�
- List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
- .eq("raw_inspect_id", inspectUnaccepted.getRawInspectId()));
- rawInsProductMapper.updateBatch(rawInsProductList);
- break;
- default:
- break;
- }
- }
- //鏇存柊鎰忚
- return opinionMapper.updateOpinion(list);
- }
-
- @Override
- public List<Map<String, Object>> viewEditorialComments(Integer rawUnacceptedId) {
- return opinionMapper.viewEditorialComments(rawUnacceptedId);
- }
-}
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 61ba2ce..7d32d42 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,6 +1,7 @@
package com.yuanchu.mom.service.impl;
+import ch.qos.logback.core.joran.util.beans.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,16 +9,15 @@
import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.pojo.vo.RawInsProductVo;
import com.yuanchu.mom.service.RawInsProductService;
import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.sql.Wrapper;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -88,6 +88,19 @@
rawInsProductMapper.update(new RawInsProduct(), updateWrapper);
}
+ @Override
+ public void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts) {
+ List<RawInsProduct> rawInsProductList = new ArrayList<>();
+ rawInsProducts.forEach(i -> {
+ RawInsProduct rawInsProduct1 = new RawInsProduct();
+ BeanUtils.copyProperties(i, rawInsProduct1);
+ rawInsProduct1.setRawInspectId(id);
+ rawInsProduct1.setState(1);
+ rawInsProductList.add(rawInsProduct1);
+ });
+ rawInsProductMapper.insertBatchSomeColumn(rawInsProductList);
+ }
+
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
//濡傛灉鏄辩殑鎿嶄綔
private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
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 175cb11..9c4252c 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
@@ -136,6 +136,7 @@
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
.reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
.rawInspectId(id)
+ .dealReasult(1)
.type(0) //绫诲瀷涓哄師鏉愭枡
.build();
inspectUnacceptedMapper.insert(rawUnaccepted);
diff --git a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
index 1030be2..5f5ea10 100644
--- a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
@@ -1,12 +1,6 @@
<?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.FinishedInspectMapper">
- <!--娓呯┖妫�楠岀姸鎬�-->
- <update id="updById">
- update mom_ocean.finished_inspect
- set result=null
- where id = #{rawInspectId}
- </update>
<select id="selectFinishedInspectPage" resultType="map">
SELECT f.`id`,
f.`order_number`,
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 83fe31d..c6202b9 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -88,7 +88,7 @@
<!--涓嶅悎鏍煎缃�-->
<select id="selectDisposal" resultType="map">
SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
- i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way, i.faulty_materials, i.opinion_tell
FROM mom_ocean.inspect_unaccepted i
LEFT JOIN
(
@@ -103,7 +103,7 @@
productName != null and productName != ''">AND r.`name` LIKE CONCAT('%', #{productName}, '%')
</if>
UNION ALL
- -- 鎴愬搧
+ -- 鍗婃垚鍝�
SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`, f.`id`, u.name user_name
FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
WHERE f.`state` = 1
@@ -115,7 +115,7 @@
AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
</if>
UNION ALL
- -- 鍗婃垚鍝�
+ -- 鍦ㄥ埗鍝�
SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`, u.name user_name
FROM mom_ocean.process_inspect p, mom_ocean.`user` u
WHERE p.state = 1
@@ -137,4 +137,32 @@
</if>
ORDER BY i.`update_time` DESC
</select>
+
+ <resultMap id="editDisposalOpinionConfirmationMap" type="com.yuanchu.mom.pojo.vo.RawInspectVo">
+ <id property="code" column="code"/>
+ <result property="unit" column="unit"/>
+ <result property="name" column="name"/>
+ <result property="specifications" column="specifications"/>
+ <result property="formTime" column="form_time"/>
+ <result property="number" column="number"/>
+ <result property="supplier" column="supplier"/>
+ <result property="userName" column="user_name"/>
+ <collection property="rawInsProducts" ofType="com.yuanchu.mom.pojo.vo.RawInsProductVo">
+ <result property="name" column="pNmae"/>
+ <result property="unit" column="pUnit"/>
+ <result property="required" column="required"/>
+ <result property="deviceId" column="device_id"/>
+ <result property="internal" column="internal"/>
+ <result property="testValue" column="test_value"/>
+ </collection>
+ </resultMap>
+
+ <select id="editDisposalOpinionConfirmation" resultMap="editDisposalOpinionConfirmationMap">
+ select r.`form_time`, r.`specifications`, r.`code`, r.`name`, r.`unit`, r.`number`, r.`supplier`, r.`user_name`, p.`name` pNmae, p.`unit` pUnit,
+ p.`required`,p.`internal`, p.`test_value`, p.`device_id`
+ from (mom_ocean.inspect_unaccepted i, mom_ocean.raw_inspect r)
+ left join mom_ocean.raw_ins_product p on r.`id` = p.`raw_inspect_id`
+ where i.`id` = #{rawUnacceptedId}
+ and i.`raw_inspect_id` = r.`id`
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/OpinionMapper.xml b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
deleted file mode 100644
index e9c22ca..0000000
--- a/inspect-server/src/main/resources/mapper/OpinionMapper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.OpinionMapper">
-
- <select id="clickEditingTriggerQuery" resultType="updateInspectUnacceptedDto">
- SELECT o.`id`, o.`tell`, o.`type`, o.`way`
- FROM opinion o
- LEFT JOIN `user` u ON o.`user_id` = u.`id`
- WHERE o.`raw_unaccepted_id` = #{rawUnacceptedId}
- ORDER BY o.`type`
- </select>
-
- <update id="updateOpinion" parameterType="integer">
- UPDATE opinion o
- <trim prefix="set" suffixOverrides=",">
- <trim prefix="tell=case" suffix="end,">
- <foreach collection="list" item="item" index="index">
- WHEN o.id = #{item.id} THEN #{item.tell}
- </foreach>
- </trim>
- <trim prefix="way=case" suffix="end,">
- <foreach collection="list" item="item" index="index">
- WHEN o.id = #{item.id} THEN #{item.way}
- </foreach>
- </trim>
- <trim prefix="fill_date=case" suffix="end,">
- <foreach collection="list" item="item" index="index">
- WHEN o.id = #{item.id} THEN #{item.fillDate}
- </foreach>
- </trim>
- <trim prefix="user_id=case" suffix="end,">
- <foreach collection="list" item="item" index="index">
- WHEN o.id = #{item.id} THEN #{item.userId}
- </foreach>
- </trim>
- </trim>
- WHERE o.id in
- <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
- #{item.id, jdbcType=BIGINT}
- </foreach>
- </update>
-
- <select id="viewEditorialComments" resultType="map">
- SELECT o.`tell`, o.`type`, o.`way`, DATE_FORMAT(o.`fill_date`, '%Y-%m-%d') fillDate, u.`name`
- FROM opinion o
- LEFT JOIN `user` u ON o.`user_id` = u.`id`
- WHERE o.raw_unaccepted_id = #{rawUnacceptedId}
- ORDER BY o.type
- </select>
-</mapper>
diff --git a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
index 68aea86..f838547 100644
--- a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.ProcessInspectMapper">
- <!--灏嗘楠岀姸鎬佷慨鏀逛负null-->
- <update id="updById">
- update mom_ocean.process_inspect set result=null where id=#{rawInspectId}
- </update>
<!--鏂板杩囩▼妫�楠屽崟-鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅鍜屽伐鑹�-->
<resultMap id="oneMap" type="map">
<id property="name" column="material"/>
@@ -124,4 +120,4 @@
and result =#{result}
</if>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index b6f7a8c..985266e 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -3,14 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
- <!--娓呯┖鍘熸潗鏂欐楠岀粨璁�-->
- <update id="updById">
- update mom_ocean.raw_inspect
- set ins_state=0,
- ins_time=null,
- judge_state=null
- where id = #{rawInspectId}
- </update>
<select id="selCountRaw" resultType="java.lang.Integer">
select count(id)
from mom_ocean.raw_inspect
--
Gitblit v1.9.3