|
|
@@ -9,7 +9,7 @@
|
|
|
<result property="planName" column="plan_name"/>
|
|
|
<result property="planCycle" column="plan_cycle"/>
|
|
|
<result property="execOrgType" column="exec_org_type"/>
|
|
|
- <result property="checkOrgType" column="check_org_type"/>
|
|
|
+<!-- <result property="checkOrgType" column="check_org_type"/>-->
|
|
|
<result property="planStatus" column="plan_status"/>
|
|
|
<result property="startDate" column="start_date"/>
|
|
|
<result property="endDate" column="end_date"/>
|
|
|
@@ -40,7 +40,7 @@
|
|
|
<result property="planCreateOrgName" column="plan_create_org_name"/>
|
|
|
<result property="planOfOrgName" column="plan_of_org_name"/>
|
|
|
<result property="execOrg" column="exec_org"/>
|
|
|
- <result property="checkOrg" column="check_org"/>
|
|
|
+<!-- <result property="checkOrg" column="check_org"/>-->
|
|
|
<!-- 角色关系映射 -->
|
|
|
<collection property="roleList" ofType="com.xunmei.system.api.domain.SysRole">
|
|
|
<result column="role_name" property="roleName"/>
|
|
|
@@ -192,9 +192,9 @@
|
|
|
<select id="selectCoreSafecheckPlanPage" resultMap="CoreSafecheckPlanResult">
|
|
|
SELECT
|
|
|
GROUP_CONCAT(DISTINCT role_name) as role_names,
|
|
|
- GROUP_CONCAT( tem.check_org_name) as check_org,
|
|
|
+# GROUP_CONCAT( tem.check_org_name) as check_org,
|
|
|
GROUP_CONCAT( tem.exec_org_name) as exec_org,
|
|
|
- GROUP_CONCAT( tem.dict_label) as type_names,
|
|
|
+ GROUP_CONCAT(DISTINCT tem.dict_label) as type_names,
|
|
|
tem.*
|
|
|
FROM
|
|
|
(
|
luojun