From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/dev/DevServiceDAOImplMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/dev/DevServiceDAOImplMapper.xml b/java110-db/src/main/resources/mapper/dev/DevServiceDAOImplMapper.xml
index 8fe67ec..677c4cb 100644
--- a/java110-db/src/main/resources/mapper/dev/DevServiceDAOImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/dev/DevServiceDAOImplMapper.xml
@@ -23,7 +23,7 @@
</select>
- <select id="getMappingInfoAll" resultType="com.java110.entity.mapping.Mapping">
+ <select id="getMappingInfoAll" resultType="com.java110.dto.mapping.Mapping">
<![CDATA[
SELECT cm.domain,cm.name,cm.key,cm.value,cm.remark from c_mapping cm where cm.status_cd = '0'
@@ -31,13 +31,13 @@
]]>
</select>
- <select id="getPrivilegeAll" resultType="com.java110.dto.basePrivilege.BasePrivilegeDto">
+ <select id="getPrivilegeAll" resultType="com.java110.dto.privilege.BasePrivilegeDto">
<![CDATA[
select t.p_id pId,t.name,t.domain,t.resource,t.description,t.create_time createTime from p_privilege t where t.status_cd = '0'
]]>
</select>
- <select id="getDatabusAll" resultType="com.java110.dto.businessDatabus.BusinessDatabusDto">
+ <select id="getDatabusAll" resultType="com.java110.dto.system.BusinessDatabusDto">
<![CDATA[
SELECT
t.databus_id databusId,
@@ -53,4 +53,16 @@
]]>
</select>
+ <select id="getBusinessTableHisAll" resultType="com.java110.dto.system.BusinessTableHisDto">
+ <![CDATA[
+ SELECT
+ t.action_obj,t.action_obj actionObj,t.business_type_cd,t.business_type_cd
+ businessTypeCd,t.his_id,t.his_id hisId,t.action,t.remark,t.status_cd,t.status_cd
+ statusCd,t.action_obj_his,t.action_obj_his actionObjHis
+ from
+ c_business_table_his t
+ where t.status_cd = '0'
+ ]]>
+ </select>
+
</mapper>
--
Gitblit v1.8.0