Skip to content

A
amos-boot-biz
Commit da079069 authored by suhuiguang's avatar suhuiguang
Browse files
Options

fix(common): 奥利sql解析

1.去掉--
parent 3d50446b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 314 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml
View file @ da079069
......@@ -17,28 +17,6 @@
<select id="queryListByQueryDto" resultType="java.util.Map">
SELECT
r.sequence_nbr AS sequenceNbr,
-- r.filling_unit_name AS fillingUnitName,
-- r.factory_num AS factoryNum,
-- CASE
-- i.cylinder_variety
-- WHEN 1 THEN
-- '无缝气瓶'
-- WHEN 2 THEN
-- '焊接气瓶'
-- WHEN 3 THEN
-- '缠绕气瓶'
-- WHEN 4 THEN
-- '绝热气瓶'
-- WHEN 5 THEN
-- '内装填料气瓶'
-- ELSE
-- ''
-- END AS cylinderVariety,
-- i.qrCode AS qrCode,
-- i.electronic_label_code AS electronicLabelCode,
-- r.sequence_code AS sequenceCode,
-- i.unit_inner_code AS unitInnerCode,
-- u.unit_name AS propertyUnit,
r.filling_startTime AS fillingStarttime,
r.filling_endTime AS fillingEndtime,
r.filling_user AS fillingUser,
......@@ -92,18 +70,6 @@
<if test="appId != null and appId != ''">
AND r.app_id = #{appId}
</if>
<!-- <if test="fillingUnitName != null and fillingUnitName != ''">-->
<!-- AND r.filling_unit_name like-->
<!-- CONCAT(CONCAT('%',#{fillingUnitName}),'%')-->
<!-- </if>-->
<!-- <if test="propertyUnit != null and propertyUnit != ''">-->
<!-- AND u.unit_name like-->
<!-- CONCAT(CONCAT('%',#{propertyUnit}),'%')-->
<!-- </if>-->
<!-- <if test="factoryNum != null and factoryNum != ''">-->
<!-- AND r.factory_num like-->
<!-- CONCAT(CONCAT('%',#{factoryNum}),'%')-->
<!-- </if>-->
<if test="fillingStartTime != null ">
and #{fillingStartTime} <![CDATA[ <= ]]>
r.filling_startTime
......@@ -112,24 +78,6 @@
and r.filling_endTime <![CDATA[ <= ]]>
#{fillingEndTime}
</if>
<!-- <if test="cylinderVariety != null and cylinderVariety != ''">-->
<!-- AND i.cylinder_variety = #{cylinderVariety}-->
<!-- </if>-->
<!-- <if test="qrCode != null and qrCode != ''">-->
<!-- AND i.qrCode like CONCAT(CONCAT('%',#{qrCode}),'%')-->
<!-- </if>-->
<!-- <if test="electronicLabelCode != null and electronicLabelCode != ''">-->
<!-- AND i.electronic_label_code like-->
<!-- CONCAT(CONCAT('%',#{electronicLabelCode}),'%')-->
<!-- </if>-->
<!-- <if test="sequenceCode != null and sequenceCode != ''">-->
<!-- AND r.sequence_code like-->
<!-- CONCAT(CONCAT('%',#{sequenceCode}),'%')-->
<!-- </if>-->
<!-- <if test="unitInnerCode != null and unitInnerCode != ''">-->
<!-- AND i.unit_inner_code like-->
<!-- CONCAT(CONCAT('%',#{unitInnerCode}),'%')-->
<!-- </if>-->
<if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != '' ">
ORDER BY ${sortParam} ${sortRule}
</if>
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml
View file @ da079069
......@@ -146,97 +146,6 @@
joi.RECORD
</where>
</select>
<!-- <select id="selectExportDataNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew">-->
<!-- SELECT joi.CODE96333 AS rescueCode,-->
<!-- jri.EQU_CODE AS registerCode,-->
<!-- jui.PROVINCE_NAME AS province,-->
<!-- jui.CITY_NAME AS city,-->
<!-- jui.COUNTY_NAME AS district,-->
<!-- concat(jui.PROVINCE, '#', jui.CITY, '#', jui.COUNTY) AS regionCode,-->
<!-- jui.ADDRESS AS address,-->
<!-- jui.USE_INNER_CODE AS innerNum,-->
<!-- jri.BRAND_NAME AS brand,-->
<!-- jfi.FACTORY_NUM AS factoryNum,-->
<!-- (SELECT GROUP_CONCAT(USC_UNIT_NAME)-->
<!-- FROM idx_biz_jg_construction_info-->
<!-- WHERE RECORD = jui.RECORD-->
<!-- and CONSTRUCTION_TYPE = '6030') AS installationUnit,-->
<!-- ifnull ( CAST(jfi.PRODUCE_DATE as VARCHAR ), '' ) AS factoryDate,-->
<!-- ifnull ((SELECT CAST(USC_DATE as VARCHAR )-->
<!-- FROM idx_biz_jg_construction_info-->
<!-- WHERE RECORD = jui.RECORD-->
<!-- and CONSTRUCTION_TYPE = '6031'-->
<!-- ORDER BY USC_DATE DESC LIMIT 1 ), '' ) AS overhaulDate,-->
<!-- ifnull ( CAST(jui.USE_DATE as VARCHAR ), '' ) AS startUseDate,-->
<!-- (SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS categoryName,-->
<!-- (SELECT name from cb_data_dictionary WHERE code = jui.USE_PLACE and type = 'ADDRESS' ) AS useSiteCategory,-->
<!-- jri.EQU_TYPE AS model,-->
<!-- tpe.STOREY AS floors,-->
<!-- tpe.STAND AS stations,-->
<!-- tpe.NUMBER_DOORS AS doors,-->
<!-- tpe.RATED_SPEED_UP AS ratedSpeed,-->
<!-- tpe.RATED_LOAD_CAPACITY AS ratedLoad,-->
<!-- '' AS maxPersonLoad,-->
<!-- tpe.LIFTING_HEIGHT AS raiseHeight,-->
<!-- tpe.CONTROL_MODE AS dragModeName,-->
<!-- case-->
<!-- WHEN jui.EQU_STATE = 0 then '未登记'-->
<!-- WHEN jui.EQU_STATE = 1 then '在用'-->
<!-- WHEN jui.EQU_STATE = 2 then '停用'-->
<!-- WHEN jui.EQU_STATE = 3 then '报废'-->
<!-- WHEN jui.EQU_STATE = 4 then '注销'-->
<!-- ELSE ''-->
<!-- END AS useStatus,-->
<!-- jui.USE_UNIT_NAME AS useUnit,-->
<!-- jfi.PRODUCE_UNIT_NAME AS manufacturerName,-->
<!-- jfi.PRODUCE_LICENSE_NUM AS manufacturingLicense,-->
<!-- '' AS maintainTypeName,-->
<!-- '' AS maintainLeaderPhone,-->
<!-- '' AS hostModel,-->
<!-- '' AS hostNum,-->
<!-- '' AS engineType,-->
<!-- '' AS engineNum,-->
<!-- '' AS panelModel,-->
<!-- '' AS panelNum,-->
<!-- '' AS cascadeModel,-->
<!-- '' AS cascadeLineModel,-->
<!-- '' AS handrailType,-->
<!-- '' AS handrailPanelModel,-->
<!-- '' AS handrailPanelBrand,-->
<!-- '' AS rollerMode,-->
<!-- '' AS tiltAngle,-->
<!-- '' AS horizontalSpan,-->
<!-- '' AS runningNoise,-->
<!-- '' AS runningMode,-->
<!-- '' AS runningVibration,-->
<!-- '' AS power,-->
<!-- ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'latitude', '' ) AS latitude,-->
<!-- ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'longitude', '' ) AS longitude,-->
<!-- (SELECT ME_CYCLE FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC limit-->
<!-- 1) as maintainPeriodName,-->
<!-- (SELECT ME_UNIT_NAME FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC-->
<!-- limit 1) as maintainUnit,-->
<!-- (SELECT ME_MASTER FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC limit-->
<!-- 1) as maintainLeader,-->
<!-- jui.RECORD AS sequenceNbr-->
<!-- FROM idx_biz_jg_register_info jri-->
<!-- LEFT JOIN idx_biz_jg_other_info joi ON jri.RECORD = joi.RECORD-->
<!-- LEFT JOIN idx_biz_jg_use_info jui ON jri.RECORD = jui.RECORD-->
<!-- LEFT JOIN idx_biz_jg_factory_info jfi ON jri.RECORD = jfi.RECORD-->
<!-- LEFT JOIN idx_biz_jg_tech_params_elevator tpe ON tpe.RECORD = jfi.RECORD-->
<!-- WHERE jri.EQU_LIST = '3000'-->
<!-- <if test="ids != null and ids.size() > 0">-->
<!-- and jui.RECORD in-->
<!-- <foreach item="item" collection="ids" separator="," open="(" close=")" index="">#{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </select>-->
<select id="selectByRecord" resultType="java.util.Map">
SELECT joi.CODE96333 AS rescueCode,
jri.EQU_CODE AS registerCode,
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/IdxUjerMaper.xml
View file @ da079069
......@@ -24,9 +24,6 @@
#{item}
</foreach>
</if>
<!-- <if test="bizType=='yingjian'">-->
<!-- AND b.SEQUENCE_NBR is null-->
<!-- </if>-->
<if test="bizType=='yijian'">
AND b.SEQUENCE_NBR is not null
</if>
......@@ -55,9 +52,6 @@
#{item}
</foreach>
</if>
<!-- <if test="bizType=='yingjian'">-->
<!-- AND b.SEQUENCE_NBR is null-->
<!-- </if>-->
<if test="bizType=='yijian'">
AND b.SEQUENCE_NBR is not null
</if>
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ScheduleMapper.xml
View file @ da079069
......@@ -44,9 +44,6 @@
ci.longitude,
ci.latitude,
eu.address,
-- eu.custom_name,
-- eu.custom_type,
-- eu.contact_phone,
cu.person_mobile_phone,
cu.unit_person
from
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml
View file @ da079069
......@@ -365,7 +365,6 @@
(select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
ri."EQU_DEFINE" equDefine,
(select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
-- 历史遗留问题 故 as
pp."PIPE_NAME" as productName,
ri."BRAND_NAME" brandName,
ri."EQU_TYPE" equType,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ da079069
......@@ -300,7 +300,6 @@
<if test="projectContraptionSeq != null and projectContraptionSeq != ''">
and ui."PROJECT_CONTRAPTION_ID" = #{projectContraptionSeq}
</if>
-- 排除 已经做过安装告知的
AND NOT EXISTS (
SELECT 1
FROM
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ da079069
......@@ -213,7 +213,6 @@
<select id="getListPage" resultType="java.util.Map">
SELECT * FROM (
-- 查询 equListCode != '8000' 的情况
SELECT *
FROM (
<include refid="page-list-sub-select"/>
......@@ -291,7 +290,6 @@
</where>
UNION ALL
-- 查询 equListCode == '8000' 的情况
SELECT *
FROM (
<include refid="page-list-sub-pipline"/>
......@@ -771,8 +769,6 @@
AND (use_unit_credit_code = #{dto.unitCode} or transfer_to_user_ids LIKE concat ('%',#{dto.currentUserId}, '%'))
</if>
</where>
-- GROUP BY
-- re.equip_transfer_id
order by
create_date DESC, applyNo DESC
</select>
......@@ -859,8 +855,6 @@
concat(tzi.sequence_nbr,'_',SAFETY_MANAGER) as safetyManagerSeq,
ibjui."PHONE" as phone,
concat(ibjui.ESTATE_UNIT_CREDIT_CODE, '_', ibjui.ESTATE_UNIT_NAME) as estateUnitName,
-- ESTATE_UNIT_NAME as estateUnitName,
-- ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
ibjui.ADDRESS as address,
ibjui.PROVINCE as province,
ibjui.CITY as city,
......@@ -1106,7 +1100,6 @@
(select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
ri."EQU_DEFINE" equDefine,
(select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
-- 历史遗留问题 故 as
pp."PIPE_NAME" as productName,
ri."BRAND_NAME" brandName,
ri."EQU_TYPE" equType,
......@@ -1667,7 +1660,6 @@
<foreach collection="projectContraptionSeqList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
--AND ui.IS_INTO_MANAGEMENT = true
ORDER BY ui.REC_DATE DESC
)
</select>
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ da079069
......@@ -311,7 +311,6 @@
group by a.inspection_type
</select>
<select id="queryAppByEquListForDP" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
-- 8大类 待检数量
SELECT
count(1) as longValue,
a.equip_classify as keyStr,
......@@ -326,7 +325,6 @@
and EXISTS (select 1 from tz_jyjc_inspection_result r where r.result_status='1' and a.application_no = r.application_no)
and date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
GROUP BY a.equip_classify
-- 8大类 报检数量统计
union all
SELECT
count(1) as longValue,
......@@ -714,7 +712,6 @@
(select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
ri."EQU_DEFINE" equDefine,
(select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
-- 历史遗留问题 故 as
pp."PIPE_NAME" as productName,
ri."BRAND_NAME" brandName,
ri."EQU_TYPE" equType,
......@@ -762,7 +759,6 @@
(select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
ri."EQU_DEFINE" equDefine,
(select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
-- 历史遗留问题 故 as
pp."PIPE_NAME" as productName,
ri."BRAND_NAME" brandName,
ri."EQU_TYPE" equType,
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml
View file @ da079069
......@@ -17,28 +17,6 @@
<select id="queryListByQueryDto" resultType="java.util.Map">
SELECT
r.sequence_nbr AS sequenceNbr,
-- r.filling_unit_name AS fillingUnitName,
-- r.factory_num AS factoryNum,
-- CASE
-- i.cylinder_variety
-- WHEN 1 THEN
-- '无缝气瓶'
-- WHEN 2 THEN
-- '焊接气瓶'
-- WHEN 3 THEN
-- '缠绕气瓶'
-- WHEN 4 THEN
-- '绝热气瓶'
-- WHEN 5 THEN
-- '内装填料气瓶'
-- ELSE
-- ''
-- END AS cylinderVariety,
-- i.qrCode AS qrCode,
-- i.electronic_label_code AS electronicLabelCode,
-- r.sequence_code AS sequenceCode,
-- i.unit_inner_code AS unitInnerCode,
-- u.unit_name AS propertyUnit,
r.filling_startTime AS fillingStarttime,
r.filling_endTime AS fillingEndtime,
r.filling_user AS fillingUser,
......@@ -92,18 +70,6 @@
<if test="appId != null and appId != ''">
AND r.app_id = #{appId}
</if>
<!-- <if test="fillingUnitName != null and fillingUnitName != ''">-->
<!-- AND r.filling_unit_name like-->
<!-- CONCAT(CONCAT('%',#{fillingUnitName}),'%')-->
<!-- </if>-->
<!-- <if test="propertyUnit != null and propertyUnit != ''">-->
<!-- AND u.unit_name like-->
<!-- CONCAT(CONCAT('%',#{propertyUnit}),'%')-->
<!-- </if>-->
<!-- <if test="factoryNum != null and factoryNum != ''">-->
<!-- AND r.factory_num like-->
<!-- CONCAT(CONCAT('%',#{factoryNum}),'%')-->
<!-- </if>-->
<if test="fillingStartTime != null ">
and #{fillingStartTime} <![CDATA[ <= ]]>
r.filling_startTime
......@@ -112,24 +78,6 @@
and r.filling_endTime <![CDATA[ <= ]]>
#{fillingEndTime}
</if>
<!-- <if test="cylinderVariety != null and cylinderVariety != ''">-->
<!-- AND i.cylinder_variety = #{cylinderVariety}-->
<!-- </if>-->
<!-- <if test="qrCode != null and qrCode != ''">-->
<!-- AND i.qrCode like CONCAT(CONCAT('%',#{qrCode}),'%')-->
<!-- </if>-->
<!-- <if test="electronicLabelCode != null and electronicLabelCode != ''">-->
<!-- AND i.electronic_label_code like-->
<!-- CONCAT(CONCAT('%',#{electronicLabelCode}),'%')-->
<!-- </if>-->
<!-- <if test="sequenceCode != null and sequenceCode != ''">-->
<!-- AND r.sequence_code like-->
<!-- CONCAT(CONCAT('%',#{sequenceCode}),'%')-->
<!-- </if>-->
<!-- <if test="unitInnerCode != null and unitInnerCode != ''">-->
<!-- AND i.unit_inner_code like-->
<!-- CONCAT(CONCAT('%',#{unitInnerCode}),'%')-->
<!-- </if>-->
<if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != '' ">
ORDER BY ${sortParam} ${sortRule}
</if>
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/IdxUjerMaper.xml
View file @ da079069
......@@ -24,9 +24,6 @@
#{item}
</foreach>
</if>
<!-- <if test="bizType=='yingjian'">-->
<!-- AND b.SEQUENCE_NBR is null-->
<!-- </if>-->
<if test="bizType=='yijian'">
AND b.SEQUENCE_NBR is not null
</if>
......@@ -55,9 +52,6 @@
#{item}
</foreach>
</if>
<!-- <if test="bizType=='yingjian'">-->
<!-- AND b.SEQUENCE_NBR is null-->
<!-- </if>-->
<if test="bizType=='yijian'">
AND b.SEQUENCE_NBR is not null
</if>
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/RiskReportMapper.xml
View file @ da079069
......@@ -64,8 +64,6 @@
select * FROM
(
SELECT * FROM (
-- 风险单位 只显示下发整改和整改上报后的
<include refid="baseSelectForRiskReport"/>
FROM tzs_risk_report AS rr1
WHERE rr1."risk_company_code" = #{dto.riskCompanyCode} AND rr1."current_status" != '草稿' AND
......@@ -77,13 +75,10 @@
)
UNION
-- 报送单位
<include refid="baseSelectForRiskReport"/>
FROM tzs_risk_report AS rr2
WHERE rr2."report_company_code" = #{dto.reportCompanyCode} AND rr2."current_status" != '草稿'
<!-- 处置单位 -->
<if test='dto.unitType != null and dto.unitType != "" and dto.unitType == "supervision"'>
UNION
<include refid="baseSelectForRiskReport"/>
......@@ -91,8 +86,6 @@
WHERE rr3."current_status" != '草稿' AND rr3."all_risk_disposal_unit_org_code" like CONCAT('%',
#{dto.riskDisposalUnitOrgCode}, '%')
</if>
<!-- 自己的草稿状态 -->
<if test='dto.createUserId != null and dto.createUserId != ""'>
UNION
<include refid="baseSelectForRiskReport"/>
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/ScheduleMapper.xml
View file @ da079069
......@@ -44,9 +44,6 @@
ci.longitude,
ci.latitude,
eu.address,
-- eu.custom_name,
-- eu.custom_type,
-- eu.contact_phone,
cu.person_mobile_phone,
cu.unit_person
from
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @ da079069
......@@ -235,7 +235,7 @@
update tz_base_enterprise_info
set SUPERVISE_ORG_NAME = #{superviseOrgName},
SUPERVISE_ORG_CODE = REPLACE(SUPERVISE_ORG_CODE, #{oldSuperviseOrgCode}, #{preSuperviseOrgCode}),
ORG_CODE = IFNULL(REPLACE(ORG_CODE, #{oldOrgCode}, #{preOrgCode}), #{preOrgCode}), -- 兼容旧数据，如果为空则使用新值
ORG_CODE = IFNULL(REPLACE(ORG_CODE, #{oldOrgCode}, #{preOrgCode}), #{preOrgCode}),
governing_body = #{superviseOrgName}
where sequence_nbr = #{sequenceNbr}
</update>
......@@ -403,7 +403,6 @@
</update>
<update id="updateRedundantSupervisionOrgCodeStatistics">
--三项制度因为会定时生成统计数据（刚好在层级调整后生成了统计数据，此时再单位层级树再调整会原有，根据该表的唯一约束会提示更新冲突），所以需要特殊处理（如果目标数据存在则不更新，并删除旧的统计数据）
WITH potential_updates AS (
SELECT
ctid,
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml
View file @ da079069
......@@ -55,13 +55,6 @@
<if test="dto.subPost != '' and dto.subPost != null">
and sub_post like concat('%',#{dto.subPost},'%')
</if>
<!-- <if test="dto.menuTypeUnderPost != null and dto.menuTypeUnderPost.size() > 0">-->
<!-- AND (-->
<!-- <foreach collection="dto.menuTypeUnderPost" separator="or" item="postType">-->
<!-- new_post like concat('%',#{postType},'%')-->
<!-- </foreach>-->
<!-- )-->
<!-- </if>-->
<if test="dto.postName != '' and dto.postName != null">
and post like concat('%',#{dto.postName},'%')
</if>
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/changelog/patrol-sql-task.xml
View file @ da079069
......@@ -222,7 +222,7 @@
p_input_item ii
WHERE
ci.check_id = sss.CheckID
AND ci.is_ok = '2' -- 不合格
AND ci.is_ok = '2'
AND ci.input_id = ii.id
)
END AS ErrorMsg
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/CheckInputMapper.xml
View file @ da079069
......@@ -34,7 +34,6 @@
b.route_id AS route_id,
a.point_classify_id AS pointClassifyId,
e.risk_source_id as riskSourceId
-- e.evaluate_id AS evaluateId
FROM
p_check_input AS a
LEFT JOIN p_check AS b ON a.check_id = b.id
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @ da079069
......@@ -455,7 +455,7 @@
p_point c,
spc_risk_source d
WHERE
a.danger_level = #{type} -- (1,2)
a.danger_level = #{type}
<if test="departmentId != null and departmentId != -1">
and d.belong_department_id = #{departmentId}
</if>
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml
View file @ da079069
......@@ -17,28 +17,6 @@
<select id="queryListByQueryDto" resultType="java.util.Map">
SELECT
r.sequence_nbr AS sequenceNbr,
-- r.filling_unit_name AS fillingUnitName,
-- r.factory_num AS factoryNum,
-- CASE
-- i.cylinder_variety
-- WHEN 1 THEN
-- '无缝气瓶'
-- WHEN 2 THEN
-- '焊接气瓶'
-- WHEN 3 THEN
-- '缠绕气瓶'
-- WHEN 4 THEN
-- '绝热气瓶'
-- WHEN 5 THEN
-- '内装填料气瓶'
-- ELSE
-- ''
-- END AS cylinderVariety,
-- i.qrCode AS qrCode,
-- i.electronic_label_code AS electronicLabelCode,
-- r.sequence_code AS sequenceCode,
-- i.unit_inner_code AS unitInnerCode,
-- u.unit_name AS propertyUnit,
r.filling_startTime AS fillingStarttime,
r.filling_endTime AS fillingEndtime,
r.filling_user AS fillingUser,
......@@ -92,18 +70,6 @@
<if test="appId != null and appId != ''">
AND r.app_id = #{appId}
</if>
<!-- <if test="fillingUnitName != null and fillingUnitName != ''">-->
<!-- AND r.filling_unit_name like-->
<!-- CONCAT(CONCAT('%',#{fillingUnitName}),'%')-->
<!-- </if>-->
<!-- <if test="propertyUnit != null and propertyUnit != ''">-->
<!-- AND u.unit_name like-->
<!-- CONCAT(CONCAT('%',#{propertyUnit}),'%')-->
<!-- </if>-->
<!-- <if test="factoryNum != null and factoryNum != ''">-->
<!-- AND r.factory_num like-->
<!-- CONCAT(CONCAT('%',#{factoryNum}),'%')-->
<!-- </if>-->
<if test="fillingStartTime != null ">
and #{fillingStartTime} <![CDATA[ <= ]]>
r.filling_startTime
......@@ -112,24 +78,6 @@
and r.filling_endTime <![CDATA[ <= ]]>
#{fillingEndTime}
</if>
<!-- <if test="cylinderVariety != null and cylinderVariety != ''">-->
<!-- AND i.cylinder_variety = #{cylinderVariety}-->
<!-- </if>-->
<!-- <if test="qrCode != null and qrCode != ''">-->
<!-- AND i.qrCode like CONCAT(CONCAT('%',#{qrCode}),'%')-->
<!-- </if>-->
<!-- <if test="electronicLabelCode != null and electronicLabelCode != ''">-->
<!-- AND i.electronic_label_code like-->
<!-- CONCAT(CONCAT('%',#{electronicLabelCode}),'%')-->
<!-- </if>-->
<!-- <if test="sequenceCode != null and sequenceCode != ''">-->
<!-- AND r.sequence_code like-->
<!-- CONCAT(CONCAT('%',#{sequenceCode}),'%')-->
<!-- </if>-->
<!-- <if test="unitInnerCode != null and unitInnerCode != ''">-->
<!-- AND i.unit_inner_code like-->
<!-- CONCAT(CONCAT('%',#{unitInnerCode}),'%')-->
<!-- </if>-->
<if test="sortParam != null and sortParam != '' and sortRule != null and sortRule != '' ">
ORDER BY ${sortParam} ${sortRule}
</if>
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml
View file @ da079069
......@@ -451,8 +451,6 @@
ESTATE_UNIT_NAME,
FACTORY_USE_SITE_STREET,
LONGITUDE_LATITUDE,
-- ifnull(LONGITUDE_LATITUDE :: json->> 'latitude', null) AS latitude,
-- ifnull(LONGITUDE_LATITUDE :: json->> 'longitude', null) AS longitude,
PHONE,
PROVINCE,
PROVINCE_NAME,
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxUjerMaper.xml
View file @ da079069
......@@ -24,9 +24,6 @@
#{item}
</foreach>
</if>
<!-- <if test="bizType=='yingjian'">-->
<!-- AND b.SEQUENCE_NBR is null-->
<!-- </if>-->
<if test="bizType=='yijian'">
AND b.SEQUENCE_NBR is not null
</if>
......@@ -55,9 +52,6 @@
#{item}
</foreach>
</if>
<!-- <if test="bizType=='yingjian'">-->
<!-- AND b.SEQUENCE_NBR is null-->
<!-- </if>-->
<if test="bizType=='yijian'">
AND b.SEQUENCE_NBR is not null
</if>
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/ScheduleMapper.xml
View file @ da079069
......@@ -44,9 +44,6 @@
ci.longitude,
ci.latitude,
eu.address,
-- eu.custom_name,
-- eu.custom_type,
-- eu.contact_phone,
cu.person_mobile_phone,
cu.unit_person
from
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @ da079069
......@@ -113,11 +113,6 @@
ON t1.unit_code = use_code
</if>
<where>
<!-- <if-->
<!-- test="tzBaseEnterpriseInfoDto.unitType!=null and tzBaseEnterpriseInfoDto.unitType!='' and tzBaseEnterpriseInfoDto.unitType!='使用单位' ">-->
<!-- -->
<!-- AND unit_type LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.unitType},'%')-->
<!-- </if>-->
<if test="unitTypeList != null and !unitTypeList.isEmpty()">
AND (
<foreach collection="unitTypeList" item="item" separator=" OR ">
......
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