Bläddra i källkod

新增公出审核时审核时间记录

anderx 3 år sedan
förälder
incheckning
5d052e7035

+ 17 - 4
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -44,6 +44,7 @@
     <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" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
@@ -51,7 +52,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, public_again
+    assistant_aid, assistant_name, public_again, audit_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -77,7 +78,8 @@
       update_status, assist, assist_aid,
       assist_aid_name, main_id, main_name,
       clock_in_remarks, reject_name, assistant_aid,
-      assistant_name, public_again)
+      assistant_name, public_again, audit_time
+      )
     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},
@@ -91,7 +93,8 @@
       #{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})
+      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
     insert into public_release
@@ -219,6 +222,9 @@
       <if test="publicAgain != null">
         public_again,
       </if>
+      <if test="auditTime != null">
+        audit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="uid != null">
@@ -344,6 +350,9 @@
       <if test="publicAgain != null">
         #{publicAgain,jdbcType=INTEGER},
       </if>
+      <if test="auditTime != null">
+        #{auditTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
@@ -472,6 +481,9 @@
       <if test="publicAgain != null">
         public_again = #{publicAgain,jdbcType=INTEGER},
       </if>
+      <if test="auditTime != null">
+        audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -517,7 +529,8 @@
       reject_name = #{rejectName,jdbcType=VARCHAR},
       assistant_aid = #{assistantAid,jdbcType=VARCHAR},
       assistant_name = #{assistantName,jdbcType=VARCHAR},
-      public_again = #{publicAgain,jdbcType=INTEGER}
+      public_again = #{publicAgain,jdbcType=INTEGER},
+      audit_time = #{auditTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

+ 16 - 3
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;
@@ -146,7 +146,7 @@ public class PublicRelease implements Serializable {
     private String nextPlan;
 
     /**
-     * 分类 0业务 1技术 2行政 3 协单
+     * 分类 0业务 1技术 2行政 3 技术协单 4 技术助手
      */
     private Integer type;
 
@@ -215,6 +215,11 @@ public class PublicRelease implements Serializable {
      */
     private Integer publicAgain;
 
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -552,4 +557,12 @@ public class PublicRelease implements Serializable {
     public void setPublicAgain(Integer publicAgain) {
         this.publicAgain = publicAgain;
     }
-}
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+}

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -280,6 +280,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		str=str.append(remarks);
 		p.setAuditInfo(str.toString());
+		p.setAuditTime(date);
 		p.setRejectName(ad.getName());
 		publicReleaseMapper.updateByPrimaryKeySelective(p);
 		addpublicLog(id, status, remarks);