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/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

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 7794ad3..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
@@ -7,13 +7,16 @@
 import com.yuanchu.mom.pojo.InspectUnaccepted;
 import com.yuanchu.mom.pojo.Opinion;
 import com.yuanchu.mom.mapper.OpinionMapper;
+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;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,8 +35,8 @@
     private OpinionMapper opinionMapper;
 
     @Override
-    public List<Map<String, Object>> clickEditingTriggerQuery(Integer rawUnacceptedId) {
-        List<Map<String, Object>> mapList = opinionMapper.clickEditingTriggerQuery(rawUnacceptedId);
+    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++) {
@@ -49,11 +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));
+            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

--
Gitblit v1.9.3