From ccf9dfb83b9846974c569161502b784c668ee307 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 18 六月 2024 16:48:07 +0800
Subject: [PATCH] 企业字段添加，执法评价添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java | 92 ++++
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateVo.java | 19
project-common/src/main/java/com/project/common/core/domain/entity/SysDictType.java | 23
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 7
project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java | 24
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java | 26 +
project-system/src/main/java/com/project/system/service/ISysDeptService.java | 7
project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java | 23
project-admin/src/main/resources/application.yml | 2
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 30
project-system/src/main/java/com/project/system/domain/SysCompany.java | 16
project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java | 6
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 136 +++--
project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java | 7
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java | 36 -
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java | 32
project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java | 10
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java | 90 ---
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 9
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java | 41 -
project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java | 32 +
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java | 41 -
project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java | 27
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java | 51 ++
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java | 21
project-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 9
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java | 28 +
/dev/null | 188 --------
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 37
project-admin/src/main/java/com/project/core/config/SwaggerConfig.java | 33 +
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 44 +
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java | 16
project-common/src/main/java/com/project/common/constant/CheckLevelCodeConstants.java | 22 +
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java | 88 ---
34 files changed, 630 insertions(+), 643 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateAnswerController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateAnswerController.java
deleted file mode 100644
index d3fb1b6..0000000
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateAnswerController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.project.admin.controller.enforce;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.project.common.annotation.RepeatSubmit;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.project.common.annotation.Log;
-import com.project.common.core.controller.BaseController;
-import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
-import com.project.enforce.domain.vo.EnforceEvaluateAnswerVo;
-import com.project.enforce.domain.bo.editBo.EnforceEvaluateAnswerBo;
-import com.project.enforce.domain.bo.queryBo.EnforceEvaluateAnswerQueryBo;
-import com.project.enforce.service.IEnforceEvaluateAnswerService;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 鎵ф硶璇勪环绛旀Controller
- *
- * @author manton
- */
-@Api(value = "鎵ф硶璇勪环绛旀鎺у埗鍣�", tags = {"鎵ф硶璇勪环绛旀绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/enforce/answer")
-public class EnforceEvaluateAnswerController extends BaseController {
-
- private final IEnforceEvaluateAnswerService iEnforceEvaluateAnswerService;
-
-
- @ApiOperation("鏌ヨ鎵ф硶璇勪环绛旀鍒楄〃")
- @GetMapping("/list")
- public TableDataInfo list(EnforceEvaluateAnswerQueryBo bo)
- {
- startPage();
- List<EnforceEvaluateAnswerVo> list = iEnforceEvaluateAnswerService.queryList(bo);
- return getDataTable(list);
- }
-
-
-
- @ApiOperation("瀵煎嚭鎵ф硶璇勪环绛旀鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('enforce:answer:export')")
- @Log(title = "鎵ф硶璇勪环绛旀", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- @RepeatSubmit
- public AjaxResult export(EnforceEvaluateAnswerQueryBo bo)
- {
- List<EnforceEvaluateAnswerVo> list = iEnforceEvaluateAnswerService.queryList(bo);
- ExcelUtil<EnforceEvaluateAnswerVo> util = new ExcelUtil<EnforceEvaluateAnswerVo>(EnforceEvaluateAnswerVo.class);
- return util.exportExcel(list, "鎵ф硶璇勪环绛旀");
- }
-
-
- @ApiOperation("鑾峰彇鎵ф硶璇勪环绛旀璇︾粏淇℃伅")
- @GetMapping("/{answerId}")
- public AjaxResult getInfo(@PathVariable("answerId" ) Long answerId)
- {
- return AjaxResult.success(iEnforceEvaluateAnswerService.queryById(answerId));
- }
-
-
- @ApiOperation("鏂板鎵ф硶璇勪环绛旀")
- //@PreAuthorize("@ss.hasPermi('enforce:answer:add')")
- @Log(title = "鎵ф硶璇勪环绛旀", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @RepeatSubmit
- public AjaxResult add(@RequestBody EnforceEvaluateAnswerBo bo)
- {
- return toAjax(iEnforceEvaluateAnswerService.insertByBo(bo) ? 1 : 0);
- }
-
-
- @ApiOperation("淇敼鎵ф硶璇勪环绛旀")
- //@PreAuthorize("@ss.hasPermi('enforce:answer:edit')")
- @Log(title = "鎵ф硶璇勪环绛旀", businessType = BusinessType.UPDATE)
- @PostMapping("/upd")
- @RepeatSubmit
- public AjaxResult upd(@RequestBody EnforceEvaluateAnswerBo bo)
- {
- return toAjax(iEnforceEvaluateAnswerService.updateByBo(bo) ? 1 : 0);
- }
-
-
- @ApiOperation("鍒犻櫎鎵ф硶璇勪环绛旀")
- //@PreAuthorize("@ss.hasPermi('enforce:answer:remove')")
- @Log(title = "鎵ф硶璇勪环绛旀" , businessType = BusinessType.DELETE)
- @DeleteMapping("/{answerIds}")
- @RepeatSubmit
- public AjaxResult remove(@PathVariable Long[] answerIds)
- {
- return toAjax(iEnforceEvaluateAnswerService.deleteByIds(Arrays.asList(answerIds)) ? 1 : 0);
- }
-}
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
new file mode 100644
index 0000000..25f06ec
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java
@@ -0,0 +1,51 @@
+package com.project.admin.controller.enforce;
+
+import com.project.common.annotation.Log;
+import com.project.common.annotation.RepeatSubmit;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.enums.BusinessType;
+import com.project.enforce.domain.bo.editBo.EnforceEvaluateBo;
+import com.project.enforce.service.IEnforceEvaluateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ * @date 2024骞�06鏈�18鏃�
+ */
+
+@Api(value = "鎵ф硶璇勪环鎺у埗鍣�", tags = {"鎵ф硶璇勪环绠＄悊"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/enforce/evaluate/")
+public class EnforceEvaluateController extends BaseController
+{
+
+ private final IEnforceEvaluateService enforceEvaluateService;
+
+ @ApiOperation("鑾峰彇鎵ф硶璇勪环璇︾粏淇℃伅")
+ @GetMapping("/detail")
+ public AjaxResult getInfo()
+ {
+ return AjaxResult.success(enforceEvaluateService.getInfo());
+ }
+
+
+ @ApiOperation("淇濆瓨鎵ф硶璇勪环")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:add')")
+ @Log(title = "鎵ф硶璇勪环", businessType = BusinessType.INSERT)
+ @PostMapping("/save")
+ @RepeatSubmit
+ public AjaxResult save(@RequestBody EnforceEvaluateBo bo)
+ {
+ return toAjax(enforceEvaluateService.save(bo) ? 1 : 0);
+ }
+
+}
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateQuestionController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateQuestionController.java
deleted file mode 100644
index 3799a0a..0000000
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateQuestionController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.project.admin.controller.enforce;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.project.common.annotation.RepeatSubmit;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.project.common.annotation.Log;
-import com.project.common.core.controller.BaseController;
-import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
-import com.project.enforce.domain.vo.EnforceEvaluateQuestionVo;
-import com.project.enforce.domain.bo.editBo.EnforceEvaluateQuestionBo;
-import com.project.enforce.domain.bo.queryBo.EnforceEvaluateQuestionQueryBo;
-import com.project.enforce.service.IEnforceEvaluateQuestionService;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 鎵ф硶璇勪环棰樼洰Controller
- *
- * @author manton
- */
-@Api(value = "鎵ф硶璇勪环棰樼洰鎺у埗鍣�", tags = {"鎵ф硶璇勪环棰樼洰绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/enforce/question")
-public class EnforceEvaluateQuestionController extends BaseController {
-
- private final IEnforceEvaluateQuestionService iEnforceEvaluateQuestionService;
-
-
- @ApiOperation("鏌ヨ鎵ф硶璇勪环棰樼洰鍒楄〃")
- @GetMapping("/list")
- public TableDataInfo list(EnforceEvaluateQuestionQueryBo bo)
- {
- startPage();
- List<EnforceEvaluateQuestionVo> list = iEnforceEvaluateQuestionService.queryList(bo);
- return getDataTable(list);
- }
-
-
-
- @ApiOperation("瀵煎嚭鎵ф硶璇勪环棰樼洰鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('enforce:question:export')")
- @Log(title = "鎵ф硶璇勪环棰樼洰", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- @RepeatSubmit
- public AjaxResult export(EnforceEvaluateQuestionQueryBo bo)
- {
- List<EnforceEvaluateQuestionVo> list = iEnforceEvaluateQuestionService.queryList(bo);
- ExcelUtil<EnforceEvaluateQuestionVo> util = new ExcelUtil<EnforceEvaluateQuestionVo>(EnforceEvaluateQuestionVo.class);
- return util.exportExcel(list, "鎵ф硶璇勪环棰樼洰");
- }
-
-
- @ApiOperation("鑾峰彇鎵ф硶璇勪环棰樼洰璇︾粏淇℃伅")
- @GetMapping("/{questionId}")
- public AjaxResult getInfo(@PathVariable("questionId" ) Long questionId)
- {
- return AjaxResult.success(iEnforceEvaluateQuestionService.queryById(questionId));
- }
-
-
- @ApiOperation("鏂板鎵ф硶璇勪环棰樼洰")
- //@PreAuthorize("@ss.hasPermi('enforce:question:add')")
- @Log(title = "鎵ф硶璇勪环棰樼洰", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @RepeatSubmit
- public AjaxResult add(@RequestBody EnforceEvaluateQuestionBo bo)
- {
- return toAjax(iEnforceEvaluateQuestionService.insertByBo(bo) ? 1 : 0);
- }
-
-
- @ApiOperation("淇敼鎵ф硶璇勪环棰樼洰")
- //@PreAuthorize("@ss.hasPermi('enforce:question:edit')")
- @Log(title = "鎵ф硶璇勪环棰樼洰", businessType = BusinessType.UPDATE)
- @PostMapping("/upd")
- @RepeatSubmit
- public AjaxResult upd(@RequestBody EnforceEvaluateQuestionBo bo)
- {
- return toAjax(iEnforceEvaluateQuestionService.updateByBo(bo) ? 1 : 0);
- }
-
-
- @ApiOperation("鍒犻櫎鎵ф硶璇勪环棰樼洰")
- //@PreAuthorize("@ss.hasPermi('enforce:question:remove')")
- @Log(title = "鎵ф硶璇勪环棰樼洰" , businessType = BusinessType.DELETE)
- @DeleteMapping("/{questionIds}")
- @RepeatSubmit
- public AjaxResult remove(@PathVariable Long[] questionIds)
- {
- return toAjax(iEnforceEvaluateQuestionService.deleteByIds(Arrays.asList(questionIds)) ? 1 : 0);
- }
-}
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index e5c5896..21aa86d 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -1,30 +1,24 @@
package com.project.admin.controller.enforce;
-import java.util.List;
-import java.util.Arrays;
-
-import com.project.common.annotation.RepeatSubmit;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.project.common.annotation.Log;
+import com.project.common.annotation.RepeatSubmit;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
+import com.project.common.core.page.TableDataInfo;
import com.project.common.enums.BusinessType;
-import com.project.enforce.domain.vo.EnforceOrderVo;
+import com.project.common.utils.poi.ExcelUtil;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.service.IEnforceOrderService;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鎵ф硶鍗旵ontroller
@@ -50,6 +44,15 @@
}
+ @ApiOperation("鏌ヨ鎵ф硶鍗曞緟瀹℃牳鍒楄〃")
+ @GetMapping("/checkList")
+ public TableDataInfo checkList(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryCheckList(bo);
+ return getDataTable(list);
+ }
+
@ApiOperation("瀵煎嚭鎵ф硶鍗曞垪琛�")
//@PreAuthorize("@ss.hasPermi('enforce:order:export')")
@@ -59,7 +62,7 @@
public AjaxResult export(EnforceOrderQueryBo bo)
{
List<EnforceOrderVo> list = iEnforceOrderService.queryList(bo);
- ExcelUtil<EnforceOrderVo> util = new ExcelUtil<EnforceOrderVo>(EnforceOrderVo.class);
+ ExcelUtil<EnforceOrderVo> util = new ExcelUtil<>(EnforceOrderVo.class);
return util.exportExcel(list, "鎵ф硶鍗�");
}
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
index 1866bf3..a4f3a5f 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
@@ -1,25 +1,26 @@
package com.project.admin.controller.system;
-import java.util.List;
-import java.util.Arrays;
-
+import com.project.common.annotation.Log;
import com.project.common.annotation.RepeatSubmit;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.core.page.TableDataInfo;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.system.domain.bo.editBo.SysCompanyBo;
+import com.project.system.domain.bo.queryBo.SysCompanyQueryBo;
+import com.project.system.domain.vo.SysCompanyVo;
+import com.project.system.service.ISysCompanyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import com.project.common.annotation.Log;
-import com.project.common.core.controller.BaseController;
-import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
-import com.project.system.domain.vo.SysCompanyVo;
-import com.project.system.domain.bo.editBo.SysCompanyBo;
-import com.project.system.domain.bo.queryBo.SysCompanyQueryBo;
-import com.project.system.service.ISysCompanyService;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 浼佷笟淇℃伅Controller
@@ -109,6 +110,7 @@
}
@ApiOperation(value = "瀵煎叆娲诲姩鎸囨爣")
+ @ApiImplicitParam(value = "涓婁紶鏂囦欢", name = "file", dataType = "file", dataTypeClass = MultipartFile.class)
@PostMapping("/import")
public AjaxResult importList(@RequestParam MultipartFile file) throws Exception
{
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
index 335569a..e09cec6 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -1,22 +1,5 @@
package com.project.admin.controller.system;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import com.project.common.annotation.Log;
import com.project.common.constant.UserConstants;
import com.project.common.core.controller.BaseController;
@@ -33,6 +16,16 @@
import com.project.system.service.ISysPostService;
import com.project.system.service.ISysRoleService;
import com.project.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛淇℃伅
@@ -47,7 +40,7 @@
private final ISysUserService userService;
private final ISysRoleService roleService;
private final ISysDeptService deptService;
- private final ISysPostService postService;
+ private final ISysPostService postService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
@@ -124,6 +117,7 @@
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
user.setUserType("01");
+ user.setRecommendPhone(deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).toString());
}
}
diff --git a/project-admin/src/main/java/com/project/core/config/SwaggerConfig.java b/project-admin/src/main/java/com/project/core/config/SwaggerConfig.java
index 1afb99e..c71283a 100644
--- a/project-admin/src/main/java/com/project/core/config/SwaggerConfig.java
+++ b/project-admin/src/main/java/com/project/core/config/SwaggerConfig.java
@@ -1,27 +1,22 @@
package com.project.core.config;
-import java.util.ArrayList;
-import java.util.List;
-
import com.project.common.config.ProjectConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.service.*;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Swagger2鐨勬帴鍙ｉ厤缃�
@@ -102,6 +97,22 @@
}
@Bean
+ public Docket toolApi()
+ {
+ return new Docket(DocumentationType.OAS_30)
+ .groupName("宸ュ叿涓績")
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.any())
+ .paths(PathSelectors.regex("/tool/.*"))
+ .build()
+ /* 璁剧疆瀹夊叏妯″紡锛宻wagger鍙互璁剧疆璁块棶token */
+ .securitySchemes(securitySchemes())
+ .securityContexts(securityContexts())
+ .pathMapping(pathMapping);
+ }
+
+ @Bean
public Docket enforceApi()
{
return new Docket(DocumentationType.OAS_30)
diff --git a/project-admin/src/main/resources/application.yml b/project-admin/src/main/resources/application.yml
index 664165e..5babdb5 100644
--- a/project-admin/src/main/resources/application.yml
+++ b/project-admin/src/main/resources/application.yml
@@ -143,3 +143,5 @@
- /system/dict/**
- /getVerifyCode
- /login/phone
+ - /system/company/** #涓存椂鐧藉悕鍗�
+ - /tool/** #涓存椂鐧藉悕鍗�
diff --git a/project-common/src/main/java/com/project/common/constant/CheckLevelCodeConstants.java b/project-common/src/main/java/com/project/common/constant/CheckLevelCodeConstants.java
new file mode 100644
index 0000000..1adb533
--- /dev/null
+++ b/project-common/src/main/java/com/project/common/constant/CheckLevelCodeConstants.java
@@ -0,0 +1,22 @@
+package com.project.common.constant;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ * @date 2024骞�06鏈�18鏃�
+ */
+public class CheckLevelCodeConstants
+{
+
+ /**
+ * 鎵ф硶鍗曚竴绾у鎵�
+ */
+ public static final String CHECK_LEVEL_ONE = "check_enforce_1";
+
+ /**
+ * 鎵ф硶鍗曚簩绾у鎵�
+ */
+ public static final String CHECK_LEVEL_TWO = "check_enforce_2";
+}
diff --git a/project-common/src/main/java/com/project/common/core/domain/entity/SysDictType.java b/project-common/src/main/java/com/project/common/core/domain/entity/SysDictType.java
index 354731c..d4b803b 100644
--- a/project-common/src/main/java/com/project/common/core/domain/entity/SysDictType.java
+++ b/project-common/src/main/java/com/project/common/core/domain/entity/SysDictType.java
@@ -1,13 +1,14 @@
package com.project.common.core.domain.entity;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.project.common.annotation.Excel;
import com.project.common.annotation.Excel.ColumnType;
import com.project.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
/**
* 瀛楀吀绫诲瀷琛� sys_dict_type
@@ -34,6 +35,18 @@
@Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
+ /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ @Excel(name = "鏄惁绯荤粺鍐呯疆", readConverterExp = "0=鑷畾涔�,1=绯荤粺鍐呯疆")
+ private Integer isSystem;
+
+ public Integer getIsSystem() {
+ return isSystem;
+ }
+
+ public void setIsSystem(Integer isSystem) {
+ this.isSystem = isSystem;
+ }
+
public Long getDictId()
{
return dictId;
diff --git a/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java b/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
index 428f295..4d21a07 100644
--- a/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
+++ b/project-common/src/main/java/com/project/common/core/domain/entity/SysUser.java
@@ -1,26 +1,24 @@
package com.project.common.core.domain.entity;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.validation.constraints.*;
-
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.project.common.annotation.Excel;
import com.project.common.annotation.Excel.Type;
import com.project.common.annotation.Excels;
import com.project.common.xss.Xss;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 鐢ㄦ埛瀵硅薄 sys_user
@@ -98,9 +96,12 @@
/** 澶囨敞 */
private String remark;
-
+ /** 澶囨敞 */
private String recommendUser;
+ /** 鎵�灞炴墽娉曟満鏋� */
+ private String recommendPhone;
+
/** 鐢熸棩 */
private String birthday;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java
index 4169f8e..35bc3b1 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java
@@ -1,21 +1,24 @@
package com.project.enforce.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
-import java.io.Serializable;
+
import java.math.BigDecimal;
-import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+
/**
* 鎵ф硶璇勪环棰樼洰瀵硅薄 enforce_evaluate_question
*
* @author manton
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@Accessors(chain = true)
@@ -30,22 +33,24 @@
@ApiModelProperty("ID")
private Long questionId;
-
@ApiModelProperty("棰樼洰")
private String questionName;
-
@ApiModelProperty("鍒嗗��")
private BigDecimal questionScore;
+ @ApiModelProperty("绫诲瀷锛�1閫夋嫨锛�2鎵撳垎")
+ private Integer questionType;
@ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
private Integer questionStatus;
-
- @ApiModelProperty("棰樼洰绛旀")
+ @ApiModelProperty("棰樼洰绛旀ids")
private String answerIds;
+ @ApiModelProperty("棰樼洰绛旀鍒楄〃")
+ private List<EnforceEvaluateAnswer> answerList;
+
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateAnswerBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateAnswerBo.java
deleted file mode 100644
index d0deeea..0000000
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateAnswerBo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.project.enforce.domain.bo.editBo;
-
-import com.project.common.core.domain.BaseDomain;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-
-/**
- * 鎵ф硶璇勪环绛旀缂栬緫瀵硅薄 enforce_evaluate_answer
- *
- * @author manton
- */
-
-@Data
-@ApiModel("鎵ф硶璇勪环绛旀鎿嶄綔瀵硅薄")
-public class EnforceEvaluateAnswerBo {
-
-
- /** 绛旀ID */
- @ApiModelProperty("绛旀ID")
- private Long answerId;
-
- /** 绛旀 */
- @ApiModelProperty("绛旀")
- private String answerName;
-
- /** 棰樼洰ID */
- @ApiModelProperty("棰樼洰ID")
- private Long questionId;
-
- /** 棰樼洰 */
- @ApiModelProperty("棰樼洰")
- private String questionName;
-
- /** 鏄惁寰楀垎锛�0涓嶅緱鍒嗭紝1寰楀垎锛� */
- @ApiModelProperty("鏄惁寰楀垎锛�0涓嶅緱鍒嗭紝1寰楀垎锛�")
- private Integer isScore;
-
- /** 绛旀琛ュ厖 */
- @ApiModelProperty("绛旀琛ュ厖")
- private String answerRemark;
-
- /** 浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤 */
- @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
- private Integer answerStatus;
-
- /** 鏇存柊浜� */
- @ApiModelProperty("鏇存柊浜�")
- private String updateBy;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 澶囨敞 */
- @ApiModelProperty("澶囨敞")
- private String remark;
-}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java
new file mode 100644
index 0000000..4bf83eb
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateBo.java
@@ -0,0 +1,21 @@
+package com.project.enforce.domain.bo.editBo;
+
+import com.project.enforce.domain.EnforceEvaluateQuestion;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+
+@Data
+public class EnforceEvaluateBo
+{
+
+ private List<EnforceEvaluateQuestion> questionList;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateQuestionBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateQuestionBo.java
deleted file mode 100644
index 310ffd5..0000000
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateQuestionBo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.project.enforce.domain.bo.editBo;
-
-import com.project.common.core.domain.BaseDomain;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import java.math.BigDecimal;
-
-/**
- * 鎵ф硶璇勪环棰樼洰缂栬緫瀵硅薄 enforce_evaluate_question
- *
- * @author manton
- */
-
-@Data
-@ApiModel("鎵ф硶璇勪环棰樼洰鎿嶄綔瀵硅薄")
-public class EnforceEvaluateQuestionBo {
-
-
- /** ID */
- @ApiModelProperty("ID")
- private Long questionId;
-
- /** 棰樼洰 */
- @ApiModelProperty("棰樼洰")
- private String questionName;
-
- /** 鍒嗗�� */
- @ApiModelProperty("鍒嗗��")
- private BigDecimal questionScore;
-
- /** 浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤 */
- @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
- private Integer questionStatus;
-
- /** 棰樼洰绛旀 */
- @ApiModelProperty("棰樼洰绛旀")
- private String answerIds;
-
- /** 鏇存柊浜� */
- @ApiModelProperty("鏇存柊浜�")
- private String updateBy;
-
- /** 鏇存柊鏃堕棿 */
- @ApiModelProperty("鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 澶囨敞 */
- @ApiModelProperty("澶囨敞")
- private String remark;
-}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java
deleted file mode 100644
index 7f22891..0000000
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderBo.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.project.enforce.domain.bo.queryBo;
-
-import com.project.common.core.domain.BaseDomain;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * 鎵ф硶鍗曠紪杈戝璞� enforce_order
- *
- * @author manton
- */
-
-@Data
-@ApiModel("鎵ф硶鍗曟搷浣滃璞�")
-public class EnforceOrderBo {
-
-
- /** 鍗曟嵁id */
- @ApiModelProperty("鍗曟嵁id")
- private Long orderId;
-
- /** 鍗曟嵁缂栧彿 */
- @ApiModelProperty("鍗曟嵁缂栧彿")
- private String orderNo;
-
- /** 浼佷笟id */
- @ApiModelProperty("浼佷笟id")
- private Long companyId;
-
- /** 浼佷笟鍚� */
- @ApiModelProperty("浼佷笟鍚�")
- private String companyName;
-
- /** 浼佷笟绀句細缂栫爜 */
- @ApiModelProperty("浼佷笟绀句細缂栫爜")
- private String companyCode;
-
- /** 浼佷笟鑱旂郴浜� */
- @ApiModelProperty("浼佷笟鑱旂郴浜�")
- private String companyUser;
-
- /** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
- @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
- private String companyPhone;
-
- /** 浼佷笟鍦板潃 */
- @ApiModelProperty("浼佷笟鍦板潃")
- private String companyAddress;
-
- /** 鎵�灞炲尯鍩熺紪鐮� */
- @ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
- private String regionCode;
-
- /** 鎵�灞炲尯鍩� */
- @ApiModelProperty("鎵�灞炲尯鍩�")
- private String regionName;
-
- /** 鎵ф硶鍘熷洜 */
- @ApiModelProperty("鎵ф硶鍘熷洜")
- private String enforceReason;
-
- /** 鐢宠浜篿d */
- @ApiModelProperty("鐢宠浜篿d")
- private Long applyId;
-
- /** 鐢宠浜� */
- @ApiModelProperty("鐢宠浜�")
- private String applyUser;
-
- /** 鐢宠浜虹數璇� */
- @ApiModelProperty("鐢宠浜虹數璇�")
- private String applyPhone;
-
- /** 鐢宠浜哄崟浣� */
- @ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptId;
-
- /** 鐢宠浜哄崟浣� */
- @ApiModelProperty("鐢宠浜哄崟浣�")
- private String applyDeptName;
-
- /** 鐢宠鏃堕棿 */
- @ApiModelProperty("鐢宠鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date applyTime;
-
- /** 鎵ф硶闃熷憳浜烘暟 */
- @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
- private Integer userNum;
-
- /** 棰勮鐘舵�侊細0姝ｅ父锛�1棰勮 */
- @ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
- private Integer warnStatus;
-
- /** 棰勮鍘熷洜 */
- @ApiModelProperty("棰勮鍘熷洜")
- private String warnReason;
-
- /** 璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠� */
- @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
- private Integer orderStatus;
-
- /** 瀹℃壒浜哄崟浣� */
- @ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptId;
-
- /** 瀹℃壒浜哄崟浣� */
- @ApiModelProperty("瀹℃壒浜哄崟浣�")
- private String checkDeptName;
-
- /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
- @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
- private Integer checkStatus;
-
- /** 瀹℃壒鍘熷洜 */
- @ApiModelProperty("瀹℃壒鍘熷洜")
- private String checkReason;
-
- /** 褰撳墠瀹℃壒灞傜骇: */
- @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
- private Integer checkLevel;
-
- /** 鎵ц浜篿d */
- @ApiModelProperty("鎵ц浜篿d")
- private Long executeId;
-
- /** 鎵ц浜� */
- @ApiModelProperty("鎵ц浜�")
- private String executeUser;
-
- /** 鎵ц浜虹數璇� */
- @ApiModelProperty("鎵ц浜虹數璇�")
- private String executePhone;
-
- /** 鎵ц浜哄崟浣� */
- @ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptId;
-
- /** 鎵ц浜哄崟浣� */
- @ApiModelProperty("鎵ц浜哄崟浣�")
- private String executeDeptName;
-
- /** 鎵ц鏃堕棿 */
- @ApiModelProperty("鎵ц鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date executeTime;
-
- /** 鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀� */
- @ApiModelProperty("鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀�")
- private Integer regionStatus;
-
- /** 鎵ф硶缁撴灉璇存槑 */
- @ApiModelProperty("鎵ф硶缁撴灉璇存槑")
- private String regionReason;
-
- /** 鎵ф硶鍥剧墖 */
- @ApiModelProperty("鎵ф硶鍥剧墖")
- private String regionImgs;
-
- /** 鎵ф硶瑙嗛 */
- @ApiModelProperty("鎵ф硶瑙嗛")
- private String regionVideos;
-
- /** 鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄� */
- @ApiModelProperty("鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄�")
- private Integer isNoticeCompany;
-
- /** 鏄惁鍏ず锛�0鍚︼紝1鏄� */
- @ApiModelProperty("鏄惁鍏ず锛�0鍚︼紝1鏄�")
- private Integer isShow;
-
- /** 鏄惁璇勪环锛�0鍚︼紝1鏄� */
- @ApiModelProperty("鏄惁璇勪环锛�0鍚︼紝1鏄�")
- private Integer isEva;
-
- /** 璇勪环鎬诲緱鍒� */
- @ApiModelProperty("璇勪环鎬诲緱鍒�")
- private BigDecimal totalScore;
-}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
index 3acd37a..61604c4 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
@@ -1,5 +1,6 @@
package com.project.enforce.domain.bo.queryBo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.core.domain.BaseQuery;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +9,6 @@
import java.math.BigDecimal;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 鎵ф硶鍗曞垎椤垫煡璇㈠璞� enforce_order
@@ -69,22 +69,22 @@
private Long applyId;
/** 鐢宠浜� */
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
/** 鐢宠浜虹數璇� */
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
/** 鐢宠浜哄崟浣� */
@ApiModelProperty("鐢宠浜哄崟浣�")
private Long applyDeptId;
/** 鐢宠浜哄崟浣� */
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
/** 鐢宠鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
- /** 鎵ф硶闃熷憳鏁伴噺 */
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ /** 鎵ф硶闃熷憳浜烘暟 */
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
/** 棰勮鐘舵�侊細0姝ｅ父锛�1棰勮 */
@ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@@ -95,46 +95,36 @@
/** 璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠� */
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
private Integer orderStatus;
- /** 瀹℃壒浜篿d */
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
- /** 瀹℃壒浜� */
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
- /** 瀹℃壒浜虹數璇� */
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
/** 瀹℃壒浜哄崟浣� */
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
- /** 瀹℃壒鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("瀹℃壒鏃堕棿")
- private Date checkTime;
+ private String checkDeptName;
/** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
/** 瀹℃壒鍘熷洜 */
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
+ /** 褰撳墠瀹℃壒灞傜骇: */
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
/** 鎵ц浜篿d */
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
/** 鎵ц浜� */
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
/** 鎵ц浜虹數璇� */
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
/** 鎵ц浜哄崟浣� */
@ApiModelProperty("鎵ц浜哄崟浣�")
private Long executeDeptId;
/** 鎵ц浜哄崟浣� */
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
/** 鎵ц鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鎵ц鏃堕棿")
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java
index 3c2f808..550f98f 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java
@@ -1,11 +1,12 @@
package com.project.enforce.domain.vo;
import com.project.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import java.math.BigDecimal;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
@@ -25,17 +26,28 @@
@Excel(name = "棰樼洰")
@ApiModelProperty("棰樼洰")
private String questionName;
+
@Excel(name = "鍒嗗��")
@ApiModelProperty("鍒嗗��")
private BigDecimal questionScore;
+
+ @Excel(name = "绫诲瀷锛�1閫夋嫨锛�2鎵撳垎")
+ @ApiModelProperty("绫诲瀷锛�1閫夋嫨锛�2鎵撳垎")
+ private Integer questionType;
+
@Excel(name = "浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
@ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
private Integer questionStatus;
+
@Excel(name = "棰樼洰绛旀")
@ApiModelProperty("棰樼洰绛旀")
private String answerIds;
+
@Excel(name = "澶囨敞")
@ApiModelProperty("澶囨敞")
private String remark;
+ @ApiModelProperty("绛旀")
+ private List<EnforceEvaluateAnswerVo> answerList;
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateVo.java
new file mode 100644
index 0000000..5263703
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateVo.java
@@ -0,0 +1,19 @@
+package com.project.enforce.domain.vo;
+
+import com.project.enforce.domain.EnforceEvaluateQuestion;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+
+@Data
+public class EnforceEvaluateVo
+{
+ private List<EnforceEvaluateQuestion> questionList;
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
index 6c8e344..1624d80 100644
--- a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
@@ -2,12 +2,19 @@
import com.project.enforce.domain.EnforceOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+import com.project.enforce.domain.vo.EnforceOrderVo;
+
+import java.util.List;
/**
* 鎵ф硶鍗昅apper鎺ュ彛
*
* @author manton
*/
-public interface EnforceOrderMapper extends BaseMapper<EnforceOrder> {
+public interface EnforceOrderMapper extends BaseMapper<EnforceOrder>
+{
+
+ List<EnforceOrderVo> selectCheckList(EnforceOrderQueryBo bo);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java
index 6f322fa..cb0c058 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java
@@ -1,15 +1,7 @@
package com.project.enforce.service;
-import com.project.enforce.domain.EnforceEvaluateAnswer;
-import com.project.enforce.domain.vo.EnforceEvaluateAnswerVo;
-import com.project.enforce.domain.bo.editBo.EnforceEvaluateAnswerBo;
-import com.project.enforce.domain.bo.queryBo.EnforceEvaluateAnswerQueryBo;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.project.common.mybatis.IBaseService;
-import cn.hutool.core.convert.Convert;
-
-import java.util.Collection;
-import java.util.List;
+import com.project.enforce.domain.EnforceEvaluateAnswer;
/**
* 鎵ф硶璇勪环绛旀Service鎺ュ彛
@@ -18,36 +10,5 @@
*/
public interface IEnforceEvaluateAnswerService extends IBaseService<EnforceEvaluateAnswer> {
- /**
- * 鏌ヨ鍒楄〃
- */
- List<EnforceEvaluateAnswerVo> queryList(EnforceEvaluateAnswerQueryBo bo);
- /**
- * 鏌ヨ鍗曚釜
- * @return EnforceEvaluateAnswerVo
- */
- EnforceEvaluateAnswerVo queryById(Long answerId);
-
-
- /**
- * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆鎵ф硶璇勪环绛旀
- * @param bo 鎵ф硶璇勪环绛旀鏂板涓氬姟瀵硅薄
- * @return true鎴愬姛 false澶辫触
- */
- Boolean insertByBo(EnforceEvaluateAnswerBo bo);
-
- /**
- * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼鎵ф硶璇勪环绛旀
- * @param bo 鎵ф硶璇勪环绛旀缂栬緫涓氬姟瀵硅薄
- * @return true鎴愬姛 false澶辫触
- */
- Boolean updateByBo(EnforceEvaluateAnswerBo bo);
-
- /**
- * 鏍￠獙骞跺垹闄ゆ暟鎹�
- * @param ids 涓婚敭闆嗗悎
- * @return true鎴愬姛 false澶辫触
- */
- Boolean deleteByIds(Collection<Long> ids);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java
index bf4ee2f..e99a4d9 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java
@@ -1,15 +1,7 @@
package com.project.enforce.service;
-import com.project.enforce.domain.EnforceEvaluateQuestion;
-import com.project.enforce.domain.vo.EnforceEvaluateQuestionVo;
-import com.project.enforce.domain.bo.editBo.EnforceEvaluateQuestionBo;
-import com.project.enforce.domain.bo.queryBo.EnforceEvaluateQuestionQueryBo;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.project.common.mybatis.IBaseService;
-import cn.hutool.core.convert.Convert;
-
-import java.util.Collection;
-import java.util.List;
+import com.project.enforce.domain.EnforceEvaluateQuestion;
/**
* 鎵ф硶璇勪环棰樼洰Service鎺ュ彛
@@ -18,36 +10,5 @@
*/
public interface IEnforceEvaluateQuestionService extends IBaseService<EnforceEvaluateQuestion> {
- /**
- * 鏌ヨ鍒楄〃
- */
- List<EnforceEvaluateQuestionVo> queryList(EnforceEvaluateQuestionQueryBo bo);
- /**
- * 鏌ヨ鍗曚釜
- * @return EnforceEvaluateQuestionVo
- */
- EnforceEvaluateQuestionVo queryById(Long questionId);
-
-
- /**
- * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆鎵ф硶璇勪环棰樼洰
- * @param bo 鎵ф硶璇勪环棰樼洰鏂板涓氬姟瀵硅薄
- * @return true鎴愬姛 false澶辫触
- */
- Boolean insertByBo(EnforceEvaluateQuestionBo bo);
-
- /**
- * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼鎵ф硶璇勪环棰樼洰
- * @param bo 鎵ф硶璇勪环棰樼洰缂栬緫涓氬姟瀵硅薄
- * @return true鎴愬姛 false澶辫触
- */
- Boolean updateByBo(EnforceEvaluateQuestionBo bo);
-
- /**
- * 鏍￠獙骞跺垹闄ゆ暟鎹�
- * @param ids 涓婚敭闆嗗悎
- * @return true鎴愬姛 false澶辫触
- */
- Boolean deleteByIds(Collection<Long> ids);
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java
new file mode 100644
index 0000000..7c79723
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateService.java
@@ -0,0 +1,26 @@
+package com.project.enforce.service;
+
+import com.project.enforce.domain.bo.editBo.EnforceEvaluateBo;
+import com.project.enforce.domain.vo.EnforceEvaluateVo;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ * @date 2024骞�06鏈�18鏃�
+ */
+public interface IEnforceEvaluateService
+{
+
+ /**
+ * 淇濆瓨璇勪环
+ * @param bo 鍙傛暟
+ * @return 缁撴灉
+ */
+ Boolean save(EnforceEvaluateBo bo);
+
+ EnforceEvaluateVo getInfo();
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
index e534c74..deb4291 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -4,9 +4,7 @@
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.project.common.mybatis.IBaseService;
-import cn.hutool.core.convert.Convert;
import java.util.Collection;
import java.util.List;
@@ -23,6 +21,11 @@
*/
List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo);
+ /**
+ * 鏌ヨ寰呭鏍稿垪琛�
+ */
+ List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo);
+
/**
* 鏌ヨ鍗曚釜
* @return EnforceOrderVo
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java
index bd9dc52..d9de17d 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java
@@ -1,24 +1,12 @@
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.toolkit.Wrappers;
-import org.springframework.transaction.annotation.Transactional;
-import com.project.enforce.domain.vo.EnforceEvaluateAnswerVo;
-import com.project.enforce.domain.bo.editBo.EnforceEvaluateAnswerBo;
-import com.project.enforce.domain.bo.queryBo.EnforceEvaluateAnswerQueryBo;
import com.project.enforce.domain.EnforceEvaluateAnswer;
import com.project.enforce.mapper.EnforceEvaluateAnswerMapper;
import com.project.enforce.service.IEnforceEvaluateAnswerService;
-
-import java.util.Collection;
-import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
/**
* 鎵ф硶璇勪环绛旀Service涓氬姟灞傚鐞�
@@ -31,77 +19,5 @@
- @Override//鍒楄〃鏌ヨ
- public List<EnforceEvaluateAnswerVo> queryList(EnforceEvaluateAnswerQueryBo bo)
- {
- QueryWrapper<EnforceEvaluateAnswer> qw = getQw(bo);
- List<EnforceEvaluateAnswer> list = this.list(qw);
- return Convert.toList(EnforceEvaluateAnswerVo.class , list);
- }
- @Override//id鏌ヨ
- public EnforceEvaluateAnswerVo queryById(Long answerId)
- {
- EnforceEvaluateAnswer db = this.baseMapper.selectById(answerId);
- return Convert.convert(EnforceEvaluateAnswerVo.class , db);
- }
-
-
- @Override//娣诲姞
- @Transactional
- public Boolean insertByBo(EnforceEvaluateAnswerBo bo)
- {
- EnforceEvaluateAnswer add = Convert.convert(EnforceEvaluateAnswer.class, bo);
- validEntityBeforeSave(add);
- return this.save(add);
- }
-
- @Override//淇敼
- @Transactional
- public Boolean updateByBo(EnforceEvaluateAnswerBo bo)
- {
- EnforceEvaluateAnswer update = Convert.convert(EnforceEvaluateAnswer.class, bo);
- validEntityBeforeSave(update);
- return this.updateById(update);
- }
-
- @Override//鍒犻櫎
- @Transactional
- public Boolean deleteByIds(Collection<Long> ids)
- {
-
- //鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
-
- return this.removeByIds(ids);
- }
-
-
-//-------------------------------------------------------------------------------------
-
- //淇濆瓨鍓嶆牎楠�
- private void validEntityBeforeSave(EnforceEvaluateAnswer entity)
- {
- //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
- }
-
- //鑾峰彇鏌ヨ鍙傛暟
- private QueryWrapper<EnforceEvaluateAnswer> getQw(EnforceEvaluateAnswerQueryBo bo)
- {
- QueryWrapper<EnforceEvaluateAnswer> qw = Wrappers.query();
-
- qw.like(StringUtils.isNotEmpty(bo.getAnswerName()), "answer_name", bo.getAnswerName());
- qw.eq(bo.getQuestionId() != null, "question_id", bo.getQuestionId());
- qw.like(StringUtils.isNotEmpty(bo.getQuestionName()), "question_name", bo.getQuestionName());
- qw.eq(bo.getIsScore() != null, "is_score", bo.getIsScore());
- qw.eq(StringUtils.isNotEmpty(bo.getAnswerRemark()), "answer_remark", bo.getAnswerRemark());
- qw.eq(bo.getAnswerStatus() != null, "answer_status", bo.getAnswerStatus());
- if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
- if ("acs".equals(bo.getIsAsc())) {
- qw.orderByAsc(bo.getOrderByColumn());
- } else if ("desc".equals(bo.getIsAsc())) {
- qw.orderByDesc(bo.getOrderByColumn());
- }
- }
- return qw;
- }
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java
index dc5cb74..9cbe5be 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java
@@ -1,24 +1,12 @@
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.toolkit.Wrappers;
-import org.springframework.transaction.annotation.Transactional;
-import com.project.enforce.domain.vo.EnforceEvaluateQuestionVo;
-import com.project.enforce.domain.bo.editBo.EnforceEvaluateQuestionBo;
-import com.project.enforce.domain.bo.queryBo.EnforceEvaluateQuestionQueryBo;
import com.project.enforce.domain.EnforceEvaluateQuestion;
import com.project.enforce.mapper.EnforceEvaluateQuestionMapper;
import com.project.enforce.service.IEnforceEvaluateQuestionService;
-
-import java.util.Collection;
-import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
/**
* 鎵ф硶璇勪环棰樼洰Service涓氬姟灞傚鐞�
@@ -31,75 +19,5 @@
- @Override//鍒楄〃鏌ヨ
- public List<EnforceEvaluateQuestionVo> queryList(EnforceEvaluateQuestionQueryBo bo)
- {
- QueryWrapper<EnforceEvaluateQuestion> qw = getQw(bo);
- List<EnforceEvaluateQuestion> list = this.list(qw);
- return Convert.toList(EnforceEvaluateQuestionVo.class , list);
- }
- @Override//id鏌ヨ
- public EnforceEvaluateQuestionVo queryById(Long questionId)
- {
- EnforceEvaluateQuestion db = this.baseMapper.selectById(questionId);
- return Convert.convert(EnforceEvaluateQuestionVo.class , db);
- }
-
-
- @Override//娣诲姞
- @Transactional
- public Boolean insertByBo(EnforceEvaluateQuestionBo bo)
- {
- EnforceEvaluateQuestion add = Convert.convert(EnforceEvaluateQuestion.class, bo);
- validEntityBeforeSave(add);
- return this.save(add);
- }
-
- @Override//淇敼
- @Transactional
- public Boolean updateByBo(EnforceEvaluateQuestionBo bo)
- {
- EnforceEvaluateQuestion update = Convert.convert(EnforceEvaluateQuestion.class, bo);
- validEntityBeforeSave(update);
- return this.updateById(update);
- }
-
- @Override//鍒犻櫎
- @Transactional
- public Boolean deleteByIds(Collection<Long> ids)
- {
-
- //鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
-
- return this.removeByIds(ids);
- }
-
-
-//-------------------------------------------------------------------------------------
-
- //淇濆瓨鍓嶆牎楠�
- private void validEntityBeforeSave(EnforceEvaluateQuestion entity)
- {
- //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
- }
-
- //鑾峰彇鏌ヨ鍙傛暟
- private QueryWrapper<EnforceEvaluateQuestion> getQw(EnforceEvaluateQuestionQueryBo bo)
- {
- QueryWrapper<EnforceEvaluateQuestion> qw = Wrappers.query();
-
- qw.like(StringUtils.isNotEmpty(bo.getQuestionName()), "question_name", bo.getQuestionName());
- qw.eq(bo.getQuestionScore() != null, "question_score", bo.getQuestionScore());
- qw.eq(bo.getQuestionStatus() != null, "question_status", bo.getQuestionStatus());
- qw.eq(StringUtils.isNotEmpty(bo.getAnswerIds()), "answer_ids", bo.getAnswerIds());
- if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
- if ("acs".equals(bo.getIsAsc())) {
- qw.orderByAsc(bo.getOrderByColumn());
- } else if ("desc".equals(bo.getIsAsc())) {
- qw.orderByDesc(bo.getOrderByColumn());
- }
- }
- return qw;
- }
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
new file mode 100644
index 0000000..6a24155
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java
@@ -0,0 +1,92 @@
+package com.project.enforce.service.impl;
+
+import com.project.common.exception.base.BaseException;
+import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceEvaluateAnswer;
+import com.project.enforce.domain.EnforceEvaluateQuestion;
+import com.project.enforce.domain.bo.editBo.EnforceEvaluateBo;
+import com.project.enforce.domain.vo.EnforceEvaluateVo;
+import com.project.enforce.service.IEnforceEvaluateAnswerService;
+import com.project.enforce.service.IEnforceEvaluateQuestionService;
+import com.project.enforce.service.IEnforceEvaluateService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 鍔熻兘鎻忚堪锛�
+ *
+ * @author ZQN
+ * @version 1.0
+ */
+
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class EnforceEvaluateServiceImpl implements IEnforceEvaluateService
+{
+
+ private final IEnforceEvaluateQuestionService questionService;
+ private final IEnforceEvaluateAnswerService answerService;
+
+
+ @Override//淇濆瓨
+ @Transactional
+ public Boolean save(EnforceEvaluateBo bo)
+ {
+ List<EnforceEvaluateQuestion> questionList = bo.getQuestionList();
+ if (StringUtils.isEmpty(questionList)){
+ throw new BaseException("棰樼洰涓嶅彲涓虹┖锛�");
+ }
+ for (EnforceEvaluateQuestion question : bo.getQuestionList()) {
+ if (question.getQuestionType()==1 && StringUtils.isEmpty(question.getAnswerList())){
+ throw new BaseException("閫夋嫨绫诲瀷绛旀涓嶅彲涓虹┖锛�");
+ }
+ if (question.getQuestionId()==null){
+ int count = questionService.count(questionService.lq()
+ .eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionId()));
+ if (count>0) {
+ throw new BaseException(StringUtils.format("{}锛岄鐩噸澶嶏紝璇烽噸璇曪紒", question.getQuestionName()));
+ }
+ if (StringUtils.isNotEmpty(question.getAnswerList())){
+ EnforceEvaluateQuestion one = questionService.getOne(questionService.lq().eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionName()));
+ question.getAnswerList().forEach(enforceEvaluateAnswer -> {
+ enforceEvaluateAnswer.setQuestionId(one.getQuestionId());
+ enforceEvaluateAnswer.setQuestionName(one.getQuestionName());
+ });
+ }
+
+ } else {
+ int count = questionService.count(questionService.lq().
+ eq(EnforceEvaluateQuestion::getQuestionName, question.getQuestionId())
+ .ne(EnforceEvaluateQuestion::getQuestionId,question.getQuestionId()));
+ if (count>0) {
+ throw new BaseException(StringUtils.format("{}锛岄鐩噸澶嶏紝璇烽噸璇曪紒", question.getQuestionName()));
+ }
+ }
+ questionService.saveOrUpdate(question);
+ if (StringUtils.isNotEmpty(question.getAnswerList())){
+ answerService.saveOrUpdateBatch(question.getAnswerList());
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public EnforceEvaluateVo getInfo()
+ {
+ EnforceEvaluateVo vo = new EnforceEvaluateVo();
+ List<EnforceEvaluateQuestion> questionList = questionService.list();
+ for (EnforceEvaluateQuestion question : questionList) {
+ if (question.getQuestionType()==1){
+ List<EnforceEvaluateAnswer> answerList = answerService.list(answerService.lq().eq(EnforceEvaluateAnswer::getQuestionId, question.getQuestionId()));
+ question.setAnswerList(answerList);
+ }
+ }
+ vo.setQuestionList(questionList);
+ return vo;
+ }
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index addca4d..67468d3 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -1,24 +1,31 @@
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.EnforceOrderVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.annotation.DataScope;
+import com.project.common.constant.CheckLevelCodeConstants;
+import com.project.common.core.domain.entity.SysRole;
+import com.project.common.core.domain.entity.SysUser;
+import com.project.common.exception.base.BaseException;
+import com.project.common.utils.SecurityUtils;
+import com.project.common.utils.StringUtils;
+import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
-import com.project.enforce.domain.EnforceOrder;
+import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.mapper.EnforceOrderMapper;
import com.project.enforce.service.IEnforceOrderService;
+import com.project.system.service.ISysDeptService;
+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;
+import java.util.stream.Collectors;
/**
* 鎵ф硶鍗昐ervice涓氬姟灞傚鐞�
@@ -29,14 +36,39 @@
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class EnforceOrderServiceImpl extends ServiceImpl<EnforceOrderMapper, EnforceOrder> implements IEnforceOrderService {
+ private final ISysDeptService deptService;
@Override//鍒楄〃鏌ヨ
+ @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_user_id")
public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
+ qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//鏁版嵁鏉冮檺鎺у埗
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override//寰呭鏍稿垪琛�
+ public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
+ {
+ SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ if (!"01".equals(loginUser.getUserType())) {
+ throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ }
+ List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+ if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
+ bo.setCheckLevel(null);
+ } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
+ bo.setCheckLevel(0);
+ } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
+ bo.setCheckLevel(1);
+ } else {
+ throw new BaseException("鎮ㄦ病鏈夊鎵规潈闄愶紝璇烽噸璇曪紒");
+ }
+ bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(loginUser.getDeptId()));
+
+ return this.baseMapper.selectCheckList(bo);
}
@Override//id鏌ヨ
@@ -81,7 +113,9 @@
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceOrder entity)
{
- //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ if (entity.getOrderId()==null){
+ entity.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(entity.getApplyDeptId()));
+ }
}
//鑾峰彇鏌ヨ鍙傛暟
@@ -89,47 +123,45 @@
{
QueryWrapper<EnforceOrder> qw = Wrappers.query();
- qw.eq(StringUtils.isNotEmpty(bo.getOrderNo()), "order_no", bo.getOrderNo());
- qw.eq(bo.getCompanyId() != null, "company_id", bo.getCompanyId());
- qw.like(StringUtils.isNotEmpty(bo.getCompanyName()), "company_name", bo.getCompanyName());
- qw.eq(StringUtils.isNotEmpty(bo.getCompanyCode()), "company_code", bo.getCompanyCode());
- qw.eq(StringUtils.isNotEmpty(bo.getCompanyUser()), "company_user", bo.getCompanyUser());
- qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
- qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
- qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
- qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
- qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
- qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
- qw.eq(bo.getApplyUser() != null, "apply_user", bo.getApplyUser());
- qw.eq(bo.getApplyPhone() != null, "apply_phone", bo.getApplyPhone());
- qw.eq(bo.getApplyDeptId() != null, "apply_dept_id", bo.getApplyDeptId());
- qw.like(bo.getApplyDeptName() != null, "apply_dept_name", bo.getApplyDeptName());
- qw.eq(bo.getApplyTime() != null, "apply_time", bo.getApplyTime());
- qw.eq(bo.getWarnStatus() != null, "warn_status", bo.getWarnStatus());
- qw.eq(StringUtils.isNotEmpty(bo.getWarnReason()), "warn_reason", bo.getWarnReason());
- qw.eq(bo.getOrderStatus() != null, "order_status", bo.getOrderStatus());
- qw.eq(bo.getCheckId() != null, "check_id", bo.getCheckId());
- qw.eq(bo.getCheckUser() != null, "check_user", bo.getCheckUser());
- qw.eq(bo.getCheckPhone() != null, "check_phone", bo.getCheckPhone());
- qw.eq(bo.getCheckDeptId() != null, "check_dept_id", bo.getCheckDeptId());
- qw.like(bo.getCheckDeptName() != null, "check_dept_name", bo.getCheckDeptName());
- qw.eq(bo.getCheckTime() != null, "check_time", bo.getCheckTime());
- qw.eq(bo.getCheckStatus() != null, "check_status", bo.getCheckStatus());
- qw.eq(StringUtils.isNotEmpty(bo.getCheckReason()), "check_reason", bo.getCheckReason());
- qw.eq(bo.getExecuteId() != null, "execute_id", bo.getExecuteId());
- qw.eq(bo.getExecuteUser() != null, "execute_user", bo.getExecuteUser());
- qw.eq(bo.getExecutePhone() != null, "execute_phone", bo.getExecutePhone());
- qw.eq(bo.getExecuteDeptId() != null, "execute_dept_id", bo.getExecuteDeptId());
- qw.like(bo.getExecuteDeptName() != null, "execute_dept_name", bo.getExecuteDeptName());
- qw.eq(bo.getExecuteTime() != null, "execute_time", bo.getExecuteTime());
- qw.eq(bo.getRegionStatus() != null, "region_status", bo.getRegionStatus());
- qw.eq(StringUtils.isNotEmpty(bo.getRegionReason()), "region_reason", bo.getRegionReason());
- qw.eq(StringUtils.isNotEmpty(bo.getRegionImgs()), "region_imgs", bo.getRegionImgs());
- qw.eq(StringUtils.isNotEmpty(bo.getRegionVideos()), "region_videos", bo.getRegionVideos());
- qw.eq(bo.getIsNoticeCompany() != null, "is_notice_company", bo.getIsNoticeCompany());
- qw.eq(bo.getIsShow() != null, "is_show", bo.getIsShow());
- qw.eq(bo.getIsEva() != null, "is_eva", bo.getIsEva());
- qw.eq(bo.getTotalScore() != null, "total_score", bo.getTotalScore());
+ qw.eq(StringUtils.isNotEmpty(bo.getOrderNo()), "order_no", bo.getOrderNo());
+ qw.eq(bo.getCompanyId() != null, "company_id", bo.getCompanyId());
+ qw.like(StringUtils.isNotEmpty(bo.getCompanyName()), "company_name", bo.getCompanyName());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyCode()), "company_code", bo.getCompanyCode());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyUser()), "company_user", bo.getCompanyUser());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
+ qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
+ qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
+ qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
+ qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
+ qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());
+ qw.eq(StringUtils.isNotEmpty(bo.getApplyPhone()), "apply_phone", bo.getApplyPhone());
+ qw.eq(bo.getApplyDeptId() != null, "apply_dept_id", bo.getApplyDeptId());
+ qw.like(StringUtils.isNotEmpty(bo.getApplyDeptName()), "apply_dept_name", bo.getApplyDeptName());
+ qw.eq(bo.getApplyTime() != null, "apply_time", bo.getApplyTime());
+ qw.eq(bo.getUserNum() != null, "user_num", bo.getUserNum());
+ qw.eq(bo.getWarnStatus() != null, "warn_status", bo.getWarnStatus());
+ qw.eq(StringUtils.isNotEmpty(bo.getWarnReason()), "warn_reason", bo.getWarnReason());
+ qw.eq(bo.getOrderStatus() != null, "order_status", bo.getOrderStatus());
+ qw.eq(bo.getCheckDeptId() != null, "check_dept_id", bo.getCheckDeptId());
+ qw.like(StringUtils.isNotEmpty(bo.getCheckDeptName()), "check_dept_name", bo.getCheckDeptName());
+ qw.eq(bo.getCheckStatus() != null, "check_status", bo.getCheckStatus());
+ qw.eq(StringUtils.isNotEmpty(bo.getCheckReason()), "check_reason", bo.getCheckReason());
+ qw.eq(bo.getCheckLevel() != null, "check_level", bo.getCheckLevel());
+ qw.eq(bo.getExecuteId() != null, "execute_id", bo.getExecuteId());
+ qw.eq(StringUtils.isNotEmpty(bo.getExecuteUser()), "execute_user", bo.getExecuteUser());
+ qw.eq(StringUtils.isNotEmpty(bo.getExecutePhone()), "execute_phone", bo.getExecutePhone());
+ qw.eq(bo.getExecuteDeptId() != null, "execute_dept_id", bo.getExecuteDeptId());
+ qw.like(StringUtils.isNotEmpty(bo.getExecuteDeptName()), "execute_dept_name", bo.getExecuteDeptName());
+ qw.eq(bo.getExecuteTime() != null, "execute_time", bo.getExecuteTime());
+ qw.eq(bo.getRegionStatus() != null, "region_status", bo.getRegionStatus());
+ qw.eq(StringUtils.isNotEmpty(bo.getRegionReason()), "region_reason", bo.getRegionReason());
+ qw.eq(StringUtils.isNotEmpty(bo.getRegionImgs()), "region_imgs", bo.getRegionImgs());
+ qw.eq(StringUtils.isNotEmpty(bo.getRegionVideos()), "region_videos", bo.getRegionVideos());
+ qw.eq(bo.getIsNoticeCompany() != null, "is_notice_company", bo.getIsNoticeCompany());
+ qw.eq(bo.getIsShow() != null, "is_show", bo.getIsShow());
+ qw.eq(bo.getIsEva() != null, "is_eva", bo.getIsEva());
+ qw.eq(bo.getTotalScore() != null, "total_score", bo.getTotalScore());
if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
if ("acs".equals(bo.getIsAsc())) {
qw.orderByAsc(bo.getOrderByColumn());
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index da8443b..48c793c 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.project.enforce.mapper.EnforceOrderMapper">
-
+
<resultMap type="EnforceOrder" id="EnforceOrderResult">
<result property="orderId" column="order_id" />
<result property="orderNo" column="order_no" />
@@ -22,17 +22,15 @@
<result property="applyDeptId" column="apply_dept_id" />
<result property="applyDeptName" column="apply_dept_name" />
<result property="applyTime" column="apply_time" />
+ <result property="userNum" column="user_num" />
<result property="warnStatus" column="warn_status" />
<result property="warnReason" column="warn_reason" />
<result property="orderStatus" column="order_status" />
- <result property="checkId" column="check_id" />
- <result property="checkUser" column="check_user" />
- <result property="checkPhone" column="check_phone" />
<result property="checkDeptId" column="check_dept_id" />
<result property="checkDeptName" column="check_dept_name" />
- <result property="checkTime" column="check_time" />
<result property="checkStatus" column="check_status" />
<result property="checkReason" column="check_reason" />
+ <result property="checkLevel" column="check_level" />
<result property="executeId" column="execute_id" />
<result property="executeUser" column="execute_user" />
<result property="executePhone" column="execute_phone" />
@@ -50,6 +48,40 @@
<result property="delFlag" column="del_flag" />
</resultMap>
+ <sql id="selectEnforceOrderVo">
+ select order_id, order_no, company_id, company_name, company_code, company_user, company_phone, company_address,
+ region_code,region_name,enforce_reason,user_num,
+ apply_id,apply_user,apply_phone,apply_dept_id,apply_dept_name,apply_time,
+ warn_status,warn_reason,order_status,
+ check_dept_id,check_dept_name,check_status,check_reason,check_level,
+ execute_id,execute_user,execute_phone,execute_dept_id,execute_dept_name,execute_time,
+ region_status,region_reason,region_imgs,region_videos,is_notice_company,is_show,is_eva,total_score
+ from sys_job_log
+ </sql>
+ <select id="selectCheckList" parameterType="EnforceOrderQueryBo" resultMap="EnforceOrderResult">
+ <include refid="selectEnforceOrderVo"/>
+ <where>
+ <if test="orderNo != null and orderNo != ''">
+ AND order_no like concat('%', #{orderNo}, '%')
+ </if>
+ <if test="companyName != null and companyName != ''">
+ AND company_name like concat('%', #{companyName}, '%')
+ </if>
-</mapper>
\ No newline at end of file
+ <if test="orderStatus != null and orderStatus != ''">
+ AND order_status = #{orderStatus}
+ </if>
+
+ <if test="checkDeptId != null ">
+ AND check_dept_id = #{checkDeptId}
+ </if>
+
+ <if test="checkLevel != null ">
+ AND check_level = #{checkLevel}
+ </if>
+
+ </where>
+ </select>
+
+</mapper>
diff --git a/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java b/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
index f890106..b533252 100644
--- a/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
+++ b/project-framework/src/main/java/com/project/framework/aspectj/DataScopeAspect.java
@@ -1,11 +1,5 @@
package com.project.framework.aspectj;
-import java.util.ArrayList;
-import java.util.List;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
import com.project.common.annotation.DataScope;
import com.project.common.core.domain.BaseEntity;
import com.project.common.core.domain.entity.SysRole;
@@ -15,6 +9,13 @@
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
import com.project.framework.security.context.PermissionContextHolder;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 鏁版嵁杩囨护澶勭悊
@@ -49,6 +50,11 @@
* 浠呮湰浜烘暟鎹潈闄�
*/
public static final String DATA_SCOPE_SELF = "5";
+
+ /**
+ * 鏈満鏋勬暟鎹潈闄�
+ */
+ public static final String DATA_SCOPE_ORG = "6";
/**
* 鏁版嵁鏉冮檺杩囨护鍏抽敭瀛�
@@ -113,7 +119,7 @@
else if (DATA_SCOPE_CUSTOM.equals(dataScope))
{
sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
+ " OR {} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
role.getRoleId()));
}
else if (DATA_SCOPE_DEPT.equals(dataScope))
@@ -123,19 +129,25 @@
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
{
sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+ " OR {} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
deptAlias, user.getDeptId(), user.getDeptId()));
+ }
+ else if (DATA_SCOPE_ORG.equals(dataScope))
+ {
+ sqlString.append(StringUtils.format(
+ " OR {} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+ deptAlias, user.getRecommendUser(), user.getRecommendUser()));
}
else if (DATA_SCOPE_SELF.equals(dataScope))
{
if (StringUtils.isNotBlank(userAlias))
{
- sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+ sqlString.append(StringUtils.format(" OR {} = {} ", userAlias, user.getUserId()));
}
else
{
// 鏁版嵁鏉冮檺涓轰粎鏈汉涓旀病鏈塽serAlias鍒悕涓嶆煡璇换浣曟暟鎹�
- sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+ sqlString.append(StringUtils.format(" OR {}= = 0 ", deptAlias));
}
}
conditions.add(dataScope);
diff --git a/project-system/src/main/java/com/project/system/domain/SysCompany.java b/project-system/src/main/java/com/project/system/domain/SysCompany.java
index e523e99..9e9858a 100644
--- a/project-system/src/main/java/com/project/system/domain/SysCompany.java
+++ b/project-system/src/main/java/com/project/system/domain/SysCompany.java
@@ -1,16 +1,14 @@
package com.project.system.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
/**
* 浼佷笟淇℃伅瀵硅薄 sys_company
*
@@ -59,6 +57,12 @@
@ApiModelProperty("浼佷笟鐘舵�侊細0姝ｅ父锛�1绂佺敤")
private Integer companyStatus;
+ @ApiModelProperty("浼佷笟绫诲瀷")
+ private String companyType;
+
+ @ApiModelProperty("浼佷笟鏉ユ簮锛�0娉ㄥ唽锛�1瀵煎叆")
+ private Integer isImport;
+
@ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
private String regionCode;
diff --git a/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java b/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java
index 700a82e..ac097f7 100644
--- a/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java
+++ b/project-system/src/main/java/com/project/system/domain/bo/editBo/SysCompanyBo.java
@@ -1,11 +1,9 @@
package com.project.system.domain.bo.editBo;
-import com.project.common.core.domain.BaseDomain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -53,6 +51,12 @@
@ApiModelProperty("浼佷笟鐘舵�侊細0姝ｅ父锛�1绂佺敤")
private Integer companyStatus;
+ @ApiModelProperty("浼佷笟绫诲瀷")
+ private String companyType;
+
+ @ApiModelProperty("浼佷笟鏉ユ簮锛�0娉ㄥ唽锛�1瀵煎叆")
+ private Integer isImport;
+
/** 鎵�灞炲尯鍩熺紪鐮� */
@ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
private String regionCode;
diff --git a/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java b/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java
index 41aa34c..78fe42a 100644
--- a/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java
+++ b/project-system/src/main/java/com/project/system/domain/bo/queryBo/SysCompanyQueryBo.java
@@ -52,6 +52,13 @@
/** 浼佷笟鐘舵�侊細0姝ｅ父锛�1绂佺敤 */
@ApiModelProperty("浼佷笟鐘舵�侊細0姝ｅ父锛�1绂佺敤")
private Integer companyStatus;
+
+ @ApiModelProperty("浼佷笟绫诲瀷")
+ private String companyType;
+
+ @ApiModelProperty("浼佷笟鏉ユ簮锛�0娉ㄥ唽锛�1瀵煎叆")
+ private Integer isImport;
+
/** 鎵�灞炲尯鍩熺紪鐮� */
@ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
private String regionCode;
diff --git a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
index 48a7c0e..d54f2b8 100644
--- a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
+++ b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
@@ -1,10 +1,12 @@
package com.project.system.domain.vo;
-import com.project.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.project.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
@@ -56,6 +58,12 @@
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+ @ApiModelProperty("浼佷笟绫诲瀷")
+ private String companyType;
+
+ @ApiModelProperty("浼佷笟鏉ユ簮锛�0娉ㄥ唽锛�1瀵煎叆")
+ private Integer isImport;
+
@ApiModelProperty("瀹℃壒璇存槑")
private String checkReason;
@@ -63,6 +71,24 @@
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
+ /** 鍒涘缓浜� */
+ @Excel(name = "鍒涘缓浜�")
+ @ApiModelProperty("鍒涘缓浜�")
+ private String createBy;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鏇存柊浜� */
+ @Excel(name = "鏇存柊浜�")
+ @ApiModelProperty("鏇存柊浜�")
+ private String updateBy;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+ /** 澶囨敞 */
@Excel(name = "澶囨敞")
@ApiModelProperty("澶囨敞")
private String remark;
diff --git a/project-system/src/main/java/com/project/system/service/ISysDeptService.java b/project-system/src/main/java/com/project/system/service/ISysDeptService.java
index 2b6db51..5bcbcbc 100644
--- a/project-system/src/main/java/com/project/system/service/ISysDeptService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysDeptService.java
@@ -1,8 +1,9 @@
package com.project.system.service;
-import java.util.List;
import com.project.common.core.domain.TreeSelect;
import com.project.common.core.domain.entity.SysDept;
+
+import java.util.List;
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟灞�
@@ -121,4 +122,8 @@
* @return 缁撴灉
*/
public int deleteDeptById(Long deptId);
+
+
+
+ public Long getCheckDeptIdByLoginDeptId(Long deptId);
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
index 7988c94..b92f1d6 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
@@ -118,6 +118,7 @@
*/
private void validEntityBeforeSave(SysCompany entity, int isImport)
{
+ entity.setIsImport(isImport);
if (isImport!=1){
if (StringUtils.isEmpty(entity.getCompanyImg())){
throw new BaseException(String.format("%1$s锛岃涓婁紶钀ヤ笟鎵х収", entity.getCompanyName()));
@@ -179,7 +180,8 @@
SysCompany one = this.getOne(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
String phone = entity.getCompanyPhone();
user.setPhonenumber(phone);
- user.setUserName(entity.getCompanyUser());
+ user.setUserName(phone);
+ user.setNickName(entity.getCompanyUser());
user.setPassword(phone);
user.setDeptId(one.getCompanyId());
user.setUserType("02");
@@ -227,6 +229,8 @@
qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
qw.eq(StringUtils.isNotEmpty(bo.getCompanyImg()), "company_img", bo.getCompanyImg());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyType()), "company_type", bo.getCompanyType());
+ qw.eq(bo.getIsImport() != null, "is_import", bo.getIsImport());
qw.eq(bo.getCompanyStatus() != null, "company_status", bo.getCompanyStatus());
qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
index c6b7d36..bb89e61 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
@@ -1,11 +1,5 @@
package com.project.system.service.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.project.common.annotation.DataScope;
import com.project.common.constant.UserConstants;
import com.project.common.core.domain.TreeSelect;
@@ -20,6 +14,13 @@
import com.project.system.mapper.SysDeptMapper;
import com.project.system.mapper.SysRoleMapper;
import com.project.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇
@@ -293,6 +294,17 @@
return deptMapper.deleteDeptById(deptId);
}
+ @Override
+ public Long getCheckDeptIdByLoginDeptId(Long deptId)
+ {
+ SysDept loginDept = selectDeptById(deptId);
+ if (loginDept.getParentId()==101){
+ return loginDept.getDeptId();
+ } else {
+ return getCheckDeptIdByLoginDeptId(loginDept.getParentId());
+ }
+ }
+
/**
* 閫掑綊鍒楄〃
*/
diff --git a/project-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/project-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 9b23181..7de9a0b 100644
--- a/project-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/project-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -8,6 +8,7 @@
<id property="dictId" column="dict_id" />
<result property="dictName" column="dict_name" />
<result property="dictType" column="dict_type" />
+ <result property="isSystem" column="is_system" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -16,7 +17,7 @@
</resultMap>
<sql id="selectDictTypeVo">
- select dict_id, dict_name, dict_type, status, create_by, create_time, remark
+ select dict_id, dict_name, dict_type,is_system, status, create_by, create_time, remark
from sys_dict_type
</sql>
@@ -31,6 +32,9 @@
</if>
<if test="dictType != null and dictType != ''">
AND dict_type like concat('%', #{dictType}, '%')
+ </if>
+ <if test="isSystem != null">
+ AND is_system = #{isSystem}
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
@@ -76,6 +80,7 @@
<set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
+ <if test="isSystem != null ">is_system = #{isSystem},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -88,6 +93,7 @@
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
+ <if test="isSystem != null ">is_system,</if>
<if test="status != null">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@@ -95,6 +101,7 @@
)values(
<if test="dictName != null and dictName != ''">#{dictName},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
+ <if test="isSystem != null ">#{isSystem},</if>
<if test="status != null">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
--
Gitblit v1.9.1