|
|
@@ -39,13 +39,14 @@
|
|
|
<result column="object_type" jdbcType="INTEGER" property="objectType" />
|
|
|
<result column="public_type" jdbcType="INTEGER" property="publicType" />
|
|
|
<result column="district_name" jdbcType="VARCHAR" property="districtName" />
|
|
|
+ <result column="clock_in" jdbcType="INTEGER" property="clockIn" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
id, aid, release_start, release_end, remarks, annex_url, `status`, create_time, pid,
|
|
|
pname, duration, valid_date, 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, reject_name, assistant_aid, assistant_name, public_again, audit_time,
|
|
|
- new_user, sign_sum, user_names, object_type, public_type, district_name
|
|
|
+ new_user, sign_sum, user_names, object_type, public_type, district_name, clock_in
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -69,8 +70,8 @@
|
|
|
main_name, reject_name, assistant_aid,
|
|
|
assistant_name, public_again, audit_time,
|
|
|
new_user, sign_sum, user_names,
|
|
|
- object_type, public_type, district_name
|
|
|
- )
|
|
|
+ object_type, public_type, district_name,
|
|
|
+ clock_in)
|
|
|
values (#{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
#{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
|
|
|
#{createTime,jdbcType=TIMESTAMP}, #{pid,jdbcType=VARCHAR}, #{pname,jdbcType=VARCHAR},
|
|
|
@@ -82,8 +83,8 @@
|
|
|
#{mainName,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR},
|
|
|
#{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP},
|
|
|
#{newUser,jdbcType=VARCHAR}, #{signSum,jdbcType=VARCHAR}, #{userNames,jdbcType=VARCHAR},
|
|
|
- #{objectType,jdbcType=INTEGER}, #{publicType,jdbcType=INTEGER}, #{districtName,jdbcType=VARCHAR}
|
|
|
- )
|
|
|
+ #{objectType,jdbcType=INTEGER}, #{publicType,jdbcType=INTEGER}, #{districtName,jdbcType=VARCHAR},
|
|
|
+ #{clockIn,jdbcType=INTEGER})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
|
|
|
insert into public_release
|
|
|
@@ -196,6 +197,9 @@
|
|
|
<if test="districtName != null">
|
|
|
district_name,
|
|
|
</if>
|
|
|
+ <if test="clockIn != null">
|
|
|
+ clock_in,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="aid != null">
|
|
|
@@ -306,6 +310,9 @@
|
|
|
<if test="districtName != null">
|
|
|
#{districtName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="clockIn != null">
|
|
|
+ #{clockIn,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
|
|
|
@@ -419,6 +426,9 @@
|
|
|
<if test="districtName != null">
|
|
|
district_name = #{districtName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="clockIn != null">
|
|
|
+ clock_in = #{clockIn,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
@@ -459,7 +469,8 @@
|
|
|
user_names = #{userNames,jdbcType=VARCHAR},
|
|
|
object_type = #{objectType,jdbcType=INTEGER},
|
|
|
public_type = #{publicType,jdbcType=INTEGER},
|
|
|
- district_name = #{districtName,jdbcType=VARCHAR}
|
|
|
+ district_name = #{districtName,jdbcType=VARCHAR},
|
|
|
+ clock_in = #{clockIn,jdbcType=INTEGER}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
|
|
|
@@ -476,7 +487,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.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,a.district_name districtName,
|
|
|
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
|
|
|
+ a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames,a.clock_in clockIn
|
|
|
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
|
|
|
@@ -534,6 +545,9 @@
|
|
|
and e.aid = #{aid}
|
|
|
and a.public_type in (1,2)
|
|
|
</if>
|
|
|
+ <if test="clockIn !=null">
|
|
|
+ and a.clock_in =#{clockIn}
|
|
|
+ </if>
|
|
|
<if test="clockTime !=null">
|
|
|
and a.release_start < #{clockTime} and a.release_end > #{clockTime}
|
|
|
</if>
|