|
|
@@ -8,14 +8,8 @@
|
|
|
<result column="release_end" jdbcType="TIMESTAMP" property="releaseEnd" />
|
|
|
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
|
|
|
<result column="annex_url" jdbcType="VARCHAR" property="annexUrl" />
|
|
|
- <result column="district_name" jdbcType="VARCHAR" property="districtName" />
|
|
|
- <result column="longitude" jdbcType="VARCHAR" property="longitude" />
|
|
|
- <result column="latitude" jdbcType="VARCHAR" property="latitude" />
|
|
|
<result column="status" jdbcType="INTEGER" property="status" />
|
|
|
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
|
|
- <result column="clock_in" jdbcType="INTEGER" property="clockIn" />
|
|
|
- <result column="clock_in_time" jdbcType="TIMESTAMP" property="clockInTime" />
|
|
|
- <result column="photo_url" jdbcType="VARCHAR" property="photoUrl" />
|
|
|
<result column="pid" jdbcType="VARCHAR" property="pid" />
|
|
|
<result column="pname" jdbcType="VARCHAR" property="pname" />
|
|
|
<result column="duration" jdbcType="DOUBLE" property="duration" />
|
|
|
@@ -35,13 +29,11 @@
|
|
|
<result column="assist_aid_name" jdbcType="VARCHAR" property="assistAidName" />
|
|
|
<result column="main_id" jdbcType="INTEGER" property="mainId" />
|
|
|
<result column="main_name" jdbcType="VARCHAR" property="mainName" />
|
|
|
- <result column="clock_in_remarks" jdbcType="VARCHAR" property="clockInRemarks" />
|
|
|
<result column="reject_name" jdbcType="VARCHAR" property="rejectName" />
|
|
|
<result column="assistant_aid" jdbcType="VARCHAR" property="assistantAid" />
|
|
|
<result column="assistant_name" jdbcType="VARCHAR" property="assistantName" />
|
|
|
<result column="public_again" jdbcType="INTEGER" property="publicAgain" />
|
|
|
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
|
|
|
- <result column="uid" jdbcType="VARCHAR" property="uid" />
|
|
|
<result column="ufid" jdbcType="VARCHAR" property="ufid" />
|
|
|
<result column="new_user" jdbcType="VARCHAR" property="newUser" />
|
|
|
<result column="sign_sum" jdbcType="VARCHAR" property="signSum" />
|
|
|
@@ -49,12 +41,11 @@
|
|
|
<result column="object_type" jdbcType="INTEGER" property="objectType" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
- id, aid, release_start, release_end, remarks, annex_url, district_name, longitude,
|
|
|
- latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname,
|
|
|
- duration, valid_date, main_status, supplement, audit_info, `plan`, expected_effect,
|
|
|
+ id, aid, release_start, release_end, remarks, annex_url, `status`, create_time, pid,
|
|
|
+ pname, duration, valid_date, main_status, 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, clock_in_remarks, reject_name, assistant_aid, assistant_name,
|
|
|
- public_again, audit_time, `uid`, ufid, new_user, sign_sum, user_names, object_type
|
|
|
+ main_id, main_name, reject_name, assistant_aid, assistant_name, public_again, audit_time,
|
|
|
+ ufid, new_user, sign_sum, user_names, object_type
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -68,35 +59,31 @@
|
|
|
</delete>
|
|
|
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
insert into public_release (aid, release_start, release_end,
|
|
|
- remarks, annex_url, district_name,
|
|
|
- longitude, latitude, `status`,
|
|
|
- create_time, clock_in, clock_in_time,
|
|
|
- photo_url, pid, pname,
|
|
|
+ remarks, annex_url, `status`,
|
|
|
+ create_time, pid, pname,
|
|
|
duration, valid_date, main_status,
|
|
|
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, clock_in_remarks,
|
|
|
- reject_name, assistant_aid, assistant_name,
|
|
|
- public_again, audit_time, `uid`,
|
|
|
- ufid, new_user, sign_sum,
|
|
|
- user_names, object_type)
|
|
|
+ main_id, main_name, reject_name,
|
|
|
+ assistant_aid, assistant_name, public_again,
|
|
|
+ audit_time, ufid, new_user,
|
|
|
+ sign_sum, user_names, object_type
|
|
|
+ )
|
|
|
values (#{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
- #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, #{districtName,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},
|
|
|
+ #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
|
|
|
+ #{createTime,jdbcType=TIMESTAMP}, #{pid,jdbcType=VARCHAR}, #{pname,jdbcType=VARCHAR},
|
|
|
#{duration,jdbcType=DOUBLE}, #{validDate,jdbcType=VARCHAR}, #{mainStatus,jdbcType=INTEGER},
|
|
|
#{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR}, #{plan,jdbcType=VARCHAR},
|
|
|
#{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
|
|
|
#{orderNo,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateStatus,jdbcType=INTEGER},
|
|
|
#{assist,jdbcType=INTEGER}, #{assistAid,jdbcType=VARCHAR}, #{assistAidName,jdbcType=VARCHAR},
|
|
|
- #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR}, #{clockInRemarks,jdbcType=VARCHAR},
|
|
|
- #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR}, #{assistantName,jdbcType=VARCHAR},
|
|
|
- #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP}, #{uid,jdbcType=VARCHAR},
|
|
|
- #{ufid,jdbcType=VARCHAR}, #{newUser,jdbcType=VARCHAR}, #{signSum,jdbcType=VARCHAR},
|
|
|
- #{userNames,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER})
|
|
|
+ #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR},
|
|
|
+ #{assistantAid,jdbcType=VARCHAR}, #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER},
|
|
|
+ #{auditTime,jdbcType=TIMESTAMP}, #{ufid,jdbcType=VARCHAR}, #{newUser,jdbcType=VARCHAR},
|
|
|
+ #{signSum,jdbcType=VARCHAR}, #{userNames,jdbcType=VARCHAR}, #{objectType,jdbcType=INTEGER}
|
|
|
+ )
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
insert into public_release
|
|
|
@@ -116,30 +103,12 @@
|
|
|
<if test="annexUrl != null">
|
|
|
annex_url,
|
|
|
</if>
|
|
|
- <if test="districtName != null">
|
|
|
- district_name,
|
|
|
- </if>
|
|
|
- <if test="longitude != null">
|
|
|
- longitude,
|
|
|
- </if>
|
|
|
- <if test="latitude != null">
|
|
|
- latitude,
|
|
|
- </if>
|
|
|
<if test="status != null">
|
|
|
`status`,
|
|
|
</if>
|
|
|
<if test="createTime != null">
|
|
|
create_time,
|
|
|
</if>
|
|
|
- <if test="clockIn != null">
|
|
|
- clock_in,
|
|
|
- </if>
|
|
|
- <if test="clockInTime != null">
|
|
|
- clock_in_time,
|
|
|
- </if>
|
|
|
- <if test="photoUrl != null">
|
|
|
- photo_url,
|
|
|
- </if>
|
|
|
<if test="pid != null">
|
|
|
pid,
|
|
|
</if>
|
|
|
@@ -197,9 +166,6 @@
|
|
|
<if test="mainName != null">
|
|
|
main_name,
|
|
|
</if>
|
|
|
- <if test="clockInRemarks != null">
|
|
|
- clock_in_remarks,
|
|
|
- </if>
|
|
|
<if test="rejectName != null">
|
|
|
reject_name,
|
|
|
</if>
|
|
|
@@ -215,9 +181,6 @@
|
|
|
<if test="auditTime != null">
|
|
|
audit_time,
|
|
|
</if>
|
|
|
- <if test="uid != null">
|
|
|
- `uid`,
|
|
|
- </if>
|
|
|
<if test="ufid != null">
|
|
|
ufid,
|
|
|
</if>
|
|
|
@@ -250,30 +213,12 @@
|
|
|
<if test="annexUrl != null">
|
|
|
#{annexUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="districtName != null">
|
|
|
- #{districtName,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="longitude != null">
|
|
|
- #{longitude,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="latitude != null">
|
|
|
- #{latitude,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="status != null">
|
|
|
#{status,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="createTime != null">
|
|
|
#{createTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
- <if test="clockIn != null">
|
|
|
- #{clockIn,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="clockInTime != null">
|
|
|
- #{clockInTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="photoUrl != null">
|
|
|
- #{photoUrl,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="pid != null">
|
|
|
#{pid,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -331,9 +276,6 @@
|
|
|
<if test="mainName != null">
|
|
|
#{mainName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="clockInRemarks != null">
|
|
|
- #{clockInRemarks,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="rejectName != null">
|
|
|
#{rejectName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -349,9 +291,6 @@
|
|
|
<if test="auditTime != null">
|
|
|
#{auditTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
- <if test="uid != null">
|
|
|
- #{uid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="ufid != null">
|
|
|
#{ufid,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -387,30 +326,12 @@
|
|
|
<if test="annexUrl != null">
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="districtName != null">
|
|
|
- district_name = #{districtName,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="longitude != null">
|
|
|
- longitude = #{longitude,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="latitude != null">
|
|
|
- latitude = #{latitude,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="status != null">
|
|
|
`status` = #{status,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="createTime != null">
|
|
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
- <if test="clockIn != null">
|
|
|
- clock_in = #{clockIn,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="clockInTime != null">
|
|
|
- clock_in_time = #{clockInTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="photoUrl != null">
|
|
|
- photo_url = #{photoUrl,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="pid != null">
|
|
|
pid = #{pid,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -468,9 +389,6 @@
|
|
|
<if test="mainName != null">
|
|
|
main_name = #{mainName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="clockInRemarks != null">
|
|
|
- clock_in_remarks = #{clockInRemarks,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="rejectName != null">
|
|
|
reject_name = #{rejectName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -486,9 +404,6 @@
|
|
|
<if test="auditTime != null">
|
|
|
audit_time = #{auditTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
- <if test="uid != null">
|
|
|
- `uid` = #{uid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="ufid != null">
|
|
|
ufid = #{ufid,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -514,14 +429,8 @@
|
|
|
release_end = #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
remarks = #{remarks,jdbcType=VARCHAR},
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
- district_name = #{districtName,jdbcType=VARCHAR},
|
|
|
- longitude = #{longitude,jdbcType=VARCHAR},
|
|
|
- latitude = #{latitude,jdbcType=VARCHAR},
|
|
|
`status` = #{status,jdbcType=INTEGER},
|
|
|
create_time = #{createTime,jdbcType=TIMESTAMP},
|
|
|
- clock_in = #{clockIn,jdbcType=INTEGER},
|
|
|
- clock_in_time = #{clockInTime,jdbcType=TIMESTAMP},
|
|
|
- photo_url = #{photoUrl,jdbcType=VARCHAR},
|
|
|
pid = #{pid,jdbcType=VARCHAR},
|
|
|
pname = #{pname,jdbcType=VARCHAR},
|
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
|
@@ -541,13 +450,11 @@
|
|
|
assist_aid_name = #{assistAidName,jdbcType=VARCHAR},
|
|
|
main_id = #{mainId,jdbcType=INTEGER},
|
|
|
main_name = #{mainName,jdbcType=VARCHAR},
|
|
|
- clock_in_remarks = #{clockInRemarks,jdbcType=VARCHAR},
|
|
|
reject_name = #{rejectName,jdbcType=VARCHAR},
|
|
|
assistant_aid = #{assistantAid,jdbcType=VARCHAR},
|
|
|
assistant_name = #{assistantName,jdbcType=VARCHAR},
|
|
|
public_again = #{publicAgain,jdbcType=INTEGER},
|
|
|
audit_time = #{auditTime,jdbcType=TIMESTAMP},
|
|
|
- `uid` = #{uid,jdbcType=VARCHAR},
|
|
|
ufid = #{ufid,jdbcType=VARCHAR},
|
|
|
new_user = #{newUser,jdbcType=VARCHAR},
|
|
|
sign_sum = #{signSum,jdbcType=VARCHAR},
|
|
|
@@ -565,12 +472,12 @@
|
|
|
|
|
|
|
|
|
<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.district_name districtName,a.aid,
|
|
|
+ select a.id ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.aid,
|
|
|
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,
|
|
|
+ date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,
|
|
|
a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
|
|
|
a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames
|
|
|
- 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 admin c on a.aid =c.id
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|