From 41576aa609c839741260aee6e7880caf28147390 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 18:00:21 +0800
Subject: [PATCH] MOM系统-9-11下班
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 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..7f4ba7f 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,17 @@
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.InspectUnacceptedService;
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;
@@ -31,9 +35,12 @@
@Resource
private OpinionMapper opinionMapper;
+ @Resource
+ private InspectUnacceptedService inspectUnacceptedService;
+
@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 +56,20 @@
}
@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);
+ MyUtil.PrintLog(list.get(1).getRawUnacceptedId().toString());
+ return opinionMapper.updateOpinion(list);
}
@Override
--
Gitblit v1.9.3