|
|
@@ -24,14 +24,14 @@
|
|
|
<result column="valid_date" jdbcType="VARCHAR" property="validDate" />
|
|
|
<result column="new_user" jdbcType="INTEGER" property="newUser" />
|
|
|
<result column="sign_sum" jdbcType="INTEGER" property="signSum" />
|
|
|
- <result column="main_status" jdbcType="INTEGER" property="mainStatus" />
|
|
|
+ <result column="mian_status" jdbcType="INTEGER" property="mianStatus" />
|
|
|
<result column="supplement" jdbcType="VARCHAR" property="supplement" />
|
|
|
<result column="audit_info" jdbcType="VARCHAR" property="auditInfo" />
|
|
|
</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
|
|
|
+ ufid, duration, valid_date, new_user, sign_sum, mian_status, supplement, audit_info
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -51,7 +51,7 @@
|
|
|
clock_in_time, photo_url, pid,
|
|
|
pname, ufid, duration,
|
|
|
valid_date, new_user, sign_sum,
|
|
|
- main_status, supplement, audit_info
|
|
|
+ mian_status, supplement, audit_info
|
|
|
)
|
|
|
values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP},
|
|
|
#{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
|
|
|
@@ -60,7 +60,7 @@
|
|
|
#{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}
|
|
|
+ #{mianStatus,jdbcType=INTEGER}, #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR}
|
|
|
)
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
@@ -129,8 +129,8 @@
|
|
|
<if test="signSum != null">
|
|
|
sign_sum,
|
|
|
</if>
|
|
|
- <if test="mainStatus != null">
|
|
|
- main_status,
|
|
|
+ <if test="mianStatus != null">
|
|
|
+ mian_status,
|
|
|
</if>
|
|
|
<if test="supplement != null">
|
|
|
supplement,
|
|
|
@@ -203,8 +203,8 @@
|
|
|
<if test="signSum != null">
|
|
|
#{signSum,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
- <if test="mainStatus != null">
|
|
|
- #{mainStatus,jdbcType=INTEGER},
|
|
|
+ <if test="mianStatus != null">
|
|
|
+ #{mianStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="supplement != null">
|
|
|
#{supplement,jdbcType=VARCHAR},
|
|
|
@@ -280,8 +280,8 @@
|
|
|
<if test="signSum != null">
|
|
|
sign_sum = #{signSum,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
- <if test="mainStatus != null">
|
|
|
- main_status = #{mainStatus,jdbcType=INTEGER},
|
|
|
+ <if test="mianStatus != null">
|
|
|
+ mian_status = #{mianStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="supplement != null">
|
|
|
supplement = #{supplement,jdbcType=VARCHAR},
|
|
|
@@ -315,7 +315,7 @@
|
|
|
valid_date = #{validDate,jdbcType=VARCHAR},
|
|
|
new_user = #{newUser,jdbcType=INTEGER},
|
|
|
sign_sum = #{signSum,jdbcType=INTEGER},
|
|
|
- main_status = #{mainStatus,jdbcType=INTEGER},
|
|
|
+ mian_status = #{mianStatus,jdbcType=INTEGER},
|
|
|
supplement = #{supplement,jdbcType=VARCHAR},
|
|
|
audit_info = #{auditInfo,jdbcType=VARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
@@ -387,8 +387,8 @@
|
|
|
<if test="signSum != null">
|
|
|
sign_sum,
|
|
|
</if>
|
|
|
- <if test="mainStatus != null">
|
|
|
- main_status,
|
|
|
+ <if test="mianStatus != null">
|
|
|
+ mian_status,
|
|
|
</if>
|
|
|
<if test="supplement != null">
|
|
|
supplement,
|
|
|
@@ -461,8 +461,8 @@
|
|
|
<if test="signSum != null">
|
|
|
#{signSum,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
- <if test="mainStatus != null">
|
|
|
- #{mainStatus,jdbcType=INTEGER},
|
|
|
+ <if test="mianStatus != null">
|
|
|
+ #{mianStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
<if test="supplement != null">
|
|
|
#{supplement,jdbcType=VARCHAR},
|
|
|
@@ -594,15 +594,21 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
|
|
|
</select>
|
|
|
|
|
|
<select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
|
|
|
- select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
|
|
|
- date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,
|
|
|
- date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,
|
|
|
- date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds
|
|
|
- from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
- where 1=1
|
|
|
- <if test="aid != null">
|
|
|
+ select a.id,b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
|
|
|
+ date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,a.remarks,a.supplement,
|
|
|
+ date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,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
|
|
|
+ from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
+ left join admin d on b.aid=d.id where 1=1
|
|
|
+ <if test="aid != null">
|
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
|
+ <if test="type==1 and deps !=null">
|
|
|
+ and d.department_id in
|
|
|
+ <foreach close=")" collection="deps" item="deps" open="(" separator=",">
|
|
|
+ #{deps.id}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="uid != null">
|
|
|
and a.uid = #{uid}
|
|
|
</if>
|
|
|
@@ -623,10 +629,17 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
|
|
|
<select id="countPublicDtails" resultType="java.lang.Integer">
|
|
|
select count(*)
|
|
|
from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
|
|
|
+ left join admin d on b.aid=d.id
|
|
|
where 1=1
|
|
|
<if test="aid != null">
|
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
|
+ <if test="type==1 and deps !=null">
|
|
|
+ and d.department_id in
|
|
|
+ <foreach close=")" collection="deps" item="deps" open="(" separator=",">
|
|
|
+ #{deps.id}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
<if test="uid != null">
|
|
|
and a.uid = #{uid}
|
|
|
</if>
|