|
@@ -56,7 +56,7 @@
|
|
<result property="shjg" column="shjg"/>
|
|
<result property="shjg" column="shjg"/>
|
|
<result property="shsj" column="shsj"/>
|
|
<result property="shsj" column="shsj"/>
|
|
<result property="psnr" column="psnr"/>
|
|
<result property="psnr" column="psnr"/>
|
|
-
|
|
|
|
|
|
+ <result property="czwt" column="czwt"/>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -107,6 +107,7 @@
|
|
<result property="updateBy" column="update_by"/>
|
|
<result property="updateBy" column="update_by"/>
|
|
<result property="updateTime" column="update_time"/>
|
|
<result property="updateTime" column="update_time"/>
|
|
<result property="remark" column="remark"/>
|
|
<result property="remark" column="remark"/>
|
|
|
|
+ <result property="czwt" column="czwt"/>
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<!--开工信息-->
|
|
<!--开工信息-->
|
|
@@ -127,6 +128,7 @@
|
|
<result property="updateBy" column="update_by"/>
|
|
<result property="updateBy" column="update_by"/>
|
|
<result property="updateTime" column="update_time"/>
|
|
<result property="updateTime" column="update_time"/>
|
|
<result property="remark" column="remark"/>
|
|
<result property="remark" column="remark"/>
|
|
|
|
+ <result property="czwt" column="czwt"/>
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<!--投产信息-->
|
|
<!--投产信息-->
|
|
@@ -165,6 +167,7 @@
|
|
<result property="updateBy" column="update_by"/>
|
|
<result property="updateBy" column="update_by"/>
|
|
<result property="updateTime" column="update_time"/>
|
|
<result property="updateTime" column="update_time"/>
|
|
<result property="remark" column="remark"/>
|
|
<result property="remark" column="remark"/>
|
|
|
|
+ <result property="czwt" column="czwt"/>
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="ZsyzShyj" id="ZsyzShyjResult">
|
|
<resultMap type="ZsyzShyj" id="ZsyzShyjResult">
|
|
@@ -259,7 +262,7 @@
|
|
cjd_name,
|
|
cjd_name,
|
|
is_meet,
|
|
is_meet,
|
|
meet_remark,
|
|
meet_remark,
|
|
- shjg,psnr
|
|
|
|
|
|
+ shjg,psnr,czwt
|
|
from zsyz_sbbzb
|
|
from zsyz_sbbzb
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
@@ -270,7 +273,7 @@
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.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.is_del, s.update_time, s.remark, s.cjd_id,
|
|
- s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,
|
|
|
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
|
|
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.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.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
|
|
q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
@@ -294,8 +297,8 @@
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
- <if test="xmbh != null and xmbh != ''">and s.xmbh = #{xmbh}</if>
|
|
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
@@ -353,7 +356,7 @@
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.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.is_del, s.update_time, s.remark, s.cjd_id,
|
|
- s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,
|
|
|
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt,
|
|
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.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.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
|
|
q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
@@ -377,8 +380,8 @@
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
- <if test="xmbh != null and xmbh != ''">and s.xmbh = #{xmbh}</if>
|
|
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
@@ -436,7 +439,7 @@
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.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.is_del, s.update_time, s.remark, s.cjd_id,
|
|
- s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr
|
|
|
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.shjg,s.psnr,s.czwt
|
|
from zsyz_sbbzb s
|
|
from zsyz_sbbzb s
|
|
where s.id = #{id} and s.is_del = 'N'
|
|
where s.id = #{id} and s.is_del = 'N'
|
|
</select>
|
|
</select>
|
|
@@ -448,7 +451,7 @@
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, s.name,
|
|
s.tzrxm, s.tzrzw, s.tzrdh, s.xmjj, 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.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.is_del, s.update_time, s.remark, s.cjd_id,
|
|
- s.cjd_name, s.is_meet, s.meet_remark,s.psnr,
|
|
|
|
|
|
+ s.cjd_name, s.is_meet, s.meet_remark,s.psnr,s.czwt,
|
|
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.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.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
|
|
q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
@@ -475,8 +478,8 @@
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
- <if test="xmbh != null and xmbh != ''">and s.xmbh = #{xmbh}</if>
|
|
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
@@ -574,12 +577,13 @@
|
|
s.cjd_id,
|
|
s.cjd_id,
|
|
s.cjd_name,
|
|
s.cjd_name,
|
|
s.is_meet,
|
|
s.is_meet,
|
|
- s.meet_remark,s.psnr
|
|
|
|
|
|
+ s.meet_remark,s.psnr,s.czwt
|
|
from zsyz_project_dept d
|
|
from zsyz_project_dept d
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
where s.is_del = 'N'
|
|
where s.is_del = 'N'
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
@@ -639,11 +643,12 @@
|
|
s.cjd_id,
|
|
s.cjd_id,
|
|
s.cjd_name,
|
|
s.cjd_name,
|
|
s.is_meet,
|
|
s.is_meet,
|
|
- s.meet_remark,s.psnr
|
|
|
|
|
|
+ s.meet_remark,s.psnr,s.czwt
|
|
from zsyz_sbbzb s
|
|
from zsyz_sbbzb s
|
|
where s.is_del = 'N'
|
|
where s.is_del = 'N'
|
|
<if test="deptId != null and deptId != ''">and s.dept_id = #{deptId}</if>
|
|
<if test="deptId != null and deptId != ''">and s.dept_id = #{deptId}</if>
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
@@ -707,12 +712,13 @@
|
|
s.cjd_id,
|
|
s.cjd_id,
|
|
s.cjd_name,
|
|
s.cjd_name,
|
|
s.is_meet,
|
|
s.is_meet,
|
|
- s.meet_remark,s.psnr
|
|
|
|
|
|
+ s.meet_remark,s.psnr,s.czwt
|
|
from zsyz_project_dept d
|
|
from zsyz_project_dept d
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
where s.is_del = 'N'
|
|
where s.is_del = 'N'
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '2'
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
@@ -772,11 +778,12 @@
|
|
s.cjd_id,
|
|
s.cjd_id,
|
|
s.cjd_name,
|
|
s.cjd_name,
|
|
s.is_meet,
|
|
s.is_meet,
|
|
- s.meet_remark,s.psnr
|
|
|
|
|
|
+ s.meet_remark,s.psnr,s.czwt
|
|
from zsyz_sbbzb s
|
|
from zsyz_sbbzb s
|
|
where s.is_del = 'N'
|
|
where s.is_del = 'N'
|
|
<if test="deptId != null and deptId != ''">and s.dept_id = #{deptId}</if>
|
|
<if test="deptId != null and deptId != ''">and s.dept_id = #{deptId}</if>
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
@@ -803,8 +810,8 @@
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="tbrq != null ">and s.tbrq = #{tbrq}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
<if test="zszxfzr != null and zszxfzr != ''">and s.zszxfzr = #{zszxfzr}</if>
|
|
- <if test="xmbh != null and xmbh != ''">and s.xmbh = #{xmbh}</if>
|
|
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqId != null and yzdqId != ''">and s.yzdq_id = #{yzdqId}</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
<if test="yzdqName != null and yzdqName != ''">and s.yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
@@ -853,7 +860,8 @@
|
|
<include refid="selectZsyzSbbzbVo"/>
|
|
<include refid="selectZsyzSbbzbVo"/>
|
|
<where>
|
|
<where>
|
|
is_del = 'N'
|
|
is_del = 'N'
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="cjdId != null ">and (cjd_id = #{cjdId} or dept_id = #{cjdId})</if>
|
|
<if test="cjdId != null ">and (cjd_id = #{cjdId} or dept_id = #{cjdId})</if>
|
|
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
|
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
|
AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
|
AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
|
@@ -913,12 +921,13 @@
|
|
s.cjd_id,
|
|
s.cjd_id,
|
|
s.cjd_name,
|
|
s.cjd_name,
|
|
s.is_meet,
|
|
s.is_meet,
|
|
- s.meet_remark,s.psnr
|
|
|
|
|
|
+ s.meet_remark,s.psnr,s.czwt
|
|
from zsyz_project_dept d
|
|
from zsyz_project_dept d
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
left join zsyz_sbbzb s on s.id = d.xm_id
|
|
where s.is_del = 'N'
|
|
where s.is_del = 'N'
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '3'
|
|
and d.dept_id = #{deptId} and d.is_del = 'N' and d.dept_type = '3'
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc = #{xmxsmc}</if>
|
|
|
|
|
|
+ <if test="xmbh != null and xmbh != ''">and s.xmbh like concat('%', #{xmbh}, '%')</if>
|
|
|
|
+ <if test="xmxsmc != null and xmxsmc != ''">and s.xmxsmc like concat('%', #{xmxsmc}, '%')</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="progress != null and progress != ''">and find_in_set(s.progress , #{progress})</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="xmStatus != null and xmStatus != ''">and s.xm_status = #{xmStatus}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
<if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
@@ -1053,6 +1062,7 @@
|
|
<if test="meetRemark != null">meet_remark,</if>
|
|
<if test="meetRemark != null">meet_remark,</if>
|
|
<if test="shjg != null">shjg,</if>
|
|
<if test="shjg != null">shjg,</if>
|
|
<if test="psnr != null">psnr,</if>
|
|
<if test="psnr != null">psnr,</if>
|
|
|
|
+ <if test="czwt != null">czwt,</if>
|
|
</trim>
|
|
</trim>
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
<if test="sbdw != null and sbdw != ''">#{sbdw},</if>
|
|
<if test="sbdw != null and sbdw != ''">#{sbdw},</if>
|
|
@@ -1104,6 +1114,7 @@
|
|
<if test="meetRemark != null">#{meetRemark},</if>
|
|
<if test="meetRemark != null">#{meetRemark},</if>
|
|
<if test="shjg != null">#{shjg},</if>
|
|
<if test="shjg != null">#{shjg},</if>
|
|
<if test="psnr != null">#{psnr},</if>
|
|
<if test="psnr != null">#{psnr},</if>
|
|
|
|
+ <if test="czwt != null">#{czwt},</if>
|
|
</trim>
|
|
</trim>
|
|
</insert>
|
|
</insert>
|
|
|
|
|
|
@@ -1159,6 +1170,7 @@
|
|
<if test="meetRemark != null">meet_remark = #{meetRemark},</if>
|
|
<if test="meetRemark != null">meet_remark = #{meetRemark},</if>
|
|
<if test="shjg != null">shjg = #{shjg},</if>
|
|
<if test="shjg != null">shjg = #{shjg},</if>
|
|
<if test="psnr != null">psnr = #{psnr},</if>
|
|
<if test="psnr != null">psnr = #{psnr},</if>
|
|
|
|
+ <if test="czwt != null">czwt = #{czwt},</if>
|
|
</trim>
|
|
</trim>
|
|
where id = #{id}
|
|
where id = #{id}
|
|
</update>
|
|
</update>
|