|
|
@@ -3,27 +3,17 @@
|
|
|
<mapper namespace="com.goafanti.common.dao.PublicReleaseMapper">
|
|
|
<resultMap id="BaseResultMap" type="com.goafanti.common.model.PublicRelease">
|
|
|
<id column="id" jdbcType="INTEGER" property="id" />
|
|
|
- <result column="uid" jdbcType="VARCHAR" property="uid" />
|
|
|
<result column="aid" jdbcType="VARCHAR" property="aid" />
|
|
|
<result column="release_start" jdbcType="TIMESTAMP" property="releaseStart" />
|
|
|
<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="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="ufid" jdbcType="VARCHAR" property="ufid" />
|
|
|
<result column="duration" jdbcType="DOUBLE" property="duration" />
|
|
|
<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="supplement" jdbcType="VARCHAR" property="supplement" />
|
|
|
<result column="audit_info" jdbcType="VARCHAR" property="auditInfo" />
|
|
|
@@ -39,20 +29,23 @@
|
|
|
<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="ufid" jdbcType="VARCHAR" property="ufid" />
|
|
|
+ <result column="new_user" jdbcType="VARCHAR" property="newUser" />
|
|
|
+ <result column="sign_sum" jdbcType="VARCHAR" property="signSum" />
|
|
|
+ <result column="user_names" jdbcType="VARCHAR" property="userNames" />
|
|
|
+ <result column="object_type" jdbcType="INTEGER" property="objectType" />
|
|
|
</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,
|
|
|
- `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
|
|
|
+ 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, 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
|
|
|
@@ -65,43 +58,36 @@
|
|
|
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,
|
|
|
- `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
|
|
|
+ insert into public_release (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, reject_name,
|
|
|
+ assistant_aid, assistant_name, public_again,
|
|
|
+ audit_time, ufid, new_user,
|
|
|
+ sign_sum, user_names, object_type
|
|
|
)
|
|
|
- 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}, #{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}
|
|
|
+ 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},
|
|
|
+ #{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}, #{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
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
- <if test="uid != null">
|
|
|
- `uid`,
|
|
|
- </if>
|
|
|
<if test="aid != null">
|
|
|
aid,
|
|
|
</if>
|
|
|
@@ -117,51 +103,24 @@
|
|
|
<if test="annexUrl != null">
|
|
|
annex_url,
|
|
|
</if>
|
|
|
- <if test="userName != null">
|
|
|
- user_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>
|
|
|
<if test="pname != null">
|
|
|
pname,
|
|
|
</if>
|
|
|
- <if test="ufid != null">
|
|
|
- ufid,
|
|
|
- </if>
|
|
|
<if test="duration != null">
|
|
|
duration,
|
|
|
</if>
|
|
|
<if test="validDate != null">
|
|
|
valid_date,
|
|
|
</if>
|
|
|
- <if test="newUser != null">
|
|
|
- new_user,
|
|
|
- </if>
|
|
|
- <if test="signSum != null">
|
|
|
- sign_sum,
|
|
|
- </if>
|
|
|
<if test="mainStatus != null">
|
|
|
main_status,
|
|
|
</if>
|
|
|
@@ -207,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>
|
|
|
@@ -225,11 +181,23 @@
|
|
|
<if test="auditTime != null">
|
|
|
audit_time,
|
|
|
</if>
|
|
|
+ <if test="ufid != null">
|
|
|
+ ufid,
|
|
|
+ </if>
|
|
|
+ <if test="newUser != null">
|
|
|
+ new_user,
|
|
|
+ </if>
|
|
|
+ <if test="signSum != null">
|
|
|
+ sign_sum,
|
|
|
+ </if>
|
|
|
+ <if test="userNames != null">
|
|
|
+ user_names,
|
|
|
+ </if>
|
|
|
+ <if test="objectType != null">
|
|
|
+ object_type,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
- <if test="uid != null">
|
|
|
- #{uid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="aid != null">
|
|
|
#{aid,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -245,51 +213,24 @@
|
|
|
<if test="annexUrl != null">
|
|
|
#{annexUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="userName != null">
|
|
|
- #{userName,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>
|
|
|
<if test="pname != null">
|
|
|
#{pname,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="ufid != null">
|
|
|
- #{ufid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="duration != null">
|
|
|
#{duration,jdbcType=DOUBLE},
|
|
|
</if>
|
|
|
<if test="validDate != null">
|
|
|
#{validDate,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="newUser != null">
|
|
|
- #{newUser,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="signSum != null">
|
|
|
- #{signSum,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
<if test="mainStatus != null">
|
|
|
#{mainStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
@@ -335,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>
|
|
|
@@ -353,14 +291,26 @@
|
|
|
<if test="auditTime != null">
|
|
|
#{auditTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
+ <if test="ufid != null">
|
|
|
+ #{ufid,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="newUser != null">
|
|
|
+ #{newUser,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="signSum != null">
|
|
|
+ #{signSum,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="userNames != null">
|
|
|
+ #{userNames,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="objectType != null">
|
|
|
+ #{objectType,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
|
|
|
update public_release
|
|
|
<set>
|
|
|
- <if test="uid != null">
|
|
|
- `uid` = #{uid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="aid != null">
|
|
|
aid = #{aid,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
@@ -376,51 +326,24 @@
|
|
|
<if test="annexUrl != null">
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="userName != null">
|
|
|
- user_name = #{userName,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>
|
|
|
<if test="pname != null">
|
|
|
pname = #{pname,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="ufid != null">
|
|
|
- ufid = #{ufid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
<if test="duration != null">
|
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
|
</if>
|
|
|
<if test="validDate != null">
|
|
|
valid_date = #{validDate,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
- <if test="newUser != null">
|
|
|
- new_user = #{newUser,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="signSum != null">
|
|
|
- sign_sum = #{signSum,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
<if test="mainStatus != null">
|
|
|
main_status = #{mainStatus,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
@@ -466,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>
|
|
|
@@ -484,32 +404,37 @@
|
|
|
<if test="auditTime != null">
|
|
|
audit_time = #{auditTime,jdbcType=TIMESTAMP},
|
|
|
</if>
|
|
|
+ <if test="ufid != null">
|
|
|
+ ufid = #{ufid,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="newUser != null">
|
|
|
+ new_user = #{newUser,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="signSum != null">
|
|
|
+ sign_sum = #{signSum,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="userNames != null">
|
|
|
+ user_names = #{userNames,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="objectType != null">
|
|
|
+ object_type = #{objectType,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
<update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PublicRelease">
|
|
|
update public_release
|
|
|
- set `uid` = #{uid,jdbcType=VARCHAR},
|
|
|
- aid = #{aid,jdbcType=VARCHAR},
|
|
|
+ set aid = #{aid,jdbcType=VARCHAR},
|
|
|
release_start = #{releaseStart,jdbcType=TIMESTAMP},
|
|
|
release_end = #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
remarks = #{remarks,jdbcType=VARCHAR},
|
|
|
annex_url = #{annexUrl,jdbcType=VARCHAR},
|
|
|
- user_name = #{userName,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},
|
|
|
- ufid = #{ufid,jdbcType=VARCHAR},
|
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
|
valid_date = #{validDate,jdbcType=VARCHAR},
|
|
|
- new_user = #{newUser,jdbcType=INTEGER},
|
|
|
- sign_sum = #{signSum,jdbcType=INTEGER},
|
|
|
main_status = #{mainStatus,jdbcType=INTEGER},
|
|
|
supplement = #{supplement,jdbcType=VARCHAR},
|
|
|
audit_info = #{auditInfo,jdbcType=VARCHAR},
|
|
|
@@ -525,35 +450,43 @@
|
|
|
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}
|
|
|
+ audit_time = #{auditTime,jdbcType=TIMESTAMP},
|
|
|
+ ufid = #{ufid,jdbcType=VARCHAR},
|
|
|
+ new_user = #{newUser,jdbcType=VARCHAR},
|
|
|
+ sign_sum = #{signSum,jdbcType=VARCHAR},
|
|
|
+ user_names = #{userNames,jdbcType=VARCHAR},
|
|
|
+ object_type = #{objectType,jdbcType=INTEGER}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
|
|
|
<update id="updateSignByAidAndUid">
|
|
|
- update public_release a ,(select max(create_time)create_time from public_release
|
|
|
- where aid= #{aid} and uid=#{uid} and main_status =1 group by aid,uid)b
|
|
|
+ update public_release_details a left join public_release b on a.prid =b.id
|
|
|
+ left join `user` c on a.uid=c.id
|
|
|
set a.sign_sum =a.sign_sum +1
|
|
|
- where a.aid =#{aid} and a.uid =#{uid} and a.main_status =1 and a.create_time =b.create_time
|
|
|
+ where a.uid= #{uid} and a.main_status =1 and b.aid= #{aid}
|
|
|
</update>
|
|
|
|
|
|
|
|
|
<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 ,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,x.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
|
|
|
- from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
+ a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain,a.user_names userNames
|
|
|
+ from public_release a left join admin c on a.aid =c.id
|
|
|
+ left join (select min(prid)id,min(district_name)district_name from public_release_details group by prid )x on a.id=x.id
|
|
|
<if test="type==2">
|
|
|
left join department d on c.department_id =d.id
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<if test="type==0">
|
|
|
+ <if test="assist ==0">
|
|
|
+ and a.assist in(0,1)
|
|
|
+ </if>
|
|
|
<if test="assist == 2">
|
|
|
and a.assist =2
|
|
|
</if>
|
|
|
@@ -563,9 +496,6 @@
|
|
|
<if test="assist ==4">
|
|
|
and a.assist in (2,3)
|
|
|
</if>
|
|
|
- <if test="assist !=2 and assist !=3 and assist !=4 and assistType !=1">
|
|
|
- and a.assist in(0,1)
|
|
|
- </if>
|
|
|
<if test="aid !=null">
|
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
|
@@ -594,15 +524,9 @@
|
|
|
<if test="releaseStarts != null and publicEnd != null">
|
|
|
and a.release_start BETWEEN #{releaseStarts} and #{publicEnd}
|
|
|
</if>
|
|
|
- <if test="userName !=null">
|
|
|
- and b.nickname like CONCAT('%',#{userName},'%')
|
|
|
- </if>
|
|
|
<if test="status !=null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
- <if test="clockIn !=null">
|
|
|
- and a.clock_in = #{clockIn}
|
|
|
- </if>
|
|
|
<if test="type==2">
|
|
|
ORDER BY a.create_time desc
|
|
|
</if>
|
|
|
@@ -617,12 +541,15 @@
|
|
|
</select>
|
|
|
<select id="countPublicRelease" 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
|
|
|
+ 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>
|
|
|
where 1=1
|
|
|
<if test="type==0">
|
|
|
+ <if test="assist ==0">
|
|
|
+ and a.assist in(0,1)
|
|
|
+ </if>
|
|
|
<if test="assist == 2">
|
|
|
and a.assist =2
|
|
|
</if>
|
|
|
@@ -632,9 +559,6 @@
|
|
|
<if test="assist ==4">
|
|
|
and a.assist in (2,3)
|
|
|
</if>
|
|
|
- <if test="assist !=2 and assist !=3 and assist !=4 and assistType !=1">
|
|
|
- and a.assist in(0,1)
|
|
|
- </if>
|
|
|
<if test="assistType ==1">
|
|
|
and a.assist in(0,1,2)
|
|
|
</if>
|
|
|
@@ -666,52 +590,61 @@
|
|
|
<if test="releaseStarts != null and publicEnd != null">
|
|
|
and a.release_start BETWEEN #{releaseStarts} and #{publicEnd}
|
|
|
</if>
|
|
|
- <if test="userName !=null">
|
|
|
- and b.nickname like CONCAT('%',#{userName},'%')
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="status !=null">
|
|
|
and a.status = #{status}
|
|
|
</if>
|
|
|
- <if test="clockIn !=null">
|
|
|
- and a.clock_in = #{clockIn}
|
|
|
- </if>
|
|
|
</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,
|
|
|
+ select a.id,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,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,
|
|
|
+ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,
|
|
|
+ a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
|
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.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain
|
|
|
- from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
|
|
|
+ a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids
|
|
|
+ from public_release a left join admin c on a.aid =c.id
|
|
|
+ left join (select prid ,GROUP_CONCAT(uid)uids from public_release_details where prid= #{id} group by prid)x on a.id=x.prid
|
|
|
left join t_order_new d on a.order_no=d.order_no
|
|
|
where 1=1
|
|
|
<if test="id !=null">
|
|
|
and a.id= #{id}
|
|
|
</if>
|
|
|
- <if test="ufid !=null">
|
|
|
- and a.ufid= #{ufid}
|
|
|
- </if>
|
|
|
-
|
|
|
+ </select>
|
|
|
+ <select id="selectDtailsByFid" resultType="com.goafanti.weChat.bo.OutPublicReleaseAndDetails">
|
|
|
+ select a.id,c.name aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,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.aid ,c.superior_id suprId,x.uid uids,x.district_name districtName ,u.nickname,
|
|
|
+ a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
|
|
|
+ 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.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain
|
|
|
+ from public_release a left join admin c on a.aid =c.id
|
|
|
+ left join public_release_details x on a.id=x.prid
|
|
|
+ left join user u on x.uid=u.id
|
|
|
+ left join t_order_new d on a.order_no=d.order_no
|
|
|
+ where 1=1
|
|
|
+ <if test="ufid !=null">
|
|
|
+ and x.ufid= #{ufid}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="listPublicStatistics" resultType="com.goafanti.weChat.bo.OutPublicStatistics">
|
|
|
select y.aid,y.bh,y.dk,y.wsh,y.tg,y.duration,c.name from(select x.aid ,sum(x.bh)bh,sum(x.wsh)wsh,sum(x.tg)tg,sum(x.dk)dk,sum(x.duration)duration
|
|
|
- from (select if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,if(a.clock_in=1,1,0) dk,a.aid
|
|
|
- ,if(a.status=2,a.duration,0)duration from public_release a left join admin b on a.aid=b.id
|
|
|
- where 1=1
|
|
|
+ from (select a.aid, if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,b.dk ,if(a.status=2,a.duration,0)duration
|
|
|
+ from public_release a inner join (select prid ,sum(if(clock_in=1,1,0))dk from public_release_details where 1=1
|
|
|
+ <if test="clockStart != null and clockEnd != null">
|
|
|
+ and clock_in_time between #{clockStart} and #{clockEnd}
|
|
|
+ </if>
|
|
|
+ group by prid ) b on a.id =b.prid
|
|
|
+ left join admin c on a.aid=c.id where 1=1
|
|
|
<if test="aid != null">
|
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
|
- <if test="clockStart != null and clockEnd != null">
|
|
|
- and a.clock_in_time between #{clockStart} and #{clockEnd}
|
|
|
- </if>
|
|
|
<if test="createStart != null and createEnd !=null">
|
|
|
and a.create_time between #{createStart} and #{createEnd}
|
|
|
</if>
|
|
|
<if test="depId != null">
|
|
|
- and b.department_id = #{depId}
|
|
|
+ and c.department_id = #{depId}
|
|
|
</if>
|
|
|
)x group by x.aid)y left join admin c on c.id=y.aid
|
|
|
<if test="page_sql!=null">
|
|
|
@@ -721,42 +654,46 @@
|
|
|
|
|
|
|
|
|
<select id="countPublicStatistics" resultType="java.lang.Integer">
|
|
|
- select count(*) from (select aid from public_release a left join admin b on a.aid=b.id
|
|
|
+ select count(*) from (select aid from public_release a
|
|
|
+ inner join (select prid ,sum(if(clock_in=1,1,0))dk from public_release_details where 1=1
|
|
|
+ <if test="clockStart != null and clockEnd != null">
|
|
|
+ and clock_in_time between #{clockStart} and #{clockEnd}
|
|
|
+ </if>
|
|
|
+ group by prid ) b on a.id =b.prid
|
|
|
+ left join admin c on a.aid=c.id
|
|
|
where 1=1
|
|
|
<if test="aid != null">
|
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
|
- <if test="clockStart != null and clockEnd != null">
|
|
|
- and a.clock_in_time between #{clockStart} and #{clockEnd}
|
|
|
- </if>
|
|
|
<if test="createStart != null and createEnd !=null">
|
|
|
and a.create_time between #{createStart} and #{createEnd}
|
|
|
</if>
|
|
|
<if test="depId != null">
|
|
|
- and b.department_id = #{depId}
|
|
|
+ and c.department_id = #{depId}
|
|
|
</if>
|
|
|
group by aid)x
|
|
|
</select>
|
|
|
|
|
|
<select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
|
|
|
- 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,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,
|
|
|
- a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
|
|
|
- a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName,e.contract_no contractNo,
|
|
|
- e.total_amount totalAmout
|
|
|
- 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 left join t_order_new e on a.order_no =e.order_no
|
|
|
+ select b.id,a.district_name districtName ,c.name aname,a.duration ,b.status ,b.annex_url annexUrl,a.photo_url photoUrl,d.nickname userName,
|
|
|
+ date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn ,b.remarks ,b.supplement ,b.`type` ,b.object_type objectType ,
|
|
|
+ date_format(b.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,b.audit_info auditInfo,date_format(b.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
|
|
|
+ date_format(b.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(b.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
|
|
|
+ b.plan ,b.next_plan nextPlan ,b.expected_effect expectedEffect,b.update_status updateStatus,b.assist_aid_name assistAidName,
|
|
|
+ b.main_name mainName,b.assist,b.assistant_aid assistantAid, b.assistant_name assistantName,f.contract_no contractNo,
|
|
|
+ e.name sname,f.total_amount totalAmout
|
|
|
+ from public_release_details a left join public_release b on a.prid =b.id
|
|
|
+ left join admin c on b.aid =c.id left join t_order_new f on b.order_no =f.order_no
|
|
|
+ left join `user` d on a.uid =d.id left join admin e on d.aid=e.id
|
|
|
where 1=1
|
|
|
<if test="publicType != null">
|
|
|
- and a.type= #{publicType}
|
|
|
+ and b.type= #{publicType}
|
|
|
</if>
|
|
|
<if test="aid != null">
|
|
|
- and a.aid= #{aid}
|
|
|
+ and b.aid= #{aid}
|
|
|
</if>
|
|
|
<if test="sid != null">
|
|
|
- and d.id= #{sid}
|
|
|
+ and d.aid= #{sid}
|
|
|
</if>
|
|
|
<if test="deps !=null">
|
|
|
and c.department_id in
|
|
|
@@ -768,18 +705,21 @@
|
|
|
and a.uid = #{uid}
|
|
|
</if>
|
|
|
<if test="releaseStart != null and releaseEnd != null">
|
|
|
- and (a.release_start between #{releaseStart} and #{releaseEnd} or a.release_end between #{releaseStart} and #{releaseEnd})
|
|
|
+ and (b.release_start between #{releaseStart} and #{releaseEnd} or b.release_end between #{releaseStart} and #{releaseEnd})
|
|
|
</if>
|
|
|
<if test="createStart != null and createEnd != null">
|
|
|
- and a.create_time between #{createStart} and #{createEnd}
|
|
|
+ and b.create_time between #{createStart} and #{createEnd}
|
|
|
</if>
|
|
|
<if test="status != null">
|
|
|
- and a.status = #{status}
|
|
|
+ and b.status = #{status}
|
|
|
</if>
|
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in= #{clockIn}
|
|
|
</if>
|
|
|
- order by a.status,a.create_time desc
|
|
|
+ <if test="contractNo !=null">
|
|
|
+ and f.contract_no like CONCAT('%',#{contractNo},'%')
|
|
|
+ </if>
|
|
|
+ order by b.status,b.create_time desc
|
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
|
</if>
|
|
|
@@ -787,19 +727,22 @@
|
|
|
|
|
|
<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
|
|
|
+ from public_release_details a left join public_release b on a.prid =b.id
|
|
|
+ left join admin c on b.aid =c.id left join `user` d on a.uid =d.id
|
|
|
+ <if test="contractNo !=null">
|
|
|
+ left join t_order_new f on b.order_no =f.order_no
|
|
|
+ </if>
|
|
|
+ where 1=1
|
|
|
<if test="publicType != null">
|
|
|
- and a.type= #{publicType}
|
|
|
+ and b.type= #{publicType}
|
|
|
</if>
|
|
|
<if test="aid != null">
|
|
|
- and a.aid= #{aid}
|
|
|
+ and b.aid= #{aid}
|
|
|
</if>
|
|
|
<if test="sid != null">
|
|
|
- and d.id= #{sid}
|
|
|
+ and d.aid= #{sid}
|
|
|
</if>
|
|
|
- <if test=" deps !=null">
|
|
|
+ <if test="deps !=null">
|
|
|
and c.department_id in
|
|
|
<foreach close=")" collection="deps" item="dep" open="(" separator=",">
|
|
|
#{dep}
|
|
|
@@ -809,17 +752,20 @@
|
|
|
and a.uid = #{uid}
|
|
|
</if>
|
|
|
<if test="releaseStart != null and releaseEnd != null">
|
|
|
- and (a.release_start between #{releaseStart} and #{releaseEnd} or a.release_end between #{releaseStart} and #{releaseEnd})
|
|
|
+ and (b.release_start between #{releaseStart} and #{releaseEnd} or b.release_end between #{releaseStart} and #{releaseEnd})
|
|
|
</if>
|
|
|
<if test="createStart != null and createEnd != null">
|
|
|
- and a.create_time between #{createStart} and #{createEnd}
|
|
|
+ and b.create_time between #{createStart} and #{createEnd}
|
|
|
</if>
|
|
|
<if test="status != null">
|
|
|
- and a.status = #{status}
|
|
|
+ and b.status = #{status}
|
|
|
</if>
|
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in= #{clockIn}
|
|
|
</if>
|
|
|
+ <if test="contractNo !=null">
|
|
|
+ and f.contract_no like CONCAT('%',#{contractNo},'%')
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="checkTime" resultType="java.lang.Integer">
|
|
|
@@ -829,20 +775,21 @@
|
|
|
or (release_start < #{end} and release_end > #{end}))
|
|
|
</select>
|
|
|
<select id="getTimeUserFollow" resultType="com.goafanti.common.model.OutPublicReleaseCount">
|
|
|
- select e.id province,d.id depId,a.aid,a.uid,a.new_user newUser ,1 quantity from (select aid,uid,new_user from public_release
|
|
|
- where main_status =1 and create_time between #{date} and #{now}
|
|
|
- group by aid,uid,new_user)a left join admin c on a.aid=c.id
|
|
|
+ select e.id province,d.id depId,a.aid,a.uid,a.new_user newUser ,1 quantity from (select a.aid,b.uid,b.new_user from public_release a
|
|
|
+ left join public_release_details b on a.id=b.prid
|
|
|
+ where b.main_status =1 and a.create_time between #{date} and #{now}
|
|
|
+ group by a.aid,b.uid,b.new_user)a left join admin c on a.aid=c.id
|
|
|
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,
|
|
|
- date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStarts,
|
|
|
- date_format(a.release_end ,'%Y-%m-%d %H:%i:%S')releaseEnds,
|
|
|
+ select a.id,a.uid,b.aid,b.nickname ,c.name aname,a.duration ,a.district_name districtName,
|
|
|
+ date_format(pr.release_start,'%Y-%m-%d %H:%i:%S')releaseStarts,
|
|
|
+ date_format(pr.release_end ,'%Y-%m-%d %H:%i:%S')releaseEnds,
|
|
|
date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S')clockInTimes,
|
|
|
- a.remarks
|
|
|
- from public_release a left join user b on a.uid=b.id
|
|
|
- left join admin c on a.aid =c.id
|
|
|
- where a.order_no = #{orderNo}
|
|
|
+ pr.remarks
|
|
|
+ from public_release_details a left join public_release pr on a.prid=pr.id
|
|
|
+ left join user b on a.uid=b.id left join admin c on pr.aid =c.id
|
|
|
+ where pr.order_no = #{orderNo}
|
|
|
</select>
|
|
|
<select id="selectByMainId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|