FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_1' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-08-13 09:06:16 +08:00
parent 9f0ed13874 bfc9995aad
commit 3327223c25
11 changed files with 459 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+36 -36
View File
@@ -73,17 +73,17 @@
<!-- SAR_STAND_ITEMS table all fields -->
<sql id="Base_Column_List">
SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps,
SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo
</sql>
</sql>
<sql id="Base_Query_Column_List">
SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit,
SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit,
SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps,
SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,SAR_STAND_ITEMS.fo
</sql>
</sql>
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
@@ -194,11 +194,11 @@
<!-- 插入记录 -->
<!--<insert id="insert" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" >-->
<!--&lt;!&ndash; <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">-->
<!--SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL-->
<!--</selectKey> &ndash;&gt;-->
<!--insert into SAR_STAND_ITEMS(<include refid="Base_Column_List" />)-->
<!--values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{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})-->
<!--&lt;!&ndash; <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">-->
<!--SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL-->
<!--</selectKey> &ndash;&gt;-->
<!--insert into SAR_STAND_ITEMS(<include refid="Base_Column_List" />)-->
<!--values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{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>-->
<!-- 动态插入记录 主键是序列 -->
@@ -262,22 +262,22 @@
<!-- 根据pk，修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
update SAR_STAND_ITEMS
set modify_time = #{modifyTime},
creation_time = #{creationTime},
creation_user = #{creationUser},
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 SAR_STAND_ITEMS
set modify_time = #{modifyTime},
creation_time = #{creationTime},
creation_user = #{creationUser},
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.sarStandItems.entity.SarStandItems">
@@ -362,10 +362,10 @@
<!-- 删除记录 -->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from SAR_STAND_ITEMS
where id = #{value}
delete from SAR_STAND_ITEMS
where id = #{value}
</delete>
</delete>
<!-- SAR_STAND_ITEMS 列表总数-->
<select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
@@ -375,10 +375,10 @@
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
SELECT
*
FROM
sar_stand_items AS a
SELECT
*
FROM
sar_stand_items AS a
<where>
<if test="standId!=null and standId!=''">
@@ -386,7 +386,7 @@
</if>
<if test="fileType !=null and fileType!=''">
and a.file_type=#{fileType}
and a.file_type=#{fileType}
</if>
<if test="itemsName != null and itemsName!=''">
@@ -741,10 +741,10 @@
a.STAND_ID
FROM
sar_stand_items a
LEFT JOIN sar_standards_info b
on a.STAND_ID=b.ID
LEFT JOIN sar_standards_info b
on a.STAND_ID=b.ID
WHERE b.VALID_FLAG = 0
and a.FILE_TYPE ='FBGBJBD'
and a.FILE_TYPE ='FBGBJBD'
GROUP BY
a.STAND_ID
limit #{page},#{size}