From 72468556f3709380ab3a70e07d8a916fbd47c988 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 08:52:18 +0800
Subject: [PATCH] 添加字段，审批权限修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java
index c6ddd9d..1fa97b1 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java
@@ -1,21 +1,23 @@
package com.project.enforce.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import cn.hutool.core.convert.Convert;
-import com.project.common.utils.StringUtils;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springframework.transaction.annotation.Transactional;
-import com.project.enforce.domain.vo.EnforceEvaluateLogVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.exception.base.BaseException;
+import com.project.common.utils.JsonUtils;
+import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceEvaluateLog;
import com.project.enforce.domain.bo.editBo.EnforceEvaluateLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceEvaluateLogQueryBo;
-import com.project.enforce.domain.EnforceEvaluateLog;
+import com.project.enforce.domain.vo.EnforceEvaluateLogVo;
+import com.project.enforce.domain.vo.EnforceEvaluateVo;
import com.project.enforce.mapper.EnforceEvaluateLogMapper;
import com.project.enforce.service.IEnforceEvaluateLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
@@ -43,7 +45,15 @@
public EnforceEvaluateLogVo queryById(Long id)
{
EnforceEvaluateLog db = this.baseMapper.selectById(id);
- return Convert.convert(EnforceEvaluateLogVo.class , db);
+ EnforceEvaluateLogVo vo = Convert.convert(EnforceEvaluateLogVo.class, db);
+ String questionStatic = vo.getQuestionStatic();
+ try {
+ EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
+ vo.setEvaluateVo(evaluateVo);
+ } catch (Exception e) {
+ throw new BaseException("璇勪环闂埜瑙ｆ瀽寮傚父锛�");
+ }
+ return vo;
}
@@ -52,7 +62,9 @@
public Boolean insertByBo(EnforceEvaluateLogBo bo)
{
EnforceEvaluateLog add = Convert.convert(EnforceEvaluateLog.class, bo);
- validEntityBeforeSave(add);
+ validEntityBeforeSave(bo);
+ String questionStatic = JsonUtils.objectToJson(bo.getEvaluateVo());
+ add.setQuestionStatic(questionStatic);
return this.save(add);
}
@@ -61,7 +73,9 @@
public Boolean updateByBo(EnforceEvaluateLogBo bo)
{
EnforceEvaluateLog update = Convert.convert(EnforceEvaluateLog.class, bo);
- validEntityBeforeSave(update);
+ validEntityBeforeSave(bo);
+ String questionStatic = JsonUtils.objectToJson(bo.getEvaluateVo());
+ update.setQuestionStatic(questionStatic);
return this.updateById(update);
}
@@ -69,9 +83,7 @@
@Transactional
public Boolean deleteByIds(Collection<Long> ids)
{
-
//鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
-
return this.removeByIds(ids);
}
@@ -79,9 +91,11 @@
//-------------------------------------------------------------------------------------
//淇濆瓨鍓嶆牎楠�
- private void validEntityBeforeSave(EnforceEvaluateLog entity)
+ private void validEntityBeforeSave(EnforceEvaluateLogBo bo)
{
- //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ if (bo.getEvaluateVo()==null) {
+ throw new BaseException("璇蜂笂浼犺瘎浠烽棶鍒稿唴瀹癸紒");
+ }
}
//鑾峰彇鏌ヨ鍙傛暟
--
Gitblit v1.9.1