wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/4/head
wangpeng 2024-02-21 21:11:45 +08:00
parent 0f1b009c24 4ac70c2d74
commit 0daa256c35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml
View File

@ -190,7 +190,7 @@
blsd.BZ as TASK_TYPE_NUM, blsd.BZ as TASK_TYPE_NUM,
bhd1.DICTIONARY_NAME as CHECK_CATEGORY_NAME, bhd1.DICTIONARY_NAME as CHECK_CATEGORY_NAME,
bhd2.DICTIONARY_NAME as CHECK_ITEM_NAME, bhd2.DICTIONARY_NAME as CHECK_ITEM_NAME,
btl.DESCRIBE as BAO_BAO_NUM_NAME btl.TERM_DESCRIBE as BAO_BAO_NUM_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join bus_hiddendangercheckstandard_custom bl on bl.CUSTOM_ID = f.CUSTOM_ID left join bus_hiddendangercheckstandard_custom bl on bl.CUSTOM_ID = f.CUSTOM_ID

8
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomTermLibraryMapper.xml
View File

@ -15,7 +15,7 @@
<!-- 字段 --> <!-- 字段 -->
<sql id="Field"> <sql id="Field">
f.TASK_NUM, f.TASK_NUM,
f.DESCRIBE, f.TERM_DESCRIBE,
f.WORK_TYPE, f.WORK_TYPE,
f.IS_DELETE, f.IS_DELETE,
f.CREATE_TIME, f.CREATE_TIME,
@ -26,7 +26,7 @@
<!-- 字段用于新增 --> <!-- 字段用于新增 -->
<sql id="Field2"> <sql id="Field2">
TASK_NUM, TASK_NUM,
DESCRIBE, TERM_DESCRIBE,
WORK_TYPE, WORK_TYPE,
IS_DELETE, IS_DELETE,
CREATE_TIME, CREATE_TIME,
@ -37,7 +37,7 @@
<!-- 字段值 --> <!-- 字段值 -->
<sql id="FieldValue"> <sql id="FieldValue">
#{TASK_NUM}, #{TASK_NUM},
#{DESCRIBE}, #{TERM_DESCRIBE},
#{WORK_TYPE}, #{WORK_TYPE},
#{IS_DELETE}, #{IS_DELETE},
#{CREATE_TIME}, #{CREATE_TIME},
@ -72,7 +72,7 @@
<include refid="tableName"></include> <include refid="tableName"></include>
set set
TASK_NUM = #{TASK_NUM}, TASK_NUM = #{TASK_NUM},
DESCRIBE = #{DESCRIBE}, TERM_DESCRIBE = #{TERM_DESCRIBE},
WORK_TYPE = #{WORK_TYPE}, WORK_TYPE = #{WORK_TYPE},
IS_DELETE = #{IS_DELETE}, IS_DELETE = #{IS_DELETE},
CREATE_TIME = #{CREATE_TIME}, CREATE_TIME = #{CREATE_TIME},