|
@@ -34,12 +34,15 @@
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
|
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
|
|
<result column="update_status" jdbcType="INTEGER" property="updateStatus" />
|
|
<result column="update_status" jdbcType="INTEGER" property="updateStatus" />
|
|
|
|
|
+ <result column="assist" jdbcType="INTEGER" property="assist" />
|
|
|
|
|
+ <result column="assist_aid" jdbcType="VARCHAR" property="assistAid" />
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
<sql id="Base_Column_List">
|
|
|
id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
|
|
id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
|
|
|
latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname,
|
|
latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname,
|
|
|
ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info,
|
|
ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info,
|
|
|
- `plan`, expected_effect, next_plan, `type`, order_no, update_time, update_status
|
|
|
|
|
|
|
+ `plan`, expected_effect, next_plan, `type`, order_no, update_time, update_status,
|
|
|
|
|
+ assist, assist_aid
|
|
|
</sql>
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
select
|
|
@@ -51,7 +54,7 @@
|
|
|
delete from public_release
|
|
delete from public_release
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</delete>
|
|
</delete>
|
|
|
- <insert id="insert" parameterType="com.goafanti.common.model.PublicRelease">
|
|
|
|
|
|
|
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
insert into public_release (id, `uid`, aid,
|
|
insert into public_release (id, `uid`, aid,
|
|
|
release_start, release_end, remarks,
|
|
release_start, release_end, remarks,
|
|
|
annex_url, user_name, longitude,
|
|
annex_url, user_name, longitude,
|
|
@@ -62,7 +65,8 @@
|
|
|
main_status, supplement, audit_info,
|
|
main_status, supplement, audit_info,
|
|
|
`plan`, expected_effect, next_plan,
|
|
`plan`, expected_effect, next_plan,
|
|
|
`type`, order_no, update_time,
|
|
`type`, order_no, update_time,
|
|
|
- update_status)
|
|
|
|
|
|
|
+ update_status, assist, assist_aid
|
|
|
|
|
+ )
|
|
|
values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
|
|
values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
|
|
|
#{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
|
|
#{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
|
|
|
#{annexUrl,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR},
|
|
#{annexUrl,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR},
|
|
@@ -73,7 +77,8 @@
|
|
|
#{mainStatus,jdbcType=INTEGER}, #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR},
|
|
#{mainStatus,jdbcType=INTEGER}, #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR},
|
|
|
#{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR},
|
|
#{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR},
|
|
|
#{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
|
|
#{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
|
|
|
- #{updateStatus,jdbcType=INTEGER})
|
|
|
|
|
|
|
+ #{updateStatus,jdbcType=INTEGER}, #{assist,jdbcType=INTEGER}, #{assistAid,jdbcType=VARCHAR}
|
|
|
|
|
+ )
|
|
|
</insert>
|
|
</insert>
|
|
|
|
|
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
@@ -175,6 +180,12 @@
|
|
|
<if test="updateStatus != null">
|
|
<if test="updateStatus != null">
|
|
|
update_status,
|
|
update_status,
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="assist != null">
|
|
|
|
|
+ assist,
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="assistAid != null">
|
|
|
|
|
+ assist_aid,
|
|
|
|
|
+ </if>
|
|
|
</trim>
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="id != null">
|
|
<if test="id != null">
|
|
@@ -273,6 +284,12 @@
|
|
|
<if test="updateStatus != null">
|
|
<if test="updateStatus != null">
|
|
|
#{updateStatus,jdbcType=INTEGER},
|
|
#{updateStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="assist != null">
|
|
|
|
|
+ #{assist,jdbcType=INTEGER},
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="assistAid != null">
|
|
|
|
|
+ #{assistAid,jdbcType=VARCHAR},
|
|
|
|
|
+ </if>
|
|
|
</trim>
|
|
</trim>
|
|
|
</insert>
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
|
|
@@ -371,6 +388,12 @@
|
|
|
<if test="updateStatus != null">
|
|
<if test="updateStatus != null">
|
|
|
update_status = #{updateStatus,jdbcType=INTEGER},
|
|
update_status = #{updateStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="assist != null">
|
|
|
|
|
+ assist = #{assist,jdbcType=INTEGER},
|
|
|
|
|
+ </if>
|
|
|
|
|
+ <if test="assistAid != null">
|
|
|
|
|
+ assist_aid = #{assistAid,jdbcType=VARCHAR},
|
|
|
|
|
+ </if>
|
|
|
</set>
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
</update>
|
|
@@ -406,7 +429,9 @@
|
|
|
`type` = #{type,jdbcType=INTEGER},
|
|
`type` = #{type,jdbcType=INTEGER},
|
|
|
order_no = #{orderNo,jdbcType=VARCHAR},
|
|
order_no = #{orderNo,jdbcType=VARCHAR},
|
|
|
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
|
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
|
|
- update_status = #{updateStatus,jdbcType=INTEGER}
|
|
|
|
|
|
|
+ update_status = #{updateStatus,jdbcType=INTEGER},
|
|
|
|
|
+ assist = #{assist,jdbcType=INTEGER},
|
|
|
|
|
+ assist_aid = #{assistAid,jdbcType=VARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
@@ -420,12 +445,16 @@
|
|
|
<select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
|
|
<select id="listPublicRelease" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
|
|
|
select a.id,b.nickname ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
|
|
select a.id,b.nickname ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
|
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
|
- a.latitude ,a.longitude ,a.clock_in clockIn,date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus
|
|
|
|
|
|
|
+ a.latitude ,a.longitude ,a.clock_in clockIn,date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,
|
|
|
|
|
+a.assist,a.assist_aid assistAid
|
|
|
from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
<if test="type==2">
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
|
|
+ <if test="assist !=null">
|
|
|
|
|
+ and a.assist = #{assist}
|
|
|
|
|
+ </if>
|
|
|
<if test="type==0">
|
|
<if test="type==0">
|
|
|
and a.aid= #{aid}
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
</if>
|
|
@@ -462,6 +491,9 @@
|
|
|
left join department d on c.department_id =d.id
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
|
|
+ <if test="assist !=null">
|
|
|
|
|
+ and a.assist = #{assist}
|
|
|
|
|
+ </if>
|
|
|
<if test="type==0">
|
|
<if test="type==0">
|
|
|
and a.aid= #{aid}
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
</if>
|
|
@@ -493,7 +525,7 @@
|
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
|
|
|
a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
|
|
a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
|
|
|
a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
|
- date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus
|
|
|
|
|
|
|
+ date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid
|
|
|
from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
left join t_order_new d on a.order_no=d.order_no
|
|
left join t_order_new d on a.order_no=d.order_no
|
|
|
where 1=1
|
|
where 1=1
|