Merge remote-tracking branch 'origin/develop_master' into develop_3
# Conflicts: # adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java # adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
This commit is contained in:
zhaokaiyao@91isoft.com
+4
-2
@@ -40,9 +40,11 @@
|
||||
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
|
||||
ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname,
|
||||
ts_institution.name as unit,ts_institution.id as unitId
|
||||
from ts_user
|
||||
WHERE institution_id=#{institutionId}
|
||||
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
|
||||
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>
|
||||
|
||||
@@ -7,4 +7,21 @@
|
||||
INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
|
||||
WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
|
||||
</select>
|
||||
|
||||
<select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
|
||||
SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_user.INSTITUTION_NAME as dept_name,sar_public_idea_all.old_text,
|
||||
sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
|
||||
sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid
|
||||
FROM sar_public_idea_all
|
||||
left join ts_user on sar_public_idea_all.user_id=ts_user.USID
|
||||
WHERE
|
||||
sar_public_idea_all.idea_id = #{ideaId}
|
||||
LIMIT ${(page-1)*size},${page*size}
|
||||
</select>
|
||||
|
||||
<select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
|
||||
SELECT count(id)
|
||||
FROM sar_public_idea_all WHERE
|
||||
idea_id = #{ideaId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
+71
@@ -14,4 +14,75 @@
|
||||
and sar_interpretation_national_standard.STAND_NAME=#{find.standName}
|
||||
and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime}
|
||||
</update>
|
||||
|
||||
<select id="getAllDatas"
|
||||
resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard">
|
||||
|
||||
SELECT c.* FROM (
|
||||
SELECT
|
||||
(@i:=@i+1) as rows,
|
||||
id,
|
||||
INTERPRETATION_TIME,
|
||||
STAND_NUMBER,
|
||||
specific_item,
|
||||
compared_with_previous,
|
||||
CREATION_USER,
|
||||
CREATION_TIME,
|
||||
VALID_FLAG,
|
||||
LAST_VERSION_NUMBER,
|
||||
risk_degree,
|
||||
compliance_state,
|
||||
INTERPRETATION_STATE,
|
||||
STAND_TYPE,
|
||||
MODIFY_TIME,
|
||||
STAND_SORT,
|
||||
STAND_ID,
|
||||
STAND_NAME,
|
||||
core_technical_requirement
|
||||
FROM
|
||||
sar_interpretation_national_standard ,(SELECT @i:=0)j
|
||||
WHERE
|
||||
1=1
|
||||
<if test="interpretationTime!=null ">
|
||||
and INTERPRETATION_TIME = #{interpretationTime}
|
||||
</if>
|
||||
<if test="standId!=null and standId!=''">
|
||||
AND STAND_ID = #{standId}
|
||||
</if>
|
||||
<if test="standNumber!=null and standNumber!=''">
|
||||
AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
|
||||
</if>
|
||||
<if test="standName!=null and standName!=''">
|
||||
AND STAND_NAME like concat(concat('%',#{standName}),'%')
|
||||
</if>
|
||||
<if test="specificItem!=null and specificItem!=''">
|
||||
AND specific_item like concat(concat('%',#{specificItem}),'%')
|
||||
</if>
|
||||
ORDER BY STAND_ID, specific_item
|
||||
LIMIT ${(current-1)*size},${current*size}
|
||||
) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
|
||||
</select>
|
||||
<select id="getAllDatasCout" resultType="java.lang.Integer">
|
||||
SELECT
|
||||
count(id)
|
||||
FROM
|
||||
sar_interpretation_national_standard
|
||||
WHERE
|
||||
1=1
|
||||
<if test="interpretationTime!=null ">
|
||||
and INTERPRETATION_TIME = #{interpretationTime}
|
||||
</if>
|
||||
<if test="standId!=null and standId!=''">
|
||||
AND STAND_ID = #{standId}
|
||||
</if>
|
||||
<if test="standNumber!=null and standNumber!=''">
|
||||
AND STAND_NUMBER like concat(concat('%',#{standNumber}),'%')
|
||||
</if>
|
||||
<if test="standName!=null and standName!=''">
|
||||
AND STAND_NAME like concat(concat('%',#{standName}),'%')
|
||||
</if>
|
||||
<if test="specificItem!=null and specificItem!=''">
|
||||
AND specific_item like concat(concat('%',#{specificItem}),'%')
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
+2
-2
@@ -205,7 +205,7 @@
|
||||
<if test="creationTime != null" >creation_time,</if>
|
||||
<if test="modifyTime != null" >modify_time,</if>
|
||||
<if test="modifyUser != null" >modify_user,</if>
|
||||
|
||||
<if test="editFlag != null" >edit_flag,</if>
|
||||
<if test="fo != null" >fo,</if>
|
||||
<if test="dutyEngineer != null" >duty_engineer,</if>
|
||||
<if test="claimType != null" >claim_type,</if>
|
||||
@@ -233,7 +233,7 @@
|
||||
<if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
|
||||
<if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
|
||||
<if test="modifyUser != null" >#{modifyUser, jdbcType=VARCHAR},</if>
|
||||
|
||||
<if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR}</if>
|
||||
<if test="fo != null" >#{fo, jdbcType=VARCHAR},</if>
|
||||
<if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if>
|
||||
<if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if>
|
||||
|
||||
@@ -3,19 +3,21 @@
|
||||
<mapper namespace="com.adc.da.slrs.wgDept.dao.WgDeptDao">
|
||||
|
||||
<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
|
||||
select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
|
||||
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
|
||||
from wg_dept
|
||||
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
|
||||
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_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
|
||||
select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
|
||||
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
|
||||
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
|
||||
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
|
||||
where wg_work_group.type = #{type}
|
||||
</select>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<mapper namespace="com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao">
|
||||
|
||||
<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
|
||||
select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.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
|
||||
@@ -11,7 +11,7 @@
|
||||
</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
|
||||
select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.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
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
and name like concat('%',#{name},'%')
|
||||
</if>
|
||||
<if test="project_id != null and project_id != ''">
|
||||
and project_id = #{project_id}
|
||||
and project_id = #{projectId}
|
||||
</if>
|
||||
<if test="project_name != null and project_name != ''">
|
||||
and project_name = #{project_name}
|
||||
@@ -111,7 +111,7 @@
|
||||
name = #{name},
|
||||
</if>
|
||||
<if test="project_id != null and project_id != ''">
|
||||
project_id = #{project_id},
|
||||
project_id = #{projectId},
|
||||
</if>
|
||||
<if test="project_name != null and project_name != ''">
|
||||
project_name = #{project_name},
|
||||
@@ -254,7 +254,7 @@
|
||||
#{name},
|
||||
</if>
|
||||
<if test="project_id != null and project_id != ''">
|
||||
#{project_id},
|
||||
#{projectId},
|
||||
</if>
|
||||
<if test="project_name != null and project_name != ''">
|
||||
#{project_name},
|
||||
|
||||
Reference in New Issue
Block a user