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_1

Browse Source
This commit is contained in:
yanyizhou
2021-11-15 09:42:11 +08:00
parent bab1543ee3 262f1b198d
commit eac377a77c
139 changed files with 4744 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml
+77
View File
@@ -0,0 +1,77 @@
<?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.sapMeetInfo.dao.SapMeetingDao">
<sql id="BaseSelect">
id,title,date,content,type,attend,files
</sql>
<sql id="Search">
type = #{type}
</sql>
<insert id="insertMeeting" parameterType="com.adc.da.slrs.sapMeetInfo.entity.SapMeeting">
insert into sap_meeting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="title != null">title,</if>
<if test="date != null">date,</if>
<if test="content != null">content,</if>
<if test="type != null">type,</if>
<if test="attend != null">attend,</if>
<if test="files != null">files,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="title != null">#{title},</if>
<if test="date != null">#{date},</if>
<if test="content != null">#{content},</if>
<if test="type != null">#{type},</if>
<if test="attend != null">#{attend},</if>
<if test="files != null">#{files},</if>
</trim>
</insert>
<select id="selectMeetingsByDate" resultType="com.adc.da.slrs.sapMeetInfo.entity.SapMeeting" parameterType="java.util.Map">
select <include refid="BaseSelect"></include>
from sap_meeting
where date_format(date,'%Y%m%d') = date_format(#{date},'%Y%m%d')
and <include refid="Search"></include>
order by date
</select>
<select id="selectMeetingsByMonth" resultType="com.adc.da.slrs.sapMeetInfo.entity.SapMeeting" parameterType="java.util.Date">
select <include refid="BaseSelect"></include>
from sap_meeting
where DATE_FORMAT(date,'%Y-%m')=DATE_FORMAT(#{date},'%Y-%m')
and type = 1
</select>
<select id="selectMeetingsByMonthType" resultType="com.adc.da.slrs.sapMeetInfo.entity.SapMeeting" parameterType="java.util.Map">
select <include refid="BaseSelect"></include>
from sap_meeting
where DATE_FORMAT(date,'%Y-%m')=DATE_FORMAT(#{date},'%Y-%m')
and <include refid="Search"></include>
</select>
<select id="selectMeetingById" resultType="com.adc.da.slrs.sapMeetInfo.entity.SapMeeting" parameterType="java.lang.String">
select <include refid="BaseSelect"></include>
from sap_meeting
where id = #{id}
and <include refid="Search"></include>
</select>
<delete id="deleteById">
</delete>
<delete id="deleteByDate">
</delete>
<update id="updateMeeting">
</update>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+49 -45
View File
@@ -54,7 +54,7 @@
<sql id="Group_Column_List_show" >
stand_status, replaced_stand_num, replace_stand_num,put_time,
issue_time, stand_en_name, stand_name, stand_code,
issue_time, stand_en_name, stand_name, stand_code,standStatusShow,
SAR_BUSSIONESS_STAND.id
</sql>
@@ -350,48 +350,51 @@
<!-- 分页查询条件 -->
<sql id="standSort_in">
ORDER BY
CASE tmp_tb.stand_sort
when 'Q/FT A' THEN 0
when 'Q/FT B' THEN 1
when 'Q/FT E' THEN 2
when 'Q/FT F' THEN 3
when 'Q/FT G' THEN 4
when 'Q/FT M' THEN 5
when 'Q/FT Q' THEN 6
when 'Q/FT R' THEN 7
when 'Q/FT S' THEN 8
when 'Q/FT T' THEN 9
when 'Q/FT V' THEN 10
when 'Q/FT X' THEN 11
when 'Q/FT Y' THEN 12
when 'Q/FT Z' THEN 13
when 'Q/QCBFC' THEN 14
when '雷萨企标Q/FL' THEN 15
when 'Q/QCFLC' THEN 16
<if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
${orderByA} ${order1},
</if>
CASE
when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0
when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2
when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3
when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4
when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5
when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7
when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8
when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9
when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10
when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11
when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
ELSE 17
END,
tmp_tb.stand_sort ASC
</sql>
<sql id="standSort_out">
ORDER BY
CASE tmp_tb.stand_sort
when 'Q/FT A' THEN 0
when 'Q/FT B' THEN 1
when 'Q/FT E' THEN 2
when 'Q/FT F' THEN 3
when 'Q/FT G' THEN 4
when 'Q/FT M' THEN 5
when 'Q/FT Q' THEN 6
when 'Q/FT R' THEN 7
when 'Q/FT S' THEN 8
when 'Q/FT T' THEN 9
when 'Q/FT V' THEN 10
when 'Q/FT X' THEN 11
when 'Q/FT Y' THEN 12
when 'Q/FT Z' THEN 13
when 'Q/QCBFC' THEN 14
when '雷萨企标Q/FL' THEN 15
when 'Q/QCFLC' THEN 16
CASE
when tmp_tb.stand_code like concat('%', 'Q/FT A', '%') THEN 0
when tmp_tb.stand_code like concat('%', 'Q/FT B', '%') THEN 1
when tmp_tb.stand_code like concat('%', 'Q/FT E', '%') THEN 2
when tmp_tb.stand_code like concat('%', 'Q/FT F', '%') THEN 3
when tmp_tb.stand_code like concat('%', 'Q/FT G', '%') THEN 4
when tmp_tb.stand_code like concat('%', 'Q/FT M', '%') THEN 5
when tmp_tb.stand_code like concat('%', 'Q/FT Q', '%') THEN 6
when tmp_tb.stand_code like concat('%', 'Q/FT R', '%') THEN 7
when tmp_tb.stand_code like concat('%', 'Q/FT S', '%') THEN 8
when tmp_tb.stand_code like concat('%', 'Q/FT T', '%') THEN 9
when tmp_tb.stand_code like concat('%', 'Q/FT V', '%') THEN 10
when tmp_tb.stand_code like concat('%', 'Q/FT X', '%') THEN 11
when tmp_tb.stand_code like concat('%', 'Q/FT Y', '%') THEN 12
when tmp_tb.stand_code like concat('%', 'Q/FT Z', '%') THEN 13
when tmp_tb.stand_code like concat('%', 'Q/QCBFC', '%') THEN 14
when tmp_tb.stand_code like concat('%', '雷萨企标Q/FL', '%') THEN 15
when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16
ELSE 17
END,
tmp_tb.stand_sort ASC,
@@ -401,6 +404,11 @@
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_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)
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = SAR_BUSSIONESS_STAND.text_status_buss
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
where 1=1
<trim suffixOverrides="," >
@@ -624,16 +632,12 @@
<select id="getBussionessStandInfoPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage">
select * from
(select tmp_tb.* from
(select <include refid="Base_Column_List_show" />
(select
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
<include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND
<include refid="SarBussionInfo_Where_Clause"/>
GROUP BY <include refid="Group_Column_List_show"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition}
</if>
<if test="sql != null and sql != ''" >
ORDER BY ${sql}
</if>
GROUP BY standStatusShow,<include refid="Group_Column_List_show"/>
) tmp_tb
<include refid="standSort_in"/>
limit ${pager.startIndex-1},${pageSize}) a
adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+8 -1
View File
@@ -37,8 +37,15 @@
<!-- 只查询这个部门下的子一级人员-->
<select id="selectNextUser" resultMap="TsUser">
select * from ts_user
select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname
from ts_user
WHERE institution_id=#{institutionId}
<if test="userName != null and userName != '' ">
and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') )
</if>
</select>
<select id="selectTreeByIds" resultMap="TsInstitution">
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsFile/SarLawsFileMapper.xml
+7 -7
View File
@@ -7,7 +7,7 @@
<result column="modify_time" property="modifyTime" />
<result column="creation_time" property="creationTime" />
<result column="valid_flag" property="validFlag" />
<result column="use_model" property="useModule" />
<result column="use_model" property="useModel" />
<result column="att_id" property="attId" />
<result column="ori_att_id" property="oriAttId" />
<result column="laws_id" property="lawsId" />
@@ -50,8 +50,8 @@
<if test="validFlag != null" >
and valid_flag ${validFlagOperator} #{validFlag}
</if>
<if test="useModule != null" >
and use_model ${useModuleOperator} #{useModule}
<if test="useModel != null" >
and use_model ${useModuleOperator} #{useModel}
</if>
<if test="attId != null" >
and att_id ${attIdOperator} #{attId}
@@ -74,7 +74,7 @@
<if test="modifyTime != null" >modify_time,</if>
<if test="creationTime != null" >creation_time,</if>
<if test="validFlag != null" >valid_flag,</if>
<if test="useModule != null" >use_model,</if>
<if test="useModel != null" >use_model,</if>
<if test="attId != null" >att_id,</if>
<if test="lawsId != null" >laws_id,</if>
<if test="id != null" >id,</if>
@@ -89,7 +89,7 @@
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
<if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
<if test="useModule != null" >#{useModule, jdbcType=VARCHAR},</if>
<if test="useModel != null" >#{useModel, jdbcType=VARCHAR},</if>
<if test="attId != null" >#{attId, jdbcType=VARCHAR},</if>
<if test="lawsId != null" >#{lawsId, jdbcType=VARCHAR},</if>
<if test="id != null" >#{id, jdbcType=VARCHAR},</if>
@@ -118,8 +118,8 @@
<if test="validFlag != null" >
valid_flag = #{validFlag},
</if>
<if test="useModule != null" >
use_model = #{useModule},
<if test="useModel != null" >
use_model = #{useModel},
</if>
<if test="attId != null" >
att_id = #{attId},
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+50 -33
View File
@@ -79,6 +79,12 @@
<sql id="SarStandardsInfo_in_left">
left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0
<trim suffixOverrides=",">
<!-- 基本搜索项 -->
@@ -175,22 +181,15 @@
and TS_PERSON_COLLECT.user_id=#{userId}
)
</if>
</trim>
</sql>
<sql id="SarStandardsInfo_out_left">
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = a.LAWS_TEXT_STATE
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = a.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
where 1=1
<trim suffixOverrides=",">
<if test="advanceSearchStr != null and advanceSearchStr != ''">
and (${advanceSearchStr})
</if>
</trim>
</sql>
<sql id="SarStandardsInfo_out_left">
</sql>
<sql id="Base_Column_List_Show" >
DISTINCT SAR_LAWS_STAND_INFO.ID,
@@ -234,18 +233,6 @@
<!-- 查询SAR_LAWS_STAND_INFO列表 -->
<select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
select
a.*,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
(
CASE
WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS
END
) AS XCXSSRQLAWS
from
(select tmp_tb.* from
(
SELECT
DISTINCT SAR_LAWS_STAND_INFO.ID,
SAR_LAWS_STAND_INFO.LAWS_TYPE,
@@ -267,19 +254,27 @@
SAR_LAWS_STAND_INFO.LAWS_LABEL,
SAR_LAWS_STAND_INFO.LAWS_REMARK,
SAR_LAWS_STAND_INFO.COUNTRY,
SAR_LAWS_STAND_INFO.MODIFY_TIME
SAR_LAWS_STAND_INFO.MODIFY_TIME,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
(
CASE
WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS
END
) AS XCXSSRQLAWS
from SAR_LAWS_STAND_INFO
<include refid="SarStandardsInfo_in_left"/>
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
<include refid="SarStandardsInfo_out_left"/>
order by
${orderByA} ${order1},a.id
<if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
${orderByA} ${order1},
</if>
SAR_LAWS_STAND_INFO.id
limit ${pager.startIndex-1},${pageSize}
</select>
<select id="getSarStandardsInfoCount" resultType="java.lang.Integer"
parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
select count(1) from (select count(*) from SAR_LAWS_STAND_INFO
left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
<include refid="SarStandardsInfo_in_left"/>
GROUP BY SAR_LAWS_STAND_INFO.id) a
</select>
@@ -287,13 +282,35 @@
<select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
select
a.*,
DISTINCT SAR_LAWS_STAND_INFO.ID,
SAR_LAWS_STAND_INFO.LAWS_TYPE,
SAR_LAWS_STAND_INFO.LAWS_NUMBER,
SAR_LAWS_STAND_INFO.LAWS_NAME,
SAR_LAWS_STAND_INFO.LAWS_EN_NAME,
SAR_LAWS_STAND_INFO.LAWS_NO,
SAR_LAWS_STAND_INFO.ISSUE_TIME,
SAR_LAWS_STAND_INFO.ISSUE_COMPANY,
SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START,
SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END,
SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE,
SAR_LAWS_STAND_INFO.LAWS_SYQY,
SAR_LAWS_STAND_INFO.LAWS_SYCX,
SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS,
SAR_LAWS_STAND_INFO.LAWS_YEAR,
SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM,
SAR_LAWS_STAND_INFO.LAWS_BULLETIN,
SAR_LAWS_STAND_INFO.LAWS_LABEL,
SAR_LAWS_STAND_INFO.LAWS_REMARK,
SAR_LAWS_STAND_INFO.COUNTRY,
SAR_LAWS_STAND_INFO.MODIFY_TIME,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
from (select <include refid="Base_Column_List_Show"/>
from SAR_LAWS_STAND_INFO
<include refid="SarStandardsInfo_in_left"/>) a
<include refid="SarStandardsInfo_out_left"/>
order by a.issue_time is null,a.issue_time desc,a.id
<include refid="SarStandardsInfo_in_left"/>
order by
<if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
${orderByA} ${order1},
</if>
SAR_LAWS_STAND_INFO.id
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+55
View File
@@ -159,6 +159,31 @@
limit ${(page-1)*size},${page*size}
</select>
<select id="selectPagessolostar" resultType="java.lang.String">
SELECT
<if test="type == 'ProjectClassification' ">
distinct library.project_classification
</if>
<if test="type == 'ProjectStatus' ">
distinct library.project_status
</if>
FROM
sar_stand_project_library as library
LEFT JOIN sar_stand_project_team as team
ON team.project_code = library.project_number
WHERE
<if test="flag == 1">
library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
</if>
<if test="flag == 2">
library.id IN ( SELECT project_id FROM sar_stand_project_relation )
</if>
<if test="flag == 4">
1=1
</if>
</select>
<select id="selectPagesWorkFlow"
resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
SELECT
@@ -223,6 +248,36 @@
limit ${(page-1)*size},${page*size}
</select>
<select id="selectPagesWorkFlowsolostar"
resultType="java.lang.String">
SELECT
<if test="type == 'ProjectClassification' ">
distinct library.project_classification
</if>
<if test="type == 'ProjectStatus' ">
distinct library.project_status
</if>
FROM
sar_stand_project_library as library
LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number
WHERE
(
library.id IN (
SELECT DISTINCT
project_id
FROM
sar_stand_project_relation
WHERE
project_id NOT IN (
SELECT DISTINCT
STAND_ID
FROM
sar_stand_items
)
)
)
</select>
<select id="selectCountWorkFlow" resultType="java.lang.Integer">
SELECT
count(
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml
+32
View File
@@ -0,0 +1,32 @@
<?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.sarStandUnqualified.dao.BusinessDeptIssueDao">
<resultMap id="BusinessIssuePage" type="com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue">
<result property="id" column="ID"/>
<result property="lawId" column="law_id"/>
<result property="lawNumber" column="LAWS_NUMBER"/>
<result property="lawName" column="LAWS_NAME"/>
<result property="productType" column="product_type"/>
<result property="implTime" column="impl_time"/>
<result property="implRequire" column="impl_require"/>
<result property="conformSituation" column="conform_situation"/>
<result property="devScheme" column="dev_scheme"/>
<result property="sopTime" column="sop_Time"/>
<result property="completeSituation" column="complete_situation"/>
<result property="timeoutSituation" column="timeout_situation"/>
<result property="responseDept" column="response_dept"/>
<result property="responsePeople" column="response_people"/>
</resultMap>
<select id="findPage" resultMap="BusinessIssuePage">
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
FROM
business_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
${ew.customSqlSegment}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml
+32
View File
@@ -0,0 +1,32 @@
<?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.sarStandUnqualified.dao.ProductDeptIssueDao">
<resultMap id="ProductIssuePage" type="com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue">
<result property="id" column="ID"/>
<result property="lawId" column="law_id"/>
<result property="lawsNumber" column="LAWS_NUMBER"/>
<result property="productBusiness" column="product_business"/>
<result property="platform" column="platform"/>
<result property="pojName" column="poj_name"/>
<result property="pojDescription" column="poj_description"/>
<result property="currentNode" column="current_node"/>
<result property="conceptualState" column="conceptual_state"/>
<result property="scheduledIssuanceTime" column="scheduled_issuance_time"/>
<result property="revisedPlan" column="revised_plan"/>
<result property="explanation" column="explanation"/>
<result property="responseDept" column="response_dept"/>
</resultMap>
<select id="findPage" resultMap="ProductIssuePage">
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
FROM
product_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
${ew.customSqlSegment}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+229 -71
View File
@@ -73,7 +73,28 @@
SAR_STANDARDS_INFO.creation_time,
SAR_STANDARDS_INFO.modify_time,
SAR_STANDARDS_INFO.STAND_SYSTEM,
SAR_STANDARDS_INFO.IS_RELATE_ACCESS
SAR_STANDARDS_INFO.IS_RELATE_ACCESS,
SAR_STAND_ATTR_INFO.CHJL AS CHJL,
dicstandSort.DIC_TYPE_NAME AS standSortShow,
dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
(
CASE
WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01'
ELSE SAR_STAND_ATTR_INFO.SSRQ
END
) AS SSRQ,
(
CASE
WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01'
ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ
END
) AS ZCCSSRQ,
(
CASE
WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01'
ELSE SAR_STAND_ATTR_INFO.XCXSSRQ
END
) AS XCXSSRQ
</sql>
<sql id="Base_Column_List_Show" >
@@ -566,9 +587,12 @@
</sql>
<sql id="standSort_in">
<if test='standType != null and standType == "INLAND"'>
ORDER BY
CASE tmp_tb.stand_sort
ORDER BY
<if test='page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != ""'>
${page.orderByA} ${page.order1},
</if>
<if test='page.standType != null and page.standType == "INLAND"'>
CASE sar_standards_info.stand_sort
when 'GB' THEN 0
when 'GB/T' THEN 1
when 'QC/T' THEN 2
@@ -579,11 +603,10 @@
when 'HJ' THEN 7
ELSE 8
END,
tmp_tb.stand_sort ASC
sar_standards_info.stand_sort ASC,sar_standards_info.id
</if>
<if test='standType != null and standType == "FOREIGN"'>
ORDER BY
CASE tmp_tb.stand_sort
<if test='page.standType != null and page.standType == "FOREIGN"'>
CASE sar_standards_info.stand_sort
when 'ECE' THEN 0
when 'EU' THEN 1
when 'EC' THEN 2
@@ -610,7 +633,7 @@
when 'ADR' THEN 23
ELSE 24
END,
tmp_tb.stand_sort ASC
sar_standards_info.stand_sort ASC,sar_standards_info.id
</if>
</sql>
<sql id="standSort_out">
@@ -659,6 +682,193 @@
a.stand_sort ASC,
</if>
</sql>
<sql id="standSort_out_2">
<if test='page.standType != null and page.standType == "INLAND"'>
CASE a.stand_sort
when 'GB' THEN 0
when 'GB/T' THEN 1
when 'QC/T' THEN 2
when 'JT' THEN 3
when 'JB' THEN 4
when 'GA' THEN 5
when 'GJB' THEN 6
when 'HJ' THEN 7
ELSE 8
END,
a.stand_sort ASC,
</if>
<if test='page.standType != null and page.standType == "FOREIGN"'>
CASE a.stand_sort
when 'ECE' THEN 0
when 'EU' THEN 1
when 'EC' THEN 2
when 'EEC' THEN 3
when 'ISO' THEN 4
when 'IEC' THEN 5
when 'GTR' THEN 6
when 'CFR' THEN 7
when 'JASO' THEN 8
when 'JIS' THEN 9
when 'GSO' THEN 10
when 'GOST' THEN 11
when 'ΓOCT' THEN 12
when 'TP' THEN 13
when 'SASO' THEN 14
when 'UAE' THEN 15
when 'CONTRAN' THEN 16
when 'DENATRAN' THEN 17
when 'ABNT NBR' THEN 18
when 'NBR' THEN 19
when 'INMETRO' THEN 20
when 'CONAMA' THEN 21
when 'Normative Instruction' THEN 22
when 'ADR' THEN 23
ELSE 24
END,
a.stand_sort ASC,
</if>
</sql>
<sql id="SarStandardsInfo_in_left_2">
left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null)
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
<trim suffixOverrides=",">
<!-- 标准分类 国内标准，国外标准 必要搜索项 -->
<if test='page.standType != null and page.standType != "ALL"'>
and stand_type = #{page.standType}
</if>
<!-- 基本搜索项 -->
<!-- 国家、地区 -->
<if test="page.country != null and page.country != ''">
and country = #{page.country}
</if>
<!-- 标准编号111 -->
<if test="page.standNumber != null and page.standNumber != ''">
and (
(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%')
and SAR_STANDARDS_INFO.STAND_YEAR = '')
or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
)
</if>
<!-- 标准名称 -->
<if test="page.standName != null and page.standName != ''">
and stand_name like concat(concat('%',#{page.standName}),'%')
or STAND_NUMBER like concat(concat('%',#{page.standName}),'%')
or STAND_YEAR like concat(concat('%',#{page.standName}),'%')
or STAND_SORT like concat(concat('%',#{page.standName}),'%')
</if>
<if test="page.standEnName != null and page.standEnName != ''">
and stand_en_name like concat(concat('%',#{page.standEnName}),'%')
</if>
<!-- 标准状态 -->
<if test="page.standState != null and page.standState != ''">
and stand_state = #{page.standState}
</if>
<!-- 高级检索项 -->
<!-- 标准性质 -->
<if test="page.standNature != null and page.standNature != ''">
and stand_nature = #{page.standNature}
</if>
<!-- 代替标准 允许输入的时候输入多个-->
<if test="page.replaceStandNum != null and page.replaceStandNum != ''">
and replace_stand_num like concat(concat('%',#{page.replaceStandNum}),'%')
</if>
<!-- 被代替标准 -->
<if test="page.replacedStandNum != null and page.replacedStandNum != ''">
and replaced_stand_num like concat(concat('%',#{page.replacedStandNum}),'%')
</if>
<if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
and is_relate_access = #{page.isRelateAccess}
</if>
<!-- 目录判断 -->
<if test="page.menuId != null and page.menuId !='nomenu' and page.menuAllChildrenIdList != null">
and SAR_STAND_MENU.MENU_ID in
<foreach collection="page.menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 新修改需求，根据角色查询有权限的菜单数据-->
<if test="page.menuRoleList != null">
and SAR_STAND_MENU.MENU_ID in
<foreach collection="page.menuRoleList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- <if test="(menuId == null or menuId =='') and standType =='FOREIGN'">-->
<!-- and SAR_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-->
<!-- ='FOREIGN_STAND') connect by prior id= parent_id-->
<!-- )-->
<!-- </if>-->
<!-- 导出数据过程中，选择的id -->
<if test="page.idlist != null">
and SAR_STANDARDS_INFO.id in
<foreach collection="page.idlist" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="page.standSort != null and page.standSort != ''" >
and SAR_STANDARDS_INFO.stand_sort = #{page.standSort}
</if>
<!--标准年份-->
<if test="page.standYear != null and page.standYear != ''">
and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
</if>
<if test="page.issueTime != null and page.issueTime != ''">
and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{page.issueTime}
</if>
<!--内容摘要-->
<if test="page.synopsis != null and page.synopsis != ''" >
AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
</if>
<!--文本状态-->
<if test="page.textStatus != null and page.textStatus != ''" >
and SAR_STANDARDS_INFO.TEXT_STATUS = #{page.textStatus}
</if>
<!--是否纳入法规清单-->
<if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{page.isRelateAccess}
</if>
<if test="page.collectMenuId != null and page.collectMenuId != ''">
and SAR_STANDARDS_INFO.id in (
select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
and TS_PERSON_COLLECT.user_id=#{page.userId}
)
</if>
<!-- out -->
<if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
and SAR_STAND_ATTR_INFO.GXHBQ is not null
</if>
<if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
</if>
<!--适用车型-->
<if test="page.applyArctic != null and page.applyArctic != ''">
and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
</if>
<if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
and (${page.advanceSearchStr})
</if>
</trim>
</sql>
<sql id="SarStandardsInfo_in_left">
left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
@@ -674,13 +884,9 @@
</if>
<!-- 标准编号111 -->
<if test="standNumber != null and standNumber != ''">
and (
and
(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
and SAR_STANDARDS_INFO.STAND_YEAR = '')
or (stand_name like concat(concat('%',#{standNumber}),'%'))
)
</if>
<!-- 标准名称 -->
<if test="standName != null and standName != ''">
@@ -775,73 +981,22 @@
</trim>
</sql>
<sql id="SarStandardsInfo_out_left">
left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null)
LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
dicstandTextStatus.dic_type_code = a.text_status
AND dicstandTextStatus.dic_id IS NOT NULL
AND dicstandTextStatus.valid_flag = 0
)
left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = a.id and SAR_STAND_ATTR_INFO.valid_flag=0)
where 1=1
<if test='labelMenuId != null and labelMenuId == "gxhbq"'>
and SAR_STAND_ATTR_INFO.GXHBQ is not null
</if>
<if test='labelMenuId != null and labelMenuId != "gxhbq"'>
and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%')
</if>
<!--适用车型-->
<if test="applyArctic != null and applyArctic != ''">
and SAR_STAND_ATTR_INFO.CLLX = #{applyArctic}
</if>
<trim suffixOverrides=",">
<if test="advanceSearchStr != null and advanceSearchStr != ''">
and (${advanceSearchStr})
</if>
</trim>
</sql>
<!-- 分页查询-->
<select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
select
a.*,
SAR_STAND_ATTR_INFO.CHJL AS CHJL,
dicstandSort.DIC_TYPE_NAME AS standSortShow,
dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
(
CASE
WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01'
ELSE SAR_STAND_ATTR_INFO.SSRQ
END
) AS SSRQ,
(
CASE
WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01'
ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ
END
) AS ZCCSSRQ,
(
CASE
WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01'
ELSE SAR_STAND_ATTR_INFO.XCXSSRQ
END
) AS XCXSSRQ
from
(select tmp_tb.* from
(
SELECT
<include refid="Base_Column_List_DIS"/>
from SAR_STANDARDS_INFO
<include refid="SarStandardsInfo_in_left"/>
) tmp_tb
<include refid="SarStandardsInfo_in_left_2"/>
<if test="mark == 999 ">
and sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
</if>
<include refid="standSort_in"/>
limit ${pager.startIndex-1},${pageSize}) a
<include refid="SarStandardsInfo_out_left"/>
order by
<include refid="standSort_out"/>
${orderByA} ${order1},a.id
limit ${page.pager.startIndex-1},${page.pageSize}
</select>
<!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
<!--if(isnull(SAR_STANDARDS_INFO.issue_time),0,1) desc ,-->
@@ -978,6 +1133,9 @@
GROUP BY <include refid="Group_Column_List_Show"/>
) a
order by
<if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
${orderByA} ${order1},
</if>
<include refid="standSort_out"/>
a.issue_time is null
,a.issue_time desc,a.id
adc-da-slrs/src/main/resources/mybatis/mapper/spaMeetInfo/SapAttendeeMapper.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.spaMeetInfo.dao.SapAttendeeDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/spaMeetInfo/SapFilesMapper.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.spaMeetInfo.dao.SapFilesDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/spaMeetInfo/SapMeetingMapper.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.spaMeetInfo.dao.SapMeetingDao">
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
+15 -2
View File
@@ -2,8 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.wgDept.dao.WgDeptDao">
<select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDept">
select * from wg_dept where wg_dept.wg_id =#{data}
<select id="researchDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName
from wg_dept
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
where wg_dept.wg_id =#{data}
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName
from wg_dept
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
left join wg_work_group on wg_work_group.id = wg_dept.wg_id
where wg_work_group.type = #{type}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml
+21 -1
View File
@@ -2,8 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao">
<select id="researchDatas" resultType="com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo">
<resultMap id="WgMeetingInfos" type="com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo">
<id property="id" column="id"/>
<result property="wgId" column="wg_id"/>
<result property="meetingTime" column="meeting_time"/>
<result property="meetingName" column="meeting_name"/>
<result property="meetingReport" column="meeting_report"/>
<result property="joinfile" column="joinfile"/>
<result property="joinId" column="join_id"/>
<association property="joinMeetingPeopleInfo" javaType="java.util.List" column="id"
select="com.adc.da.slrs.wgMeetingUserRelation.dao.WgMeetingUserRelationDao.getMeetingPeoples"/>
</resultMap>
<select id="researchDatas" resultMap="WgMeetingInfos">
select * from wg_meeting_info where wg_meeting_info.wg_id = #{data}
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo">
select * from wg_meeting_info
left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id
where wg_work_group.type = #{type}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml
+21
View File
@@ -0,0 +1,21 @@
<?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.wgMeetingUserRelation.dao.WgMeetingUserRelationDao">
<select id="getMeetingPeoples"
resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation
left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id
where wg_meeting_user_relation.meeting_id = #{meetId}
</select>
<select id="getMeetingAllPeoples"
resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation
left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id
left join wg_meeting_info on wg_meeting_info.id = wg_meeting_user_relation.meeting_id
left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id
where wg_work_group.type = #{type}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
+15 -2
View File
@@ -2,8 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao">
<select id="researchDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfo">
select * from wg_net_info where wg_net_info.wg_id =#{data}
<select id="researchDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
from wg_net_info
left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
where wg_net_info.wg_id =#{data}
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
from wg_net_info
left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
left join wg_work_group on wg_work_group.id = wg_net_info.wg_id
where wg_work_group.type = #{type}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml
+6
View File
@@ -7,4 +7,10 @@
select * from wg_pay_info where wg_pay_info.wg_id = #{data}
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgPayInfo.entity.WgPayInfo">
select * from wg_pay_info
left join wg_work_group on wg_work_group.id=wg_pay_info.wg_id
where wg_work_group.type = #{type}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml
+34 -1
View File
@@ -4,6 +4,39 @@
<select id="researchDatas" resultType="com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo">
select * from wg_standorpolicy_info where wg_standorpolicy_info.wg_id = #{data}
select wg_standorpolicy_info.id , wg_standorpolicy_info.stand_id , wg_work_group.pid as wgId from wg_standorpolicy_info
left join wg_work_group on wg_work_group.id = wg_standorpolicy_info.wg_id
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo">
select wg_standorpolicy_info.id ,wg_standorpolicy_info.wg_id , wg_standorpolicy_info.stand_id
<if test="type == 0 ">
, sar_standards_info.STAND_NAME as name ,sar_standards_info.STAND_TYPE as dataType
</if>
<if test="type == 1 ">
,sar_laws_stand_info.LAWS_NAME as name
</if>
from wg_standorpolicy_info
left join wg_work_group on wg_work_group.id = wg_standorpolicy_info.wg_id
<if test="type == 0">
left join sar_standards_info on sar_standards_info.ID = wg_standorpolicy_info.stand_id
</if>
<if test="type == 1">
left join sar_laws_stand_info on sar_laws_stand_info.ID = wg_standorpolicy_info.stand_id
</if>
where wg_work_group.type = #{type}
</select>
<select id="researchAllDatasPartTwo" resultType="com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo">
select wg_standorpolicy_info.id ,wg_standorpolicy_info.wg_id , wg_standorpolicy_info.stand_id
<if test="type == 0 ">
, sar_bussioness_stand.STAND_NAME as name
</if>
from wg_standorpolicy_info
left join wg_work_group on wg_work_group.id = wg_standorpolicy_info.wg_id
<if test="type == 0">
left join sar_bussioness_stand on sar_bussioness_stand.ID = wg_standorpolicy_info.stand_id
</if>
where wg_work_group.type = #{type}
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml
+16 -12
View File
@@ -14,18 +14,18 @@
<result property="standerArea" column="stander_area"/>
<result property="mark" column="mark"/>
<result property="level" column="level"/>
<association property="wgPayInfos" javaType="java.util.List" column="id"
select="com.adc.da.slrs.wgPayInfo.dao.WgPayInfoDao.researchDatas"/>
<association property="wgStandorpolicyInfos" javaType="java.util.List" column="id"
select="com.adc.da.slrs.wgStandorpolicyInfo.dao.WgStandorpolicyInfoDao.researchDatas"/>
<association property="wgDepts" javaType="java.util.List" column="id"
select="com.adc.da.slrs.wgDept.dao.WgDeptDao.researchDatas"/>
<association property="wgNetInfos" javaType="java.util.List" column="id"
select="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao.researchDatas"/>
<association property="wgMeetingInfos" javaType="java.util.List" column="id"
select="com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao.researchDatas"/>
<association property="children" javaType="java.util.List" column="id"
select="researchDownLevel"/>
<!--<association property="wgPayInfos" javaType="java.util.List" column="id"-->
<!--select="com.adc.da.slrs.wgPayInfo.dao.WgPayInfoDao.researchDatas"/>-->
<!--<association property="wgStandorpolicyInfos" javaType="java.util.List" column="id"-->
<!--select="com.adc.da.slrs.wgStandorpolicyInfo.dao.WgStandorpolicyInfoDao.researchDatas"/>-->
<!--<association property="wgDepts" javaType="java.util.List" column="id"-->
<!--select="com.adc.da.slrs.wgDept.dao.WgDeptDao.researchDatas"/>-->
<!--<association property="wgNetInfos" javaType="java.util.List" column="id"-->
<!--select="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao.researchDatas"/>-->
<!--<association property="wgMeetingInfos" javaType="java.util.List" column="id"-->
<!--select="com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao.researchDatas"/>-->
<!--<association property="children" javaType="java.util.List" column="id"-->
<!--select="researchDownLevel"/>-->
</resultMap>
@@ -45,5 +45,9 @@
select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status}
</select>
<select id="researchAllData" resultMap="WgWorkGroups">
select * from wg_work_group where wg_work_group.type =#{type}
</select>
</mapper>