Merge branch 'develop_master' into develop_1

This commit is contained in:
Mr.Z
2021-08-24 11:05:07 +08:00
11 changed files with 1132 additions and 25 deletions
@@ -1,5 +1,385 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao">
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems" >
<id column="id" property="id" />
<result column="modify_time" property="modifyTime" />
<result column="creation_time" property="creationTime" />
<result column="valid_flag" property="validFlag" />
<result column="remarks" property="remarks" />
<result column="responsible_unit" property="responsibleUnit" />
<result column="energy_kind" property="energyKind" />
<result column="apply_arctic" property="applyArctic" />
<result column="tack_time" property="tackTime" />
<result column="parts" property="parts" />
<result column="items_name" property="itemsName" />
<result column="items_num" property="itemsNum" />
<result column="stand_id" property="standId" />
<result column="MAINPOINTS_IMPEMENTATION" property="mainPointImplementation"/>
<result column="TERMS_CONDITIONS" property="termsConditions"/>
<result column="fo" property="fo" />
<result column="duty_engineer" property="dutyEngineer" />
<result column="svpps" property="svpps" />
<result column="claim_type" property="claimType" />
<result column="bus_stand_cover" property="busStandCover" />
<result column="file_type" property="fileType" />
<result column="claimTypeShow" property="claimTypeShow" />
<result column="dutyEngineerShow" property="dutyEngineerShow" />
<result column="responsibleUnitShow" property="responsibleUnitShow" />
<result column="foShow" property="foShow"/>
</resultMap>
<!-- SAR_BUSS_STAND_ITEMS table all fields -->
<sql id="Base_Column_List" >
SAR_BUSS_STAND_ITEMS.modify_time, SAR_BUSS_STAND_ITEMS.creation_time, SAR_BUSS_STAND_ITEMS.valid_flag, SAR_BUSS_STAND_ITEMS.remarks, responsible_unit, energy_kind, apply_arctic, tack_time, parts, items_name, items_num, SAR_BUSS_STAND_ITEMS.stand_id, SAR_BUSS_STAND_ITEMS.id,SAR_BUSS_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_BUSS_STAND_ITEMS.TERMS_CONDITIONS,
tsFo.UNAME as foShow,SAR_BUSS_STAND_ITEMS.duty_engineer,SAR_BUSS_STAND_ITEMS.svpps,
SAR_BUSS_STAND_ITEMS.claim_type,SAR_BUSS_STAND_ITEMS.bus_stand_cover,SAR_BUSS_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow
</sql>
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_BUSS_STAND_ITEMS.claim_type and dicClaimType.dic_id is
not null and dicClaimType.valid_flag = 0)
left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_BUSS_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0
and tsdutyEngineer.DISABLE_FLAG=0)
left join TS_USER tsFo on (tsFo.USID = SAR_BUSS_STAND_ITEMS.fo and tsFo.valid_flag=0
and tsFo.DISABLE_FLAG=0)
where 1=1
<trim suffixOverrides="," >
<if test="modifyTime != null" >
and modify_time ${modifyTimeOperator} #{modifyTime}
</if>
<if test="modifyTime1 != null" >
and modify_time &gt;= #{modifyTime1}
</if>
<if test="modifyTime2 != null" >
and modify_time &lt;= #{modifyTime2}
</if>
<if test="creationTime != null" >
and creation_time ${creationTimeOperator} #{creationTime}
</if>
<if test="creationTime1 != null" >
and creation_time &gt;= #{creationTime1}
</if>
<if test="creationTime2 != null" >
and creation_time &lt;= #{creationTime2}
</if>
<if test="validFlag != null" >
and SAR_BUSS_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag}
</if>
<if test="remarks != null" >
and remarks ${remarksOperator} #{remarks}
</if>
<if test="responsibleUnit != null" >
and responsible_unit ${responsibleUnitOperator} #{responsibleUnit}
</if>
<if test="energyKind != null" >
and energy_kind ${energyKindOperator} #{energyKind}
</if>
<if test="applyArctic != null" >
and apply_arctic ${applyArcticOperator} #{applyArctic}
</if>
<if test="tackTime != null" >
and tack_time ${tackTimeOperator} #{tackTime}
</if>
<if test="tackTime1 != null" >
and tack_time &gt;= #{tackTime1}
</if>
<if test="tackTime2 != null" >
and tack_time &lt;= #{tackTime2}
</if>
<if test="parts != null" >
and SAR_BUSS_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
</if>
<if test="nameOrRequest != null" >
and (SAR_BUSS_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_BUSS_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
</if>
<if test="itemsName != null" >
and items_name ${itemsNameOperator} #{itemsName}
</if>
<if test="itemsNum != null" >
and items_num ${itemsNumOperator} #{itemsNum}
</if>
<if test="standId != null" >
and SAR_BUSS_STAND_ITEMS.stand_id ${standIdOperator} #{standId}
</if>
<if test="id != null" >
and SAR_BUSS_STAND_ITEMS.id ${idOperator} #{id}
</if>
<if test="idlist != null">
and SAR_BUSS_STAND_ITEMS.id in
<foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="fileType != null" >
and SAR_BUSS_STAND_ITEMS.file_type = #{fileType}
</if>
</trim>
</sql>
<!-- 插入记录 -->
<insert id="insert" parameterType="com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_SAR_BUSS_STAND_ITEMS.NEXTVAL FROM DUAL
</selectKey> -->
insert into SAR_BUSS_STAND_ITEMS(<include refid="Base_Column_List" />)
values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=CLOB}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})
</insert>
<!-- 动态插入记录 主键是序列 -->
<insert id="insertSelective" parameterType="com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_SAR_BUSS_STAND_ITEMS.NEXTVAL FROM DUAL
</selectKey> -->
insert into SAR_BUSS_STAND_ITEMS
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="modifyTime != null" >modify_time,</if>
<if test="creationTime != null" >creation_time,</if>
<if test="validFlag != null" >valid_flag,</if>
<if test="remarks != null" >remarks,</if>
<if test="responsibleUnit != null" >responsible_unit,</if>
<if test="energyKind != null" >energy_kind,</if>
<if test="applyArctic != null" >apply_arctic,</if>
<if test="tackTime != null" >tack_time,</if>
<if test="parts != null" >parts,</if>
<if test="itemsName != null" >items_name,</if>
<if test="itemsNum != null" >items_num,</if>
<if test="standId != null" >stand_id,</if>
<if test="id != null" >id,</if>
<if test="mainPointImplementation != null">MAINPOINTS_IMPEMENTATION,</if>
<if test="termsConditions != null">TERMS_CONDITIONS,</if>
<if test="fo != null" >fo,</if>
<if test="dutyEngineer != null" >duty_engineer,</if>
<if test="svpps != null" >svpps,</if>
<if test="claimType != null" >claim_type,</if>
<if test="busStandCover != null">bus_stand_cover,</if>
<if test="fileType != null">file_type</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
<if test="remarks != null" >#{remarks, jdbcType=CLOB},</if>
<if test="responsibleUnit != null" >#{responsibleUnit, jdbcType=VARCHAR},</if>
<if test="energyKind != null" >#{energyKind, jdbcType=VARCHAR},</if>
<if test="applyArctic != null" >#{applyArctic, jdbcType=VARCHAR},</if>
<if test="tackTime != null" >#{tackTime, jdbcType=TIMESTAMP},</if>
<if test="parts != null" >#{parts, jdbcType=VARCHAR},</if>
<if test="itemsName != null" >#{itemsName, jdbcType=VARCHAR},</if>
<if test="itemsNum != null" >#{itemsNum, jdbcType=VARCHAR},</if>
<if test="standId != null" >#{standId, jdbcType=VARCHAR},</if>
<if test="id != null" >#{id, jdbcType=VARCHAR},</if>
<if test="mainPointImplementation != null">#{mainPointImplementation, jdbcType=VARCHAR},</if>
<if test="termsConditions != null">#{termsConditions, jdbcType=VARCHAR},</if>
<if test="fo != null" >#{fo, jdbcType=VARCHAR},</if>
<if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if>
<if test="svpps != null" >#{svpps, jdbcType=VARCHAR},</if>
<if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if>
<if test="busStandCover != null" >#{busStandCover, jdbcType=VARCHAR},</if>
<if test="fileType != null" >#{fileType, jdbcType=VARCHAR}</if>
</trim>
</insert>
<!-- 根据pk,修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems" >
update SAR_BUSS_STAND_ITEMS
set modify_time = #{modifyTime},
creation_time = #{creationTime},
valid_flag = #{validFlag},
remarks = #{remarks},
responsible_unit = #{responsibleUnit},
energy_kind = #{energyKind},
apply_arctic = #{applyArctic},
tack_time = #{tackTime},
parts = #{parts},
items_name = #{itemsName},
items_num = #{itemsNum},
stand_id = #{standId}
where id = #{id}
</update>
<!-- 修改记录,只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarBussStandItems.page.SarBussStandItemsEOPage" >
update SAR_BUSS_STAND_ITEMS
<set >
<if test="modifyTime != null" >
modify_time = #{modifyTime},
</if>
<if test="creationTime != null" >
creation_time = #{creationTime},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
<if test="remarks != null" >
remarks = #{remarks},
</if>
<if test="responsibleUnit != null" >
responsible_unit = #{responsibleUnit},
</if>
<if test="energyKind != null" >
energy_kind = #{energyKind},
</if>
<if test="applyArctic != null" >
apply_arctic = #{applyArctic},
</if>
<if test="tackTime != null" >
tack_time = #{tackTime},
</if>
<if test="tackTime == null">
tack_time = null,
</if>
<if test="parts != null" >
parts = #{parts},
</if>
<if test="itemsName != null" >
items_name = #{itemsName},
</if>
<if test="itemsNum != null" >
items_num = #{itemsNum},
</if>
<if test="standId != null" >
stand_id = #{standId},
</if>
<if test="mainPointImplementation != null">
MAINPOINTS_IMPEMENTATION = #{mainPointImplementation},
</if>
<if test="termsConditions != null">
TERMS_CONDITIONS = #{termsConditions},
</if>
<if test="fo != null" >
fo = #{fo},
</if>
<if test="dutyEngineer != null" >
duty_engineer = #{dutyEngineer},
</if>
<if test="svpps != null" >
svpps = #{svpps},
</if>
<if test="claimType != null" >
claim_type = #{claimType},
</if>
<if test="busStandCover != null" >
bus_stand_cover = #{busStandCover},
</if>
<if test="fileType != null" >
file_type = #{fileType},
</if>
</set>
where id = #{id}
</update>
<!-- 根据id查询 SAR_BUSS_STAND_ITEMS -->
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List" />
from SAR_BUSS_STAND_ITEMS
where id = #{value}
</select>
<!-- 删除记录 -->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from SAR_BUSS_STAND_ITEMS
where id = #{value}
</delete>
<!-- SAR_BUSS_STAND_ITEMS 列表总数-->
<select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
select count(1) from SAR_BUSS_STAND_ITEMS
<include refid="Base_Where_Clause"/>
</select>
<!-- 查询SAR_BUSS_STAND_ITEMS列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select * from
(select tmp_tb.* from
(select <include refid="Base_Column_List" /> from SAR_BUSS_STAND_ITEMS
<include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select SAR_BUSS_STAND_ITEMS.*,
(
SELECT
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_BUSS_STAND_ITEM_VAL.property_type separator ',')
FROM
SAR_BUSS_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_BUSS_STAND_ITEM_VAL.property_value and TS_DICTYPE.dic_id is not null)
WHERE
SAR_BUSS_STAND_ITEM_VAL.ITEM_ID = SAR_BUSS_STAND_ITEMS.id
AND SAR_BUSS_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC'
) AS applyArcticShow,
(
SELECT
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_BUSS_STAND_ITEM_VAL.property_type separator ',')
FROM
SAR_BUSS_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_BUSS_STAND_ITEM_VAL.property_value and TS_DICTYPE.dic_id is not null)
WHERE
SAR_BUSS_STAND_ITEM_VAL.ITEM_ID = SAR_BUSS_STAND_ITEMS.id
AND SAR_BUSS_STAND_ITEM_VAL.property_type = 'ENERGY_KIND'
) AS energyKindShow,
TS_ORG.ORG_NAME as responsibleUnitShow
from SAR_BUSS_STAND_ITEMS left join TS_ORG on SAR_BUSS_STAND_ITEMS.RESPONSIBLE_UNIT = TS_ORG.ID
<include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
</select>
<select id="querySarBussStandItemsList" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandItems.page.SarBussStandItemsEOPage">
select * from
(select tmp_tb.* from
(
select <include refid="Base_Column_List"/>,
(
SELECT
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_BUSS_STAND_ITEM_VAL.property_type separator ',')
FROM
SAR_BUSS_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_BUSS_STAND_ITEM_VAL.property_value and TS_DICTYPE.dic_id is not null)
WHERE
SAR_BUSS_STAND_ITEM_VAL.ITEM_ID = SAR_BUSS_STAND_ITEMS.id
AND SAR_BUSS_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC'
) AS applyArcticShow,
(
SELECT
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_BUSS_STAND_ITEM_VAL.property_type separator ',')
FROM
SAR_BUSS_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_BUSS_STAND_ITEM_VAL.property_value and TS_DICTYPE.dic_id is not null)
WHERE
SAR_BUSS_STAND_ITEM_VAL.ITEM_ID = SAR_BUSS_STAND_ITEMS.id
AND SAR_BUSS_STAND_ITEM_VAL.property_type = 'ENERGY_KIND'
) AS energyKindShow,
TS_ORG.ORG_NAME as responsibleUnitShow
from SAR_BUSS_STAND_ITEMS left join TS_ORG on SAR_BUSS_STAND_ITEMS.RESPONSIBLE_UNIT = TS_ORG.id
<include refid="Base_Where_Clause"/>
ORDER BY SAR_BUSS_STAND_ITEMS,modify_time,SAR_BUSS_STAND_ITEMS.id
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<select id="querySarBussStandItemsListCount" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussStandItems.page.SarBussStandItemsEOPage">
select count(1) from SAR_BUSS_STAND_ITEMS left join TS_ORG on SAR_BUSS_STAND_ITEMS.RESPONSIBLE_UNIT = TS_ORG.id
<include refid="Base_Where_Clause"/>
</select>
<select id="selectItemByItemNum" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandItems.page.SarBussStandItemsEOPage">
select *
from SAR_BUSS_STAND_ITEMS
where valid_flag = '0' and items_num = #{itemsNum} and stand_id = #{standId} and file_type = #{fileType}
</select>
<delete id="deleteByStandIdAndFileType" parameterType="java.lang.String">
delete from SAR_BUSS_STAND_ITEMS
where stand_id = #{standId}
<if test="fileType != null">
and file_type = #{fileType}
</if>
</delete>
</mapper>