From f6050b9a0d04cf8a19485c0176067fb46620872c Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Tue, 29 Dec 2020 18:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A3=80=E6=9F=A5=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../checkitem/v2/CheckItemController.java | 4 ++--
.../v2/CheckItemOptionController.java | 2 +-
.../checkitem/v2/ICheckItemDao.java | 2 +-
.../v2/ICheckItemOptionDao.java | 2 +-
.../v2/impl/CheckItemServiceImpl.java | 2 +-
.../v2/impl/CheckItemOptionServiceImpl.java | 2 +-
.../checkitem/v2/checkitem-mapper.xml | 19 +++++++++++++++++--
.../checkitem/v2/list-checkitem.html | 10 +++++-----
.../checkitem/v2/list-tree-checkitem.html | 14 +++++++-------
.../checkitem/v2/save-checkitem.html | 11 ++++++-----
.../checkitem/v2/update-checkitem.html | 4 ++--
.../v2/list-checkitemoption.html | 8 ++++----
.../v2/save-checkitemoption.html | 2 +-
.../v2/update-checkitemoption.html | 4 ++--
.../route/enterprise/v2/list-enterprise.html | 4 ++--
15 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitem/v2/CheckItemController.java b/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitem/v2/CheckItemController.java
index 2725927..3a73ae6 100644
--- a/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitem/v2/CheckItemController.java
+++ b/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitem/v2/CheckItemController.java
@@ -31,8 +31,8 @@ import java.util.Map;
* @Version: 1.0
**/
@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "企业检查项接口")
-@RestController
-@RequestMapping(ISystemConstant.API_PREFIX + "enterprise/checkitem/v2")
+@RestController("CheckItemV2Controller")
+@RequestMapping(ISystemConstant.API_PREFIX + "/enterprise/checkitem/v2")
public class CheckItemController extends AbstractController {
@Autowired
diff --git a/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitemoption/v2/CheckItemOptionController.java b/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitemoption/v2/CheckItemOptionController.java
index 69809e8..3201b34 100644
--- a/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitemoption/v2/CheckItemOptionController.java
+++ b/src/main/java/com/cm/inspection/controller/apis/enterprise/checkitemoption/v2/CheckItemOptionController.java
@@ -29,7 +29,7 @@ import java.util.Map;
* @Version: 1.0
**/
@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "检查项选项接口")
-@RestController
+@RestController("CheckItemOptionV2Controller")
@RequestMapping(ISystemConstant.API_PREFIX + "/enterprise/checkitemoption/v2")
public class CheckItemOptionController extends AbstractController {
diff --git a/src/main/java/com/cm/inspection/dao/enterprise/checkitem/v2/ICheckItemDao.java b/src/main/java/com/cm/inspection/dao/enterprise/checkitem/v2/ICheckItemDao.java
index e2483e1..a015138 100644
--- a/src/main/java/com/cm/inspection/dao/enterprise/checkitem/v2/ICheckItemDao.java
+++ b/src/main/java/com/cm/inspection/dao/enterprise/checkitem/v2/ICheckItemDao.java
@@ -18,7 +18,7 @@ import java.util.Map;
* @Date: 2020-03-25 22:59
* @Version: 1.0
**/
-@Repository
+@Repository("ICheckItemV2Dao")
public interface ICheckItemDao {
/**
diff --git a/src/main/java/com/cm/inspection/dao/enterprise/checkitemoption/v2/ICheckItemOptionDao.java b/src/main/java/com/cm/inspection/dao/enterprise/checkitemoption/v2/ICheckItemOptionDao.java
index beb092f..e086bfd 100644
--- a/src/main/java/com/cm/inspection/dao/enterprise/checkitemoption/v2/ICheckItemOptionDao.java
+++ b/src/main/java/com/cm/inspection/dao/enterprise/checkitemoption/v2/ICheckItemOptionDao.java
@@ -17,7 +17,7 @@ import java.util.Map;
* @Date: 2020-04-14 08:58
* @Version: 1.0
**/
-@Repository
+@Repository("ICheckItemOptionV2Dao")
public interface ICheckItemOptionDao {
/**
diff --git a/src/main/java/com/cm/inspection/service/enterprise/checkitem/v2/impl/CheckItemServiceImpl.java b/src/main/java/com/cm/inspection/service/enterprise/checkitem/v2/impl/CheckItemServiceImpl.java
index e321ce9..2849797 100644
--- a/src/main/java/com/cm/inspection/service/enterprise/checkitem/v2/impl/CheckItemServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/enterprise/checkitem/v2/impl/CheckItemServiceImpl.java
@@ -29,7 +29,7 @@ import java.util.Map;
* @Date: 2020-03-25 22:59
* @Version: 1.0
**/
-@Service
+@Service("CheckItemServiceV2Impl")
public class CheckItemServiceImpl extends BaseService implements ICheckItemService {
@Autowired
diff --git a/src/main/java/com/cm/inspection/service/enterprise/checkitemoption/v2/impl/CheckItemOptionServiceImpl.java b/src/main/java/com/cm/inspection/service/enterprise/checkitemoption/v2/impl/CheckItemOptionServiceImpl.java
index 5691326..4d6be91 100644
--- a/src/main/java/com/cm/inspection/service/enterprise/checkitemoption/v2/impl/CheckItemOptionServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/enterprise/checkitemoption/v2/impl/CheckItemOptionServiceImpl.java
@@ -28,7 +28,7 @@ import java.util.Map;
* @Date: 2020-04-14 08:58
* @Version: 1.0
**/
-@Service
+@Service("CheckItemOptionServiceV2Impl")
public class CheckItemOptionServiceImpl extends BaseService implements ICheckItemOptionService {
@Autowired
diff --git a/src/main/resources/mybatis/mapper/enterprise/checkitem/v2/checkitem-mapper.xml b/src/main/resources/mybatis/mapper/enterprise/checkitem/v2/checkitem-mapper.xml
index 01b6a63..1b87273 100644
--- a/src/main/resources/mybatis/mapper/enterprise/checkitem/v2/checkitem-mapper.xml
+++ b/src/main/resources/mybatis/mapper/enterprise/checkitem/v2/checkitem-mapper.xml
@@ -24,6 +24,7 @@
INSERT INTO gen_enterprise_check_item_v2(
check_item_id,
check_item_parent_id,
+ enterprise_id,
type,
name,
summary,
@@ -37,6 +38,7 @@
) VALUES(
#{checkItemId},
#{checkItemParentId},
+ #{enterpriseId},
#{type},
#{name},
#{summary},
@@ -128,17 +130,26 @@
t1.icon,
t1.icon_press,
t1.check_item_parent_id,
+ t1.enterprise_id,
t1.check_item_id
FROM
gen_enterprise_check_item_v2 t1
WHERE
t1.is_delete = 0