From 9a16d4675b22d0845158d0f07424f4bda2e39475 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 九月 2023 18:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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 2990ce0..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
@@ -1,14 +1,24 @@
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.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;
/**
@@ -22,9 +32,48 @@
@Service
public class OpinionServiceImpl extends ServiceImpl<OpinionMapper, Opinion> implements OpinionService {
+ @Resource
+ private OpinionMapper opinionMapper;
+
+ @Resource
+ private InspectUnacceptedService inspectUnacceptedService;
+
@Override
- public IPage<Map<String, Object>> selectOpinionPage(Page<Object> page, String productName, String specificationsModels) {
- MyUtil.PrintLog(page +"=======" + productName + "===" + specificationsModels);
- return null;
+ 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<>();
+ 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);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ MyUtil.PrintLog(list.get(1).getRawUnacceptedId().toString());
+ return opinionMapper.updateOpinion(list);
+ }
+
+ @Override
+ public List<Map<String, Object>> viewEditorialComments(Integer rawUnacceptedId) {
+ return opinionMapper.viewEditorialComments(rawUnacceptedId);
}
}
--
Gitblit v1.9.3