|
|
@@ -44,10 +44,11 @@
|
|
|
<result property="addressName" column="address_name" jdbcType="VARCHAR"/>
|
|
|
<result property="assistProcess" column="assist_process" jdbcType="INTEGER"/>
|
|
|
<result property="alone" column="alone" jdbcType="INTEGER"/>
|
|
|
+ <result property="processStatus" column="process_status" jdbcType="VARCHAR"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="PublicReleaseAllSql">
|
|
|
- id, aid, release_start, release_end, remarks, annex_url, status, create_time, pname, duration, valid_date, supplement, audit_info, plan, expected_effect, next_plan, type, order_no, update_time, update_status, assist, assist_aid, assist_aid_name, main_id, main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time, new_user, sign_sum, user_names, object_type, public_type, district_name, clock_in, tech_start_process, address_name, assist_process, alone
|
|
|
+ id, aid, release_start, release_end, remarks, annex_url, status, create_time, pname, duration, valid_date, supplement, audit_info, plan, expected_effect, next_plan, type, order_no, update_time, update_status, assist, assist_aid, assist_aid_name, main_id, main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time, new_user, sign_sum, user_names, object_type, public_type, district_name, clock_in, tech_start_process, address_name, assist_process, alone, process_status
|
|
|
</sql>
|
|
|
|
|
|
<!--查询单个-->
|
|
|
@@ -65,13 +66,13 @@
|
|
|
order_no, update_time, update_status, assist, assist_aid, assist_aid_name, main_id,
|
|
|
main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time,
|
|
|
new_user, sign_sum, user_names, object_type, public_type, district_name, clock_in,
|
|
|
- tech_start_process, address_name, assist_process, alone)
|
|
|
+ tech_start_process, address_name, assist_process, alone, process_status)
|
|
|
values (#{aid}, #{releaseStart}, #{releaseEnd}, #{remarks}, #{annexUrl}, #{status}, #{createTime}, #{pname},
|
|
|
#{duration}, #{validDate}, #{supplement}, #{auditInfo}, #{plan}, #{expectedEffect}, #{nextPlan},
|
|
|
#{type}, #{orderNo}, #{updateTime}, #{updateStatus}, #{assist}, #{assistAid}, #{assistAidName},
|
|
|
#{mainId}, #{mainName}, #{rejectName}, #{assistantAid}, #{assistantName}, #{publicAgain}, #{auditTime},
|
|
|
#{newUser}, #{signSum}, #{userNames}, #{objectType}, #{publicType}, #{districtName}, #{clockIn},
|
|
|
- #{techStartProcess}, #{addressName}, #{assistProcess}, #{alone})
|
|
|
+ #{techStartProcess}, #{addressName}, #{assistProcess}, #{alone}, #{processStatus})
|
|
|
</insert>
|
|
|
|
|
|
<insert id="insertBatch">
|
|
|
@@ -79,7 +80,7 @@
|
|
|
duration, valid_date, supplement, audit_info, plan, expected_effect, next_plan, type, order_no, update_time,
|
|
|
update_status, assist, assist_aid, assist_aid_name, main_id, main_name, reject_name, assistant_aid,
|
|
|
assistant_name, public_again, audit_time, new_user, sign_sum, user_names, object_type, public_type,
|
|
|
- district_name, clock_in, tech_start_process, address_name, assist_process, alone)
|
|
|
+ district_name, clock_in, tech_start_process, address_name, assist_process, alone, process_status)
|
|
|
values
|
|
|
<foreach collection="entities" item="entity" separator=",">
|
|
|
(#{entity.aid}, #{entity.releaseStart}, #{entity.releaseEnd}, #{entity.remarks}, #{entity.annexUrl},
|
|
|
@@ -90,7 +91,7 @@
|
|
|
#{entity.assistantAid}, #{entity.assistantName}, #{entity.publicAgain}, #{entity.auditTime},
|
|
|
#{entity.newUser}, #{entity.signSum}, #{entity.userNames}, #{entity.objectType}, #{entity.publicType},
|
|
|
#{entity.districtName}, #{entity.clockIn}, #{entity.techStartProcess}, #{entity.addressName},
|
|
|
- #{entity.assistProcess}, #{entity.alone})
|
|
|
+ #{entity.assistProcess}, #{entity.alone}, #{entity.processStatus})
|
|
|
</foreach>
|
|
|
</insert>
|
|
|
|
|
|
@@ -99,7 +100,7 @@
|
|
|
duration, valid_date, supplement, audit_info, plan, expected_effect, next_plan, type, order_no, update_time,
|
|
|
update_status, assist, assist_aid, assist_aid_name, main_id, main_name, reject_name, assistant_aid,
|
|
|
assistant_name, public_again, audit_time, new_user, sign_sum, user_names, object_type, public_type,
|
|
|
- district_name, clock_in, tech_start_process, address_name, assist_process, alone)
|
|
|
+ district_name, clock_in, tech_start_process, address_name, assist_process, alone, process_status)
|
|
|
values
|
|
|
<foreach collection="entities" item="entity" separator=",">
|
|
|
(#{entity.aid}, #{entity.releaseStart}, #{entity.releaseEnd}, #{entity.remarks}, #{entity.annexUrl},
|
|
|
@@ -110,7 +111,7 @@
|
|
|
#{entity.assistantAid}, #{entity.assistantName}, #{entity.publicAgain}, #{entity.auditTime},
|
|
|
#{entity.newUser}, #{entity.signSum}, #{entity.userNames}, #{entity.objectType}, #{entity.publicType},
|
|
|
#{entity.districtName}, #{entity.clockIn}, #{entity.techStartProcess}, #{entity.addressName},
|
|
|
- #{entity.assistProcess}, #{entity.alone})
|
|
|
+ #{entity.assistProcess}, #{entity.alone}, #{entity.processStatus})
|
|
|
</foreach>
|
|
|
on duplicate key update
|
|
|
aid = values(aid),
|
|
|
@@ -152,7 +153,8 @@
|
|
|
tech_start_process = values(tech_start_process),
|
|
|
address_name = values(address_name),
|
|
|
assist_process = values(assist_process),
|
|
|
- alone = values(alone)
|
|
|
+ alone = values(alone),
|
|
|
+ process_status = values(process_status)
|
|
|
</insert>
|
|
|
|
|
|
<!--通过主键修改数据-->
|
|
|
@@ -279,6 +281,9 @@
|
|
|
<if test="alone != null">
|
|
|
alone = #{alone},
|
|
|
</if>
|
|
|
+ <if test="processStatus != null and processStatus != ''">
|
|
|
+ process_status = #{processStatus},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id}
|
|
|
</update>
|
|
|
@@ -413,6 +418,9 @@
|
|
|
<if test="alone != null">
|
|
|
and alone = #{alone}
|
|
|
</if>
|
|
|
+ <if test="processStatus != null and processStatus != ''">
|
|
|
+ and process_status = #{processStatus}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
@@ -547,6 +555,9 @@
|
|
|
<if test="alone != null">
|
|
|
and alone = #{alone}
|
|
|
</if>
|
|
|
+ <if test="processStatus != null and processStatus != ''">
|
|
|
+ and process_status = #{processStatus}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
|
@@ -557,7 +568,6 @@
|
|
|
where id = #{id}
|
|
|
</delete>
|
|
|
|
|
|
-
|
|
|
<delete id="deleteByMainId">
|
|
|
delete from public_release where main_id = #{id}
|
|
|
</delete>
|
|
|
@@ -608,6 +618,7 @@
|
|
|
<if test="addressName != null">address_name,</if>
|
|
|
<if test="assistProcess != null">assist_process,</if>
|
|
|
<if test="alone != null">alone,</if>
|
|
|
+ <if test="processStatus != null">process_status,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="id != null">#{id,jdbcType=INTEGER},</if>
|
|
|
@@ -651,6 +662,7 @@
|
|
|
<if test="addressName != null">#{addressName,jdbcType=VARCHAR},</if>
|
|
|
<if test="assistProcess != null">#{assistProcess,jdbcType=INTEGER},</if>
|
|
|
<if test="alone != null">#{alone,jdbcType=INTEGER},</if>
|
|
|
+ <if test="processStatus != null">#{processStatus,jdbcType=INTEGER},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
|
@@ -682,7 +694,7 @@
|
|
|
left join public_release_details b on a.id=b.prid
|
|
|
left join user e on b.uid=e.id left join admin ad on e.aid=ad.id
|
|
|
</if>
|
|
|
- left join t_order_new ton on a.order_no =ton.order_no
|
|
|
+ left join t_order_new ton on a.order_no =ton.order_no
|
|
|
<if test="type==5">
|
|
|
left join t_order_mid tom on a.order_no=tom.order_no
|
|
|
</if>
|
|
|
@@ -1244,3 +1256,5 @@
|
|
|
|
|
|
</mapper>
|
|
|
|
|
|
+
|
|
|
+
|