From cb9bc5daaa7ee5978c07d5107d3301473617f367 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 25 Jul 2020 17:14:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
index 86e35e5..b1fdfbf 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysFeedbackServiceImpl.java
@@ -1,8 +1,8 @@
package com.kidgrow.oprationcenter.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kidgrow.common.model.PageResult;
-import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.oprationcenter.mapper.SysFeedbackMapper;
import com.kidgrow.oprationcenter.model.SysFeedback;
@@ -14,46 +14,52 @@
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: <br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:04 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Slf4j
@Service
public class SysFeedbackServiceImpl extends SuperServiceImpl<SysFeedbackMapper, SysFeedback> implements ISysFeedbackService {
@Autowired
SysDoctorService sysDoctorService;
+
/**
* 列表
+ *
* @param params
* @return
*/
@Override
- public PageResult<SysFeedback> findList(Map<String, Object> params){
+ public PageResult<SysFeedback> findList(Map<String, Object> params) {
Page<SysFeedback> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- List<SysFeedback> list = baseMapper.findList(page, params);
+ List<SysFeedback> list = baseMapper.findList(page, params);
return PageResult.<SysFeedback>builder().data(list).code(0).count(page.getTotal()).build();
}
/**
- * 根据SysFeedback对象当做查询条件进行查询
- * @param sysFeedback
- * @return SysFeedback
- */
+ * 根据SysFeedback对象当做查询条件进行查询
+ *
+ * @param sysFeedback
+ * @return SysFeedback
+ */
@Override
- public SysFeedback findByObject(SysFeedback sysFeedback){
+ public SysFeedback findByObject(SysFeedback sysFeedback) {
return baseMapper.findByObject(sysFeedback);
}
/**
* 根据id和启用禁用值更新数据
+ *
* @param params
* @return ResultBody
*/
@@ -73,7 +79,25 @@
}
@Override
- public ResultBody getoneee() {
- return sysDoctorService.findById(1L);
+ public boolean saveOrUpdateStr(SysFeedback sysFeedback, SysUser sysUser) {
+ if (sysFeedback.getId()==null) {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if (organizations.size() > 0) {
+ int insert = baseMapper.insert(sysFeedback);
+ if (insert > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }else {
+ int i = baseMapper.updateById(sysFeedback);
+ if (i > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ return false;
}
}
--
Gitblit v1.8.0