|
|
@@ -8,7 +8,7 @@
|
|
|
<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="user_name" jdbcType="VARCHAR" property="userName" />
|
|
|
+ <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" />
|
|
|
@@ -49,10 +49,10 @@
|
|
|
<result column="object_type" jdbcType="INTEGER" property="objectType" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
- id, aid, release_start, release_end, remarks, annex_url, user_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, next_plan,
|
|
|
- `type`, order_no, update_time, update_status, assist, assist_aid, assist_aid_name,
|
|
|
+ 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,
|
|
|
+ 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
|
|
|
</sql>
|
|
|
@@ -68,7 +68,7 @@
|
|
|
</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, user_name,
|
|
|
+ remarks, annex_url, district_name,
|
|
|
longitude, latitude, `status`,
|
|
|
create_time, clock_in, clock_in_time,
|
|
|
photo_url, pid, pname,
|
|
|
@@ -83,7 +83,7 @@
|
|
|
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}, #{userName,jdbcType=VARCHAR},
|
|
|
+ #{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},
|
|
|
@@ -116,8 +116,8 @@
|
|
|
<if test="annexUrl != null">
|
|
|
annex_url,
|
|
|
</if>
|
|
|
- <if test="userName != null">
|
|
|
- user_name,
|
|
|
+ <if test="districtName != null">
|
|
|
+ district_name,
|
|
|
</if>
|
|
|
<if test="longitude != null">
|
|
|
longitude,
|
|
|
@@ -250,8 +250,8 @@
|
|
|
<if test="annexUrl != null">
|
|
|
#{annexUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="userName != null">
|
|
|
- #{userName,jdbcType=VARCHAR},
|
|
|
+ <if test="districtName != null">
|
|
|
+ #{districtName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
<if test="longitude != null">
|
|
|
#{longitude,jdbcType=VARCHAR},
|
|
|
@@ -387,8 +387,8 @@
|
|
|
<if test="annexUrl != null">
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="userName != null">
|
|
|
- user_name = #{userName,jdbcType=VARCHAR},
|
|
|
+ <if test="districtName != null">
|
|
|
+ district_name = #{districtName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
<if test="longitude != null">
|
|
|
longitude = #{longitude,jdbcType=VARCHAR},
|
|
|
@@ -514,7 +514,7 @@
|
|
|
release_end = #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
remarks = #{remarks,jdbcType=VARCHAR},
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
- user_name = #{userName,jdbcType=VARCHAR},
|
|
|
+ district_name = #{districtName,jdbcType=VARCHAR},
|
|
|
longitude = #{longitude,jdbcType=VARCHAR},
|
|
|
latitude = #{latitude,jdbcType=VARCHAR},
|
|
|
`status` = #{status,jdbcType=INTEGER},
|
|
|
@@ -565,7 +565,7 @@
|
|
|
|
|
|
|
|
|
<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,a.aid,
|
|
|
+ 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,
|
|
|
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.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
|
|
|
@@ -700,7 +700,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectDtails" resultType="com.goafanti.weChat.bo.OutPublicRelease">
|
|
|
- select a.id,b.nickname ,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,a.update_time updateTime,a.user_names userNames,
|
|
|
+ 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.update_time updateTime,a.user_names userNames,
|
|
|
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.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,
|
|
|
@@ -762,7 +762,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
|
|
|
- select a.id ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,a.user_names userNames,
|
|
|
+ select a.id ,a.district_name districtName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,a.user_names userNames,
|
|
|
date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,a.remarks,a.supplement,a.type,
|
|
|
date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
|
|
|
d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
|
|
|
@@ -864,7 +864,7 @@
|
|
|
left join department d on c.department_id =d.id left join district_glossory e on d.province =e.id
|
|
|
</select>
|
|
|
<select id="publicByOrder" resultType="com.goafanti.weChat.bo.OutPublicRelease">
|
|
|
- select a.id,a.uid,a.aid,b.nickname ,c.name aname,a.duration ,a.user_name userName,
|
|
|
+ select a.id,a.uid,a.aid,b.nickname ,c.name aname,a.duration ,a.district_name districtName,
|
|
|
date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStarts,
|
|
|
date_format(a.release_end ,'%Y-%m-%d %H:%i:%S')releaseEnds,
|
|
|
date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S')clockInTimes,
|