From 3a2b86071fca71b4c789762ccb2dfaf7423b0c07 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 17 六月 2024 18:56:31 +0800
Subject: [PATCH] 执法流程添加，企业导入添加
---
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 157 ++
project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java | 101 +
project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java | 61
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java | 80 +
project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java | 153 ++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 142 ++
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateQuestionController.java | 106 +
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java | 99 +
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCheckLogServiceImpl.java | 115 +
project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateQuestionMapper.xml | 23
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java | 27
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java | 65 +
project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java | 93 +
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java | 107 +
project-enforce/src/main/resources/mapper/enforce/EnforceCheckLogMapper.xml | 33
project-admin/pom.xml | 6
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java | 53
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateLogController.java | 106 +
project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateLogMapper.java | 13
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 201 +++
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateQuestionQueryBo.java | 48
project-enforce/pom.xml | 28
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateAnswerVo.java | 46
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java | 16
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 55
project-system/src/main/java/com/project/system/service/ISysUserService.java | 8
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java | 41
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateAnswerController.java | 106 +
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java | 72 +
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java | 200 +++
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateQuestionBo.java | 57
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 53
project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java | 16
pom.xml | 8
project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateQuestionMapper.java | 13
project-system/src/main/java/com/project/system/domain/SysCompany.java | 4
project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateAnswerMapper.xml | 25
project-enforce/src/main/java/com/project/enforce/service/IEnforceCheckLogService.java | 53
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java | 167 ++
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCheckLogController.java | 106 +
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 13
project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateLogMapper.xml | 31
project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateAnswerMapper.java | 13
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateAnswerQueryBo.java | 53
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java | 89 +
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java | 53
project-admin/src/main/java/com/project/ProjectApplication.java | 2
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateAnswerBo.java | 64 +
project-system/src/main/java/com/project/system/service/ISysCompanyService.java | 7
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java | 73 +
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 106 +
project-admin/src/main/java/com/project/core/config/SwaggerConfig.java | 16
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java | 113 +
project-enforce/src/main/java/com/project/enforce/mapper/EnforceCheckLogMapper.java | 13
project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateLogService.java | 53
project-admin/src/main/java/com/project/admin/controller/system/SysDocController.java | 2
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java | 105 +
project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateAnswer.java | 69 +
58 files changed, 3,710 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 89302f0..439b30f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,13 @@
<version>${project.version}</version>
</dependency>
+ <!-- 鎵ф硶涓氬姟-->
+ <dependency>
+ <groupId>com.project</groupId>
+ <artifactId>project-enforce</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -233,6 +240,7 @@
<module>project-generator</module>
<module>project-common</module>
<module>project-approval</module>
+ <module>project-enforce</module>
</modules>
<packaging>pom</packaging>
diff --git a/project-admin/pom.xml b/project-admin/pom.xml
index 93162c3..69458bb 100644
--- a/project-admin/pom.xml
+++ b/project-admin/pom.xml
@@ -67,6 +67,12 @@
<artifactId>project-approval</artifactId>
</dependency>
+ <!-- 瀹℃壒娴佺▼-->
+ <dependency>
+ <groupId>com.project</groupId>
+ <artifactId>project-enforce</artifactId>
+ </dependency>
+
</dependencies>
diff --git a/project-admin/src/main/java/com/project/ProjectApplication.java b/project-admin/src/main/java/com/project/ProjectApplication.java
index 3f1f1b6..522f52c 100644
--- a/project-admin/src/main/java/com/project/ProjectApplication.java
+++ b/project-admin/src/main/java/com/project/ProjectApplication.java
@@ -3,12 +3,14 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
/**
* 鍚姩绋嬪簭
*
* @author project
*/
+@EnableAsync
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class ProjectApplication
{
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCheckLogController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCheckLogController.java
new file mode 100644
index 0000000..75f57ae
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceCheckLogController.java
@@ -0,0 +1,106 @@
+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.EnforceCheckLogVo;
+import com.project.enforce.domain.bo.editBo.EnforceCheckLogBo;
+import com.project.enforce.domain.bo.queryBo.EnforceCheckLogQueryBo;
+import com.project.enforce.service.IEnforceCheckLogService;
+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/check/log")
+public class EnforceCheckLogController extends BaseController {
+
+ private final IEnforceCheckLogService iEnforceCheckLogService;
+
+
+ @ApiOperation("鏌ヨ鎵ф硶瀹℃壒璁板綍鍒楄〃")
+ @GetMapping("/list")
+ public TableDataInfo list(EnforceCheckLogQueryBo bo)
+ {
+ startPage();
+ List<EnforceCheckLogVo> list = iEnforceCheckLogService.queryList(bo);
+ return getDataTable(list);
+ }
+
+
+
+ @ApiOperation("瀵煎嚭鎵ф硶瀹℃壒璁板綍鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:export')")
+ @Log(title = "鎵ф硶瀹℃壒璁板綍", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ @RepeatSubmit
+ public AjaxResult export(EnforceCheckLogQueryBo bo)
+ {
+ List<EnforceCheckLogVo> list = iEnforceCheckLogService.queryList(bo);
+ ExcelUtil<EnforceCheckLogVo> util = new ExcelUtil<EnforceCheckLogVo>(EnforceCheckLogVo.class);
+ return util.exportExcel(list, "鎵ф硶瀹℃壒璁板綍");
+ }
+
+
+ @ApiOperation("鑾峰彇鎵ф硶瀹℃壒璁板綍璇︾粏淇℃伅")
+ @GetMapping("/{id}")
+ public AjaxResult getInfo(@PathVariable("id" ) Long id)
+ {
+ return AjaxResult.success(iEnforceCheckLogService.queryById(id));
+ }
+
+
+ @ApiOperation("鏂板鎵ф硶瀹℃壒璁板綍")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:add')")
+ @Log(title = "鎵ф硶瀹℃壒璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody EnforceCheckLogBo bo)
+ {
+ return toAjax(iEnforceCheckLogService.insertByBo(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("淇敼鎵ф硶瀹℃壒璁板綍")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:edit')")
+ @Log(title = "鎵ф硶瀹℃壒璁板綍", businessType = BusinessType.UPDATE)
+ @PostMapping("/upd")
+ @RepeatSubmit
+ public AjaxResult upd(@RequestBody EnforceCheckLogBo bo)
+ {
+ return toAjax(iEnforceCheckLogService.updateByBo(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("鍒犻櫎鎵ф硶瀹℃壒璁板綍")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:remove')")
+ @Log(title = "鎵ф硶瀹℃壒璁板綍" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ @RepeatSubmit
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(iEnforceCheckLogService.deleteByIds(Arrays.asList(ids)) ? 1 : 0);
+ }
+}
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
new file mode 100644
index 0000000..d3fb1b6
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateAnswerController.java
@@ -0,0 +1,106 @@
+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/EnforceEvaluateLogController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateLogController.java
new file mode 100644
index 0000000..7697f8e
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateLogController.java
@@ -0,0 +1,106 @@
+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.EnforceEvaluateLogVo;
+import com.project.enforce.domain.bo.editBo.EnforceEvaluateLogBo;
+import com.project.enforce.domain.bo.queryBo.EnforceEvaluateLogQueryBo;
+import com.project.enforce.service.IEnforceEvaluateLogService;
+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/evaluate/log")
+public class EnforceEvaluateLogController extends BaseController {
+
+ private final IEnforceEvaluateLogService iEnforceEvaluateLogService;
+
+
+ @ApiOperation("鏌ヨ鎵ф硶璇勪环璁板綍鍒楄〃")
+ @GetMapping("/list")
+ public TableDataInfo list(EnforceEvaluateLogQueryBo bo)
+ {
+ startPage();
+ List<EnforceEvaluateLogVo> list = iEnforceEvaluateLogService.queryList(bo);
+ return getDataTable(list);
+ }
+
+
+
+ @ApiOperation("瀵煎嚭鎵ф硶璇勪环璁板綍鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:export')")
+ @Log(title = "鎵ф硶璇勪环璁板綍", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ @RepeatSubmit
+ public AjaxResult export(EnforceEvaluateLogQueryBo bo)
+ {
+ List<EnforceEvaluateLogVo> list = iEnforceEvaluateLogService.queryList(bo);
+ ExcelUtil<EnforceEvaluateLogVo> util = new ExcelUtil<EnforceEvaluateLogVo>(EnforceEvaluateLogVo.class);
+ return util.exportExcel(list, "鎵ф硶璇勪环璁板綍");
+ }
+
+
+ @ApiOperation("鑾峰彇鎵ф硶璇勪环璁板綍璇︾粏淇℃伅")
+ @GetMapping("/{id}")
+ public AjaxResult getInfo(@PathVariable("id" ) Long id)
+ {
+ return AjaxResult.success(iEnforceEvaluateLogService.queryById(id));
+ }
+
+
+ @ApiOperation("鏂板鎵ф硶璇勪环璁板綍")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:add')")
+ @Log(title = "鎵ф硶璇勪环璁板綍", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody EnforceEvaluateLogBo bo)
+ {
+ return toAjax(iEnforceEvaluateLogService.insertByBo(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("淇敼鎵ф硶璇勪环璁板綍")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:edit')")
+ @Log(title = "鎵ф硶璇勪环璁板綍", businessType = BusinessType.UPDATE)
+ @PostMapping("/upd")
+ @RepeatSubmit
+ public AjaxResult upd(@RequestBody EnforceEvaluateLogBo bo)
+ {
+ return toAjax(iEnforceEvaluateLogService.updateByBo(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("鍒犻櫎鎵ф硶璇勪环璁板綍")
+ //@PreAuthorize("@ss.hasPermi('enforce:log:remove')")
+ @Log(title = "鎵ф硶璇勪环璁板綍" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ @RepeatSubmit
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(iEnforceEvaluateLogService.deleteByIds(Arrays.asList(ids)) ? 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
new file mode 100644
index 0000000..3799a0a
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateQuestionController.java
@@ -0,0 +1,106 @@
+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
new file mode 100644
index 0000000..e5c5896
--- /dev/null
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -0,0 +1,106 @@
+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.EnforceOrderVo;
+import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
+import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
+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;
+
+/**
+ * 鎵ф硶鍗旵ontroller
+ *
+ * @author manton
+ */
+@Api(value = "鎵ф硶鍗曟帶鍒跺櫒", tags = {"鎵ф硶鍗曠鐞�"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/enforce/order")
+public class EnforceOrderController extends BaseController {
+
+ private final IEnforceOrderService iEnforceOrderService;
+
+
+ @ApiOperation("鏌ヨ鎵ф硶鍗曞垪琛�")
+ @GetMapping("/list")
+ public TableDataInfo list(EnforceOrderQueryBo bo)
+ {
+ startPage();
+ List<EnforceOrderVo> list = iEnforceOrderService.queryList(bo);
+ return getDataTable(list);
+ }
+
+
+
+ @ApiOperation("瀵煎嚭鎵ф硶鍗曞垪琛�")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:export')")
+ @Log(title = "鎵ф硶鍗�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ @RepeatSubmit
+ public AjaxResult export(EnforceOrderQueryBo bo)
+ {
+ List<EnforceOrderVo> list = iEnforceOrderService.queryList(bo);
+ ExcelUtil<EnforceOrderVo> util = new ExcelUtil<EnforceOrderVo>(EnforceOrderVo.class);
+ return util.exportExcel(list, "鎵ф硶鍗�");
+ }
+
+
+ @ApiOperation("鑾峰彇鎵ф硶鍗曡缁嗕俊鎭�")
+ @GetMapping("/{orderId}")
+ public AjaxResult getInfo(@PathVariable("orderId" ) Long orderId)
+ {
+ return AjaxResult.success(iEnforceOrderService.queryById(orderId));
+ }
+
+
+ @ApiOperation("鏂板鎵ф硶鍗�")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:add')")
+ @Log(title = "鎵ф硶鍗�", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody EnforceOrderBo bo)
+ {
+ return toAjax(iEnforceOrderService.insertByBo(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("淇敼鎵ф硶鍗�")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:edit')")
+ @Log(title = "鎵ф硶鍗�", businessType = BusinessType.UPDATE)
+ @PostMapping("/upd")
+ @RepeatSubmit
+ public AjaxResult upd(@RequestBody EnforceOrderBo bo)
+ {
+ return toAjax(iEnforceOrderService.updateByBo(bo) ? 1 : 0);
+ }
+
+
+ @ApiOperation("鍒犻櫎鎵ф硶鍗�")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:remove')")
+ @Log(title = "鎵ф硶鍗�" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/{orderIds}")
+ @RepeatSubmit
+ public AjaxResult remove(@PathVariable Long[] orderIds)
+ {
+ return toAjax(iEnforceOrderService.deleteByIds(Arrays.asList(orderIds)) ? 1 : 0);
+ }
+}
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 5d4180e..1866bf3 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
@@ -6,13 +6,7 @@
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 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;
@@ -25,6 +19,7 @@
import com.project.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
/**
* 浼佷笟淇℃伅Controller
@@ -103,4 +98,22 @@
{
return toAjax(iSysCompanyService.deleteByIds(Arrays.asList(companyIds)) ? 1 : 0);
}
+
+
+ @ApiOperation("浼佷笟淇℃伅妯℃澘涓嬭浇")
+ @GetMapping("/exportTemplate")
+ public AjaxResult exportTemplate()
+ {
+ ExcelUtil<SysCompanyVo> util = new ExcelUtil<>(SysCompanyVo.class);
+ return util.exportExcel(null, "浼佷笟淇℃伅妯℃澘");
+ }
+
+ @ApiOperation(value = "瀵煎叆娲诲姩鎸囨爣")
+ @PostMapping("/import")
+ public AjaxResult importList(@RequestParam MultipartFile file) throws Exception
+ {
+ ExcelUtil<SysCompanyVo> util = new ExcelUtil<>(SysCompanyVo.class);
+ List<SysCompanyVo> list = util.importExcel(file.getInputStream());
+ return toAjax(iSysCompanyService.importList(list) ? 1 : 0);
+ }
}
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysDocController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysDocController.java
index 0a14223..d890b7f 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysDocController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysDocController.java
@@ -31,7 +31,7 @@
*
* @author manton
*/
-@Api(value = "鏂囨。绠＄悊鎺у埗鍣�", tags = {"鏂囨。绠＄悊绠＄悊"})
+@Api(value = "鎯犱紒鏀跨瓥鏂囨。绠＄悊鎺у埗鍣�", tags = {"鎯犱紒鏀跨瓥鏂囨。绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/doc")
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 5599604..1afb99e 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
@@ -101,6 +101,22 @@
.pathMapping(pathMapping);
}
+ @Bean
+ public Docket enforceApi()
+ {
+ return new Docket(DocumentationType.OAS_30)
+ .groupName("鎵ф硶娴佺▼")
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.any())
+ .paths(PathSelectors.regex("/enforce/.*"))
+ .build()
+ /* 璁剧疆瀹夊叏妯″紡锛宻wagger鍙互璁剧疆璁块棶token */
+ .securitySchemes(securitySchemes())
+ .securityContexts(securityContexts())
+ .pathMapping(pathMapping);
+ }
+
/**
* 瀹夊叏妯″紡锛岃繖閲屾寚瀹歵oken閫氳繃Authorization澶磋姹傚ご浼犻��
diff --git a/project-enforce/pom.xml b/project-enforce/pom.xml
new file mode 100644
index 0000000..d1bca9e
--- /dev/null
+++ b/project-enforce/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.project</groupId>
+ <artifactId>sqys_admin</artifactId>
+ <version>3.8.5</version>
+ </parent>
+
+ <artifactId>project-enforce</artifactId>
+
+ <description>
+ enforce鎵ф硶涓氬姟妯″潡
+ </description>
+
+ <dependencies>
+
+ <!-- 绯荤粺 -->
+ <dependency>
+ <groupId>com.project</groupId>
+ <artifactId>project-system</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java
new file mode 100644
index 0000000..347600a
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceCheckLog.java
@@ -0,0 +1,101 @@
+package com.project.enforce.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.project.common.core.domain.BaseDomain;
+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;
+/**
+ * 鎵ф硶瀹℃壒璁板綍瀵硅薄 enforce_check_log
+ *
+ * @author manton
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("enforce_check_log")
+@ApiModel("鎵ф硶瀹℃壒璁板綍瀹炰綋瀵硅薄")
+public class EnforceCheckLog extends BaseDomain {
+
+ private static final long serialVersionUID=1L;
+
+
+ @TableId(value = "id")
+ @ApiModelProperty("ID")
+ private Long id;
+
+
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+
+
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+
+
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+
+
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+
+
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+
+
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+
+
+ @ApiModelProperty("瀹℃壒浜篿d")
+ private Long checkId;
+
+
+ @ApiModelProperty("瀹℃壒浜�")
+ private Long checkUser;
+
+
+ @ApiModelProperty("瀹℃壒浜虹數璇�")
+ private Long checkPhone;
+
+
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+
+
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptName;
+
+
+ @ApiModelProperty("瀹℃壒鏃堕棿")
+ private Date checkTime;
+
+
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+
+
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateAnswer.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateAnswer.java
new file mode 100644
index 0000000..25e9205
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateAnswer.java
@@ -0,0 +1,69 @@
+package com.project.enforce.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.project.common.core.domain.BaseDomain;
+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;
+/**
+ * 鎵ф硶璇勪环绛旀瀵硅薄 enforce_evaluate_answer
+ *
+ * @author manton
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("enforce_evaluate_answer")
+@ApiModel("鎵ф硶璇勪环绛旀瀹炰綋瀵硅薄")
+public class EnforceEvaluateAnswer extends BaseDomain {
+
+ private static final long serialVersionUID=1L;
+
+
+ @TableId(value = "answer_id")
+ @ApiModelProperty("绛旀ID")
+ private Long answerId;
+
+
+ @ApiModelProperty("绛旀")
+ private String answerName;
+
+
+ @ApiModelProperty("棰樼洰ID")
+ private Long questionId;
+
+
+ @ApiModelProperty("棰樼洰")
+ private String questionName;
+
+
+ @ApiModelProperty("鏄惁寰楀垎锛�0涓嶅緱鍒嗭紝1寰楀垎锛�")
+ private Integer isScore;
+
+
+ @ApiModelProperty("绛旀琛ュ厖")
+ private String answerRemark;
+
+
+ @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ private Integer answerStatus;
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java
new file mode 100644
index 0000000..1487646
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateLog.java
@@ -0,0 +1,93 @@
+package com.project.enforce.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.project.common.core.domain.BaseDomain;
+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;
+/**
+ * 鎵ф硶璇勪环璁板綍瀵硅薄 enforce_evaluate_log
+ *
+ * @author manton
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("enforce_evaluate_log")
+@ApiModel("鎵ф硶璇勪环璁板綍瀹炰綋瀵硅薄")
+public class EnforceEvaluateLog extends BaseDomain {
+
+ private static final long serialVersionUID=1L;
+
+
+ @TableId(value = "id")
+ @ApiModelProperty("ID")
+ private Long id;
+
+
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+
+
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+
+
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+
+
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+
+
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+
+
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+
+
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+
+
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+
+
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+
+
+ @ApiModelProperty("璇勪环璇存槑")
+ private String questionRemark;
+
+
+ @ApiModelProperty("璇勪环鏁版嵁瀛樻。")
+ private String questionStatic;
+
+
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
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
new file mode 100644
index 0000000..4169f8e
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java
@@ -0,0 +1,61 @@
+package com.project.enforce.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.project.common.core.domain.BaseDomain;
+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;
+/**
+ * 鎵ф硶璇勪环棰樼洰瀵硅薄 enforce_evaluate_question
+ *
+ * @author manton
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("enforce_evaluate_question")
+@ApiModel("鎵ф硶璇勪环棰樼洰瀹炰綋瀵硅薄")
+public class EnforceEvaluateQuestion extends BaseDomain {
+
+ private static final long serialVersionUID=1L;
+
+
+ @TableId(value = "question_id")
+ @ApiModelProperty("ID")
+ private Long questionId;
+
+
+ @ApiModelProperty("棰樼洰")
+ private String questionName;
+
+
+ @ApiModelProperty("鍒嗗��")
+ private BigDecimal questionScore;
+
+
+ @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ private Integer questionStatus;
+
+
+ @ApiModelProperty("棰樼洰绛旀")
+ private String answerIds;
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
new file mode 100644
index 0000000..01209fc
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -0,0 +1,201 @@
+package com.project.enforce.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.project.common.core.domain.BaseDomain;
+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;
+/**
+ * 鎵ф硶鍗曞璞� enforce_order
+ *
+ * @author manton
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("enforce_order")
+@ApiModel("鎵ф硶鍗曞疄浣撳璞�")
+public class EnforceOrder extends BaseDomain {
+
+ private static final long serialVersionUID=1L;
+
+
+ @TableId(value = "order_id")
+ @ApiModelProperty("鍗曟嵁id")
+ private Long orderId;
+
+
+ @ApiModelProperty("鍗曟嵁缂栧彿")
+ private String orderNo;
+
+
+ @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;
+
+
+ @ApiModelProperty("鐢宠浜篿d")
+ private Long applyId;
+
+
+ @ApiModelProperty("鐢宠浜�")
+ private Long applyUser;
+
+
+ @ApiModelProperty("鐢宠浜虹數璇�")
+ private Long applyPhone;
+
+
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptId;
+
+
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptName;
+
+
+ @ApiModelProperty("鐢宠鏃堕棿")
+ private Date applyTime;
+
+ @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ private Integer userNum;
+
+ @ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
+ private Integer warnStatus;
+
+
+ @ApiModelProperty("棰勮鍘熷洜")
+ private String warnReason;
+
+
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
+ private Integer orderStatus;
+
+
+ @ApiModelProperty("瀹℃壒浜篿d")
+ private Long checkId;
+
+
+ @ApiModelProperty("瀹℃壒浜�")
+ private Long checkUser;
+
+
+ @ApiModelProperty("瀹℃壒浜虹數璇�")
+ private Long checkPhone;
+
+
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+
+
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptName;
+
+
+ @ApiModelProperty("瀹℃壒鏃堕棿")
+ private Date checkTime;
+
+
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+
+
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+
+
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+
+
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+
+
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptId;
+
+
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+
+
+ @ApiModelProperty("鎵ц鏃堕棿")
+ private Date executeTime;
+
+
+ @ApiModelProperty("鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀�")
+ private Integer regionStatus;
+
+
+ @ApiModelProperty("鎵ф硶缁撴灉璇存槑")
+ private String regionReason;
+
+
+ @ApiModelProperty("鎵ф硶鍥剧墖")
+ private String regionImgs;
+
+
+ @ApiModelProperty("鎵ф硶瑙嗛")
+ private String regionVideos;
+
+
+ @ApiModelProperty("鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄�")
+ private Integer isNoticeCompany;
+
+
+ @ApiModelProperty("鏄惁鍏ず锛�0鍚︼紝1鏄�")
+ private Integer isShow;
+
+
+ @ApiModelProperty("鏄惁璇勪环锛�0鍚︼紝1鏄�")
+ private Integer isEva;
+
+
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+
+
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java
new file mode 100644
index 0000000..eb4652c
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceCheckLogBo.java
@@ -0,0 +1,99 @@
+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.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 鎵ф硶瀹℃壒璁板綍缂栬緫瀵硅薄 enforce_check_log
+ *
+ * @author manton
+ */
+
+@Data
+@ApiModel("鎵ф硶瀹℃壒璁板綍鎿嶄綔瀵硅薄")
+public class EnforceCheckLogBo {
+
+
+ /** ID */
+ @ApiModelProperty("ID")
+ private Long id;
+
+ /** 鎵ф硶鍗昳d */
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+
+ /** 鎵ф硶鍗曞彿 */
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+
+ /** 浼佷笟ID */
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+
+ /** 浼佷笟鍚� */
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+
+ /** 浼佷笟鑱旂郴浜� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+
+ /** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+
+ /** 瀹℃壒浜篿d */
+ @ApiModelProperty("瀹℃壒浜篿d")
+ private Long checkId;
+
+ /** 瀹℃壒浜� */
+ @ApiModelProperty("瀹℃壒浜�")
+ private Long checkUser;
+
+ /** 瀹℃壒浜虹數璇� */
+ @ApiModelProperty("瀹℃壒浜虹數璇�")
+ private Long checkPhone;
+
+ /** 瀹℃壒浜哄崟浣� */
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+
+ /** 瀹℃壒浜哄崟浣� */
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptName;
+
+ /** 瀹℃壒鏃堕棿 */
+ @ApiModelProperty("瀹℃壒鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date checkTime;
+
+ /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+
+ /** 瀹℃壒鍘熷洜 */
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+
+ /** 鏇存柊浜� */
+ @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/EnforceEvaluateAnswerBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateAnswerBo.java
new file mode 100644
index 0000000..d0deeea
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateAnswerBo.java
@@ -0,0 +1,64 @@
+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/EnforceEvaluateLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java
new file mode 100644
index 0000000..8121e8b
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java
@@ -0,0 +1,89 @@
+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_log
+ *
+ * @author manton
+ */
+
+@Data
+@ApiModel("鎵ф硶璇勪环璁板綍鎿嶄綔瀵硅薄")
+public class EnforceEvaluateLogBo {
+
+
+ /** ID */
+ @ApiModelProperty("ID")
+ private Long id;
+
+ /** 鎵ф硶鍗昳d */
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+
+ /** 鎵ф硶鍗曞彿 */
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+
+ /** 浼佷笟ID */
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+
+ /** 浼佷笟鍚� */
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+
+ /** 浼佷笟鑱旂郴浜� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+
+ /** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+
+ /** 鎵ц浜� */
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+
+ /** 鎵ц浜虹數璇� */
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+
+ /** 璇勪环璇存槑 */
+ @ApiModelProperty("璇勪环璇存槑")
+ private String questionRemark;
+
+ /** 璇勪环鏁版嵁瀛樻。 */
+ @ApiModelProperty("璇勪环鏁版嵁瀛樻。")
+ private String questionStatic;
+
+ /** 璇勪环鎬诲緱鍒� */
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+
+ /** 鏇存柊浜� */
+ @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/EnforceEvaluateQuestionBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateQuestionBo.java
new file mode 100644
index 0000000..310ffd5
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateQuestionBo.java
@@ -0,0 +1,57 @@
+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/editBo/EnforceOrderBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
new file mode 100644
index 0000000..02a934d
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
@@ -0,0 +1,200 @@
+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;
+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 Long applyUser;
+
+ /** 鐢宠浜虹數璇� */
+ @ApiModelProperty("鐢宠浜虹數璇�")
+ private Long applyPhone;
+
+ /** 鐢宠浜哄崟浣� */
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptId;
+
+ /** 鐢宠浜哄崟浣� */
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long 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;
+
+ /** 瀹℃壒浜篿d */
+ @ApiModelProperty("瀹℃壒浜篿d")
+ private Long checkId;
+
+ /** 瀹℃壒浜� */
+ @ApiModelProperty("瀹℃壒浜�")
+ private Long checkUser;
+
+ /** 瀹℃壒浜虹數璇� */
+ @ApiModelProperty("瀹℃壒浜虹數璇�")
+ private Long checkPhone;
+
+ /** 瀹℃壒浜哄崟浣� */
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+
+ /** 瀹℃壒浜哄崟浣� */
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptName;
+
+ /** 瀹℃壒鏃堕棿 */
+ @ApiModelProperty("瀹℃壒鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date checkTime;
+
+ /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+
+ /** 瀹℃壒鍘熷洜 */
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+
+ /** 鎵ц浜篿d */
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+
+ /** 鎵ц浜� */
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+
+ /** 鎵ц浜虹數璇� */
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptId;
+
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long 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/EnforceCheckLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java
new file mode 100644
index 0000000..c3de8ee
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceCheckLogQueryBo.java
@@ -0,0 +1,80 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import com.project.common.core.domain.BaseQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 鎵ф硶瀹℃壒璁板綍鍒嗛〉鏌ヨ瀵硅薄 enforce_check_log
+ *
+ * @author manton
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("鎵ф硶瀹℃壒璁板綍鍒嗛〉鏌ヨ瀵硅薄")
+public class EnforceCheckLogQueryBo extends BaseQuery{
+
+ /** 鍒嗛〉澶у皬 */
+ @ApiModelProperty("鍒嗛〉澶у皬")
+ private Integer pageSize;
+ /** 褰撳墠椤垫暟 */
+ @ApiModelProperty("褰撳墠椤垫暟")
+ private Integer pageNum;
+ /** 鎺掑簭鍒� */
+ @ApiModelProperty("鎺掑簭鍒�")
+ private String orderByColumn;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
+ private String isAsc;
+
+
+ /** 鎵ф硶鍗昳d */
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+ /** 鎵ф硶鍗曞彿 */
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+ /** 浼佷笟ID */
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+ /** 浼佷笟鍚� */
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+ /** 浼佷笟鑱旂郴浜� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+ /** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+ /** 瀹℃壒浜篿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;
+ /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+ /** 瀹℃壒鍘熷洜 */
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateAnswerQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateAnswerQueryBo.java
new file mode 100644
index 0000000..f782cf6
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateAnswerQueryBo.java
@@ -0,0 +1,53 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import com.project.common.core.domain.BaseQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 鎵ф硶璇勪环绛旀鍒嗛〉鏌ヨ瀵硅薄 enforce_evaluate_answer
+ *
+ * @author manton
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("鎵ф硶璇勪环绛旀鍒嗛〉鏌ヨ瀵硅薄")
+public class EnforceEvaluateAnswerQueryBo extends BaseQuery{
+
+ /** 鍒嗛〉澶у皬 */
+ @ApiModelProperty("鍒嗛〉澶у皬")
+ private Integer pageSize;
+ /** 褰撳墠椤垫暟 */
+ @ApiModelProperty("褰撳墠椤垫暟")
+ private Integer pageNum;
+ /** 鎺掑簭鍒� */
+ @ApiModelProperty("鎺掑簭鍒�")
+ private String orderByColumn;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
+ private String isAsc;
+
+
+ /** 绛旀 */
+ @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;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java
new file mode 100644
index 0000000..616bc95
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateLogQueryBo.java
@@ -0,0 +1,72 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import com.project.common.core.domain.BaseQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 鎵ф硶璇勪环璁板綍鍒嗛〉鏌ヨ瀵硅薄 enforce_evaluate_log
+ *
+ * @author manton
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("鎵ф硶璇勪环璁板綍鍒嗛〉鏌ヨ瀵硅薄")
+public class EnforceEvaluateLogQueryBo extends BaseQuery{
+
+ /** 鍒嗛〉澶у皬 */
+ @ApiModelProperty("鍒嗛〉澶у皬")
+ private Integer pageSize;
+ /** 褰撳墠椤垫暟 */
+ @ApiModelProperty("褰撳墠椤垫暟")
+ private Integer pageNum;
+ /** 鎺掑簭鍒� */
+ @ApiModelProperty("鎺掑簭鍒�")
+ private String orderByColumn;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
+ private String isAsc;
+
+
+ /** 鎵ф硶鍗昳d */
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+ /** 鎵ф硶鍗曞彿 */
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+ /** 浼佷笟ID */
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+ /** 浼佷笟鍚� */
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+ /** 浼佷笟鑱旂郴浜� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+ /** 浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛� */
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+ /** 鎵ц浜� */
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+ /** 鎵ц浜虹數璇� */
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+ /** 璇勪环璇存槑 */
+ @ApiModelProperty("璇勪环璇存槑")
+ private String questionRemark;
+ /** 璇勪环鏁版嵁瀛樻。 */
+ @ApiModelProperty("璇勪环鏁版嵁瀛樻。")
+ private String questionStatic;
+ /** 璇勪环鎬诲緱鍒� */
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateQuestionQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateQuestionQueryBo.java
new file mode 100644
index 0000000..c4cd154
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceEvaluateQuestionQueryBo.java
@@ -0,0 +1,48 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import com.project.common.core.domain.BaseQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 鎵ф硶璇勪环棰樼洰鍒嗛〉鏌ヨ瀵硅薄 enforce_evaluate_question
+ *
+ * @author manton
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("鎵ф硶璇勪环棰樼洰鍒嗛〉鏌ヨ瀵硅薄")
+public class EnforceEvaluateQuestionQueryBo extends BaseQuery{
+
+ /** 鍒嗛〉澶у皬 */
+ @ApiModelProperty("鍒嗛〉澶у皬")
+ private Integer pageSize;
+ /** 褰撳墠椤垫暟 */
+ @ApiModelProperty("褰撳墠椤垫暟")
+ private Integer pageNum;
+ /** 鎺掑簭鍒� */
+ @ApiModelProperty("鎺掑簭鍒�")
+ private String orderByColumn;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
+ private String isAsc;
+
+
+ /** 棰樼洰 */
+ @ApiModelProperty("棰樼洰")
+ private String questionName;
+ /** 鍒嗗�� */
+ @ApiModelProperty("鍒嗗��")
+ private BigDecimal questionScore;
+ /** 浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤 */
+ @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ private Integer questionStatus;
+ /** 棰樼洰绛旀 */
+ @ApiModelProperty("棰樼洰绛旀")
+ private String answerIds;
+
+}
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
new file mode 100644
index 0000000..3acd37a
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
@@ -0,0 +1,167 @@
+package com.project.enforce.domain.bo.queryBo;
+
+import com.project.common.core.domain.BaseQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 鎵ф硶鍗曞垎椤垫煡璇㈠璞� enforce_order
+ *
+ * @author manton
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("鎵ф硶鍗曞垎椤垫煡璇㈠璞�")
+public class EnforceOrderQueryBo extends BaseQuery{
+
+ /** 鍒嗛〉澶у皬 */
+ @ApiModelProperty("鍒嗛〉澶у皬")
+ private Integer pageSize;
+ /** 褰撳墠椤垫暟 */
+ @ApiModelProperty("褰撳墠椤垫暟")
+ private Integer pageNum;
+ /** 鎺掑簭鍒� */
+ @ApiModelProperty("鎺掑簭鍒�")
+ private String orderByColumn;
+ /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+ @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
+ private String isAsc;
+
+
+ /** 鍗曟嵁缂栧彿 */
+ @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 Long applyUser;
+ /** 鐢宠浜虹數璇� */
+ @ApiModelProperty("鐢宠浜虹數璇�")
+ private Long applyPhone;
+ /** 鐢宠浜哄崟浣� */
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptId;
+ /** 鐢宠浜哄崟浣� */
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptName;
+ /** 鐢宠鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鐢宠鏃堕棿")
+ 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;
+ /** 瀹℃壒浜篿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;
+ /** 璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃 */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+ /** 瀹℃壒鍘熷洜 */
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+ /** 鎵ц浜篿d */
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+ /** 鎵ц浜� */
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+ /** 鎵ц浜虹數璇� */
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptId;
+ /** 鎵ц浜哄崟浣� */
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+ /** 鎵ц鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鎵ц鏃堕棿")
+ 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/vo/EnforceCheckLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java
new file mode 100644
index 0000000..f76b962
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceCheckLogVo.java
@@ -0,0 +1,73 @@
+package com.project.enforce.domain.vo;
+
+import com.project.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 鎵ф硶瀹℃壒璁板綍瑙嗗浘瀵硅薄 mall_package
+ *
+ * @author manton
+ */
+@Data
+@ApiModel("鎵ф硶瀹℃壒璁板綍瑙嗗浘瀵硅薄")
+public class EnforceCheckLogVo {
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ @ApiModelProperty("ID")
+ private Long id;
+
+ @Excel(name = "鎵ф硶鍗昳d")
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+ @Excel(name = "鎵ф硶鍗曞彿")
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+ @Excel(name = "浼佷笟ID")
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+ @Excel(name = "浼佷笟鍚�")
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+ @Excel(name = "浼佷笟鑱旂郴浜�")
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+ @Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+ @Excel(name = "瀹℃壒浜篿d")
+ @ApiModelProperty("瀹℃壒浜篿d")
+ private Long checkId;
+ @Excel(name = "瀹℃壒浜�")
+ @ApiModelProperty("瀹℃壒浜�")
+ private Long checkUser;
+ @Excel(name = "瀹℃壒浜虹數璇�")
+ @ApiModelProperty("瀹℃壒浜虹數璇�")
+ private Long checkPhone;
+ @Excel(name = "瀹℃壒浜哄崟浣�")
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+ @Excel(name = "瀹℃壒浜哄崟浣�")
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptName;
+ @Excel(name = "瀹℃壒鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("瀹℃壒鏃堕棿")
+ private Date checkTime;
+ @Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+ @Excel(name = "瀹℃壒鍘熷洜")
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateAnswerVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateAnswerVo.java
new file mode 100644
index 0000000..d260c25
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateAnswerVo.java
@@ -0,0 +1,46 @@
+package com.project.enforce.domain.vo;
+
+import com.project.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 鎵ф硶璇勪环绛旀瑙嗗浘瀵硅薄 mall_package
+ *
+ * @author manton
+ */
+@Data
+@ApiModel("鎵ф硶璇勪环绛旀瑙嗗浘瀵硅薄")
+public class EnforceEvaluateAnswerVo {
+ private static final long serialVersionUID = 1L;
+
+ /** 绛旀ID */
+ @ApiModelProperty("绛旀ID")
+ private Long answerId;
+
+ @Excel(name = "绛旀")
+ @ApiModelProperty("绛旀")
+ private String answerName;
+ @Excel(name = "棰樼洰ID")
+ @ApiModelProperty("棰樼洰ID")
+ private Long questionId;
+ @Excel(name = "棰樼洰")
+ @ApiModelProperty("棰樼洰")
+ private String questionName;
+ @Excel(name = "鏄惁寰楀垎" , readConverterExp = "0=涓嶅緱鍒嗭紝1寰楀垎")
+ @ApiModelProperty("鏄惁寰楀垎锛�0涓嶅緱鍒嗭紝1寰楀垎锛�")
+ private Integer isScore;
+ @Excel(name = "绛旀琛ュ厖")
+ @ApiModelProperty("绛旀琛ュ厖")
+ private String answerRemark;
+ @Excel(name = "浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ private Integer answerStatus;
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java
new file mode 100644
index 0000000..a522245
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java
@@ -0,0 +1,65 @@
+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;
+
+
+/**
+ * 鎵ф硶璇勪环璁板綍瑙嗗浘瀵硅薄 mall_package
+ *
+ * @author manton
+ */
+@Data
+@ApiModel("鎵ф硶璇勪环璁板綍瑙嗗浘瀵硅薄")
+public class EnforceEvaluateLogVo {
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ @ApiModelProperty("ID")
+ private Long id;
+
+ @Excel(name = "鎵ф硶鍗昳d")
+ @ApiModelProperty("鎵ф硶鍗昳d")
+ private String orderId;
+ @Excel(name = "鎵ф硶鍗曞彿")
+ @ApiModelProperty("鎵ф硶鍗曞彿")
+ private String orderNo;
+ @Excel(name = "浼佷笟ID")
+ @ApiModelProperty("浼佷笟ID")
+ private Long companyId;
+ @Excel(name = "浼佷笟鍚�")
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+ @Excel(name = "浼佷笟鑱旂郴浜�")
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+ @Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+ @Excel(name = "鎵ц浜�")
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+ @Excel(name = "鎵ц浜虹數璇�")
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+ @Excel(name = "鎵ц浜哄崟浣�")
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+ @Excel(name = "璇勪环璇存槑")
+ @ApiModelProperty("璇勪环璇存槑")
+ private String questionRemark;
+ @Excel(name = "璇勪环鏁版嵁瀛樻。")
+ @ApiModelProperty("璇勪环鏁版嵁瀛樻。")
+ private String questionStatic;
+ @Excel(name = "璇勪环鎬诲緱鍒�")
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+}
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
new file mode 100644
index 0000000..3c2f808
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateQuestionVo.java
@@ -0,0 +1,41 @@
+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;
+
+
+/**
+ * 鎵ф硶璇勪环棰樼洰瑙嗗浘瀵硅薄 mall_package
+ *
+ * @author manton
+ */
+@Data
+@ApiModel("鎵ф硶璇勪环棰樼洰瑙嗗浘瀵硅薄")
+public class EnforceEvaluateQuestionVo {
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ @ApiModelProperty("ID")
+ private Long questionId;
+
+ @Excel(name = "棰樼洰")
+ @ApiModelProperty("棰樼洰")
+ private String questionName;
+ @Excel(name = "鍒嗗��")
+ @ApiModelProperty("鍒嗗��")
+ private BigDecimal questionScore;
+ @Excel(name = "浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ @ApiModelProperty("浣跨敤鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+ private Integer questionStatus;
+ @Excel(name = "棰樼洰绛旀")
+ @ApiModelProperty("棰樼洰绛旀")
+ private String answerIds;
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
new file mode 100644
index 0000000..5303b0e
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -0,0 +1,157 @@
+package com.project.enforce.domain.vo;
+
+import com.project.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 鎵ф硶鍗曡鍥惧璞� mall_package
+ *
+ * @author manton
+ */
+@Data
+@ApiModel("鎵ф硶鍗曡鍥惧璞�")
+public class EnforceOrderVo {
+ private static final long serialVersionUID = 1L;
+
+ /** 鍗曟嵁id */
+ @ApiModelProperty("鍗曟嵁id")
+ private Long orderId;
+
+ @Excel(name = "鍗曟嵁缂栧彿")
+ @ApiModelProperty("鍗曟嵁缂栧彿")
+ private String orderNo;
+ @Excel(name = "浼佷笟id")
+ @ApiModelProperty("浼佷笟id")
+ private Long companyId;
+ @Excel(name = "浼佷笟鍚�")
+ @ApiModelProperty("浼佷笟鍚�")
+ private String companyName;
+ @Excel(name = "浼佷笟绀句細缂栫爜")
+ @ApiModelProperty("浼佷笟绀句細缂栫爜")
+ private String companyCode;
+ @Excel(name = "浼佷笟鑱旂郴浜�")
+ @ApiModelProperty("浼佷笟鑱旂郴浜�")
+ private String companyUser;
+ @Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
+ @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ private String companyPhone;
+ @Excel(name = "浼佷笟鍦板潃")
+ @ApiModelProperty("浼佷笟鍦板潃")
+ private String companyAddress;
+ @Excel(name = "鎵�灞炲尯鍩熺紪鐮�")
+ @ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
+ private String regionCode;
+ @Excel(name = "鎵�灞炲尯鍩�")
+ @ApiModelProperty("鎵�灞炲尯鍩�")
+ private String regionName;
+ @Excel(name = "鎵ф硶鍘熷洜")
+ @ApiModelProperty("鎵ф硶鍘熷洜")
+ private String enforceReason;
+ @Excel(name = "鐢宠浜篿d")
+ @ApiModelProperty("鐢宠浜篿d")
+ private Long applyId;
+ @Excel(name = "鐢宠浜�")
+ @ApiModelProperty("鐢宠浜�")
+ private Long applyUser;
+ @Excel(name = "鐢宠浜虹數璇�")
+ @ApiModelProperty("鐢宠浜虹數璇�")
+ private Long applyPhone;
+ @Excel(name = "鐢宠浜哄崟浣�")
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptId;
+ @Excel(name = "鐢宠浜哄崟浣�")
+ @ApiModelProperty("鐢宠浜哄崟浣�")
+ private Long applyDeptName;
+ @Excel(name = "鐢宠鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鐢宠鏃堕棿")
+ private Date applyTime;
+ @Excel(name = "鎵ф硶闃熷憳鏁伴噺")
+ @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ private Integer userNum;
+ @Excel(name = "棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
+ @ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
+ private Integer warnStatus;
+ @Excel(name = "棰勮鍘熷洜")
+ @ApiModelProperty("棰勮鍘熷洜")
+ private String warnReason;
+ @Excel(name = "璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
+ private Integer orderStatus;
+ @Excel(name = "瀹℃壒浜篿d")
+ @ApiModelProperty("瀹℃壒浜篿d")
+ private Long checkId;
+ @Excel(name = "瀹℃壒浜�")
+ @ApiModelProperty("瀹℃壒浜�")
+ private Long checkUser;
+ @Excel(name = "瀹℃壒浜虹數璇�")
+ @ApiModelProperty("瀹℃壒浜虹數璇�")
+ private Long checkPhone;
+ @Excel(name = "瀹℃壒浜哄崟浣�")
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptId;
+ @Excel(name = "瀹℃壒浜哄崟浣�")
+ @ApiModelProperty("瀹℃壒浜哄崟浣�")
+ private Long checkDeptName;
+ @Excel(name = "瀹℃壒鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("瀹℃壒鏃堕棿")
+ private Date checkTime;
+ @Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ @ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+ private Integer checkStatus;
+ @Excel(name = "瀹℃壒鍘熷洜")
+ @ApiModelProperty("瀹℃壒鍘熷洜")
+ private String checkReason;
+ @Excel(name = "鎵ц浜篿d")
+ @ApiModelProperty("鎵ц浜篿d")
+ private Long executeId;
+ @Excel(name = "鎵ц浜�")
+ @ApiModelProperty("鎵ц浜�")
+ private Long executeUser;
+ @Excel(name = "鎵ц浜虹數璇�")
+ @ApiModelProperty("鎵ц浜虹數璇�")
+ private Long executePhone;
+ @Excel(name = "鎵ц浜哄崟浣�")
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptId;
+ @Excel(name = "鎵ц浜哄崟浣�")
+ @ApiModelProperty("鎵ц浜哄崟浣�")
+ private Long executeDeptName;
+ @Excel(name = "鎵ц鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鎵ц鏃堕棿")
+ private Date executeTime;
+ @Excel(name = "鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀�")
+ @ApiModelProperty("鎵ф硶缁撴灉锛�0姝ｅ父锛�1寰呮暣鏀�")
+ private Integer regionStatus;
+ @Excel(name = "鎵ф硶缁撴灉璇存槑")
+ @ApiModelProperty("鎵ф硶缁撴灉璇存槑")
+ private String regionReason;
+ @Excel(name = "鎵ф硶鍥剧墖")
+ @ApiModelProperty("鎵ф硶鍥剧墖")
+ private String regionImgs;
+ @Excel(name = "鎵ф硶瑙嗛")
+ @ApiModelProperty("鎵ф硶瑙嗛")
+ private String regionVideos;
+ @Excel(name = "鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄�")
+ @ApiModelProperty("鏄惁閫氱煡浼佷笟锛�0鍚︼紝1鏄�")
+ private Integer isNoticeCompany;
+ @Excel(name = "鏄惁鍏ず锛�0鍚︼紝1鏄�")
+ @ApiModelProperty("鏄惁鍏ず锛�0鍚︼紝1鏄�")
+ private Integer isShow;
+ @Excel(name = "鏄惁璇勪环锛�0鍚︼紝1鏄�")
+ @ApiModelProperty("鏄惁璇勪环锛�0鍚︼紝1鏄�")
+ private Integer isEva;
+ @Excel(name = "璇勪环鎬诲緱鍒�")
+ @ApiModelProperty("璇勪环鎬诲緱鍒�")
+ private BigDecimal totalScore;
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceCheckLogMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceCheckLogMapper.java
new file mode 100644
index 0000000..d9d56f7
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceCheckLogMapper.java
@@ -0,0 +1,13 @@
+package com.project.enforce.mapper;
+
+import com.project.enforce.domain.EnforceCheckLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 鎵ф硶瀹℃壒璁板綍Mapper鎺ュ彛
+ *
+ * @author manton
+ */
+public interface EnforceCheckLogMapper extends BaseMapper<EnforceCheckLog> {
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateAnswerMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateAnswerMapper.java
new file mode 100644
index 0000000..e1843d5
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateAnswerMapper.java
@@ -0,0 +1,13 @@
+package com.project.enforce.mapper;
+
+import com.project.enforce.domain.EnforceEvaluateAnswer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 鎵ф硶璇勪环绛旀Mapper鎺ュ彛
+ *
+ * @author manton
+ */
+public interface EnforceEvaluateAnswerMapper extends BaseMapper<EnforceEvaluateAnswer> {
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateLogMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateLogMapper.java
new file mode 100644
index 0000000..d61653d
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateLogMapper.java
@@ -0,0 +1,13 @@
+package com.project.enforce.mapper;
+
+import com.project.enforce.domain.EnforceEvaluateLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 鎵ф硶璇勪环璁板綍Mapper鎺ュ彛
+ *
+ * @author manton
+ */
+public interface EnforceEvaluateLogMapper extends BaseMapper<EnforceEvaluateLog> {
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateQuestionMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateQuestionMapper.java
new file mode 100644
index 0000000..b0fe30d
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceEvaluateQuestionMapper.java
@@ -0,0 +1,13 @@
+package com.project.enforce.mapper;
+
+import com.project.enforce.domain.EnforceEvaluateQuestion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 鎵ф硶璇勪环棰樼洰Mapper鎺ュ彛
+ *
+ * @author manton
+ */
+public interface EnforceEvaluateQuestionMapper extends BaseMapper<EnforceEvaluateQuestion> {
+
+}
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
new file mode 100644
index 0000000..6c8e344
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
@@ -0,0 +1,13 @@
+package com.project.enforce.mapper;
+
+import com.project.enforce.domain.EnforceOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 鎵ф硶鍗昅apper鎺ュ彛
+ *
+ * @author manton
+ */
+public interface EnforceOrderMapper extends BaseMapper<EnforceOrder> {
+
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceCheckLogService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceCheckLogService.java
new file mode 100644
index 0000000..65615eb
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceCheckLogService.java
@@ -0,0 +1,53 @@
+package com.project.enforce.service;
+
+import com.project.enforce.domain.EnforceCheckLog;
+import com.project.enforce.domain.vo.EnforceCheckLogVo;
+import com.project.enforce.domain.bo.editBo.EnforceCheckLogBo;
+import com.project.enforce.domain.bo.queryBo.EnforceCheckLogQueryBo;
+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;
+
+/**
+ * 鎵ф硶瀹℃壒璁板綍Service鎺ュ彛
+ *
+ * @author manton
+ */
+public interface IEnforceCheckLogService extends IBaseService<EnforceCheckLog> {
+
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ List<EnforceCheckLogVo> queryList(EnforceCheckLogQueryBo bo);
+
+ /**
+ * 鏌ヨ鍗曚釜
+ * @return EnforceCheckLogVo
+ */
+ EnforceCheckLogVo queryById(Long id);
+
+
+ /**
+ * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆鎵ф硶瀹℃壒璁板綍
+ * @param bo 鎵ф硶瀹℃壒璁板綍鏂板涓氬姟瀵硅薄
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean insertByBo(EnforceCheckLogBo bo);
+
+ /**
+ * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼鎵ф硶瀹℃壒璁板綍
+ * @param bo 鎵ф硶瀹℃壒璁板綍缂栬緫涓氬姟瀵硅薄
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean updateByBo(EnforceCheckLogBo bo);
+
+ /**
+ * 鏍￠獙骞跺垹闄ゆ暟鎹�
+ * @param ids 涓婚敭闆嗗悎
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean deleteByIds(Collection<Long> ids);
+}
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
new file mode 100644
index 0000000..6f322fa
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateAnswerService.java
@@ -0,0 +1,53 @@
+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;
+
+/**
+ * 鎵ф硶璇勪环绛旀Service鎺ュ彛
+ *
+ * @author manton
+ */
+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/IEnforceEvaluateLogService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateLogService.java
new file mode 100644
index 0000000..7594b37
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateLogService.java
@@ -0,0 +1,53 @@
+package com.project.enforce.service;
+
+import com.project.enforce.domain.EnforceEvaluateLog;
+import com.project.enforce.domain.vo.EnforceEvaluateLogVo;
+import com.project.enforce.domain.bo.editBo.EnforceEvaluateLogBo;
+import com.project.enforce.domain.bo.queryBo.EnforceEvaluateLogQueryBo;
+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;
+
+/**
+ * 鎵ф硶璇勪环璁板綍Service鎺ュ彛
+ *
+ * @author manton
+ */
+public interface IEnforceEvaluateLogService extends IBaseService<EnforceEvaluateLog> {
+
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ List<EnforceEvaluateLogVo> queryList(EnforceEvaluateLogQueryBo bo);
+
+ /**
+ * 鏌ヨ鍗曚釜
+ * @return EnforceEvaluateLogVo
+ */
+ EnforceEvaluateLogVo queryById(Long id);
+
+
+ /**
+ * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆鎵ф硶璇勪环璁板綍
+ * @param bo 鎵ф硶璇勪环璁板綍鏂板涓氬姟瀵硅薄
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean insertByBo(EnforceEvaluateLogBo bo);
+
+ /**
+ * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼鎵ф硶璇勪环璁板綍
+ * @param bo 鎵ф硶璇勪环璁板綍缂栬緫涓氬姟瀵硅薄
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean updateByBo(EnforceEvaluateLogBo 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
new file mode 100644
index 0000000..bf4ee2f
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceEvaluateQuestionService.java
@@ -0,0 +1,53 @@
+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;
+
+/**
+ * 鎵ф硶璇勪环棰樼洰Service鎺ュ彛
+ *
+ * @author manton
+ */
+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/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
new file mode 100644
index 0000000..e534c74
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -0,0 +1,53 @@
+package com.project.enforce.service;
+
+import com.project.enforce.domain.EnforceOrder;
+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;
+
+/**
+ * 鎵ф硶鍗昐ervice鎺ュ彛
+ *
+ * @author manton
+ */
+public interface IEnforceOrderService extends IBaseService<EnforceOrder> {
+
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo);
+
+ /**
+ * 鏌ヨ鍗曚釜
+ * @return EnforceOrderVo
+ */
+ EnforceOrderVo queryById(Long orderId);
+
+
+ /**
+ * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆鎵ф硶鍗�
+ * @param bo 鎵ф硶鍗曟柊澧炰笟鍔″璞�
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean insertByBo(EnforceOrderBo bo);
+
+ /**
+ * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼鎵ф硶鍗�
+ * @param bo 鎵ф硶鍗曠紪杈戜笟鍔″璞�
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean updateByBo(EnforceOrderBo bo);
+
+ /**
+ * 鏍￠獙骞跺垹闄ゆ暟鎹�
+ * @param ids 涓婚敭闆嗗悎
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean deleteByIds(Collection<Long> ids);
+}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCheckLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCheckLogServiceImpl.java
new file mode 100644
index 0000000..0de09f4
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCheckLogServiceImpl.java
@@ -0,0 +1,115 @@
+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.EnforceCheckLogVo;
+import com.project.enforce.domain.bo.editBo.EnforceCheckLogBo;
+import com.project.enforce.domain.bo.queryBo.EnforceCheckLogQueryBo;
+import com.project.enforce.domain.EnforceCheckLog;
+import com.project.enforce.mapper.EnforceCheckLogMapper;
+import com.project.enforce.service.IEnforceCheckLogService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鎵ф硶瀹℃壒璁板綍Service涓氬姟灞傚鐞�
+ *
+ * @author manton
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class EnforceCheckLogServiceImpl extends ServiceImpl<EnforceCheckLogMapper, EnforceCheckLog> implements IEnforceCheckLogService {
+
+
+
+ @Override//鍒楄〃鏌ヨ
+ public List<EnforceCheckLogVo> queryList(EnforceCheckLogQueryBo bo)
+ {
+ QueryWrapper<EnforceCheckLog> qw = getQw(bo);
+ List<EnforceCheckLog> list = this.list(qw);
+ return Convert.toList(EnforceCheckLogVo.class , list);
+ }
+
+ @Override//id鏌ヨ
+ public EnforceCheckLogVo queryById(Long id)
+ {
+ EnforceCheckLog db = this.baseMapper.selectById(id);
+ return Convert.convert(EnforceCheckLogVo.class , db);
+ }
+
+
+ @Override//娣诲姞
+ @Transactional
+ public Boolean insertByBo(EnforceCheckLogBo bo)
+ {
+ EnforceCheckLog add = Convert.convert(EnforceCheckLog.class, bo);
+ validEntityBeforeSave(add);
+ return this.save(add);
+ }
+
+ @Override//淇敼
+ @Transactional
+ public Boolean updateByBo(EnforceCheckLogBo bo)
+ {
+ EnforceCheckLog update = Convert.convert(EnforceCheckLog.class, bo);
+ validEntityBeforeSave(update);
+ return this.updateById(update);
+ }
+
+ @Override//鍒犻櫎
+ @Transactional
+ public Boolean deleteByIds(Collection<Long> ids)
+ {
+
+ //鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+
+ return this.removeByIds(ids);
+ }
+
+
+//-------------------------------------------------------------------------------------
+
+ //淇濆瓨鍓嶆牎楠�
+ private void validEntityBeforeSave(EnforceCheckLog entity)
+ {
+ //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ }
+
+ //鑾峰彇鏌ヨ鍙傛暟
+ private QueryWrapper<EnforceCheckLog> getQw(EnforceCheckLogQueryBo bo)
+ {
+ QueryWrapper<EnforceCheckLog> qw = Wrappers.query();
+
+ qw.eq(StringUtils.isNotEmpty(bo.getOrderId()), "order_id", bo.getOrderId());
+ 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.getCompanyUser()), "company_user", bo.getCompanyUser());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
+ 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());
+ 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/EnforceEvaluateAnswerServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java
new file mode 100644
index 0000000..bd9dc52
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateAnswerServiceImpl.java
@@ -0,0 +1,107 @@
+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;
+
+/**
+ * 鎵ф硶璇勪环绛旀Service涓氬姟灞傚鐞�
+ *
+ * @author manton
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class EnforceEvaluateAnswerServiceImpl extends ServiceImpl<EnforceEvaluateAnswerMapper, EnforceEvaluateAnswer> implements IEnforceEvaluateAnswerService {
+
+
+
+ @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/EnforceEvaluateLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java
new file mode 100644
index 0000000..c6ddd9d
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java
@@ -0,0 +1,113 @@
+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.EnforceEvaluateLogVo;
+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.mapper.EnforceEvaluateLogMapper;
+import com.project.enforce.service.IEnforceEvaluateLogService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鎵ф硶璇勪环璁板綍Service涓氬姟灞傚鐞�
+ *
+ * @author manton
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class EnforceEvaluateLogServiceImpl extends ServiceImpl<EnforceEvaluateLogMapper, EnforceEvaluateLog> implements IEnforceEvaluateLogService {
+
+
+
+ @Override//鍒楄〃鏌ヨ
+ public List<EnforceEvaluateLogVo> queryList(EnforceEvaluateLogQueryBo bo)
+ {
+ QueryWrapper<EnforceEvaluateLog> qw = getQw(bo);
+ List<EnforceEvaluateLog> list = this.list(qw);
+ return Convert.toList(EnforceEvaluateLogVo.class , list);
+ }
+
+ @Override//id鏌ヨ
+ public EnforceEvaluateLogVo queryById(Long id)
+ {
+ EnforceEvaluateLog db = this.baseMapper.selectById(id);
+ return Convert.convert(EnforceEvaluateLogVo.class , db);
+ }
+
+
+ @Override//娣诲姞
+ @Transactional
+ public Boolean insertByBo(EnforceEvaluateLogBo bo)
+ {
+ EnforceEvaluateLog add = Convert.convert(EnforceEvaluateLog.class, bo);
+ validEntityBeforeSave(add);
+ return this.save(add);
+ }
+
+ @Override//淇敼
+ @Transactional
+ public Boolean updateByBo(EnforceEvaluateLogBo bo)
+ {
+ EnforceEvaluateLog update = Convert.convert(EnforceEvaluateLog.class, bo);
+ validEntityBeforeSave(update);
+ return this.updateById(update);
+ }
+
+ @Override//鍒犻櫎
+ @Transactional
+ public Boolean deleteByIds(Collection<Long> ids)
+ {
+
+ //鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+
+ return this.removeByIds(ids);
+ }
+
+
+//-------------------------------------------------------------------------------------
+
+ //淇濆瓨鍓嶆牎楠�
+ private void validEntityBeforeSave(EnforceEvaluateLog entity)
+ {
+ //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ }
+
+ //鑾峰彇鏌ヨ鍙傛暟
+ private QueryWrapper<EnforceEvaluateLog> getQw(EnforceEvaluateLogQueryBo bo)
+ {
+ QueryWrapper<EnforceEvaluateLog> qw = Wrappers.query();
+
+ qw.eq(StringUtils.isNotEmpty(bo.getOrderId()), "order_id", bo.getOrderId());
+ 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.getCompanyUser()), "company_user", bo.getCompanyUser());
+ qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
+ qw.eq(bo.getExecuteUser() != null, "execute_user", bo.getExecuteUser());
+ qw.eq(bo.getExecutePhone() != null, "execute_phone", bo.getExecutePhone());
+ qw.like(bo.getExecuteDeptName() != null, "execute_dept_name", bo.getExecuteDeptName());
+ qw.eq(StringUtils.isNotEmpty(bo.getQuestionRemark()), "question_remark", bo.getQuestionRemark());
+ qw.eq(StringUtils.isNotEmpty(bo.getQuestionStatic()), "question_static", bo.getQuestionStatic());
+ 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());
+ } 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
new file mode 100644
index 0000000..dc5cb74
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateQuestionServiceImpl.java
@@ -0,0 +1,105 @@
+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;
+
+/**
+ * 鎵ф硶璇勪环棰樼洰Service涓氬姟灞傚鐞�
+ *
+ * @author manton
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class EnforceEvaluateQuestionServiceImpl extends ServiceImpl<EnforceEvaluateQuestionMapper, EnforceEvaluateQuestion> implements IEnforceEvaluateQuestionService {
+
+
+
+ @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/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
new file mode 100644
index 0000000..addca4d
--- /dev/null
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -0,0 +1,142 @@
+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.EnforceOrderVo;
+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.mapper.EnforceOrderMapper;
+import com.project.enforce.service.IEnforceOrderService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鎵ф硶鍗昐ervice涓氬姟灞傚鐞�
+ *
+ * @author manton
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class EnforceOrderServiceImpl extends ServiceImpl<EnforceOrderMapper, EnforceOrder> implements IEnforceOrderService {
+
+
+
+ @Override//鍒楄〃鏌ヨ
+ public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
+ {
+ QueryWrapper<EnforceOrder> qw = getQw(bo);
+ List<EnforceOrder> list = this.list(qw);
+ return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override//id鏌ヨ
+ public EnforceOrderVo queryById(Long orderId)
+ {
+ EnforceOrder db = this.baseMapper.selectById(orderId);
+ return Convert.convert(EnforceOrderVo.class , db);
+ }
+
+
+ @Override//娣诲姞
+ @Transactional
+ public Boolean insertByBo(EnforceOrderBo bo)
+ {
+ EnforceOrder add = Convert.convert(EnforceOrder.class, bo);
+ validEntityBeforeSave(add);
+ return this.save(add);
+ }
+
+ @Override//淇敼
+ @Transactional
+ public Boolean updateByBo(EnforceOrderBo bo)
+ {
+ EnforceOrder update = Convert.convert(EnforceOrder.class, bo);
+ validEntityBeforeSave(update);
+ return this.updateById(update);
+ }
+
+ @Override//鍒犻櫎
+ @Transactional
+ public Boolean deleteByIds(Collection<Long> ids)
+ {
+
+ //鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+
+ return this.removeByIds(ids);
+ }
+
+
+//-------------------------------------------------------------------------------------
+
+ //淇濆瓨鍓嶆牎楠�
+ private void validEntityBeforeSave(EnforceOrder entity)
+ {
+ //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ }
+
+ //鑾峰彇鏌ヨ鍙傛暟
+ private QueryWrapper<EnforceOrder> getQw(EnforceOrderQueryBo bo)
+ {
+ 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());
+ 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/resources/mapper/enforce/EnforceCheckLogMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceCheckLogMapper.xml
new file mode 100644
index 0000000..4e9cb25
--- /dev/null
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceCheckLogMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.enforce.mapper.EnforceCheckLogMapper">
+
+ <resultMap type="EnforceCheckLog" id="EnforceCheckLogResult">
+ <result property="id" column="id" />
+ <result property="orderId" column="order_id" />
+ <result property="orderNo" column="order_no" />
+ <result property="companyId" column="company_id" />
+ <result property="companyName" column="company_name" />
+ <result property="companyUser" column="company_user" />
+ <result property="companyPhone" column="company_phone" />
+ <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="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateAnswerMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateAnswerMapper.xml
new file mode 100644
index 0000000..328523e
--- /dev/null
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateAnswerMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.enforce.mapper.EnforceEvaluateAnswerMapper">
+
+ <resultMap type="EnforceEvaluateAnswer" id="EnforceEvaluateAnswerResult">
+ <result property="answerId" column="answer_id" />
+ <result property="answerName" column="answer_name" />
+ <result property="questionId" column="question_id" />
+ <result property="questionName" column="question_name" />
+ <result property="isScore" column="is_score" />
+ <result property="answerRemark" column="answer_remark" />
+ <result property="answerStatus" column="answer_status" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateLogMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateLogMapper.xml
new file mode 100644
index 0000000..8a88ea1
--- /dev/null
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateLogMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.enforce.mapper.EnforceEvaluateLogMapper">
+
+ <resultMap type="EnforceEvaluateLog" id="EnforceEvaluateLogResult">
+ <result property="id" column="id" />
+ <result property="orderId" column="order_id" />
+ <result property="orderNo" column="order_no" />
+ <result property="companyId" column="company_id" />
+ <result property="companyName" column="company_name" />
+ <result property="companyUser" column="company_user" />
+ <result property="companyPhone" column="company_phone" />
+ <result property="executeUser" column="execute_user" />
+ <result property="executePhone" column="execute_phone" />
+ <result property="executeDeptName" column="execute_dept_name" />
+ <result property="questionRemark" column="question_remark" />
+ <result property="questionStatic" column="question_static" />
+ <result property="totalScore" column="total_score" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateQuestionMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateQuestionMapper.xml
new file mode 100644
index 0000000..a73fe51
--- /dev/null
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceEvaluateQuestionMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.enforce.mapper.EnforceEvaluateQuestionMapper">
+
+ <resultMap type="EnforceEvaluateQuestion" id="EnforceEvaluateQuestionResult">
+ <result property="questionId" column="question_id" />
+ <result property="questionName" column="question_name" />
+ <result property="questionScore" column="question_score" />
+ <result property="questionStatus" column="question_status" />
+ <result property="answerIds" column="answer_ids" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
new file mode 100644
index 0000000..da8443b
--- /dev/null
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+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" />
+ <result property="companyId" column="company_id" />
+ <result property="companyName" column="company_name" />
+ <result property="companyCode" column="company_code" />
+ <result property="companyUser" column="company_user" />
+ <result property="companyPhone" column="company_phone" />
+ <result property="companyAddress" column="company_address" />
+ <result property="regionCode" column="region_code" />
+ <result property="regionName" column="region_name" />
+ <result property="enforceReason" column="enforce_reason" />
+ <result property="applyId" column="apply_id" />
+ <result property="applyUser" column="apply_user" />
+ <result property="applyPhone" column="apply_phone" />
+ <result property="applyDeptId" column="apply_dept_id" />
+ <result property="applyDeptName" column="apply_dept_name" />
+ <result property="applyTime" column="apply_time" />
+ <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="executeId" column="execute_id" />
+ <result property="executeUser" column="execute_user" />
+ <result property="executePhone" column="execute_phone" />
+ <result property="executeDeptId" column="execute_dept_id" />
+ <result property="executeDeptName" column="execute_dept_name" />
+ <result property="executeTime" column="execute_time" />
+ <result property="regionStatus" column="region_status" />
+ <result property="regionReason" column="region_reason" />
+ <result property="regionImgs" column="region_imgs" />
+ <result property="regionVideos" column="region_videos" />
+ <result property="isNoticeCompany" column="is_notice_company" />
+ <result property="isShow" column="is_show" />
+ <result property="isEva" column="is_eva" />
+ <result property="totalScore" column="total_score" />
+ <result property="delFlag" column="del_flag" />
+ </resultMap>
+
+
+
+</mapper>
\ No newline at end of file
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 3568694..7d9e659 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
@@ -16,6 +16,7 @@
*
* @author manton
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@Accessors(chain = true)
@@ -73,9 +74,6 @@
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
-
-
-
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 922687c..58ed304 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
@@ -24,36 +24,42 @@
@Excel(name = "浼佷笟鍚�")
@ApiModelProperty("浼佷笟鍚�")
private String companyName;
+
@Excel(name = "浼佷笟绀句細缂栫爜")
@ApiModelProperty("浼佷笟绀句細缂栫爜")
private String companyCode;
+
@Excel(name = "浼佷笟鑱旂郴浜�")
@ApiModelProperty("浼佷笟鑱旂郴浜�")
private String companyUser;
+
@Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
private String companyPhone;
+
@Excel(name = "浼佷笟鍦板潃")
@ApiModelProperty("浼佷笟鍦板潃")
private String companyAddress;
- @Excel(name = "浼佷笟钀ヤ笟鎵х収鍥�")
+
@ApiModelProperty("浼佷笟钀ヤ笟鎵х収鍥�")
private String companyImg;
- @Excel(name = "浼佷笟鐘舵�侊細0姝ｅ父锛�1绂佺敤")
+
@ApiModelProperty("浼佷笟鐘舵�侊細0姝ｅ父锛�1绂佺敤")
private Integer companyStatus;
- @Excel(name = "鎵�灞炲尯鍩熺紪鐮�")
+
@ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
private String regionCode;
- @Excel(name = "鎵�灞炲尯鍩�")
+
@ApiModelProperty("鎵�灞炲尯鍩�")
private String regionName;
- @Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+
@Excel(name = "鑷畾涔夋帓搴�")
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
+
@Excel(name = "澶囨敞")
@ApiModelProperty("澶囨敞")
private String remark;
diff --git a/project-system/src/main/java/com/project/system/service/ISysCompanyService.java b/project-system/src/main/java/com/project/system/service/ISysCompanyService.java
index cfb2616..1937239 100644
--- a/project-system/src/main/java/com/project/system/service/ISysCompanyService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysCompanyService.java
@@ -50,4 +50,11 @@
* @return true鎴愬姛 false澶辫触
*/
Boolean deleteByIds(Collection<Long> ids);
+
+ /**
+ * 鎵归噺瀵煎叆浼佷笟淇℃伅
+ * @param list 浼佷笟淇℃伅闆嗗悎
+ * @return true鎴愬姛 false澶辫触
+ */
+ Boolean importList(List<SysCompanyVo> list);
}
diff --git a/project-system/src/main/java/com/project/system/service/ISysUserService.java b/project-system/src/main/java/com/project/system/service/ISysUserService.java
index dc9e83d..ed59bf8 100644
--- a/project-system/src/main/java/com/project/system/service/ISysUserService.java
+++ b/project-system/src/main/java/com/project/system/service/ISysUserService.java
@@ -204,4 +204,12 @@
* @return 缁撴灉
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+
+ /**
+ * 鏍规嵁鏈烘瀯id娓呴櫎鐢ㄦ埛
+ * @param deptId 鏈烘瀯id
+ * @return 缁撴灉
+ */
+ public int deleteUserByDeptId(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 421b46c..ed25210 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
@@ -1,13 +1,18 @@
package com.project.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.project.common.constant.UserConstants;
+import com.project.common.core.domain.entity.SysUser;
+import com.project.common.exception.base.BaseException;
+import com.project.common.utils.SecurityUtils;
+import com.project.system.service.ISysUserService;
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.scheduling.annotation.Async;
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.system.domain.vo.SysCompanyVo;
@@ -29,7 +34,7 @@
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysCompany> implements ISysCompanyService {
-
+ private final ISysUserService userService;
@Override//鍒楄〃鏌ヨ
public List<SysCompanyVo> queryList(SysCompanyQueryBo bo)
@@ -52,16 +57,26 @@
public Boolean insertByBo(SysCompanyBo bo)
{
SysCompany add = Convert.convert(SysCompany.class, bo);
- validEntityBeforeSave(add);
- return this.save(add);
+ validEntityBeforeSave(add, 0);
+ boolean save = this.save(add);
+ addCompanyUser(add);
+ return save;
}
@Override//淇敼
@Transactional
public Boolean updateByBo(SysCompanyBo bo)
{
+ SysCompany old = this.getById(bo.getCompanyId());
SysCompany update = Convert.convert(SysCompany.class, bo);
- validEntityBeforeSave(update);
+ if (!old.getCompanyPhone().equals(update.getCompanyPhone())){
+ boolean delUser = delCompanyUser(old.getCompanyId());
+ if (!delUser) {
+ throw new BaseException("鍘熶紒涓氱敤鎴锋竻闄ゅけ璐ワ紝璇疯仈绯荤鐞嗗憳锛�");
+ }
+ this.addCompanyUser(update);
+ }
+ validEntityBeforeSave(update, 0);
return this.updateById(update);
}
@@ -69,22 +84,136 @@
@Transactional
public Boolean deleteByIds(Collection<Long> ids)
{
-
- //鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
-
+ for (Long id : ids) {
+ boolean b = delCompanyUser(id);
+ if (!b) {
+ throw new BaseException(String.format("鍘熶紒涓� %1$s 鐢ㄦ埛娓呴櫎澶辫触锛岃鑱旂郴绠＄悊鍛橈紒", id));
+ }
+ }
return this.removeByIds(ids);
+ }
+
+ @Override//瀵煎叆
+ @Transactional
+ public Boolean importList(List<SysCompanyVo> list)
+ {
+ if (list==null || list.size()<1){
+ throw new BaseException("鏈幏鍙栧埌瀵煎叆淇℃伅");
+ }
+ List<SysCompany> companies = Convert.toList(SysCompany.class, list);
+ companies.forEach(e-> validEntityBeforeSave(e,1));
+ boolean b = this.saveOrUpdateBatch(companies);
+
+ companies.forEach(this::addCompanyUser);
+ return b;
}
//-------------------------------------------------------------------------------------
- //淇濆瓨鍓嶆牎楠�
- private void validEntityBeforeSave(SysCompany entity)
+ /**
+ * 淇濆瓨鍓嶆牎楠�
+ * @param entity 鍙傛暟
+ * @param isImport 鏄惁瀵煎叆锛�0鍚︼紝1鏄�
+ */
+ private void validEntityBeforeSave(SysCompany entity, int isImport)
{
- //鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ if (isImport!=1){
+ if (StringUtils.isEmpty(entity.getCompanyImg())){
+ throw new BaseException(String.format("%1$s锛岃涓婁紶钀ヤ笟鎵х収", entity.getCompanyName()));
+ }
+ }
+ if (StringUtils.isEmpty(entity.getCompanyCode())){
+ throw new BaseException(String.format("%1$s锛岃濉啓浼佷笟绀句細缂栫爜锛�", entity.getCompanyName()));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyUser())){
+ throw new BaseException(String.format("%1$s锛岃濉啓浼佷笟鑱旂郴浜猴紒", entity.getCompanyName()));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyPhone())){
+ throw new BaseException(String.format("%1$s锛岃濉啓浼佷笟鑱旂郴浜虹數璇濓紒", entity.getCompanyName()));
+ }
+ if (StringUtils.isEmpty(entity.getCompanyName())){
+ throw new BaseException("璇峰～鍐欎紒涓氬悕锛�");
+ }
+ if (entity.getCompanyId()==null){ //鏂板
+ int codeCount = this.count(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
+ if (codeCount>0){
+ throw new BaseException(String.format("%1$s锛屼紒涓氱ぞ浼氱紪鐮佸凡瀛樺湪锛�", entity.getCompanyName()));
+ }
+ int nameCount = this.count(lq().eq(SysCompany::getCompanyName, entity.getCompanyName()));
+ if (nameCount>0){
+ throw new BaseException(String.format("%1$s锛屼紒涓氬悕宸插瓨鍦紒", entity.getCompanyName()));
+ }
+ int phoneCount = this.count(lq().eq(SysCompany::getCompanyPhone, entity.getCompanyPhone()));
+ if (phoneCount>0){
+ throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛�", entity.getCompanyName()));
+ }
+ } else {
+ int codeCount = this.count(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()).ne(SysCompany::getCompanyId,entity.getCompanyId()));
+ if (codeCount>0){
+ throw new BaseException(String.format("%1$s锛屼紒涓氱ぞ浼氱紪鐮佸凡瀛樺湪锛�", entity.getCompanyName()));
+ }
+ int nameCount = this.count(lq().eq(SysCompany::getCompanyName, entity.getCompanyName()).ne(SysCompany::getCompanyId,entity.getCompanyId()));
+ if (nameCount>0){
+ throw new BaseException(String.format("%1$s锛屼紒涓氬悕宸插瓨鍦紒", entity.getCompanyName()));
+ }
+ int phoneCount = this.count(lq().eq(SysCompany::getCompanyPhone, entity.getCompanyPhone()).ne(SysCompany::getCompanyId,entity.getCompanyId()));
+ if (phoneCount>0){
+ throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛�", entity.getCompanyName()));
+ }
+ }
}
- //鑾峰彇鏌ヨ鍙傛暟
+
+ /**
+ * 娣诲姞浼佷笟鐢ㄦ埛
+ * @param entity 浼佷笟淇℃伅
+ */
+ @Async
+ protected void addCompanyUser(SysCompany entity)
+ {
+ SysUser user = new SysUser();
+ SysCompany one = this.getOne(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
+ String phone = entity.getCompanyPhone();
+ user.setPhonenumber(phone);
+ user.setUserName(entity.getCompanyUser());
+ user.setPassword(phone);
+ user.setDeptId(one.getCompanyId());
+ user.setUserType("02");
+ if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
+ {
+ return;
+ }
+ else if (StringUtils.isNotEmpty(user.getPhonenumber())
+ && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+ {
+ return;
+ }
+ else if (StringUtils.isNotEmpty(user.getEmail())
+ && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+ {
+ return;
+ }
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setRecommendUser(user.getPassword());
+ userService.insertUser(user);
+ }
+
+ /**
+ * 鍒犻櫎浼佷笟鐢ㄦ埛
+ * @param companyId 浼佷笟id
+ */
+ protected boolean delCompanyUser(Long companyId)
+ {
+ return userService.deleteUserByDeptId(companyId)>0;
+ }
+
+ /**
+ * 鑾峰彇鏌ヨ鍙傛暟
+ * @param bo 鍙傛暟
+ * @return 鏌ヨ鍙傛暟
+ */
private QueryWrapper<SysCompany> getQw(SysCompanyQueryBo bo)
{
QueryWrapper<SysCompany> qw = Wrappers.query();
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
index b34dac0..b1983d5 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java
@@ -5,6 +5,7 @@
import java.util.stream.Collectors;
import javax.validation.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
@@ -531,4 +532,19 @@
}
return successMsg.toString();
}
+
+
+ /**
+ * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
+ *
+ * @param deptId 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int deleteUserByDeptId(Long deptId)
+ {
+ List<SysUser> sysUsers = userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getDeptId, deptId));
+ return this.deleteUserByIds((Long[]) sysUsers.stream().map(SysUser::getUserId).toArray());
+ }
}
--
Gitblit v1.9.1