|
@@ -532,55 +532,32 @@
|
|
|
order by s.update_time desc
|
|
|
</select>
|
|
|
<select id="selectZsyzSbbzbListByZp" resultMap="ZsyzSbbzbResult">
|
|
|
- SELECT * from ( select s.id,
|
|
|
- s.sbdw,
|
|
|
- s.tbrq,
|
|
|
- s.zszxfzr,
|
|
|
- s.xmbh,
|
|
|
- s.xmxsmc,
|
|
|
- s.sfwlhxxxm,
|
|
|
- s.yzdq_id,
|
|
|
- s.yzdq_name,
|
|
|
- s.yzss_name,
|
|
|
- s.ntze,
|
|
|
- s.cylx_id,
|
|
|
- s.cylx_name,
|
|
|
- s.xmlb,
|
|
|
- s.tzlb,
|
|
|
- s.nlhd,
|
|
|
- s.czpt,
|
|
|
- s.tzzt,
|
|
|
- s.xmjz,
|
|
|
- s.gtzzrsfzhm,
|
|
|
- s.qytzrxyzdm,
|
|
|
- s.qybj,
|
|
|
- s.tzfjj,
|
|
|
- s.sndxse,
|
|
|
- s.sndnse,
|
|
|
- s.tzrxm,
|
|
|
- s.tzrzw,
|
|
|
- s.tzrdh,
|
|
|
- s.xmjj,s.xmjzqk,
|
|
|
- s.name,
|
|
|
- s.strq,
|
|
|
- s.phone,
|
|
|
- s.zw,
|
|
|
- s.user_id,
|
|
|
- s.create_by,
|
|
|
- s.type,
|
|
|
- s.progress,
|
|
|
- s.xm_status,
|
|
|
- s.dept_id,
|
|
|
- s.create_time,
|
|
|
- s.update_by,
|
|
|
- s.is_del,
|
|
|
- s.update_time,
|
|
|
- s.remark,
|
|
|
- s.cjd_id,
|
|
|
- s.cjd_name,
|
|
|
- s.is_meet,
|
|
|
- s.meet_remark,s.psnr,s.czwt
|
|
|
+ SELECT * from (
|
|
|
+ select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
|
|
|
+ s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
|
|
|
+ s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
|
|
|
+ s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
|
|
|
+ s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
|
|
|
+ s.is_del, s.update_time, s.remark, s.cjd_id,
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,s.update_time,
|
|
|
+ q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
|
|
|
+ q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
|
|
|
+ q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
|
+ q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by,
|
|
|
+ q.create_time,
|
|
|
+ q.update_by, q.update_time, q.remark,
|
|
|
+ k.id, k.xm_id, k.xmbh, k.xmmc, k.kgrq, k.njgrq, k.sscrq, k.ntcsj, k.rtsj, k.nrtsj, k.kggjrsjh, k.create_by,
|
|
|
+ k.create_time, k.update_by,
|
|
|
+ k.update_time, k.remark,
|
|
|
+ t.id, t.xm_id, t.xmbh, t.xmmc, t.tcrq, t.rgsj, t.nrgsj, t.tcgjrsjh, t.sjdze, t.ydmj, t.tdcr, t.xjcf, t.cftr,
|
|
|
+ t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
|
|
|
+ t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by,
|
|
|
+ t.create_time, t.update_by,
|
|
|
+ t.update_time, t.remark
|
|
|
from zsyz_project_dept d
|
|
|
+ left join zsyz_qyxx q on d.xm_id = q.xm_id
|
|
|
+ left join zsyz_kgxx k on d.xm_id = k.xm_id
|
|
|
+ left join zsyz_tcxx t on d.xm_id = t.xm_id
|
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
|
where s.is_del = 'N'
|
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
|
|
@@ -597,56 +574,32 @@
|
|
|
</if>
|
|
|
|
|
|
UNION
|
|
|
-
|
|
|
- select s.id,
|
|
|
- s.sbdw,
|
|
|
- s.tbrq,
|
|
|
- s.zszxfzr,
|
|
|
- s.xmbh,
|
|
|
- s.xmxsmc,
|
|
|
- s.sfwlhxxxm,
|
|
|
- s.yzdq_id,
|
|
|
- s.yzdq_name,
|
|
|
- s.yzss_name,
|
|
|
- s.ntze,
|
|
|
- s.cylx_id,
|
|
|
- s.cylx_name,
|
|
|
- s.xmlb,
|
|
|
- s.tzlb,
|
|
|
- s.nlhd,
|
|
|
- s.czpt,
|
|
|
- s.tzzt,
|
|
|
- s.xmjz,
|
|
|
- s.gtzzrsfzhm,
|
|
|
- s.qytzrxyzdm,
|
|
|
- s.qybj,
|
|
|
- s.tzfjj,
|
|
|
- s.sndxse,
|
|
|
- s.sndnse,
|
|
|
- s.tzrxm,
|
|
|
- s.tzrzw,
|
|
|
- s.tzrdh,
|
|
|
- s.xmjj,s.xmjzqk,
|
|
|
- s.name,
|
|
|
- s.strq,
|
|
|
- s.phone,
|
|
|
- s.zw,
|
|
|
- s.user_id,
|
|
|
- s.create_by,
|
|
|
- s.type,
|
|
|
- s.progress,
|
|
|
- s.xm_status,
|
|
|
- s.dept_id,
|
|
|
- s.create_time,
|
|
|
- s.update_by,
|
|
|
- s.is_del,
|
|
|
- s.update_time,
|
|
|
- s.remark,
|
|
|
- s.cjd_id,
|
|
|
- s.cjd_name,
|
|
|
- s.is_meet,
|
|
|
- s.meet_remark,s.psnr,s.czwt
|
|
|
+ select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
|
|
|
+ s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
|
|
|
+ s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
|
|
|
+ s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
|
|
|
+ s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
|
|
|
+ s.is_del, s.update_time, s.remark, s.cjd_id,
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,s.update_time,
|
|
|
+ q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
|
|
|
+ q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
|
|
|
+ q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
|
+ q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by,
|
|
|
+ q.create_time,
|
|
|
+ q.update_by, q.update_time, q.remark,
|
|
|
+ k.id, k.xm_id, k.xmbh, k.xmmc, k.kgrq, k.njgrq, k.sscrq, k.ntcsj, k.rtsj, k.nrtsj, k.kggjrsjh, k.create_by,
|
|
|
+ k.create_time, k.update_by,
|
|
|
+ k.update_time, k.remark,
|
|
|
+ t.id, t.xm_id, t.xmbh, t.xmmc, t.tcrq, t.rgsj, t.nrgsj, t.tcgjrsjh, t.sjdze, t.ydmj, t.tdcr, t.xjcf, t.cftr,
|
|
|
+ t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
|
|
|
+ t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by,
|
|
|
+ t.create_time, t.update_by,
|
|
|
+ t.update_time, t.remark
|
|
|
from zsyz_sbbzb s
|
|
|
+ left join zsyz_qyxx q on s.id = q.xm_id
|
|
|
+ left join zsyz_kgxx k on s.id = k.xm_id
|
|
|
+ left join zsyz_tcxx t on s.id = t.xm_id
|
|
|
+ left join zsyz_sbbzb s on s.id = d.xm_id
|
|
|
where s.is_del = 'N'
|
|
|
<if test="deptId != null and deptId != ''">and s.dept_id = #{deptId}</if>
|
|
|
<if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
@@ -876,56 +829,32 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectZsyzSbbzbListYz" resultMap="ZsyzSbbzbResult">
|
|
|
- select s.id,
|
|
|
- s.sbdw,
|
|
|
- s.tbrq,
|
|
|
- s.zszxfzr,
|
|
|
- s.xmbh,
|
|
|
- s.xmxsmc,
|
|
|
- s.sfwlhxxxm,
|
|
|
- s.yzdq_id,
|
|
|
- s.yzdq_name,
|
|
|
- s.yzss_name,
|
|
|
- s.ntze,
|
|
|
- s.cylx_id,
|
|
|
- s.cylx_name,
|
|
|
- s.xmlb,
|
|
|
- s.tzlb,
|
|
|
- s.nlhd,
|
|
|
- s.czpt,
|
|
|
- s.tzzt,
|
|
|
- s.xmjz,
|
|
|
- s.gtzzrsfzhm,
|
|
|
- s.qytzrxyzdm,
|
|
|
- s.qybj,
|
|
|
- s.tzfjj,
|
|
|
- s.sndxse,
|
|
|
- s.sndnse,
|
|
|
- s.tzrxm,
|
|
|
- s.tzrzw,
|
|
|
- s.tzrdh,
|
|
|
- s.xmjj,s.xmjzqk,
|
|
|
- s.name,
|
|
|
- s.strq,
|
|
|
- s.phone,
|
|
|
- s.zw,
|
|
|
- s.user_id,
|
|
|
- s.create_by,
|
|
|
- s.type,
|
|
|
- s.progress,
|
|
|
- s.xm_status,
|
|
|
- s.dept_id,
|
|
|
- s.create_time,
|
|
|
- s.update_by,
|
|
|
- s.is_del,
|
|
|
- s.update_time,
|
|
|
- s.remark,
|
|
|
- s.cjd_id,
|
|
|
- s.cjd_name,
|
|
|
- s.is_meet,
|
|
|
- s.meet_remark,s.psnr,s.czwt
|
|
|
+ select s.id, s.sbdw, s.tbrq, s.zszxfzr, s.xmbh, s.xmxsmc, s.sfwlhxxxm, s.yzdq_id, s.yzdq_name, s.yzss_name,
|
|
|
+ s.ntze, s.cylx_id, s.cylx_name, s.xmlb,
|
|
|
+ s.tzlb, s.nlhd, s.czpt, s.tzzt, s.xmjz, s.gtzzrsfzhm, s.qytzrxyzdm, s.qybj, s.tzfjj, s.sndxse, s.sndnse,
|
|
|
+ s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj,s.xmjzqk, s.name,
|
|
|
+ s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress,s.xm_status, s.dept_id, s.create_time, s.update_by,
|
|
|
+ s.is_del, s.update_time, s.remark, s.cjd_id,
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,s.update_time,
|
|
|
+ q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
|
|
|
+ q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
|
|
|
+ q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
|
+ q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by,
|
|
|
+ q.create_time,
|
|
|
+ q.update_by, q.update_time, q.remark,
|
|
|
+ k.id, k.xm_id, k.xmbh, k.xmmc, k.kgrq, k.njgrq, k.sscrq, k.ntcsj, k.rtsj, k.nrtsj, k.kggjrsjh, k.create_by,
|
|
|
+ k.create_time, k.update_by,
|
|
|
+ k.update_time, k.remark,
|
|
|
+ t.id, t.xm_id, t.xmbh, t.xmmc, t.tcrq, t.rgsj, t.nrgsj, t.tcgjrsjh, t.sjdze, t.ydmj, t.tdcr, t.xjcf, t.cftr,
|
|
|
+ t.sbqd, t.sbfp, t.sbht, t.fkpz, t.zlcf,
|
|
|
+ t.zlcftr, t.zlsbqd, t.zlsbfp, t.zlsbht, t.zlfkpz, t.sjss, t.lxy, t.jnsb, t.zbtr, t.ndsjss, t.qt, t.create_by,
|
|
|
+ t.create_time, t.update_by,
|
|
|
+ t.update_time, t.remark
|
|
|
from zsyz_project_dept d
|
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
|
+ left join zsyz_qyxx q on d.xm_id = q.xm_id
|
|
|
+ left join zsyz_kgxx k on d.xm_id = k.xm_id
|
|
|
+ left join zsyz_tcxx t on d.xm_id = t.xm_id
|
|
|
where s.is_del = 'N'
|
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '3'
|
|
|
<if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|