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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-25 17:52:23 +08:00
parent 11193a3c93 64e8f0ef71
commit dddd3ad6ef
4 changed files with 238 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+7 -7
View File
@@ -568,14 +568,14 @@
</foreach>
</if>
<!-- 游离态标准查询 -->
<!-- <if test="menuId != null and menuId =='nomenu'" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)-->
<!-- </if>-->
<!-- <if test="menuId != null and menuId =='nomenu'" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)-->
<!-- </if>-->
<!-- 当第一次进入页面未选择记录时-->
<!-- <if test="(menuId == null or menuId =='') and menuRoleList == null" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(-->
<!-- SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )-->
<!-- </if>-->
<!-- <if test="(menuId == null or menuId =='') and menuRoleList == null" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(-->
<!-- SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )-->
<!-- </if>-->
<!-- 新修改需求，根据角色查询有权限的菜单数据-->
<if test="menuRoleList != null">
and SAR_BUSS_STAND_MENU.MENU_ID in
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+113 -3
View File
@@ -21,7 +21,9 @@
sar_bussioness_stand_state.MODIFY_TIME,
sar_bussioness_stand_state.VALID_FLAG,
sar_bussioness_stand_state.PARAM1,
sar_bussioness_stand_state.PARAM2
sar_bussioness_stand_state.PARAM2,
sar_buss_stand_attr_info.QCDW As 'QCDW',
sar_buss_stand_attr_info.QCRBUSS AS 'QCRBUSS'
</sql>
<sql id="Base_Column_List_buss" >
DISTINCT sar_bussioness_stand.ID,
@@ -117,6 +119,35 @@
<if test="QCDW != null and QCDW != '' " >
and QCDW like concat(concat('%',#{QCDW}),'%')
</if>
<if test="menuId != null and menuId =='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 and sarMsType != null and sarMsType == 'filterSarMsMenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID IS NULL
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 " >
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 游离态标准查询 -->
<!-- <if test="menuId != null and menuId =='nomenu'" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)-->
<!-- </if>-->
<!-- 当第一次进入页面未选择记录时-->
<!-- <if test="(menuId == null or menuId =='') and menuRoleList == null" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(-->
<!-- SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )-->
<!-- </if>-->
<!-- 新修改需求，根据角色查询有权限的菜单数据-->
<if test="menuRoleList != null">
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
@@ -144,6 +175,38 @@
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="QCDW != null and QCDW != '' " >
and QCDW like concat(concat('%',#{QCDW}),'%')
</if>
<if test="menuId != null and menuId =='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 and sarMsType != null and sarMsType == 'filterSarMsMenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID IS NULL
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 " >
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 游离态标准查询 -->
<!-- <if test="menuId != null and menuId =='nomenu'" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)-->
<!-- </if>-->
<!-- 当第一次进入页面未选择记录时-->
<!-- <if test="(menuId == null or menuId =='') and menuRoleList == null" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(-->
<!-- SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )-->
<!-- </if>-->
<!-- 新修改需求，根据角色查询有权限的菜单数据-->
<if test="menuRoleList != null">
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results">
@@ -170,6 +233,38 @@
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
<if test="QCDW != null and QCDW != '' " >
and QCDW like concat(concat('%',#{QCDW}),'%')
</if>
<if test="menuId != null and menuId =='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 and sarMsType != null and sarMsType == 'filterSarMsMenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID IS NULL
</if>
<!-- 目录判断 -->
<if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null and menuAllChildrenIdList.size()>0 " >
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 游离态标准查询 -->
<!-- <if test="menuId != null and menuId =='nomenu'" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)-->
<!-- </if>-->
<!-- 当第一次进入页面未选择记录时-->
<!-- <if test="(menuId == null or menuId =='') and menuRoleList == null" >-->
<!-- and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT TS_RESOURCE.id FROM TS_RESOURCE START WITH id =(-->
<!-- SELECT TS_RESOURCE.id FROM TS_RESOURCE WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id )-->
<!-- </if>-->
<!-- 新修改需求，根据角色查询有权限的菜单数据-->
<if test="menuRoleList != null">
and SAR_BUSS_STAND_MENU.MENU_ID in
<foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</trim>
</sql>
@@ -254,6 +349,7 @@
sar_buss_stand_attr_info.QCRBUSS
from sar_bussioness_stand
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss"/>
) A
ORDER BY
@@ -276,10 +372,14 @@
SELECT A.* FROM (
select <include refid="Base_Column_List" />
from sar_bussioness_stand_state
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
union
select <include refid="Base_Column_List" />
from sar_bussioness_stand_state
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
ORDER BY
REVIEW_RESULTS ASC,
@@ -291,10 +391,20 @@
<select id="getBussionessStandStateCount" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
select count(1) from (
select id from sar_bussioness_stand_state
SELECT
sar_bussioness_stand_state.id
FROM
sar_bussioness_stand_state
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
union
select id from sar_bussioness_stand_state
SELECT
sar_bussioness_stand_state.id
FROM
sar_bussioness_stand_state
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
LEFT JOIN SAR_BUSS_STAND_MENU ON sar_bussioness_stand_state.stand_id = SAR_BUSS_STAND_MENU.buss_stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results"/>
) a
</select>