anderx 3 years ago
parent
commit
12f06e1c49

+ 31 - 26
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -43,6 +43,7 @@
     <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" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
@@ -50,7 +51,7 @@
     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
+    assistant_aid, assistant_name, public_again
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -62,42 +63,39 @@
     delete from public_release
     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 (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,
+    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
-      )
-    values (#{id,jdbcType=INTEGER}, #{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},
+      assist_aid_name, main_id, main_name,
+      clock_in_remarks, reject_name, assistant_aid,
+      assistant_name, public_again)
+    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}
-      )
+      #{assistAidName,jdbcType=VARCHAR}, #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR},
+      #{clockInRemarks,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR},
+      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,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="id != null">
-        id,
-      </if>
       <if test="uid != null">
         `uid`,
       </if>
@@ -218,11 +216,11 @@
       <if test="assistantName != null">
         assistant_name,
       </if>
+      <if test="publicAgain != null">
+        public_again,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="uid != null">
         #{uid,jdbcType=VARCHAR},
       </if>
@@ -343,6 +341,9 @@
       <if test="assistantName != null">
         #{assistantName,jdbcType=VARCHAR},
       </if>
+      <if test="publicAgain != null">
+        #{publicAgain,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
@@ -468,6 +469,9 @@
       <if test="assistantName != null">
         assistant_name = #{assistantName,jdbcType=VARCHAR},
       </if>
+      <if test="publicAgain != null">
+        public_again = #{publicAgain,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -512,7 +516,8 @@
       clock_in_remarks = #{clockInRemarks,jdbcType=VARCHAR},
       reject_name = #{rejectName,jdbcType=VARCHAR},
       assistant_aid = #{assistantAid,jdbcType=VARCHAR},
-      assistant_name = #{assistantName,jdbcType=VARCHAR}
+      assistant_name = #{assistantName,jdbcType=VARCHAR},
+      public_again = #{publicAgain,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

+ 15 - 2
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 /**
  * public_release
- * @author 
+ * @author
  */
 public class PublicRelease implements Serializable {
     private Integer id;
@@ -210,6 +210,11 @@ public class PublicRelease implements Serializable {
      */
     private String assistantName;
 
+    /**
+     * 再次公出
+     */
+    private Integer publicAgain;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -539,4 +544,12 @@ public class PublicRelease implements Serializable {
     public void setAssistantName(String assistantName) {
         this.assistantName = assistantName;
     }
-}
+
+    public Integer getPublicAgain() {
+        return publicAgain;
+    }
+
+    public void setPublicAgain(Integer publicAgain) {
+        this.publicAgain = publicAgain;
+    }
+}