|
|
@@ -36,22 +36,22 @@
|
|
|
inner join ZZ_ZZQKXX z on m.partycode=z.dzzdm
|
|
|
inner join ZZ_ZZQKXX dw on SUBSTR(m.partycode,1,12)=dw.DZZDM
|
|
|
inner join (
|
|
|
- select t.meetingId
|
|
|
- , GROUP_CONCAT(shykType order by shykType SEPARATOR ', ') as shykTypes
|
|
|
- , GROUP_CONCAT(dic.DICVALUE order by shykType SEPARATOR ', ') as shykTypeNames
|
|
|
- from SHYK_Meeting_Type t
|
|
|
- inner join cf_dictionary dic on t.shykType = dic.DICKEY and dic.DICTYPEKEY = 'shykType'
|
|
|
- where 1=1
|
|
|
- group by meetingId
|
|
|
+ select t.meetingId
|
|
|
+ , GROUP_CONCAT(shykType order by shykType SEPARATOR ', ') as shykTypes
|
|
|
+ , GROUP_CONCAT(dic.DICVALUE order by shykType SEPARATOR ', ') as shykTypeNames
|
|
|
+ from SHYK_Meeting_Type t
|
|
|
+ inner join cf_dictionary dic on t.shykType = dic.DICKEY and dic.DICTYPEKEY = 'shykType'
|
|
|
+ where 1=1
|
|
|
+ group by meetingId
|
|
|
) st on m.meetingId = st.meetingId
|
|
|
<if test="shykType != null and shykType.size()>0">
|
|
|
inner join (
|
|
|
- select meetingId from SHYK_Meeting_Type where 1=1
|
|
|
- and shykType in
|
|
|
- <foreach collection="shykType" item="shyktype" index="index" open="(" close=")" separator=",">
|
|
|
+ select meetingId from SHYK_Meeting_Type where 1=1
|
|
|
+ and shykType in
|
|
|
+ <foreach collection="shykType" item="shyktype" index="index" open="(" close=")" separator=",">
|
|
|
#{shyktype}
|
|
|
</foreach>
|
|
|
- group by meetingId
|
|
|
+ group by meetingId
|
|
|
) tt on m.meetingId = tt.meetingId
|
|
|
</if>
|
|
|
where 1=1 and m.OPERATESTATE in ('A','M')
|
|
|
@@ -131,30 +131,30 @@
|
|
|
|
|
|
<select id="selectMeetingUserList" resultType="java.util.HashMap">
|
|
|
select mu.MEETINGUSERID, mu.MEETINGID,mu.USERNAME,mu.USERCODE, mu.PARTYNAME,mu.PARTYCODE,
|
|
|
- mu.SIGNINSTATUS,mu.SIGNINUSERCODE,mu.SIGNINUSERNAME,mu.SIGNINTIME,mu.CHECKINSTATUS,
|
|
|
- mu.CHECKINUSERCODE,mu.CHECKINUSERNAME, mu.CHECKINTIME,mu.USERREMARK,mu.APPROVESTATUS, mu.APPROVEOPINION,
|
|
|
- mu.APPROVEUSERCODE,mu.APPROVEUSERNAME,mu.MAKEUUPSTUDY,
|
|
|
- u.XM,u.SFZH,u.JG,p.DZZMC,xb.HZMC as XBMC,mu.USERCODE as RYBM,u.RYJBXXBS,u.SZDZBDM,
|
|
|
- (case when ue.MEETINGUSERID is not null then 1 else 0 end) as ISEVALUATE
|
|
|
+ mu.SIGNINSTATUS,mu.SIGNINUSERCODE,mu.SIGNINUSERNAME,mu.SIGNINTIME,mu.CHECKINSTATUS,
|
|
|
+ mu.CHECKINUSERCODE,mu.CHECKINUSERNAME, mu.CHECKINTIME,mu.USERREMARK,mu.APPROVESTATUS, mu.APPROVEOPINION,
|
|
|
+ mu.APPROVEUSERCODE,mu.APPROVEUSERNAME,mu.MAKEUUPSTUDY,
|
|
|
+ u.XM,u.SFZH,u.JG,p.DZZMC,xb.HZMC as XBMC,mu.USERCODE as RYBM,u.RYJBXXBS,u.SZDZBDM,
|
|
|
+ (case when ue.MEETINGUSERID is not null then 1 else 0 end) as ISEVALUATE
|
|
|
from SHYK_MeetingUser mu
|
|
|
- inner join VM_RYJBXX u on mu.USERCODE = u.RYBM
|
|
|
- inner join ZZ_ZZQKXX p on u.SZDZBDM=p.DZZDM
|
|
|
- left join zd_xbm xb on u.XB=xb.BM -- 性别
|
|
|
- left join SHYK_USEREVALUATE ue on mu.MEETINGUSERID=ue.MEETINGUSERID and ue.OPERATESTATE not in('D')
|
|
|
+ inner join VM_RYJBXX u on mu.USERCODE = u.RYBM
|
|
|
+ inner join ZZ_ZZQKXX p on u.SZDZBDM=p.DZZDM
|
|
|
+ left join zd_xbm xb on u.XB=xb.BM -- 性别
|
|
|
+ left join SHYK_USEREVALUATE ue on mu.MEETINGUSERID=ue.MEETINGUSERID and ue.OPERATESTATE not in('D')
|
|
|
where mu.MEETINGID=#{meetingId}
|
|
|
- and mu.OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and mu.OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
order by mu.PARTYCODE,mu.USERCODE
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectMeetingDemocracyReviewList" resultType="com.ghsc.partybuild.vo.shyk.MeetingDemocracyReviewVo">
|
|
|
select mdr.democracyreviewid ,mdr.meetingid,mdr.usercode,mdr.startdate,mdr.enddate,mdr.democracyreviewresulttype
|
|
|
- ,mdr.createtime,mdr.createuserid,mdr.updatetime,mdr.updateuserid
|
|
|
- ,p.dzzdm as partyCode,p.dzzmc as partyName,us.xm as userName
|
|
|
- ,dic.DICVALUE as democracyReviewResultTypeName
|
|
|
+ ,mdr.createtime,mdr.createuserid,mdr.updatetime,mdr.updateuserid
|
|
|
+ ,p.dzzdm as partyCode,p.dzzmc as partyName,us.xm as userName
|
|
|
+ ,dic.DICVALUE as democracyReviewResultTypeName
|
|
|
from SHYK_Meeting_DemocracyReview mdr
|
|
|
- inner join vm_ryjbxx us on mdr.userCode = us.rybm
|
|
|
- inner join zz_zzqkxx p on us.SZDZBDM = p.dzzdm
|
|
|
- inner join cf_dictionary dic on dic.DICKEY = mdr.democracyreviewresulttype and dic.DICTYPEKEY='DemocracyReviewResultType'
|
|
|
+ inner join vm_ryjbxx us on mdr.userCode = us.rybm
|
|
|
+ inner join zz_zzqkxx p on us.SZDZBDM = p.dzzdm
|
|
|
+ inner join cf_dictionary dic on dic.DICKEY = mdr.democracyreviewresulttype and dic.DICTYPEKEY='DemocracyReviewResultType'
|
|
|
where mdr.meetingId = #{meetingId}
|
|
|
order by p.dzzdm,CONVERT(us.XM USING gbk)
|
|
|
</select>
|
|
|
@@ -162,7 +162,7 @@
|
|
|
<select id="selectMeetingTypeList" resultType="com.ghsc.partybuild.vo.shyk.MeetingTypeVo">
|
|
|
select mt.meetingid,mt.shyktype,dic.DICVALUE as shykTypeName
|
|
|
from SHYK_Meeting_Type mt
|
|
|
- inner join cf_dictionary dic on dic.DICKEY = mt.shykType and dic.DICTYPEKEY='shykType'
|
|
|
+ inner join cf_dictionary dic on dic.DICKEY = mt.shykType and dic.DICTYPEKEY='shykType'
|
|
|
where mt.meetingId = #{meetingId}
|
|
|
order by mt.shykType
|
|
|
</select>
|
|
|
@@ -176,7 +176,7 @@
|
|
|
<!--删除会议成员-->
|
|
|
<update id="deteteMeetingUser" parameterType="java.lang.String">
|
|
|
update SHYK_MeetingUser set OPERATESTATE='D',OPERATETIME=sysdate(),SYNCSTATE='N' where MEETINGID=#{meetingId}
|
|
|
- and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
</update>
|
|
|
|
|
|
<!--删除会议民主评议成员-->
|
|
|
@@ -192,13 +192,13 @@
|
|
|
<!--删除会议议题-->
|
|
|
<update id="deleteMeetingTopic" parameterType="java.lang.String">
|
|
|
update shyk_meetingtopic set OPERATESTATE='D',OPERATETIME=sysdate(),SYNCSTATE='N' where MEETINGID=#{meetingId}
|
|
|
- and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
</update>
|
|
|
|
|
|
<!--删除会议决议-->
|
|
|
<update id="deleteMeetingDecision" parameterType="java.lang.String">
|
|
|
update SHYK_MeetingDecision set OPERATESTATE='D',OPERATETIME=sysdate(),SYNCSTATE='N' where MEETINGID=#{meetingId}
|
|
|
- and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
</update>
|
|
|
|
|
|
<!--删除会议-->
|
|
|
@@ -209,12 +209,12 @@
|
|
|
<!--会议历史地址-->
|
|
|
<select id="selectHistoryAddressList" resultType="java.util.HashMap">
|
|
|
select MEETINGADDRESS from (
|
|
|
- select MEETINGADDRESS,max(CREATETIME) CREATETIME from SHYK_MEETING m
|
|
|
- where 1=1
|
|
|
- and m.OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
- and m.CREATEUSERID=#{userId}
|
|
|
- group by MEETINGADDRESS
|
|
|
- ) meet order by CREATETIME desc
|
|
|
+ select MEETINGADDRESS,max(CREATETIME) CREATETIME from SHYK_MEETING m
|
|
|
+ where 1=1
|
|
|
+ and m.OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and m.CREATEUSERID=#{userId}
|
|
|
+ group by MEETINGADDRESS
|
|
|
+ ) meet order by CREATETIME desc
|
|
|
</select>
|
|
|
|
|
|
<!--统计三会一课-->
|
|
|
@@ -291,7 +291,7 @@
|
|
|
) t1
|
|
|
order by dzzdm,yy,quarter,shyktype,month_order
|
|
|
) t1
|
|
|
- -- piv ot (max(num) for month_order in ('1' as month_first,'2' AS month_second,'3' AS month_third ))
|
|
|
+ -- piv ot (max(num) for month_order in ('1' as month_first,'2' AS month_second,'3' AS month_third ))
|
|
|
order by dzzdm,yy,quarter,shyktype
|
|
|
) t1
|
|
|
where 1=1
|
|
|
@@ -306,27 +306,27 @@
|
|
|
|
|
|
<select id="selectMeetingTotalNew" resultType="java.util.HashMap">
|
|
|
select #{dzzdm} as DZZDM,#{year} as YY,#{quarter} as QUARTER,SHYKTYPE,
|
|
|
- sum(case
|
|
|
- when BEGINTIME >= date_format(#{month1_bt},'%Y-%m-%d') and BEGINTIME <![CDATA[ < ]]> date_format(#{month1_et},'%Y-%m-%d')
|
|
|
- then 1
|
|
|
- else 0 end) as MONTH1,
|
|
|
- sum(case
|
|
|
- when BEGINTIME >= date_format(#{month2_bt},'%Y-%m-%d') and BEGINTIME <![CDATA[ < ]]> date_format(#{month2_bt},'%Y-%m-%d')
|
|
|
- then 1
|
|
|
- else 0 end) as MONTH2,
|
|
|
- sum(case
|
|
|
- when BEGINTIME >= date_format(#{month3_bt},'%Y-%m-%d') and BEGINTIME <![CDATA[ < ]]> date_format(#{month3_bt},'%Y-%m-%d')
|
|
|
- then 1
|
|
|
- else 0 end) as MONTH3,
|
|
|
- count(1) as YEARCOUNT,
|
|
|
- sum(case when QUARTER(BEGINTIME)=1 then 1 else 0 end) as QUARTERCOUNT1,
|
|
|
- sum(case when QUARTER(BEGINTIME)=2 then 1 else 0 end) as QUARTERCOUNT2,
|
|
|
- sum(case when QUARTER(BEGINTIME)=3 then 1 else 0 end) as QUARTERCOUNT3,
|
|
|
- sum(case when QUARTER(BEGINTIME)=4 then 1 else 0 end) as QUARTERCOUNT4
|
|
|
+ sum(case
|
|
|
+ when BEGINTIME >= date_format(#{month1_bt},'%Y-%m-%d') and BEGINTIME <![CDATA[ < ]]> date_format(#{month1_et},'%Y-%m-%d')
|
|
|
+ then 1
|
|
|
+ else 0 end) as MONTH1,
|
|
|
+ sum(case
|
|
|
+ when BEGINTIME >= date_format(#{month2_bt},'%Y-%m-%d') and BEGINTIME <![CDATA[ < ]]> date_format(#{month2_bt},'%Y-%m-%d')
|
|
|
+ then 1
|
|
|
+ else 0 end) as MONTH2,
|
|
|
+ sum(case
|
|
|
+ when BEGINTIME >= date_format(#{month3_bt},'%Y-%m-%d') and BEGINTIME <![CDATA[ < ]]> date_format(#{month3_bt},'%Y-%m-%d')
|
|
|
+ then 1
|
|
|
+ else 0 end) as MONTH3,
|
|
|
+ count(1) as YEARCOUNT,
|
|
|
+ sum(case when QUARTER(BEGINTIME)=1 then 1 else 0 end) as QUARTERCOUNT1,
|
|
|
+ sum(case when QUARTER(BEGINTIME)=2 then 1 else 0 end) as QUARTERCOUNT2,
|
|
|
+ sum(case when QUARTER(BEGINTIME)=3 then 1 else 0 end) as QUARTERCOUNT3,
|
|
|
+ sum(case when QUARTER(BEGINTIME)=4 then 1 else 0 end) as QUARTERCOUNT4
|
|
|
from SHYK_MEETING
|
|
|
where 1=1 and OPERATESTATE not in('D') and SHYKSTATUS not in (2) -- 排除已取消
|
|
|
- and PARTYCODE =#{dzzdm}
|
|
|
- and Extract(year from BEGINTIME)=#{year}
|
|
|
+ and PARTYCODE =#{dzzdm}
|
|
|
+ and Extract(year from BEGINTIME)=#{year}
|
|
|
group by #{dzzdm},SHYKTYPE
|
|
|
order by SHYKTYPE
|
|
|
</select>
|
|
|
@@ -431,7 +431,7 @@
|
|
|
</if>
|
|
|
</if>
|
|
|
<if test="shykType != null">
|
|
|
- and m.SHYKTYPE=#{shykType}
|
|
|
+ and m.SHYKTYPE=#{shykType}
|
|
|
</if>
|
|
|
<if test="meetingName != null and meetingName != ''">
|
|
|
and topic.TOPICNAME like concat('%',#{meetingName},'%')
|
|
|
@@ -457,14 +457,14 @@
|
|
|
<select id="selectMeetingEvaluateProjectList" resultMap="meetingEvaluateProjectMap">
|
|
|
select dic.DICKEY as SHYKEVALUATETYPE,dic.DICVALUE as PROJECTNAME,ue.PROJECTID,ue.USEREVALUATEID,ue.SHYKEVALUATERESULTTYPE,ue.SHYKEVALUATERESULTTYPENAME,ue.RECOMMEND
|
|
|
from (select * from CF_DICTIONARY where DICTYPEKEY='shykEvaluateType') dic
|
|
|
- left join (
|
|
|
+ left join (
|
|
|
select p.SHYKEVALUATETYPE,p.PROJECTID,p.USEREVALUATEID,p.SHYKEVALUATERESULTTYPE,dicResult.DICVALUE as SHYKEVALUATERESULTTYPENAME,p.RECOMMEND
|
|
|
from SHYK_USEREVALUATE ue
|
|
|
- inner join SHYK_USEREVALUATEPROJECT p on p.USEREVALUATEID=ue.USEREVALUATEID
|
|
|
- inner join CF_DICTIONARY dicResult on p.SHYKEVALUATERESULTTYPE=dicResult.DICKEY and dicResult.DICTYPEKEY='shykEvaluateResultType'
|
|
|
+ inner join SHYK_USEREVALUATEPROJECT p on p.USEREVALUATEID=ue.USEREVALUATEID
|
|
|
+ inner join CF_DICTIONARY dicResult on p.SHYKEVALUATERESULTTYPE=dicResult.DICKEY and dicResult.DICTYPEKEY='shykEvaluateResultType'
|
|
|
where ue.OPERATESTATE not in('D') and p.OPERATESTATE not in('D')
|
|
|
- and ue.MEETINGUSERID=#{meetingUserId}
|
|
|
- ) ue on dic.DICKEY=ue.SHYKEVALUATETYPE
|
|
|
+ and ue.MEETINGUSERID=#{meetingUserId}
|
|
|
+ ) ue on dic.DICKEY=ue.SHYKEVALUATETYPE
|
|
|
where 1=1
|
|
|
order by dic.DICKEY
|
|
|
</select>
|
|
|
@@ -473,45 +473,45 @@
|
|
|
<!--删除评分项-->
|
|
|
<update id="deleteMeetingEvaluateProject" parameterType="java.lang.String">
|
|
|
update SHYK_USEREVALUATEPROJECT set OPERATESTATE='D',OPERATETIME=sysdate(),SYNCSTATE='N' where USEREVALUATEID=#{userevaluateId}
|
|
|
- and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
</update>
|
|
|
|
|
|
|
|
|
<select id="selectMeetingPlanTotalList" resultType="java.util.HashMap">
|
|
|
select ztp.SHYKTYPE,
|
|
|
(case ztp.SHYKTYPE
|
|
|
- when 1 then '党员大会'
|
|
|
- when 2 then '支委会'
|
|
|
- when 3 then '党小组会'
|
|
|
- when 4 then '党课'
|
|
|
- else '' end) as shykTypeName,
|
|
|
+ when 1 then '党员大会'
|
|
|
+ when 2 then '支委会'
|
|
|
+ when 3 then '党小组会'
|
|
|
+ when 4 then '党课'
|
|
|
+ else '' end) as shykTypeName,
|
|
|
ztp.DZZDM, ztp.DZZMC, ztp.planType,
|
|
|
(case ztp.PLANTYPE when 1 then '每月一次'
|
|
|
- when 2 then '每季度一次'
|
|
|
- when 3 then '每半年一次'
|
|
|
- when 4 then '每年一次'
|
|
|
- else '' end) as planTypeName,
|
|
|
+ when 2 then '每季度一次'
|
|
|
+ when 3 then '每半年一次'
|
|
|
+ when 4 then '每年一次'
|
|
|
+ else '' end) as planTypeName,
|
|
|
sum(
|
|
|
- case when m.MEETINGID is not null and ztp.PLANTYPE = 1 and date_format(m.BEGINTIME,'%Y') = #{year} and date_format(m.BEGINTIME,'%m') = #{month} then 1 -- 每月一次
|
|
|
- when m.MEETINGID is not null and ztp.PLANTYPE = 2 and date_format(m.BEGINTIME,'%Y') = #{year} and QUARTER(m.BEGINTIME) = #{quarter} then 1 -- 每季度一次
|
|
|
- when m.MEETINGID is not null and ztp.PLANTYPE = 3 and date_format(m.BEGINTIME,'%Y') = #{year} and #{quarter} in(1,2) and QUARTER(m.BEGINTIME) in (1,2) then 1 -- 每半年一次
|
|
|
- when m.MEETINGID is not null and ztp.PLANTYPE = 3 and date_format(m.BEGINTIME,'%Y') = #{year} and #{quarter} in(3,4) and QUARTER(m.BEGINTIME) in (3,4) then 1 -- 每半年一次
|
|
|
- when m.MEETINGID is not null and ztp.PLANTYPE = 4 and date_format(m.BEGINTIME,'%Y') = #{year} then 1
|
|
|
- else 0 end -- 每年一次
|
|
|
+ case when m.MEETINGID is not null and ztp.PLANTYPE = 1 and date_format(m.BEGINTIME,'%Y') = #{year} and date_format(m.BEGINTIME,'%m') = #{month} then 1 -- 每月一次
|
|
|
+ when m.MEETINGID is not null and ztp.PLANTYPE = 2 and date_format(m.BEGINTIME,'%Y') = #{year} and QUARTER(m.BEGINTIME) = #{quarter} then 1 -- 每季度一次
|
|
|
+ when m.MEETINGID is not null and ztp.PLANTYPE = 3 and date_format(m.BEGINTIME,'%Y') = #{year} and #{quarter} in(1,2) and QUARTER(m.BEGINTIME) in (1,2) then 1 -- 每半年一次
|
|
|
+ when m.MEETINGID is not null and ztp.PLANTYPE = 3 and date_format(m.BEGINTIME,'%Y') = #{year} and #{quarter} in(3,4) and QUARTER(m.BEGINTIME) in (3,4) then 1 -- 每半年一次
|
|
|
+ when m.MEETINGID is not null and ztp.PLANTYPE = 4 and date_format(m.BEGINTIME,'%Y') = #{year} then 1
|
|
|
+ else 0 end -- 每年一次
|
|
|
) as planCount
|
|
|
from (
|
|
|
- select t1.SHYKTYPE,
|
|
|
- z.DZZDM,
|
|
|
- z.DZZMC,
|
|
|
- (case t1.SHYKTYPE
|
|
|
- when 1 then pn.PLANTYPE_USER
|
|
|
- when 2 then pn.PLANTYPE_BRANCH
|
|
|
- when 3 then pn.PLANTYPE_GROUP
|
|
|
- when 4 then pn.PLANTYPE_CLASS
|
|
|
- else 99 end) as planType
|
|
|
- from (select level SHYKTYPE from dual connect by 0 + level <![CDATA[ <= 4 ]]>) t1,
|
|
|
- ZZ_ZZQKXX z
|
|
|
- inner join SHYK_PARTYPLAN pn on pn.PARTYCODE = z.DZZDM
|
|
|
+ select t1.SHYKTYPE,
|
|
|
+ z.DZZDM,
|
|
|
+ z.DZZMC,
|
|
|
+ (case t1.SHYKTYPE
|
|
|
+ when 1 then pn.PLANTYPE_USER
|
|
|
+ when 2 then pn.PLANTYPE_BRANCH
|
|
|
+ when 3 then pn.PLANTYPE_GROUP
|
|
|
+ when 4 then pn.PLANTYPE_CLASS
|
|
|
+ else 99 end) as planType
|
|
|
+ from (select level SHYKTYPE from dual connect by 0 + level <![CDATA[ <= 4 ]]>) t1,
|
|
|
+ ZZ_ZZQKXX z
|
|
|
+ inner join SHYK_PARTYPLAN pn on pn.PARTYCODE = z.DZZDM
|
|
|
) ztp
|
|
|
left join SHYK_MEETING m on ztp.DZZDM = m.PARTYCODE and ztp.SHYKTYPE = m.SHYKTYPE and m.OPERATESTATE not in('D') and m.SHYKSTATUS not in (2) -- 排除已取消
|
|
|
where 1=1
|
|
|
@@ -526,40 +526,40 @@
|
|
|
|
|
|
<select id="selectMyMeetingListForApp" resultType="java.util.HashMap">
|
|
|
SELECT m.MEETINGID,
|
|
|
- m.MEETINGNAME,
|
|
|
- m.SHYKTYPE,
|
|
|
- z.DZZMC as PARTYNAME ,
|
|
|
- m.PARTYCODE,
|
|
|
- m.MEETINGADDRESS,
|
|
|
- m.CHAIRUSER,
|
|
|
- m.RECORDUSER,
|
|
|
- m.BEGINTIME,
|
|
|
- m.ENDTIME,
|
|
|
- m.ISTEMP,
|
|
|
- m.SHYKSTATUS,
|
|
|
- m.CREATETIME,
|
|
|
- m.CREATEUSERID,
|
|
|
- m.CREATEUSERNAME,
|
|
|
- m.UPDATETIME,
|
|
|
- m.UPDATEUSERID,
|
|
|
- m.UPDATEUSERNAME,
|
|
|
- m.MEETINGAPPROVESTATUS,
|
|
|
- m.MEETINGAPPROVEUSERNAME,
|
|
|
- dw.DZZMC as DWMC,
|
|
|
- m.DECISIONSTATUS,-- 决议填写状态 0保存中，1已提交
|
|
|
- ISUPLOADIMG, -- 是否上传会议图片 0未上传，1已上传
|
|
|
- MEETINGRECORDSTATE,-- 会议填写状态 0保存中，1已提交
|
|
|
- ROUND((ENDTIME - BEGINTIME) * 24,2) as MEETINGTIME, -- 会议时长（小时）
|
|
|
- (case
|
|
|
- when BEGINTIME > sysdate() then 1 else 2 end ) as STATUS, -- 1会议未开始，2会议已开始
|
|
|
- (sysdate()-ENDTIME) as endLongTime -- 会议结束时长
|
|
|
+ m.MEETINGNAME,
|
|
|
+ m.SHYKTYPE,
|
|
|
+ z.DZZMC as PARTYNAME ,
|
|
|
+ m.PARTYCODE,
|
|
|
+ m.MEETINGADDRESS,
|
|
|
+ m.CHAIRUSER,
|
|
|
+ m.RECORDUSER,
|
|
|
+ m.BEGINTIME,
|
|
|
+ m.ENDTIME,
|
|
|
+ m.ISTEMP,
|
|
|
+ m.SHYKSTATUS,
|
|
|
+ m.CREATETIME,
|
|
|
+ m.CREATEUSERID,
|
|
|
+ m.CREATEUSERNAME,
|
|
|
+ m.UPDATETIME,
|
|
|
+ m.UPDATEUSERID,
|
|
|
+ m.UPDATEUSERNAME,
|
|
|
+ m.MEETINGAPPROVESTATUS,
|
|
|
+ m.MEETINGAPPROVEUSERNAME,
|
|
|
+ dw.DZZMC as DWMC,
|
|
|
+ m.DECISIONSTATUS,-- 决议填写状态 0保存中，1已提交
|
|
|
+ ISUPLOADIMG, -- 是否上传会议图片 0未上传，1已上传
|
|
|
+ MEETINGRECORDSTATE,-- 会议填写状态 0保存中，1已提交
|
|
|
+ ROUND((ENDTIME - BEGINTIME) * 24,2) as MEETINGTIME, -- 会议时长（小时）
|
|
|
+ (case
|
|
|
+ when BEGINTIME > sysdate() then 1 else 2 end ) as STATUS, -- 1会议未开始，2会议已开始
|
|
|
+ (sysdate()-ENDTIME) as endLongTime -- 会议结束时长
|
|
|
FROM SHYK_MEETING m
|
|
|
- inner join ZZ_ZZQKXX z on m.PARTYCODE=z.DZZDM
|
|
|
- inner join ZZ_ZZQKXX dw on SUBSTR(m.PARTYCODE,1,12)=dw.DZZDM
|
|
|
- inner join SHYK_MEETINGUSER us on m.MEETINGID = us.MEETINGID
|
|
|
+ inner join ZZ_ZZQKXX z on m.PARTYCODE=z.DZZDM
|
|
|
+ inner join ZZ_ZZQKXX dw on SUBSTR(m.PARTYCODE,1,12)=dw.DZZDM
|
|
|
+ inner join SHYK_MEETINGUSER us on m.MEETINGID = us.MEETINGID
|
|
|
where 1=1 and m.OPERATESTATE <![CDATA[ <> ]]> 'D' and m.SHYKSTATUS <![CDATA[ <> ]]> 2
|
|
|
- and us.OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
- and us.USERCODE = #{userId}
|
|
|
+ and us.OPERATESTATE <![CDATA[ <> ]]> 'D'
|
|
|
+ and us.USERCODE = #{userId}
|
|
|
order by BEGINTIME desc
|
|
|
</select>
|
|
|
|
|
|
@@ -576,7 +576,7 @@
|
|
|
inner join cf_dictionary dic_target on pt.targetType = dic_target.DICKEY and dic_target.DICTYPEKEY='SHYK_PartyPlan'
|
|
|
order by pt.partyCode,pt.shykType
|
|
|
</select>
|
|
|
-
|
|
|
+
|
|
|
<select id="selectMeetingMonthTotalList" resultType="com.ghsc.partybuild.vo.shyk.MeetingMonthTotalVo">
|
|
|
select m.partyCode,t.shykType,year(m.BEGINTIME) as year,month(m.BEGINTIME) as month,count(1) as count
|
|
|
from SHYK_MEETING m
|
