|
@@ -54,157 +54,194 @@
|
|
|
<result property="meetRemark" column="meet_remark"/>
|
|
|
|
|
|
|
|
|
- <association property="zsyzQyxx" javaType="ZsyzQyxx" resultMap="ZsyzQyxxResult" />
|
|
|
- <association property="zsyzKgxx" javaType="ZsyzKgxx" resultMap="ZsyzKgxxResult" />
|
|
|
- <association property="zsyzTcxx" javaType="ZsyzTcxx" resultMap="ZsyzTcxxResult" />
|
|
|
+ <association property="zsyzQyxx" javaType="ZsyzQyxx" resultMap="ZsyzQyxxResult"/>
|
|
|
+ <association property="zsyzKgxx" javaType="ZsyzKgxx" resultMap="ZsyzKgxxResult"/>
|
|
|
+ <association property="zsyzTcxx" javaType="ZsyzTcxx" resultMap="ZsyzTcxxResult"/>
|
|
|
+ <collection property="shyjList" javaType="java.util.List" resultMap="ZsyzShyjResult"/>
|
|
|
+
|
|
|
</resultMap>
|
|
|
|
|
|
<!--签约信息-->
|
|
|
<resultMap type="ZsyzQyxx" id="ZsyzQyxxResult">
|
|
|
- <result property="id" column="id" />
|
|
|
- <result property="xmId" column="xm_id" />
|
|
|
- <result property="xmbh" column="xmbh" />
|
|
|
- <result property="xmmc" column="xmmc" />
|
|
|
- <result property="dfqyr" column="dfqyr" />
|
|
|
- <result property="wfqyr" column="wfqyr" />
|
|
|
- <result property="tbrq" column="tbrq" />
|
|
|
- <result property="qyrq" column="qyrq" />
|
|
|
- <result property="xytze" column="xytze" />
|
|
|
- <result property="swzj" column="swzj" />
|
|
|
- <result property="gdzctze" column="gdzctze" />
|
|
|
- <result property="qygjrsjh" column="qygjrsjh" />
|
|
|
- <result property="xmszd" column="xmszd" />
|
|
|
- <result property="sshy" column="sshy" />
|
|
|
- <result property="tzfs" column="tzfs" />
|
|
|
- <result property="jsfs" column="jsfs" />
|
|
|
- <result property="sfys" column="sfys" />
|
|
|
- <result property="jsnr" column="jsnr" />
|
|
|
- <result property="ydmj" column="ydmj" />
|
|
|
- <result property="zcqymc" column="zcqymc" />
|
|
|
- <result property="zcrq" column="zcrq" />
|
|
|
- <result property="zczb" column="zczb" />
|
|
|
- <result property="frdb" column="frdb" />
|
|
|
- <result property="lxfs" column="lxfs" />
|
|
|
- <result property="jyfw" column="jyfw" />
|
|
|
- <result property="lxrq" column="lxrq" />
|
|
|
- <result property="nkgrq" column="nkgrq" />
|
|
|
- <result property="path" column="path" />
|
|
|
- <result property="createBy" column="create_by" />
|
|
|
- <result property="createTime" column="create_time" />
|
|
|
- <result property="updateBy" column="update_by" />
|
|
|
- <result property="updateTime" column="update_time" />
|
|
|
- <result property="remark" column="remark" />
|
|
|
+ <result property="id" column="id"/>
|
|
|
+ <result property="xmId" column="xm_id"/>
|
|
|
+ <result property="xmbh" column="xmbh"/>
|
|
|
+ <result property="xmmc" column="xmmc"/>
|
|
|
+ <result property="dfqyr" column="dfqyr"/>
|
|
|
+ <result property="wfqyr" column="wfqyr"/>
|
|
|
+ <result property="tbrq" column="tbrq"/>
|
|
|
+ <result property="qyrq" column="qyrq"/>
|
|
|
+ <result property="xytze" column="xytze"/>
|
|
|
+ <result property="swzj" column="swzj"/>
|
|
|
+ <result property="gdzctze" column="gdzctze"/>
|
|
|
+ <result property="xmgjrxm" column="xmgjrxm"/>
|
|
|
+ <result property="xmgjrzw" column="xmgjrzw"/>
|
|
|
+ <result property="xmgjrsjh" column="xmgjrsjh"/>
|
|
|
+ <result property="xmszd" column="xmszd"/>
|
|
|
+ <result property="sshy" column="sshy"/>
|
|
|
+ <result property="tzfs" column="tzfs"/>
|
|
|
+ <result property="jsfs" column="jsfs"/>
|
|
|
+ <result property="sfys" column="sfys"/>
|
|
|
+ <result property="jsnr" column="jsnr"/>
|
|
|
+ <result property="zlcf" column="zlcf"/>
|
|
|
+ <result property="gdmj" column="gdmj"/>
|
|
|
+ <result property="zcqymc" column="zcqymc"/>
|
|
|
+ <result property="zcrq" column="zcrq"/>
|
|
|
+ <result property="zczb" column="zczb"/>
|
|
|
+ <result property="frdb" column="frdb"/>
|
|
|
+ <result property="lxfs" column="lxfs"/>
|
|
|
+ <result property="jyfw" column="jyfw"/>
|
|
|
+ <result property="lxrq" column="lxrq"/>
|
|
|
+ <result property="nkgrq" column="nkgrq"/>
|
|
|
+ <result property="path" column="path"/>
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<!--开工信息-->
|
|
|
<resultMap type="ZsyzKgxx" id="ZsyzKgxxResult">
|
|
|
- <result property="id" column="id" />
|
|
|
- <result property="xmId" column="xm_id" />
|
|
|
- <result property="xmbh" column="xmbh" />
|
|
|
- <result property="xmmc" column="xmmc" />
|
|
|
- <result property="kgrq" column="kgrq" />
|
|
|
- <result property="njgrq" column="njgrq" />
|
|
|
- <result property="sscrq" column="sscrq" />
|
|
|
- <result property="ntcsj" column="ntcsj" />
|
|
|
- <result property="rtsj" column="rtsj" />
|
|
|
- <result property="nrtsj" column="nrtsj" />
|
|
|
- <result property="kggjrsjh" column="kggjrsjh" />
|
|
|
- <result property="createBy" column="create_by" />
|
|
|
- <result property="createTime" column="create_time" />
|
|
|
- <result property="updateBy" column="update_by" />
|
|
|
- <result property="updateTime" column="update_time" />
|
|
|
- <result property="remark" column="remark" />
|
|
|
+ <result property="id" column="id"/>
|
|
|
+ <result property="xmId" column="xm_id"/>
|
|
|
+ <result property="xmbh" column="xmbh"/>
|
|
|
+ <result property="xmmc" column="xmmc"/>
|
|
|
+ <result property="kgrq" column="kgrq"/>
|
|
|
+ <result property="njgrq" column="njgrq"/>
|
|
|
+ <result property="sscrq" column="sscrq"/>
|
|
|
+ <result property="ntcsj" column="ntcsj"/>
|
|
|
+ <result property="rtsj" column="rtsj"/>
|
|
|
+ <result property="nrtsj" column="nrtsj"/>
|
|
|
+ <result property="kggjrsjh" column="kggjrsjh"/>
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<!--投产信息-->
|
|
|
<resultMap type="ZsyzTcxx" id="ZsyzTcxxResult">
|
|
|
- <result property="id" column="id" />
|
|
|
- <result property="xmId" column="xm_id" />
|
|
|
- <result property="xmbh" column="xmbh" />
|
|
|
- <result property="xmmc" column="xmmc" />
|
|
|
- <result property="tcrq" column="tcrq" />
|
|
|
- <result property="rgsj" column="rgsj" />
|
|
|
- <result property="nrgsj" column="nrgsj" />
|
|
|
- <result property="tcgjrsjh" column="tcgjrsjh" />
|
|
|
- <result property="sjdze" column="sjdze" />
|
|
|
- <result property="ydmj" column="ydmj" />
|
|
|
- <result property="tdcr" column="tdcr" />
|
|
|
- <result property="xjcf" column="xjcf" />
|
|
|
- <result property="cftr" column="cftr" />
|
|
|
- <result property="sbqd" column="sbqd" />
|
|
|
- <result property="sbfp" column="sbfp" />
|
|
|
- <result property="sbht" column="sbht" />
|
|
|
- <result property="fkpz" column="fkpz" />
|
|
|
- <result property="zlcf" column="zlcf" />
|
|
|
- <result property="zlcftr" column="zlcftr" />
|
|
|
- <result property="zlsbqd" column="zlsbqd" />
|
|
|
- <result property="zlsbfp" column="zlsbfp" />
|
|
|
- <result property="zlsbht" column="zlsbht" />
|
|
|
- <result property="zlfkpz" column="zlfkpz" />
|
|
|
- <result property="sjss" column="sjss" />
|
|
|
- <result property="lxy" column="lxy" />
|
|
|
- <result property="jnsb" column="jnsb" />
|
|
|
- <result property="zbtr" column="zbtr" />
|
|
|
- <result property="ndsjss" column="ndsjss" />
|
|
|
- <result property="qt" column="qt" />
|
|
|
- <result property="createBy" column="create_by" />
|
|
|
- <result property="createTime" column="create_time" />
|
|
|
- <result property="updateBy" column="update_by" />
|
|
|
- <result property="updateTime" column="update_time" />
|
|
|
- <result property="remark" column="remark" />
|
|
|
+ <result property="id" column="id"/>
|
|
|
+ <result property="xmId" column="xm_id"/>
|
|
|
+ <result property="xmbh" column="xmbh"/>
|
|
|
+ <result property="xmmc" column="xmmc"/>
|
|
|
+ <result property="tcrq" column="tcrq"/>
|
|
|
+ <result property="rgsj" column="rgsj"/>
|
|
|
+ <result property="nrgsj" column="nrgsj"/>
|
|
|
+ <result property="tcgjrsjh" column="tcgjrsjh"/>
|
|
|
+ <result property="sjdze" column="sjdze"/>
|
|
|
+ <result property="ydmj" column="ydmj"/>
|
|
|
+ <result property="tdcr" column="tdcr"/>
|
|
|
+ <result property="xjcf" column="xjcf"/>
|
|
|
+ <result property="cftr" column="cftr"/>
|
|
|
+ <result property="sbqd" column="sbqd"/>
|
|
|
+ <result property="sbfp" column="sbfp"/>
|
|
|
+ <result property="sbht" column="sbht"/>
|
|
|
+ <result property="fkpz" column="fkpz"/>
|
|
|
+ <result property="zlcf" column="zlcf"/>
|
|
|
+ <result property="zlcftr" column="zlcftr"/>
|
|
|
+ <result property="zlsbqd" column="zlsbqd"/>
|
|
|
+ <result property="zlsbfp" column="zlsbfp"/>
|
|
|
+ <result property="zlsbht" column="zlsbht"/>
|
|
|
+ <result property="zlfkpz" column="zlfkpz"/>
|
|
|
+ <result property="sjss" column="sjss"/>
|
|
|
+ <result property="lxy" column="lxy"/>
|
|
|
+ <result property="jnsb" column="jnsb"/>
|
|
|
+ <result property="zbtr" column="zbtr"/>
|
|
|
+ <result property="ndsjss" column="ndsjss"/>
|
|
|
+ <result property="qt" column="qt"/>
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
</resultMap>
|
|
|
|
|
|
-
|
|
|
+ <resultMap type="ZsyzShyj" id="ZsyzShyjResult">
|
|
|
+ <result property="id" column="id"/>
|
|
|
+ <result property="xmId" column="xm_id"/>
|
|
|
+ <result property="xmbh" column="xmbh"/>
|
|
|
+ <result property="deptId" column="dept_id"/>
|
|
|
+ <result property="shrxm" column="shrxm"/>
|
|
|
+ <result property="xmjd" column="xmjd"/>
|
|
|
+ <result property="xmmc" column="xmmc"/>
|
|
|
+ <result property="shjg" column="shjg"/>
|
|
|
+ <result property="shyj" column="shyj"/>
|
|
|
+ <result property="shsj" column="shsj"/>
|
|
|
+ <result property="createBy" column="create_by"/>
|
|
|
+ <result property="createTime" column="create_time"/>
|
|
|
+ <result property="updateBy" column="update_by"/>
|
|
|
+ <result property="updateTime" column="update_time"/>
|
|
|
+ <result property="remark" column="remark"/>
|
|
|
+ </resultMap>
|
|
|
<sql id="selectZsyzSbbzbVo">
|
|
|
select id, sbdw, tbrq, zszxfzr, xmbh, xmxsmc, sfwlhxxxm, yzdq_id, yzdq_name, yzss_name, ntze, cylx_id, cylx_name, xmlb, tzlb, nlhd, czpt, tzzt, xmjz, gtzzrsfzhm, qytzrxyzdm, qybj, tzfjj, sndxse, sndnse, tzrxm, tzrzw, tzrdh, xmjj, name, strq, phone, zw, user_id, create_by, type, progress, dept_id, create_time, update_by, is_del, update_time, remark, cjd_id, cjd_name, is_meet, meet_remark from zsyz_sbbzb
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectZsyzSbbzbList" parameterType="ZsyzSbbzb" resultMap="ZsyzSbbzbResult">
|
|
|
- <include refid="selectZsyzSbbzbVo"/>
|
|
|
+ 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.name,
|
|
|
+ s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, 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,
|
|
|
+ j.id,j.xm_id,j.xmbh,j.xmmc,j.dept_id,j.shrxm,j.xmjd,j.shjg,j.shyj,j.shsj
|
|
|
+ from zsyz_sbbzb s
|
|
|
+ left join zsyz_shyj j on s.id = j.xm_id
|
|
|
<where>
|
|
|
- is_del = 'N'
|
|
|
- <if test="sbdw != null and sbdw != ''">and sbdw = #{sbdw}</if>
|
|
|
- <if test="tbrq != null ">and tbrq = #{tbrq}</if>
|
|
|
- <if test="zszxfzr != null and zszxfzr != ''">and zszxfzr = #{zszxfzr}</if>
|
|
|
- <if test="xmbh != null and xmbh != ''">and xmbh = #{xmbh}</if>
|
|
|
- <if test="xmxsmc != null and xmxsmc != ''">and xmxsmc = #{xmxsmc}</if>
|
|
|
- <if test="sfwlhxxxm != null and sfwlhxxxm != ''">and sfwlhxxxm = #{sfwlhxxxm}</if>
|
|
|
- <if test="yzdqId != null and yzdqId != ''">and yzdq_id = #{yzdqId}</if>
|
|
|
- <if test="yzdqName != null and yzdqName != ''">and yzdq_name like concat('%', #{yzdqName}, '%')</if>
|
|
|
- <if test="yzssName != null and yzssName != ''">and yzss_name like concat('%', #{yzssName}, '%')</if>
|
|
|
- <if test="ntze != null and ntze != ''">and ntze = #{ntze}</if>
|
|
|
- <if test="cylxId != null and cylxId != ''">and cylx_id = #{cylxId}</if>
|
|
|
- <if test="cylxName != null and cylxName != ''">and cylx_name like concat('%', #{cylxName}, '%')</if>
|
|
|
- <if test="xmlb != null and xmlb != ''">and xmlb = #{xmlb}</if>
|
|
|
- <if test="tzlb != null and tzlb != ''">and tzlb = #{tzlb}</if>
|
|
|
- <if test="nlhd != null and nlhd != ''">and nlhd = #{nlhd}</if>
|
|
|
- <if test="czpt != null and czpt != ''">and czpt = #{czpt}</if>
|
|
|
- <if test="tzzt != null and tzzt != ''">and tzzt = #{tzzt}</if>
|
|
|
- <if test="xmjz != null and xmjz != ''">and xmjz = #{xmjz}</if>
|
|
|
- <if test="gtzzrsfzhm != null and gtzzrsfzhm != ''">and gtzzrsfzhm = #{gtzzrsfzhm}</if>
|
|
|
- <if test="qytzrxyzdm != null and qytzrxyzdm != ''">and qytzrxyzdm = #{qytzrxyzdm}</if>
|
|
|
- <if test="qybj != null and qybj != ''">and qybj = #{qybj}</if>
|
|
|
- <if test="tzfjj != null and tzfjj != ''">and tzfjj = #{tzfjj}</if>
|
|
|
- <if test="sndxse != null and sndxse != ''">and sndxse = #{sndxse}</if>
|
|
|
- <if test="sndnse != null and sndnse != ''">and sndnse = #{sndnse}</if>
|
|
|
- <if test="tzrxm != null and tzrxm != ''">and tzrxm = #{tzrxm}</if>
|
|
|
- <if test="tzrzw != null and tzrzw != ''">and tzrzw = #{tzrzw}</if>
|
|
|
- <if test="tzrdh != null and tzrdh != ''">and tzrdh = #{tzrdh}</if>
|
|
|
- <if test="xmjj != null and xmjj != ''">and xmjj = #{xmjj}</if>
|
|
|
- <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
|
|
|
- <if test="strq != null ">and strq = #{strq}</if>
|
|
|
- <if test="phone != null and phone != ''">and phone = #{phone}</if>
|
|
|
- <if test="zw != null and zw != ''">and zw = #{zw}</if>
|
|
|
- <if test="userId != null ">and user_id = #{userId}</if>
|
|
|
- <if test="type != null and type != ''">and type = #{type}</if>
|
|
|
- <if test="progress != null and progress != ''">and progress in (#{progress}) </if>
|
|
|
- <if test="deptId != null ">and dept_id = #{deptId}</if>
|
|
|
- <if test="isDel != null and isDel != ''">and is_del = #{isDel}</if>
|
|
|
- <if test="cjdId != null ">and cjd_id = #{cjdId}</if>
|
|
|
- <if test="cjdName != null and cjdName != ''">and cjd_name like concat('%', #{cjdName}, '%')</if>
|
|
|
- <if test="isMeet != null and isMeet != ''">and is_meet = #{isMeet}</if>
|
|
|
- <if test="meetRemark != null and meetRemark != ''">and meet_remark = #{meetRemark}</if>
|
|
|
+ s.is_del = 'N'
|
|
|
+ <if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
|
+ <if test="tbrq != null ">and s.tbrq = #{tbrq}</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="sfwlhxxxm != null and sfwlhxxxm != ''">and s.sfwlhxxxm = #{sfwlhxxxm}</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="yzssName != null and yzssName != ''">and s.yzss_name like concat('%', #{yzssName}, '%')</if>
|
|
|
+ <if test="ntze != null and ntze != ''">and s.ntze = #{ntze}</if>
|
|
|
+ <if test="cylxId != null and cylxId != ''">and s.cylx_id = #{cylxId}</if>
|
|
|
+ <if test="cylxName != null and cylxName != ''">and s.cylx_name like concat('%', #{cylxName}, '%')</if>
|
|
|
+ <if test="xmlb != null and xmlb != ''">and s.xmlb = #{xmlb}</if>
|
|
|
+ <if test="tzlb != null and tzlb != ''">and s.tzlb = #{tzlb}</if>
|
|
|
+ <if test="nlhd != null and nlhd != ''">and s.nlhd = #{nlhd}</if>
|
|
|
+ <if test="czpt != null and czpt != ''">and s.czpt = #{czpt}</if>
|
|
|
+ <if test="tzzt != null and tzzt != ''">and s.tzzt = #{tzzt}</if>
|
|
|
+ <if test="xmjz != null and xmjz != ''">and s.xmjz = #{xmjz}</if>
|
|
|
+ <if test="gtzzrsfzhm != null and gtzzrsfzhm != ''">and s.gtzzrsfzhm = #{gtzzrsfzhm}</if>
|
|
|
+ <if test="qytzrxyzdm != null and qytzrxyzdm != ''">and s.qytzrxyzdm = #{qytzrxyzdm}</if>
|
|
|
+ <if test="qybj != null and qybj != ''">and s.qybj = #{qybj}</if>
|
|
|
+ <if test="tzfjj != null and tzfjj != ''">and s.tzfjj = #{tzfjj}</if>
|
|
|
+ <if test="sndxse != null and sndxse != ''">and s.sndxse = #{sndxse}</if>
|
|
|
+ <if test="sndnse != null and sndnse != ''">and s.sndnse = #{sndnse}</if>
|
|
|
+ <if test="tzrxm != null and tzrxm != ''">and s.tzrxm = #{tzrxm}</if>
|
|
|
+ <if test="tzrzw != null and tzrzw != ''">and s.tzrzw = #{tzrzw}</if>
|
|
|
+ <if test="tzrdh != null and tzrdh != ''">and s.tzrdh = #{tzrdh}</if>
|
|
|
+ <if test="xmjj != null and xmjj != ''">and s.xmjj = #{xmjj}</if>
|
|
|
+ <if test="name != null and name != ''">and s.name like concat('%', #{name}, '%')</if>
|
|
|
+ <if test="strq != null ">and s.strq = #{strq}</if>
|
|
|
+ <if test="phone != null and phone != ''">and s.phone = #{phone}</if>
|
|
|
+ <if test="zw != null and zw != ''">and s.zw = #{zw}</if>
|
|
|
+ <if test="userId != null ">and s.user_id = #{userId}</if>
|
|
|
+ <if test="type != null and type != ''">and s.type = #{type}</if>
|
|
|
+ <if test="progress != null and progress != ''">and s.progress in (#{progress})</if>
|
|
|
+ <if test="isDel != null and isDel != ''">and s.is_del = #{isDel}</if>
|
|
|
+ <if test="cjdId != null ">and s.cjd_id = #{cjdId}</if>
|
|
|
+ <if test="cjdName != null and cjdName != ''">and s.cjd_name like concat('%', #{cjdName}, '%')</if>
|
|
|
+ <if test="isMeet != null and isMeet != ''">and s.is_meet = #{isMeet}</if>
|
|
|
+ <if test="meetRemark != null and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
|
|
|
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
|
|
+ AND date_format(s.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
|
|
+ </if>
|
|
|
+ <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
|
|
+ AND date_format(s.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
|
+ </if>
|
|
|
</where>
|
|
|
+ <!-- 数据范围过滤 -->
|
|
|
+ ${params.dataScope}
|
|
|
</select>
|
|
|
|
|
|
<select id="selectZsyzSbbzbById" parameterType="Long" resultMap="ZsyzSbbzbResult">
|
|
@@ -213,21 +250,29 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectZsyzSbbzbListDc" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
|
|
|
- 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.name,
|
|
|
- s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by, s.is_del, s.update_time, s.remark, s.cjd_id,
|
|
|
+ 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.name,
|
|
|
+ s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, 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,
|
|
|
- q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq, q.xytze, q.swzj, q.gdzctze, q.qygjrsjh, q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
|
- q.ydmj, 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,
|
|
|
+ q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq, q.xytze, q.swzj, q.gdzctze, q.qygjrsjh,
|
|
|
+ q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
|
|
|
+ q.ydmj, 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.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_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
|
|
|
<where>
|
|
|
s.is_del = 'N'
|
|
|
<if test="sbdw != null and sbdw != ''">and s.sbdw = #{sbdw}</if>
|
|
@@ -273,6 +318,16 @@
|
|
|
<if test="meetRemark != null and meetRemark != ''">and s.meet_remark = #{meetRemark}</if>
|
|
|
</where>
|
|
|
</select>
|
|
|
+ <select id="selectZsyzSbbzbListByZp" resultType="com.ruoyi.system.domain.projectV2.ZsyzSbbzb">
|
|
|
+ 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.name,
|
|
|
+ s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, 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
|
|
|
+ from zsyz_project_dept d
|
|
|
+ left join zsyz_sbbzb s on s.id = d.xm_id
|
|
|
+ where s.is_del = 'N'
|
|
|
+ and (d.dept_id = #{deptId} or s.depe_id = #{deptId})
|
|
|
+ </select>
|
|
|
|
|
|
<insert id="insertZsyzSbbzb" parameterType="ZsyzSbbzb" useGeneratedKeys="true" keyProperty="id">
|
|
|
insert into zsyz_sbbzb
|
|
@@ -435,7 +490,7 @@
|
|
|
<if test="type != null and type != ''">type = #{type},</if>
|
|
|
<if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
|
|
|
</trim>
|
|
|
- where id = #{id}
|
|
|
+ where id = #{id}
|
|
|
</update>
|
|
|
<update id="updateZsyzSbbzbProgress" parameterType="ZsyzSbbzb">
|
|
|
update zsyz_sbbzb set progress = #{progress} where id = #{id}
|