|
|
@@ -34,13 +34,13 @@
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
- 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,
|
|
|
- ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info,
|
|
|
+ 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,
|
|
|
+ ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info,
|
|
|
`plan`, expected_effect, next_plan, `type`, order_no
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
- select
|
|
|
+ select
|
|
|
<include refid="Base_Column_List" />
|
|
|
from public_release
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
@@ -50,25 +50,25 @@
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</delete>
|
|
|
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
- insert into public_release (`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, ufid, duration,
|
|
|
- valid_date, new_user, sign_sum,
|
|
|
- main_status, supplement, audit_info,
|
|
|
- `plan`, expected_effect, next_plan,
|
|
|
+ insert into public_release (`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, ufid, duration,
|
|
|
+ valid_date, new_user, sign_sum,
|
|
|
+ main_status, supplement, audit_info,
|
|
|
+ `plan`, expected_effect, next_plan,
|
|
|
`type`, order_no)
|
|
|
- values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP},
|
|
|
- #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
|
|
|
- #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
|
|
|
- #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{clockIn,jdbcType=INTEGER},
|
|
|
- #{clockInTime,jdbcType=TIMESTAMP}, #{photoUrl,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR},
|
|
|
- #{pname,jdbcType=VARCHAR}, #{ufid,jdbcType=VARCHAR}, #{duration,jdbcType=DOUBLE},
|
|
|
- #{validDate,jdbcType=VARCHAR}, #{newUser,jdbcType=INTEGER}, #{signSum,jdbcType=INTEGER},
|
|
|
- #{mainStatus,jdbcType=INTEGER}, #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR},
|
|
|
- #{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR},
|
|
|
+ values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP},
|
|
|
+ #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
|
|
|
+ #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
|
|
|
+ #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{clockIn,jdbcType=INTEGER},
|
|
|
+ #{clockInTime,jdbcType=TIMESTAMP}, #{photoUrl,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR},
|
|
|
+ #{pname,jdbcType=VARCHAR}, #{ufid,jdbcType=VARCHAR}, #{duration,jdbcType=DOUBLE},
|
|
|
+ #{validDate,jdbcType=VARCHAR}, #{newUser,jdbcType=INTEGER}, #{signSum,jdbcType=INTEGER},
|
|
|
+ #{mainStatus,jdbcType=INTEGER}, #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR},
|
|
|
+ #{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR},
|
|
|
#{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
@@ -534,10 +534,10 @@
|
|
|
and d.id= #{sid}
|
|
|
</if>
|
|
|
<if test="depId != null">
|
|
|
- and d.department_id = #{depId}
|
|
|
+ and c.department_id = #{depId}
|
|
|
</if>
|
|
|
<if test="type==1 and deps !=null">
|
|
|
- and d.department_id in
|
|
|
+ and c.department_id in
|
|
|
<foreach close=")" collection="deps" item="deps" open="(" separator=",">
|
|
|
#{deps.id}
|
|
|
</foreach>
|
|
|
@@ -575,10 +575,10 @@
|
|
|
and d.id= #{sid}
|
|
|
</if>
|
|
|
<if test="depId != null">
|
|
|
- and d.department_id = #{depId}
|
|
|
+ and c.department_id = #{depId}
|
|
|
</if>
|
|
|
<if test="type==1 and deps !=null">
|
|
|
- and d.department_id in
|
|
|
+ and c.department_id in
|
|
|
<foreach close=")" collection="deps" item="deps" open="(" separator=",">
|
|
|
#{deps.id}
|
|
|
</foreach>
|
|
|
@@ -619,4 +619,4 @@
|
|
|
left join admin c on a.aid =c.id
|
|
|
where a.order_no = #{orderNo}
|
|
|
</select>
|
|
|
-</mapper>
|
|
|
+</mapper>
|