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_master' into develop_master

Browse Source
This commit is contained in:
庄新伟
2022-03-14 09:30:10 +08:00
parent bae566fd1f 0d4bc28382
commit af846f74e0
19 changed files with 634 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+19
View File
@@ -116,6 +116,15 @@
<if test="qu.projectEndDate != null">
AND library.project_end_date &lt;= #{qu.projectEndDate}
</if>
<if test="qu.managementHostName != null">
AND library.management_host_name LIKE concat(concat('%',#{qu.managementHostName}),'%')
</if>
<if test="qu.developmentHostName != null">
AND library.development_host_name LIKE concat(concat('%',#{qu.developmentHostName}),'%')
</if>
<if test="qu.categoryName != null">
AND library.category_name LIKE concat(concat('%',#{qu.categoryName}),'%')
</if>
</if>
</select>
@@ -186,6 +195,16 @@
<if test="qu.projectEndDate != null">
AND library.project_end_date &lt;= #{qu.projectEndDate}
</if>
<if test="qu.managementHostName != null">
AND library.management_host_name LIKE concat(concat('%',#{qu.managementHostName}),'%')
</if>
<if test="qu.developmentHostName != null">
AND library.development_host_name LIKE concat(concat('%',#{qu.developmentHostName}),'%')
</if>
<if test="qu.categoryName != null">
AND library.category_name LIKE concat(concat('%',#{qu.categoryName}),'%')
</if>
</if>
limit ${(page-1)*size},${size}
adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitMenuEOMapper.xml
+36 -7
View File
@@ -310,28 +310,57 @@
) t3 WHERE ischild != '0'
</select>
<!--<select id="getChildrenCountByParentId" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">-->
<!--SELECT count(*) FROM-->
<!--SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id-->
<!--</select>-->
<select id="getChildrenCountByParentId" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
SELECT count(*) FROM
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id
SAR_FILE_SPLIT_MENU ,(SELECT getSplitChildList(#{id}) childListStr) t WHERE FIND_IN_SET(ID,childListStr)
</select>
<!--<update id="updateChildrenDisplaySeqByIDAdd" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO" >-->
<!--update SAR_FILE_SPLIT_MENU-->
<!--set display_seq = display_seq + #{childrenCount},-->
<!--modify_time = #{modifyTime},-->
<!--modify_user = #{modifyUser}-->
<!--where id in ( SELECT id FROM-->
<!--SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id)-->
<!--</update>-->
<update id="updateChildrenDisplaySeqByIDAdd" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO" >
update SAR_FILE_SPLIT_MENU
set display_seq = display_seq + #{childrenCount},
modify_time = #{modifyTime},
modify_user = #{modifyUser}
where id in ( SELECT id FROM
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id)
</update>
where id in (SELECT id
FROM SAR_FILE_SPLIT_MENU,
(SELECT getSplitChildList(#{id}) childListStr) t
WHERE FIND_IN_SET(ID, childListStr)
)
</update>
<!--<update id="updateChildrenDisplaySeqByIDCut" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO" >-->
<!--update SAR_FILE_SPLIT_MENU-->
<!--set display_seq = display_seq - #{childrenCount},-->
<!--modify_time = #{modifyTime},-->
<!--modify_user = #{modifyUser}-->
<!--where id in ( SELECT id FROM-->
<!--SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id)-->
<!--</update>-->
<update id="updateChildrenDisplaySeqByIDCut" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO" >
update SAR_FILE_SPLIT_MENU
set display_seq = display_seq - #{childrenCount},
modify_time = #{modifyTime},
modify_user = #{modifyUser}
where id in ( SELECT id FROM
SAR_FILE_SPLIT_MENU START WITH id = #{id} CONNECT BY PRIOR id = p_id)
</update>
where id in (SELECT id
FROM SAR_FILE_SPLIT_MENU,
(SELECT getSplitChildList(#{id}) childListStr) t
WHERE FIND_IN_SET(ID, childListStr)
)
</update>
<!--oracle 写法-->
<!--<select id="queryAllChildrenByid" resultMap="BaseResultMap" parameterType="com.adc.da.lawss.entity.SarFileSplitMenuEO">-->
adc-da-slrs/src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<mapper namespace="com.adc.da.slrs.sysLog.dao.SysLogDao">
<select id="queryAllLog" parameterType="com.adc.da.slrs.sysLog.vo.SysLogReqDTO" resultType="com.adc.da.slrs.sysLog.entity.SysLog">
select ts_user.account,ts_institution.name dept,sys_log.oper_time,sys_log.oper,sys_log.special from sys_log
select ts_user.account,ts_user.UNAME as accountName,ts_institution.name dept,sys_log.oper_time,sys_log.oper,sys_log.special from sys_log
left join ts_user on sys_log.user_id = ts_user.usid
left join ts_institution on ts_user.institution_id = ts_institution.id
WHERE 1=1
adc-da-slrs/src/main/resources/mybatis/mapper/wgCommittee/WgCommitteeMapper.xml
+69
View File
@@ -0,0 +1,69 @@
<?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.wgCommittee.dao.WgCommitteeDao">
<select id="getData" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
wg_committee.committeer ,
(
SELECT GROUP_CONCAT(t3.UNAME) FROM wg_committee_user
LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
WHERE wg_committee_user.id = wg_committee.committeer
) as committor,
(
SELECT GROUP_CONCAT(t3.USID) FROM wg_committee_user
LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
WHERE wg_committee_user.id = wg_committee.committeer
) as committorId
from wg_committee
LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
where 1=1
<if test="committeeName != null and ''!=committeeName">
and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
</if>
limit ${(page-1)*pageSize},${pageSize}
</select>
<select id="getDataCount" resultType="java.lang.Integer">
SELECT count(wg_committee.id)
from wg_committee
LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
where 1=1
<if test="committeeName != null and ''!=committeeName">
and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
</if>
</select>
<select id="getDataWk" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
t3.UNAME as committor,t3.USID as committorId,wg_committee.committeer ,
from wg_committee
LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
LEFT JOIN wg_committee_user on wg_committee_user.id = wg_committee.committeer
LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
where 1=1
<if test="committeeName != null and ''!=committeeName">
and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
</if>
limit ${(page-1)*pageSize},${pageSize}
</select>
<select id="getDataCountWk" resultType="java.lang.Integer">
SELECT count(wg_committee.id)
from wg_committee
LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
LEFT JOIN wg_committee_user on wg_committee_user.id = wg_committee.committeer
LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
where 1=1
<if test="committeeName != null and ''!=committeeName">
and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
</if>
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgCommitteeUser/WgCommitteeUserMapper.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.wgCommitteeUser.dao.WgCommitteeUserDao">
</mapper>