Merge branch 'dev_20231101_TXSS' into 'dev_20230829_change'
Dev 20231101 txss See merge request laws-foton-slrs/foton-slrs-system-rest!136
This commit is contained in:
高嵩
@@ -144,5 +144,118 @@
|
||||
|
||||
</select>
|
||||
|
||||
<select id="getGBStandMenu" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
|
||||
select
|
||||
DISTINCT
|
||||
sms.ID AS menuId,
|
||||
stand.ID as standId
|
||||
from SAR_STAND_MENU AS sm
|
||||
LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID AND stand.VALID_FLAG = '0'
|
||||
LEFT JOIN sar_menu_standard sms on sm.MENU_ID = sms.ID
|
||||
where stand.STAND_TYPE = 'INLAND'
|
||||
AND sms.MENU_NAME IS NOT NULL
|
||||
AND LENGTH(sm.MENU_ID) > 30
|
||||
AND sm.VALID_FLAG = '0'
|
||||
AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
|
||||
group by stand.ID
|
||||
</select>
|
||||
|
||||
<select id="getFBStandMenu" resultType="com.adc.da.slrs.sarStandMenu.entity.SarStandMenu">
|
||||
select
|
||||
DISTINCT
|
||||
sms.ID AS menuId,
|
||||
stand.ID as standId
|
||||
from SAR_STAND_MENU AS sm
|
||||
LEFT JOIN sar_standards_info AS stand ON sm.STAND_ID = stand.ID AND stand.VALID_FLAG = '0'
|
||||
LEFT JOIN sar_menu_standard sms on sm.MENU_ID = sms.ID
|
||||
where stand.STAND_TYPE = 'FOREIGN'
|
||||
AND sms.MENU_NAME IS NOT NULL
|
||||
AND LENGTH(sm.MENU_ID) > 30
|
||||
AND sm.VALID_FLAG = '0'
|
||||
AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
|
||||
group by stand.ID
|
||||
</select>
|
||||
|
||||
<select id="getStandInfoSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
|
||||
SELECT
|
||||
gb.ID AS standId,
|
||||
CONCAT(gb.STAND_SORT, ' ', gb.STAND_NUMBER) AS standNo,
|
||||
gb.STAND_NAME AS standName,
|
||||
gb.STAND_STATE AS standState,
|
||||
gb.ISSUE_TIME AS releaseDate,
|
||||
gb.PUT_TIME AS implementDate,
|
||||
gb.REPLACE_STAND_NUM AS replaceStandardNo,
|
||||
gba.QCDW AS dept,
|
||||
gba.WSSMR AS draftUserName,
|
||||
gb.STAND_TYPE AS dataSource,
|
||||
gb.STAND_SORT AS standSort,
|
||||
CASE
|
||||
WHEN gb.STAND_TYPE = 'INLAND' THEN 1
|
||||
WHEN gb.STAND_TYPE = 'FOREIGN' THEN 2
|
||||
END AS standTypeSort,
|
||||
sms.ID AS menuId
|
||||
FROM
|
||||
`sar_standards_info` AS gb
|
||||
LEFT JOIN `sar_stand_attr_info` AS gba ON gb.ID = gba.STAND_ID
|
||||
LEFT JOIN `sar_stand_menu` AS m ON gb.ID = m.STAND_ID AND LENGTH(m.MENU_ID) > 30
|
||||
LEFT JOIN sar_menu_standard sms on m.MENU_ID = sms.ID
|
||||
WHERE gb.VALID_FLAG = '0'
|
||||
AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
|
||||
<!--国标/外标-->
|
||||
<if test="param.standNo != null and param.standNo != ''">
|
||||
AND gb.STAND_TYPE = #{dataSource}
|
||||
</if>
|
||||
<!--关联的节点IDList-->
|
||||
<if test="param.menuIdList != null and param.menuIdList.size() > 0">
|
||||
AND m.MENU_ID IN
|
||||
<foreach item="item" index="index" collection="param.menuIdList" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<!--标准编号-->
|
||||
<if test="param.standNo != null and param.standNo != ''">
|
||||
AND gb.STAND_NUMBER LIKE CONCAT('%',#{param.standNo},'%')
|
||||
</if>
|
||||
<!--标准名称-->
|
||||
<if test="param.standName != null and param.standName != ''">
|
||||
AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
|
||||
</if>
|
||||
<!--发布时间-->
|
||||
<if test="param.startReleaseDateString != null and param.startReleaseDateString != '' and
|
||||
param.endReleaseDateString != null and param.endReleaseDateString != ''">
|
||||
AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDateString} AND #{param.endReleaseDateString}
|
||||
</if>
|
||||
<!--实施日期-->
|
||||
<if test="param.startImplementDate != null and param.endImplementDate != ''">
|
||||
AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate}
|
||||
</if>
|
||||
<!--代替标准-->
|
||||
<if test="param.replaceStandardNo != null and param.replaceStandardNo != ''">
|
||||
AND gb.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%')
|
||||
</if>
|
||||
<!--编制单位-->
|
||||
<if test="param.dept != null and param.dept != ''">
|
||||
AND gba.QCDW LIKE CONCAT('%',#{param.dept},'%')
|
||||
</if>
|
||||
<!--起草人-->
|
||||
<if test="param.draftUserName != null and param.draftUserName != ''">
|
||||
AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%')
|
||||
</if>
|
||||
<!--搜索条件数据来源-->
|
||||
<if test="param.dataSource != null and param.dataSource != ''">
|
||||
AND gb.STAND_TYPE = #{param.dataSource}
|
||||
</if>
|
||||
<!--SQL复用数据来源-->
|
||||
<if test="dataSource != null and dataSource != ''">
|
||||
AND gb.STAND_TYPE = #{dataSource}
|
||||
</if>
|
||||
<if test="param.selectIdList != null and param.selectIdList.size() > 0">
|
||||
AND gb.ID IN
|
||||
<foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
group by gb.ID
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<?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.roleReplacePosition.mapper.PositionRoleMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="com.adc.da.slrs.roleReplacePosition.domain.PositionRole">
|
||||
<id property="roleId" column="role_id" jdbcType="VARCHAR"/>
|
||||
<id property="positionId" column="position_id" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
role_id,position_id
|
||||
</sql>
|
||||
</mapper>
|
||||
+18
@@ -203,6 +203,24 @@
|
||||
where buss_stand_id = #{bussStandId} and valid_flag=0
|
||||
</select>
|
||||
|
||||
<select id="getESStandMenu" resultType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
|
||||
select
|
||||
DISTINCT
|
||||
sms.ID AS menuId,
|
||||
stand.ID AS bussStandId
|
||||
from sar_buss_stand_menu AS sm
|
||||
LEFT JOIN sar_bussioness_stand AS stand
|
||||
ON sm.BUSS_STAND_ID = stand.ID AND
|
||||
stand.VALID_FLAG = 0
|
||||
LEFT JOIN sar_menu_standard sms on sm.MENU_ID = sms.ID
|
||||
where LENGTH(sm.MENU_ID) > 30
|
||||
AND sms.MENU_NAME IS NOT NULL
|
||||
AND sm.VALID_FLAG = 0
|
||||
AND sm.TREE_TYPE is null
|
||||
AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
|
||||
group by stand.ID
|
||||
</select>
|
||||
|
||||
<delete id="deleteByStandIdAndMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
|
||||
delete from SAR_BUSS_STAND_MENU
|
||||
where buss_stand_id = #{bussStandId, jdbcType=VARCHAR} and MENU_ID = #{menuId, jdbcType=VARCHAR}
|
||||
|
||||
+92
@@ -1267,4 +1267,96 @@
|
||||
where id = #{attfId}
|
||||
</update>
|
||||
|
||||
<select id="getESSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
|
||||
SELECT
|
||||
DISTINCT
|
||||
es.ID AS standId,
|
||||
es.STAND_CODE AS standNo,
|
||||
es.STAND_NAME AS standName,
|
||||
es.TEXT_STATUS_BUSS AS standState,
|
||||
es.ISSUE_TIME AS releaseDate,
|
||||
es.PUT_TIME AS implementDate,
|
||||
es.REPLACE_STAND_NUM AS replaceStandardNo,
|
||||
esa.QCDW AS dept,
|
||||
esa.QCRBUSS AS draftUserName,
|
||||
'ENTERPRISE' AS dataSource,
|
||||
sms.ID AS menuId,
|
||||
3 AS standTypeSort,
|
||||
CASE
|
||||
when es.stand_code like concat('%', 'Q/FT A', '%') THEN 0
|
||||
when es.stand_code like concat('%', 'Q/FT B', '%') THEN 1
|
||||
when es.stand_code like concat('%', 'Q/FT E', '%') THEN 2
|
||||
when es.stand_code like concat('%', 'Q/FT F', '%') THEN 3
|
||||
when es.stand_code like concat('%', 'Q/FT G', '%') THEN 4
|
||||
when es.stand_code like concat('%', 'Q/FT M', '%') THEN 5
|
||||
when es.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
|
||||
when es.stand_code like concat('%', 'Q/FT R', '%') THEN 7
|
||||
when es.stand_code like concat('%', 'Q/FT S', '%') THEN 8
|
||||
when es.stand_code like concat('%', 'Q/FT T', '%') THEN 9
|
||||
when es.stand_code like concat('%', 'Q/FT V', '%') THEN 10
|
||||
when es.stand_code like concat('%', 'Q/FT X', '%') THEN 11
|
||||
when es.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
|
||||
when es.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
|
||||
when es.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
|
||||
when es.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
|
||||
when es.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
|
||||
ELSE 17
|
||||
END AS standCategorySort
|
||||
FROM
|
||||
`sar_bussioness_stand` AS es
|
||||
LEFT JOIN `sar_buss_stand_attr_info` AS esa ON es.ID = esa.STAND_ID
|
||||
LEFT JOIN `sar_buss_stand_menu` AS m ON es.ID = m.BUSS_STAND_ID
|
||||
AND LENGTH(m.MENU_ID) > 30
|
||||
AND m.TREE_TYPE is null
|
||||
AND m.VALID_FLAG = 0
|
||||
LEFT JOIN sar_menu_standard sms on m.MENU_ID = sms.ID
|
||||
WHERE 1 = 1
|
||||
AND sms.id in (select id from sar_menu_standard where valid_flag = 0)
|
||||
<!--标准编号-->
|
||||
<if test="param.standNo != null and param.standNo != ''">
|
||||
AND es.STAND_CODE LIKE CONCAT('%',#{param.standNo},'%')
|
||||
</if>
|
||||
<!--关联的节点IDList-->
|
||||
<if test="param.menuIdList != null and param.menuIdList.size() > 0">
|
||||
AND m.MENU_ID IN
|
||||
<foreach item="item" index="index" collection="param.menuIdList" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<!--标准名称-->
|
||||
<if test="param.standName != null and param.standName != ''">
|
||||
AND es.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
|
||||
</if>
|
||||
<!--发布时间-->
|
||||
<if test="param.startReleaseDate != null and param.endReleaseDate != null">
|
||||
AND es.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate}
|
||||
</if>
|
||||
<!--实施日期-->
|
||||
<if test="param.startImplementDate != null and param.endImplementDate != null">
|
||||
AND es.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate}
|
||||
</if>
|
||||
<!--代替标准-->
|
||||
<if test="param.replaceStandardNo != null and param.replaceStandardNo != ''">
|
||||
AND es.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%')
|
||||
</if>
|
||||
<!--编制单位-->
|
||||
<if test="param.dept != null and param.dept != ''">
|
||||
AND esa.QCDW LIKE CONCAT('%',#{param.dept},'%')
|
||||
</if>
|
||||
<!--起草人-->
|
||||
<if test="param.draftUserName != null and param.draftUserName != ''">
|
||||
AND esa.QCRBUSS LIKE CONCAT('%',#{param.draftUserName},'%')
|
||||
</if>
|
||||
<!--数据来源-->
|
||||
<if test="param.dataSource != null and param.dataSource != ''">
|
||||
AND 'ENTERPRISE' = #{param.dataSource}
|
||||
</if>
|
||||
<if test="param.selectIdList != null and param.selectIdList.size() > 0">
|
||||
AND es.ID IN
|
||||
<foreach item="item" index="index" collection="param.selectIdList" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
group by es.ID
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<?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.roleReplacePosition.mapper.UserPositionMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="com.adc.da.slrs.roleReplacePosition.domain.UserPosition">
|
||||
<result property="userId" column="user_id" jdbcType="VARCHAR"/>
|
||||
<result property="positionId" column="position_id" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
user_id,position_id
|
||||
</sql>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user