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

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request !52
This commit is contained in:
super_liu
2021-07-25 12:50:49 +00:00
parent f5ceeebbf6 8a1c2b39c3
commit c608e52226
42 changed files with 1623 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/SarBussStandItemVal/SarBussStandItemValMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.SarBussStandItemVal.dao.SarBussStandItemValDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandFile/SarBussStandFileMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.sarBussStandFile.dao.SarBussStandFileDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandItems/SarBussStandItemsMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandMenu/SarBussStandMenuMapper.xml
+204
View File
@@ -0,0 +1,204 @@
<?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.sarBussStandMenu.dao.SarBussStandMenuDao">
<!-- Result Map-->
<resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
<id column="id" property="id" />
<result column="menu_id" property="menuId" />
<result column="buss_stand_id" property="bussStandId" />
<result column="valid_flag" property="validFlag" />
</resultMap>
<!-- SAR_BUSS_STAND_MENU table all fields -->
<sql id="Base_Column_List" >
menu_id, buss_stand_id, id, valid_flag
</sql>
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
where 1=1
<trim suffixOverrides="," >
<if test="menuId != null" >
and menu_id = #{menuId}
</if>
<if test="bussStandId != null" >
and buss_stand_id = #{bussStandId}
</if>
<if test="id != null" >
and id = #{id}
</if>
<if test="validFlag != null" >
and valid_flag = #{validFlag}
</if>
</trim>
</sql>
<!-- 插入记录 -->
<insert id="insert" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_SAR_BUSS_STAND_MENU.NEXTVAL FROM DUAL
</selectKey> -->
insert into SAR_BUSS_STAND_MENU(<include refid="Base_Column_List" />)
values (#{menuId, jdbcType=VARCHAR}, #{bussStandId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER})
</insert>
<!-- 动态插入记录 主键是序列 -->
<insert id="insertSelective" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
SELECT SEQ_SAR_BUSS_STAND_MENU.NEXTVAL FROM DUAL
</selectKey> -->
insert into SAR_BUSS_STAND_MENU
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="menuId != null" >menu_id,</if>
<if test="bussStandId != null" >buss_stand_id,</if>
<if test="id != null" >id,</if>
<if test="validFlag != null" >valid_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="menuId != null" >#{menuId, jdbcType=VARCHAR},</if>
<if test="bussStandId != null" >#{bussStandId, jdbcType=VARCHAR},</if>
<if test="id != null" >#{id, jdbcType=VARCHAR},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
</trim>
</insert>
<!-- 根据pk，修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
update SAR_BUSS_STAND_MENU
set menu_id = #{menuId},
buss_stand_id = #{bussStandId},
valid_flag = #{validFlag}
where id = #{id}
</update>
<!-- 修改记录，只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
update SAR_BUSS_STAND_MENU
<set >
<if test="menuId != null" >
menu_id = #{menuId},
</if>
<if test="bussStandId != null" >
buss_stand_id = #{bussStandId},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
</set>
where id = #{id}
</update>
<update id="updateMenuidByMenuid" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.NewmenuOldmenuVO" >
update SAR_BUSS_STAND_MENU
set menu_id = #{newMenuid}
where menu_id = #{oldMenuid}
</update>
<update id="updateByStandIDSelective" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
update SAR_BUSS_STAND_MENU
<set >
<if test="menuId != null" >
menu_id = #{menuId},
</if>
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
</set>
where buss_stand_id = #{bussStandId}
</update>
<!-- 根据id查询 SAR_BUSS_STAND_MENU -->
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List" />
from SAR_BUSS_STAND_MENU
where id = #{value}
</select>
<!-- 删除记录 -->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from SAR_BUSS_STAND_MENU
where id = #{value}
</delete>
<!-- SAR_BUSS_STAND_MENU 列表总数-->
<select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
select count(1) from SAR_BUSS_STAND_MENU
<include refid="Base_Where_Clause"/>
</select>
<!-- 查询SAR_BUSS_STAND_MENU列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List" /> from
(select tmp_tb.* from
(select <include refid="Base_Column_List" /> from SAR_BUSS_STAND_MENU
<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 <include refid="Base_Column_List"/> from SAR_BUSS_STAND_MENU
<include refid="Base_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
</select>
<select id="selectByMenuId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
select <include refid="Base_Column_List"/> from SAR_BUSS_STAND_MENU
<include refid="Base_Where_Clause"/>
</select>
<delete id="deleteByStandId" parameterType="java.lang.String">
delete from SAR_BUSS_STAND_MENU
where buss_stand_id = #{bussStandId}
</delete>
<select id="selectMenuByMenuParentId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
select <include refid="Base_Column_List"/> from SAR_BUSS_STAND_MENU
where buss_stand_id = #{bussStandId} and valid_flag=0
and MENU_ID in
<foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<update id="updateByStandIdAndMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu" >
update SAR_BUSS_STAND_MENU
<set >
<if test="menuId != null" >
menu_id = #{menuId},
</if>
</set>
where buss_stand_id = #{bussStandId}
and MENU_ID in
<foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<delete id="deleteByMenuId" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
delete from SAR_BUSS_STAND_MENU
where buss_stand_id = #{bussStandId}
and MENU_ID in
<foreach collection="menuIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<select id="selectAllMenuByStandId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu">
select <include refid="Base_Column_List" />
from SAR_BUSS_STAND_MENU
where buss_stand_id = #{bussStandId} and valid_flag=0
</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}
</delete>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandPlan/SarBussStandPlanMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.sarBussStandPlan.dao.SarBussStandPlanDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandVal/SarBussStandValMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?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.sarBussStandVal.dao.SarBussStandValDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+15 -15
View File
@@ -357,7 +357,7 @@
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0)
where 1=1
<trim suffixOverrides="," >
@@ -406,14 +406,14 @@
</foreach>
</if>
<!-- 游离态标准查询 -->
<if test="menuId != null and menuId =='nomenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU 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 SAR_MENU.id FROM SAR_MENU START WITH id =(
SELECT SAR_MENU.id FROM SAR_MENU 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
@@ -466,7 +466,7 @@
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
where 1=1
<trim suffixOverrides="," >
<!-- 基本搜索项 -->
@@ -496,7 +496,7 @@
<if test="menuId != null and menuId !='nomenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID in (
select a.* from (
select SAR_MENU.id from SAR_MENU,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id
select TS_RESOURCE.id from TS_RESOURCE,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id
)a,TS_ROLE_SAR_MENU
where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in
<foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
@@ -507,14 +507,14 @@
</if>
<!-- 游离态标准查询 -->
<if test="menuId != null and menuId =='nomenu'" >
and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0)
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 SAR_BUSS_STAND_MENU.MENU_ID in (
select a.* from (
SELECT SAR_MENU.id FROM SAR_MENU START WITH id =(
SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0) connect by prior id= parent_id
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
)a,TS_ROLE_SAR_MENU
where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in
<foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
@@ -549,7 +549,7 @@
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
where 1=1
<trim suffixOverrides="," >
<!-- 基本搜索项 -->
@@ -662,7 +662,7 @@
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id
left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
where SAR_BUSSIONESS_STAND.id = #{id}
</select>