From b1ee044a6f0b6561fba149255432e0214c1884c3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 05 九月 2023 15:48:43 +0800
Subject: [PATCH] MOM系统-9-05 三个不合格完成
---
inspect-server/src/main/resources/mapper/OpinionMapper.xml | 43 ++++++
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 38 +++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java | 70 ++++++---
inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java | 11 +
inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java | 11 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 16 +
system-run/src/main/resources/application-dev.yml | 4
/dev/null | 50 -------
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 62 ++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java | 39 +++++
inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java | 21 ++
13 files changed, 274 insertions(+), 95 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 0d513ab..dd389f2 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,16 +3,24 @@
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.utils.RedisUtil;
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;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -28,6 +36,11 @@
@Autowired
private InspectUnacceptedService inspectUnacceptedService;
+ @Autowired
+ private Jwt jwt;
+
+ @Autowired
+ private OpinionService opinionService;
@ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@@ -79,16 +92,16 @@
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "specificationModel",value = "瑙勬牸鍨嬪彿",dataTypeClass = String.class),
@ApiImplicitParam(name = "productName",value = "浜у搧鍚嶇О",dataTypeClass = String.class),
- @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = Integer.class),
@ApiImplicitParam(name = "state",value = "鐘舵��",dataTypeClass = Integer.class)
})
@GetMapping("/selectDisposal")
public Result<?> selectDisposal(int pageSize,
- int countSize,
- String specificationModel,
- String productName,
- String productCategories,
- Integer state){
+ int countSize,
+ String specificationModel,
+ String productName,
+ Integer productCategories,
+ Integer state){
IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
new Page<Object>(pageSize, countSize),
specificationModel,
@@ -100,5 +113,42 @@
map.put("row", inspectionPage.getRecords());
return Result.success(map);
}
+
+ @ApiOperation(value = "缂栬緫鎰忚-->纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @PostMapping("/addOpinion")
+ public Result<?> updateOpinion(@RequestHeader("token") String token, @Validated @RequestBody List<Opinion> opinion) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ String id = data.get("id").replaceAll("\"", "");
+ opinionService.updateOpinion(id, opinion);
+ 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),
+ @ApiImplicitParam(name = "tell",value = "鐜拌薄鎻忚堪",dataTypeClass = Integer.class,required = true)
+ })
+ @GetMapping("/descriptionUpdate")
+ public Result<?> descriptionUpdate(Integer rawUnacceptedId, String tell) {
+ return Result.success(inspectUnacceptedService.descriptionUpdate(rawUnacceptedId, tell));
+ }
+
+ @ApiOperation(value = "鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rawUnacceptedId",value = "涓嶅悎鏍煎搧澶勭疆Id",dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/clickEditing")
+ public Result<?> clickEditingTriggerQuery(Integer rawUnacceptedId) {
+ return Result.success(opinionService.clickEditingTriggerQuery(rawUnacceptedId));
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/OpinionController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/OpinionController.java
deleted file mode 100644
index 05f1916..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/OpinionController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.service.OpinionService;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- * 涓嶅悎鏍煎鐞嗘剰瑙佽〃 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07 01:54:28
- */
-@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
-@Controller
-@RequestMapping("/opinion")
-public class OpinionController {
-
- @Autowired
- private OpinionService opinionService;
-
- @ApiOperation(value = "涓婚〉鍒嗛〉")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "productName", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "specificationsModels", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class)
- })
- @GetMapping("/list_page")
- public Result<?> selectOpinionPage(Integer pageNo, Integer pageSize, String productName, String specificationsModels){
- IPage<Map<String, Object>> page = opinionService.selectOpinionPage(new Page<Object>(pageNo, pageSize), productName, specificationsModels);
- Map<String, Object> map = new HashMap<>();
- map.put("total", page.getTotal());
- map.put("row", page.getRecords());
- return Result.success(map);
- }
-}
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 2a109be..1ba404f 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
@@ -25,5 +25,7 @@
void delAllRawIns(String ids);
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);
}
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
index 3884381..4da43f7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/OpinionMapper.java
@@ -1,7 +1,11 @@
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 java.util.List;
+import java.util.Map;
/**
* <p>
@@ -11,6 +15,11 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-07 01:54:28
*/
-public interface OpinionMapper extends BaseMapper<Opinion> {
+public interface OpinionMapper extends MyBaseMapper<Opinion> {
+ List<Map<String, Object>> 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/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index 489ab3d..abeaf24 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
@@ -32,7 +32,7 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "0锛氭垚鍝佹楠屽崟锛�1锛氬崐鎴愬搧妫�楠屽崟锛�2锛氬師鏉愭枡妫�楠屽崟")
+ @ApiModelProperty(value = "0锛氭垚鍝佹楠屽崟锛涘崐鎴愬搧妫�楠屽崟锛�1锛氬師鏉愭枡妫�楠屽崟")
private Integer type;
/**
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
index 610ccbe..e64674a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/Opinion.java
@@ -1,11 +1,20 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
+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>
@@ -15,8 +24,11 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-07 01:54:28
*/
-@Getter
-@Setter
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
public class Opinion implements Serializable {
private static final long serialVersionUID = 1L;
@@ -24,40 +36,46 @@
/**
* 鎰忚id
*/
+ @ApiModelProperty(value = "id", required = true, example = "1")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- /**
- * 閮ㄩ棬绫诲瀷 0锛氭妧鏈儴锛�1锛氱敓浜ч儴锛�2锛氳川閲忛儴锛�3锛氭�荤粡鍔�
- */
+ @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;
- /**
- * 澶勭悊鏂瑰紡 鏍煎紡[1,2,3] 0锛氳繑宸ワ紱1锛氳繑淇紱2锛氳姝ユ帴鏀讹紱3锛氭嫆鏀讹紱4锛氶檷绾т娇鐢紱5锛氭姤搴�
- */
+ @NotBlank(message = "澶勭悊鏂瑰紡涓嶈兘涓虹┖锛�")
+ @ApiModelProperty(value = "澶勭悊鏂瑰紡锛�0锛氳繑宸ワ紱1锛氳繑淇紱2锛氳姝ユ帴鏀讹紱3锛氭嫆鏀讹紱4锛氶檷绾т娇鐢紱5锛氭姤搴�", required = true, example = "杩斿伐")
private String way;
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎", hidden = true)
+ @TableLogic(value = "1", delval = "0")
private Integer state;
- /**
- * 濉啓鏃ユ湡
- */
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ private Date createTime;
- private LocalDateTime updateTime;
+ @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;
- /**
- * 鍏宠仈 濉啓浜猴紙鐢ㄦ埛id锛�
- */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "濉啓鏃ユ湡", required = true, example = "2023-09-05", dataType = "date")
+ private Date fillDate;
+
+ @ApiModelProperty(value = "濉啓浜篒d", hidden = true, example = "1")
private Integer userId;
- /**
- * 鍏宠仈 涓嶅悎鏍肩粺璁¤〃id
- */
+ @NotNull(message = "涓嶅悎鏍肩粺璁¤〃id鑳戒负绌�")
+ @ApiModelProperty(value = "涓嶅悎鏍肩粺璁¤〃id", hidden = true, example = "2")
private Integer rawUnacceptedId;
}
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 f95e13b..7945c23 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,9 @@
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.pojo.Opinion;
+import java.util.List;
import java.util.Map;
/**
@@ -44,6 +46,13 @@
* @param state
* @return
*/
- IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, String productCategories, Integer state);
+ IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state);
+
+ /**
+ * 澶辩劍鏇存柊鐜板儚鎻忚堪
+ * @param rawUnacceptedId
+ * @return
+ */
+ Integer descriptionUpdate(Integer rawUnacceptedId, String tell);
}
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
index 3b7b35e..0a055ea 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Opinion;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
import java.util.Map;
/**
@@ -17,5 +19,22 @@
*/
public interface OpinionService extends IService<Opinion> {
- IPage<Map<String, Object>> selectOpinionPage(Page<Object> page, String productName, String specificationsModels);
+ @Transactional(rollbackFor = Exception.class)
+ List<Map<String, Object>> clickEditingTriggerQuery(Integer rawUnacceptedId);
+
+ /**
+ * 鎵归噺鏇存柊鎰忚
+ * @param id
+ * @param opinion
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ Integer updateOpinion(String id, List<Opinion> opinion);
+
+ /**
+ * 鏌ョ湅澶勭疆鎰忚
+ * @param rawUnacceptedId
+ * @return
+ */
+ List<Map<String, Object>> viewEditorialComments(Integer rawUnacceptedId);
}
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 906b8b3..fd02e38 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
@@ -1,16 +1,16 @@
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.core.toolkit.Wrappers;
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.pojo.InspectUnaccepted;
import com.yuanchu.mom.service.InspectUnacceptedService;
-import com.yuanchu.mom.vo.Result;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -37,8 +37,16 @@
}
@Override
- public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, String productCategories, Integer state) {
- return null;
+ public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state) {
+ return inspectUnacceptedMapper.selectDisposal(page, specificationModel, productName, productCategories, state);
+ }
+
+ @Override
+ public Integer descriptionUpdate(Integer rawUnacceptedId, String tell) {
+ LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
+ .eq(InspectUnaccepted::getId, rawUnacceptedId)
+ .set(InspectUnaccepted::getTell, tell);
+ 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
index 2990ce0..7794ad3 100644
--- 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
@@ -1,7 +1,10 @@
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.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.pojo.Opinion;
import com.yuanchu.mom.mapper.OpinionMapper;
import com.yuanchu.mom.service.OpinionService;
@@ -9,6 +12,9 @@
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -22,9 +28,36 @@
@Service
public class OpinionServiceImpl extends ServiceImpl<OpinionMapper, Opinion> implements OpinionService {
+ @Resource
+ private OpinionMapper opinionMapper;
+
@Override
- public IPage<Map<String, Object>> selectOpinionPage(Page<Object> page, String productName, String specificationsModels) {
- MyUtil.PrintLog(page +"=======" + productName + "===" + specificationsModels);
- return null;
+ public List<Map<String, Object>> clickEditingTriggerQuery(Integer rawUnacceptedId) {
+ List<Map<String, Object>> 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> opinion) {
+ opinion.forEach(i -> {
+ i.setUserId(Integer.valueOf(id));
+ });
+ return opinionMapper.updateOpinion(opinion);
+ }
+
+ @Override
+ public List<Map<String, Object>> viewEditorialComments(Integer rawUnacceptedId) {
+ return opinionMapper.viewEditorialComments(rawUnacceptedId);
}
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 1e74cb7..4e0ab3c 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -107,4 +107,42 @@
</if>
ORDER BY i.`id` DESC
</select>
+
+ <select id="selectDisposal" resultType="map">
+ SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
+ o.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
+ FROM (inspect_unaccepted i,
+ (
+ SELECT 2 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`, 0 AS classify
+ FROM raw_inspect r
+ WHERE r.state = 1
+ <if test="specificationModel != null and specificationModel != ''">
+ AND r.`specifications` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ AND r.`name` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ UNION ALL
+ SELECT f.`type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` number, f.`id`, u.name user_name, 1 AS classify
+ FROM finished_inspect f, `user` u
+ WHERE f.`state` = 1
+ AND u.id = f.user_id
+ <if test="specificationModel != null and specificationModel != ''">
+ AND f.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ ) AS s)
+ LEFT JOIN opinion o ON i.`id` = o.`raw_unaccepted_id`
+ WHERE i.`state` = 1
+ AND i.`type` = s.`classify`
+ AND s.`id` = i.`raw_inspect_id`
+ <if test="state != null">
+ AND i.`deal_state` = #{state}
+ </if>
+ <if test="productCategories != null">
+ AND s.`type` = #{productCategories}
+ </if>
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/OpinionMapper.xml b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
index 30cc7e6..8221360 100644
--- a/inspect-server/src/main/resources/mapper/OpinionMapper.xml
+++ b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
@@ -2,4 +2,47 @@
<!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="map">
+ SELECT o.`id`, o.`tell`, o.`type`, o.`way`, o.`fill_date`
+ FROM opinion o
+ LEFT JOIN `user` u ON o.`user_id` = u.`id`
+ WHERE o.`raw_unaccepted_id` = #{rawUnacceptedId}
+ </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}
+ </select>
</mapper>
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index c5fbcf7..9eccb15 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -34,7 +34,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.73.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.65.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: user
password: 123456
druid:
@@ -59,7 +59,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.73.113
+ host: 192.168.65.113
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3