From 9f87ca56f82c2352adbb7201a190ac944e6deeeb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 08 九月 2023 17:55:54 +0800
Subject: [PATCH] MOM系统-9-08
---
inspect-server/src/main/resources/mapper/OpinionMapper.xml | 7 ++-----
system-run/src/main/resources/application-dev.yml | 4 ++--
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 3 +--
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 7 +++----
inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java | 16 ++++++++++++----
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java | 3 +--
inspect-server/src/main/java/com/yuanchu/mom/service/OpinionService.java | 2 +-
8 files changed, 23 insertions(+), 21 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 0ce198a..4b0c6ad 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
@@ -116,12 +116,11 @@
@ApiOperation(value = "缂栬緫鎰忚-->纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@PostMapping("/addOpinion")
- public Result<?> updateOpinion(@RequestHeader("token") String token, @Validated @RequestBody List<Opinion> opinion) throws Exception {
- MyUtil.PrintLog(opinion.toString());
-
+ 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, opinion);
+ opinionService.updateOpinion(id, opinion1);
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 8a3518e..93f7f02 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
@@ -51,7 +51,7 @@
@ApiImplicitParam(name = "insState", value = "妫�娴嬬姸鎬�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "name", value = "鍘熸潗鏂欏悕绉�", dataTypeClass = String.class)
})
- @PostMapping("/selectRawInspectsList")
+ @GetMapping("/selectRawInspectsList")
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<>();
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 839ff67..50d0973 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
@@ -17,7 +17,7 @@
@Data
//鏂板鍘熸潗鏂欐楠屽崟鍙傛暟
public class RawInspectVo implements Serializable {
-
+
/* 妫�楠岃鎯� */
/**
* 鏉ユ枡鏃ユ湡
@@ -72,7 +72,6 @@
/**
* 鎶ユ浜猴紙褰撳墠鐢ㄦ埛鍚嶏級
*/
- @NotBlank(message = "鎶ユ浜轰笉鑳戒负绌�!")
@JsonSerialize
private String userName;
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 c7f28d8..22d0316 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
@@ -30,7 +30,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- Integer updateOpinion(String id, List<Opinion> opinion);
+ Integer updateOpinion(String id, List<?> opinion);
/**
* 鏌ョ湅澶勭疆鎰忚
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 bb2ad6b..da3dcd9 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
@@ -10,6 +10,7 @@
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.utils.MyUtil;
import org.springframework.stereotype.Service;
@@ -51,12 +52,19 @@
}
@Override
- public Integer updateOpinion(String id, List<Opinion> opinion) {
+ public Integer updateOpinion(String id, List<?> opinion) {
+ List<Opinion> list = new ArrayList<>();
opinion.forEach(i -> {
- i.setUserId(Integer.valueOf(id));
- i.setFillDate(new Date());
+ try {
+ Opinion unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(i), Opinion.class);
+ unmarshal.setUserId(Integer.valueOf(id));
+ unmarshal.setFillDate(new Date());
+ list.add(unmarshal);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
});
- return opinionMapper.updateOpinion(opinion);
+ return opinionMapper.updateOpinion(list);
}
@Override
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index ad09614..7a3d9b8 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -73,7 +73,7 @@
<!--涓嶅悎鏍煎缃�-->
<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`
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
FROM inspect_unaccepted i
LEFT JOIN
(
@@ -112,7 +112,6 @@
AND p.`material` LIKE CONCAT('%', #{productName}, '%')
</if>
)AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
- LEFT JOIN opinion o ON i.`id` = o.`raw_unaccepted_id`
WHERE i.`state` = 1
<if test="state != null">
AND i.`deal_state` = #{state}
diff --git a/inspect-server/src/main/resources/mapper/OpinionMapper.xml b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
index 718ce9d..e9c22ca 100644
--- a/inspect-server/src/main/resources/mapper/OpinionMapper.xml
+++ b/inspect-server/src/main/resources/mapper/OpinionMapper.xml
@@ -7,6 +7,7 @@
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">
@@ -32,11 +33,6 @@
WHEN o.id = #{item.id} THEN #{item.userId}
</foreach>
</trim>
- <trim prefix="raw_unaccepted_id=case" suffix="end,">
- <foreach collection="list" item="item" index="index">
- WHEN o.id = #{item.id} THEN #{item.rawUnacceptedId}
- </foreach>
- </trim>
</trim>
WHERE o.id in
<foreach collection="list" index="index" item="item" separator="," open="(" close=")">
@@ -49,5 +45,6 @@
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/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index af31743..7eb7e36 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.218.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.0.22: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.218.113
+ host: 192.168.0.22
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3