Skip to content

A
amos-boot-biz
Commit f35cd88c authored by litengwei's avatar litengwei
Browse files
Options

脚本大小写修复

parent 1896f845
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
amos-boot-system-patrol/src/main/resources/db/changelog/patrol-3.0.1.xml
View file @ f35cd88c
...@@ -227,27 +227,27 @@ ...@@ -227,27 +227,27 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tb" id="tb-20211009-11"> <!-- <changeSet author="tb" id="tb-20211009-11">-->
<preConditions onFail="MARK_RAN"> <!-- <preConditions onFail="MARK_RAN">-->
<columnExists tableName="p_latent_danger" columnName="check_input_id"/> <!-- <columnExists tableName="p_latent_danger" columnName="check_input_id"/>-->
</preConditions> <!-- </preConditions>-->
<comment>p_latent_danger CHANGE COLUMN check_input_id to biz_id '创建隐患的业务数据主键id'</comment> <!-- <comment>p_latent_danger CHANGE COLUMN check_input_id to biz_id '创建隐患的业务数据主键id'</comment>-->
<sql> <!-- <sql>-->
ALTER TABLE p_latent_danger CHANGE COLUMN `check_input_id` `biz_id` bigint(20) DEFAULT NULL COMMENT '创建隐患的业务数据主键id'; <!-- ALTER TABLE p_latent_danger CHANGE COLUMN `check_input_id` `biz_id` bigint(20) DEFAULT NULL COMMENT '创建隐患的业务数据主键id';-->
</sql> <!-- </sql>-->
</changeSet> <!-- </changeSet>-->
<changeSet author="tb" id="tb-20211009-12"> <!-- <changeSet author="tb" id="tb-20211009-12">-->
<preConditions onFail="MARK_RAN"> <!-- <preConditions onFail="MARK_RAN">-->
<not> <!-- <not>-->
<columnExists tableName="p_latent_danger" columnName="biz_info"/> <!-- <columnExists tableName="p_latent_danger" columnName="biz_info"/>-->
</not> <!-- </not>-->
</preConditions> <!-- </preConditions>-->
<comment>p_latent_danger add COLUMN biz_info '业务信息'</comment> <!-- <comment>p_latent_danger add COLUMN biz_info '业务信息'</comment>-->
<sql> <!-- <sql>-->
ALTER TABLE p_latent_danger add COLUMN `biz_info` varchar(500) DEFAULT NULL COMMENT '业务信息'; <!-- ALTER TABLE p_latent_danger add COLUMN `biz_info` varchar(500) DEFAULT NULL COMMENT '业务信息';-->
</sql> <!-- </sql>-->
</changeSet> <!-- </changeSet>-->
<changeSet author="tb" id="tb-20211009-13"> <changeSet author="tb" id="tb-20211009-13">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
......
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ f35cd88c
...@@ -835,8 +835,8 @@ ...@@ -835,8 +835,8 @@
SELECT SELECT
count( 1 ) count( 1 )
FROM FROM
P_PLAN_TASK ppt p_plan_task ppt
RIGHT JOIN P_PLAN_TASK_DETAIL pptd ON ppt.ID = pptd.TASK_NO RIGHT JOIN p_plan_task_detail pptd ON ppt.ID = pptd.TASK_NO
WHERE WHERE
ppt.org_code LIKE CONCAT( #{orgCode}, '%' ) and t_date.checkDate BETWEEN DATE_FORMAT( ppt.BEGIN_TIME, '%Y-%m-%d' ) ppt.org_code LIKE CONCAT( #{orgCode}, '%' ) and t_date.checkDate BETWEEN DATE_FORMAT( ppt.BEGIN_TIME, '%Y-%m-%d' )
AND DATE_FORMAT( ppt.END_TIME, '%Y-%m-%d' ) AND DATE_FORMAT( ppt.END_TIME, '%Y-%m-%d' )
...@@ -845,7 +845,7 @@ ...@@ -845,7 +845,7 @@
SELECT SELECT
count( 1 ) count( 1 )
FROM FROM
P_CHECK pc p_check pc
WHERE WHERE
pc.org_code LIKE CONCAT( #{orgCode}, '%' ) and pc.org_code LIKE CONCAT( #{orgCode}, '%' ) and
DATE_FORMAT( pc.CHECK_TIME, '%Y-%m-%d' ) = t_date.checkDate DATE_FORMAT( pc.CHECK_TIME, '%Y-%m-%d' ) = t_date.checkDate
...@@ -855,7 +855,7 @@ ...@@ -855,7 +855,7 @@
SELECT SELECT
count( 1 ) count( 1 )
FROM FROM
P_CHECK pc p_check pc
WHERE WHERE
pc.org_code LIKE CONCAT( #{orgCode}, '%' ) and pc.org_code LIKE CONCAT( #{orgCode}, '%' ) and
DATE_FORMAT( pc.CHECK_TIME, '%Y-%m-%d' ) = t_date.checkDate DATE_FORMAT( pc.CHECK_TIME, '%Y-%m-%d' ) = t_date.checkDate
...@@ -894,15 +894,15 @@ ...@@ -894,15 +894,15 @@
<select id="getCountMonthChkNew" resultType="java.util.HashMap"> <select id="getCountMonthChkNew" resultType="java.util.HashMap">
SELECT SELECT
T_DATE.checkDate t_date.checkDate
, ( , (
SELECT count(1) FROM P_PLAN_TASK ppt RIGHT JOIN P_PLAN_TASK_DETAIL pptd ON ppt.ID = pptd.TASK_NO WHERE t_date.checkDate BETWEEN DATE_FORMAT(ppt .BEGIN_TIME, '%Y-%m-%d') AND DATE_FORMAT(ppt .END_TIME , '%Y-%m-%d') SELECT count(1) FROM p_plan_task ppt RIGHT JOIN p_plan_task_detail pptd ON ppt.ID = pptd.TASK_NO WHERE t_date.checkDate BETWEEN DATE_FORMAT(ppt .BEGIN_TIME, '%Y-%m-%d') AND DATE_FORMAT(ppt .END_TIME , '%Y-%m-%d')
) AS proNum ) AS proNum
, ( , (
SELECT SELECT
count(1) count(1)
FROM FROM
P_CHECK pc p_check pc
WHERE WHERE
DATE_FORMAT(pc.CHECK_TIME, '%Y-%m-%d') = t_date.checkDate DATE_FORMAT(pc.CHECK_TIME, '%Y-%m-%d') = t_date.checkDate
AND pc.IS_OK = 3 AND pc.IS_OK = 3
...@@ -911,10 +911,10 @@ ...@@ -911,10 +911,10 @@
SELECT SELECT
count(1) count(1)
FROM FROM
P_CHECK pc p_check pc
WHERE WHERE
DATE_FORMAT(pc.CHECK_TIME, '%Y-%m-%d') = t_date.checkDate DATE_FORMAT(pc.CHECK_TIME, '%Y-%m-%d') = t_date.checkDate
AND pc.IS_OK != 3 AND pc.is_ok != 3
) AS actualNum ) AS actualNum
FROM FROM
( (
......
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ f35cd88c
...@@ -523,12 +523,12 @@ ...@@ -523,12 +523,12 @@
<!-- 巡检执行情况统计分页用 --> <!-- 巡检执行情况统计分页用 -->
<select id="countChkExListData" resultType="long"> <select id="countChkExListData" resultType="long">
select select
count(A.ID) total_num count(a.id) total_num
from from
p_plan_task a, p_plan_task a,
p_plan b p_plan b
<!-- s_user c --> <!-- s_user c -->
WHERE <!-- A.USER_ID = C.ID AND --> A.PLAN_ID = B.ID WHERE <!-- A.USER_ID = C.ID AND --> a.plan_id = b.id
<if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if> <if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if>
<if test="orgCode != null and orgCode !=''" > <if test="orgCode != null and orgCode !=''" >
And (a.org_code LIKE CONCAT( #{orgCode}, '-%' ) or a.org_code= #{orgCode} ) And (a.org_code LIKE CONCAT( #{orgCode}, '-%' ) or a.org_code= #{orgCode} )
...@@ -538,12 +538,12 @@ ...@@ -538,12 +538,12 @@
<!-- 巡检执行情况统计分页用 --> <!-- 巡检执行情况统计分页用 -->
<select id="countChkExListDataNew" resultType="long"> <select id="countChkExListDataNew" resultType="long">
select select
count(A.ID) total_num count(a.id) total_num
from from
p_plan_task a, p_plan_task a,
p_plan b p_plan b
<!-- s_user c --> <!-- s_user c -->
WHERE <!-- A.USER_ID = C.ID AND --> A.PLAN_ID = B.ID WHERE <!-- A.USER_ID = C.ID AND --> a.plan_id = b.id
<if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if> <if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if>
<if test="orgCode != null and orgCode !=''" > <if test="orgCode != null and orgCode !=''" >
And a.org_code LIKE CONCAT( #{orgCode}, '%' ) And a.org_code LIKE CONCAT( #{orgCode}, '%' )
...@@ -568,7 +568,7 @@ ...@@ -568,7 +568,7 @@
p_plan_task a, p_plan_task a,
p_plan b p_plan b
<!-- s_user c --> <!-- s_user c -->
WHERE <!-- A.USER_ID = C.ID AND --> A.PLAN_ID = B.ID WHERE <!-- A.USER_ID = C.ID AND --> a.plan_id = b.id
<if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if> <if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if>
<if test="orgCode != null and orgCode !=''" > <if test="orgCode != null and orgCode !=''" >
And (a.org_code LIKE CONCAT( #{orgCode}, '-%' ) or a.org_code= #{orgCode} ) And (a.org_code LIKE CONCAT( #{orgCode}, '-%' ) or a.org_code= #{orgCode} )
...@@ -606,7 +606,7 @@ ...@@ -606,7 +606,7 @@
from from
p_plan_task a, p_plan_task a,
p_plan b p_plan b
WHERE A.PLAN_ID = B.ID WHERE a.plan_id = b.id
<if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if> <if test="checkDate!=null"> and date_format(a.begin_time, '%Y%m%d') <![CDATA[<=]]> #{checkDate} and date_format(a.end_time, '%Y%m%d') >= #{checkDate}</if>
<if test="orgCode != null and orgCode !=''" > <if test="orgCode != null and orgCode !=''" >
And a.org_code LIKE CONCAT( #{orgCode}, '%' ) And a.org_code LIKE CONCAT( #{orgCode}, '%' )
......
amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml
View file @ f35cd88c
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
<if test="orgCode!=null"> <if test="orgCode!=null">
and (org_code LIKE CONCAT( #{orgCode}, '-%' ) or org_code= #{orgCode} ) and (org_code LIKE CONCAT( #{orgCode}, '-%' ) or org_code= #{orgCode} )
</if> </if>
) VP ) vp
) tt group by tt.RealTimeStatus,tt.status order by status ) tt group by tt.RealTimeStatus,tt.status order by status
</select> </select>
<!-- 巡检点统计 --> <!-- 巡检点统计 -->
...@@ -505,7 +505,7 @@ ...@@ -505,7 +505,7 @@
and (org_code LIKE CONCAT( #{orgCode}, '-%' ) or org_code= #{orgCode} ) and (org_code LIKE CONCAT( #{orgCode}, '-%' ) or org_code= #{orgCode} )
</if> </if>
</where> </where>
) VP ) vp
) tt group by tt.RealTimeStatus,tt.status order by status ) tt group by tt.RealTimeStatus,tt.status order by status
</select> </select>
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
<if test="orgCode!=null"> <if test="orgCode!=null">
and biz_org_code LIKE CONCAT( #{orgCode}, '%' ) and biz_org_code LIKE CONCAT( #{orgCode}, '%' )
</if> </if>
) VP ) vp
) tt group by tt.RealTimeStatus,tt.status order by status ) tt group by tt.RealTimeStatus,tt.status order by status
</select> </select>
...@@ -613,7 +613,7 @@ ...@@ -613,7 +613,7 @@
'合格' '合格'
END AS STATUS, END AS STATUS,
DATE_FORMAT( DATE_FORMAT(
P.check_Time, p.check_time,
'%Y-%m-%d %H:%i:%s' '%Y-%m-%d %H:%i:%s'
) checkTime, ) checkTime,
p.error errorMsg p.error errorMsg
...@@ -676,12 +676,12 @@ ...@@ -676,12 +676,12 @@
'合格' '合格'
END AS STATUS, END AS STATUS,
DATE_FORMAT( DATE_FORMAT(
P.check_Time, p.check_time,
'%Y-%m-%d %H:%i:%s' '%Y-%m-%d %H:%i:%s'
) checkTime, ) checkTime,
p.error errorMsg p.error errorMsg
FROM p_point p FROM p_point p
LEFT JOIN p_Catalog_Tree ct ON ct.ID = p.Catalog_ID LEFT JOIN p_catalog_tree ct ON ct.ID = p.Catalog_ID
<!-- LEFT JOIN s_department sd ON sd.id = p.charge_dept_id <!-- LEFT JOIN s_department sd ON sd.id = p.charge_dept_id
LEFT JOIN s_user su ON su.id = p.charge_person_id --> LEFT JOIN s_user su ON su.id = p.charge_person_id -->
where p.is_delete = 0 where p.is_delete = 0
...@@ -730,7 +730,7 @@ ...@@ -730,7 +730,7 @@
'合格' '合格'
END AS STATUS END AS STATUS
FROM p_point p FROM p_point p
LEFT JOIN p_Catalog_Tree ct ON ct.ID = p.Catalog_ID LEFT JOIN p_catalog_tree ct ON ct.ID = p.Catalog_ID
<!-- LEFT JOIN s_department sd ON sd.id = p.charge_dept_id <!-- LEFT JOIN s_department sd ON sd.id = p.charge_dept_id
LEFT JOIN s_user su ON su.id = p.charge_person_id --> LEFT JOIN s_user su ON su.id = p.charge_person_id -->
<trim prefix="WHERE" prefixOverrides="AND "> <trim prefix="WHERE" prefixOverrides="AND ">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment