Explorar o código

审核公出接口修改

anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
762fac1a8c

+ 23 - 0
.idea/free-mybatis-generator-config.xml

@@ -26,6 +26,29 @@
             </Config>
           </value>
         </entry>
+        <entry key="public_release">
+          <value>
+            <Config>
+              <option name="comment" value="true" />
+              <option name="daoMvnPath" value="src/main/java" />
+              <option name="daoName" value="PublicReleaseMapper" />
+              <option name="daoPackage" value="com.goafanti.common.dao" />
+              <option name="daoPostfix" value="Mapper" />
+              <option name="modelMvnPath" value="src/main/java" />
+              <option name="modelName" value="PublicRelease" />
+              <option name="modelPackage" value="com.goafanti.common.model" />
+              <option name="name" value="public_release" />
+              <option name="overrideJava" value="true" />
+              <option name="overrideXML" value="true" />
+              <option name="primaryKey" value="id" />
+              <option name="projectFolder" value="$PROJECT_DIR$" />
+              <option name="tableName" value="public_release" />
+              <option name="useSchemaPrefix" value="true" />
+              <option name="xmlMvnPath" value="src/main/java" />
+              <option name="xmlPackage" value="com.goafanti.common.mapper" />
+            </Config>
+          </value>
+        </entry>
         <entry key="user_data">
           <value>
             <Config>

+ 20 - 51
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -1,59 +1,28 @@
 package com.goafanti.common.dao;
 
-import java.util.Date;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.goafanti.common.model.PublicRelease;
 import com.goafanti.weChat.bo.OutPublicRelease;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 public interface PublicReleaseMapper {
-    /**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	int insert(PublicRelease record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	int insertSelective(PublicRelease record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	PublicRelease selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	int updateByPrimaryKeySelective(PublicRelease record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	int updateByPrimaryKeyWithBLOBs(PublicRelease record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	int updateByPrimaryKey(PublicRelease record);
-
-	void insertSelectiveGetId(PublicRelease in);
-
-	OutPublicRelease selectDtails(@Param("id") Integer id,@Param("ufid")String ufid);
-
-	int checkTime(@Param("aid")String aid,@Param("start")Date start, @Param("end")Date end);
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(PublicRelease record);
+
+    int insertSelective(PublicRelease record);
+
+    PublicRelease selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(PublicRelease record);
+
+    int updateByPrimaryKey(PublicRelease record);
+
+    void insertSelectiveGetId(PublicRelease in);
+
+    OutPublicRelease selectDtails(@Param("id") Integer id, @Param("ufid")String ufid);
+
+    int checkTime(@Param("aid")String aid, @Param("start") Date start, @Param("end")Date end);
 
 }

+ 259 - 264
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -2,17 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.PublicReleaseMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
     <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" />
@@ -20,92 +16,56 @@
     <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" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
-    <result column="annex_url" jdbcType="LONGVARCHAR" property="annexUrl" />
-    <result column="photo_url" jdbcType="LONGVARCHAR" property="photoUrl" />
+    <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" />
   </resultMap>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
-    id, `uid`, aid, release_start, release_end, remarks, user_name, longitude, latitude, 
-    `status`, create_time, clock_in, clock_in_time, pid, pname, ufid, duration, valid_date
-  </sql>
-  <sql id="Blob_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
-    annex_url, photo_url
+    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
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from public_release
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
     delete from public_release
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
-    insert into public_release (id, `uid`, aid, 
-      release_start, release_end, remarks, 
+  <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, pid, pname, 
-      ufid, duration, valid_date, 
-      annex_url, photo_url)
-    values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
-      #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, 
+      clock_in_time, photo_url, pid, 
+      pname, ufid, duration, 
+      valid_date, new_user, sign_sum, 
+      main_status, supplement, audit_info
+      )
+    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}, #{pid,jdbcType=VARCHAR}, #{pname,jdbcType=VARCHAR}, 
-      #{ufid,jdbcType=VARCHAR}, #{duration,jdbcType=DOUBLE}, #{validDate,jdbcType=VARCHAR}, 
-      #{annexUrl,jdbcType=LONGVARCHAR}, #{photoUrl,jdbcType=LONGVARCHAR})
+      #{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}
+      )
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
+  <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>
@@ -121,6 +81,9 @@
       <if test="remarks != null">
         remarks,
       </if>
+      <if test="annexUrl != null">
+        annex_url,
+      </if>
       <if test="userName != null">
         user_name,
       </if>
@@ -142,6 +105,9 @@
       <if test="clockInTime != null">
         clock_in_time,
       </if>
+      <if test="photoUrl != null">
+        photo_url,
+      </if>
       <if test="pid != null">
         pid,
       </if>
@@ -157,17 +123,23 @@
       <if test="validDate != null">
         valid_date,
       </if>
-      <if test="annexUrl != null">
-        annex_url,
+      <if test="newUser != null">
+        new_user,
       </if>
-      <if test="photoUrl != null">
-        photo_url,
+      <if test="signSum != null">
+        sign_sum,
+      </if>
+      <if test="mainStatus != null">
+        main_status,
+      </if>
+      <if test="supplement != null">
+        supplement,
+      </if>
+      <if test="auditInfo != null">
+        audit_info,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="uid != null">
         #{uid,jdbcType=VARCHAR},
       </if>
@@ -183,6 +155,9 @@
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="annexUrl != null">
+        #{annexUrl,jdbcType=VARCHAR},
+      </if>
       <if test="userName != null">
         #{userName,jdbcType=VARCHAR},
       </if>
@@ -204,6 +179,9 @@
       <if test="clockInTime != null">
         #{clockInTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="photoUrl != null">
+        #{photoUrl,jdbcType=VARCHAR},
+      </if>
       <if test="pid != null">
         #{pid,jdbcType=VARCHAR},
       </if>
@@ -219,20 +197,24 @@
       <if test="validDate != null">
         #{validDate,jdbcType=VARCHAR},
       </if>
-      <if test="annexUrl != null">
-        #{annexUrl,jdbcType=LONGVARCHAR},
+      <if test="newUser != null">
+        #{newUser,jdbcType=INTEGER},
       </if>
-      <if test="photoUrl != null">
-        #{photoUrl,jdbcType=LONGVARCHAR},
+      <if test="signSum != null">
+        #{signSum,jdbcType=INTEGER},
+      </if>
+      <if test="mainStatus != null">
+        #{mainStatus,jdbcType=INTEGER},
+      </if>
+      <if test="supplement != null">
+        #{supplement,jdbcType=VARCHAR},
+      </if>
+      <if test="auditInfo != null">
+        #{auditInfo,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
     update public_release
     <set>
       <if test="uid != null">
@@ -250,6 +232,9 @@
       <if test="remarks != null">
         remarks = #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="annexUrl != null">
+        annex_url = #{annexUrl,jdbcType=VARCHAR},
+      </if>
       <if test="userName != null">
         user_name = #{userName,jdbcType=VARCHAR},
       </if>
@@ -271,6 +256,9 @@
       <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>
@@ -286,55 +274,32 @@
       <if test="validDate != null">
         valid_date = #{validDate,jdbcType=VARCHAR},
       </if>
-      <if test="annexUrl != null">
-        annex_url = #{annexUrl,jdbcType=LONGVARCHAR},
+      <if test="newUser != null">
+        new_user = #{newUser,jdbcType=INTEGER},
       </if>
-      <if test="photoUrl != null">
-        photo_url = #{photoUrl,jdbcType=LONGVARCHAR},
+      <if test="signSum != null">
+        sign_sum = #{signSum,jdbcType=INTEGER},
+      </if>
+      <if test="mainStatus != null">
+        main_status = #{mainStatus,jdbcType=INTEGER},
+      </if>
+      <if test="supplement != null">
+        supplement = #{supplement,jdbcType=VARCHAR},
+      </if>
+      <if test="auditInfo != null">
+        audit_info = #{auditInfo,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
-    update public_release
-    set `uid` = #{uid,jdbcType=VARCHAR},
-      aid = #{aid,jdbcType=VARCHAR},
-      release_start = #{releaseStart,jdbcType=TIMESTAMP},
-      release_end = #{releaseEnd,jdbcType=TIMESTAMP},
-      remarks = #{remarks,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},
-      pid = #{pid,jdbcType=VARCHAR},
-      pname = #{pname,jdbcType=VARCHAR},
-      ufid = #{ufid,jdbcType=VARCHAR},
-      duration = #{duration,jdbcType=DOUBLE},
-      valid_date = #{validDate,jdbcType=VARCHAR},
-      annex_url = #{annexUrl,jdbcType=LONGVARCHAR},
-      photo_url = #{photoUrl,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PublicRelease">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 10 15:22:12 CST 2021.
-    -->
     update public_release
     set `uid` = #{uid,jdbcType=VARCHAR},
       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},
@@ -342,153 +307,183 @@
       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}
+      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}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  
+
    <insert id="insertSelectiveGetId" 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>
-      <if test="aid != null">
-        aid,
-      </if>
-      <if test="releaseStart != null">
-        release_start,
-      </if>
-      <if test="releaseEnd != null">
-        release_end,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </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="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="annexUrl != null">
-        annex_url,
-      </if>
-      <if test="photoUrl != null">
-        photo_url,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="releaseStart != null">
-        #{releaseStart,jdbcType=TIMESTAMP},
-      </if>
-      <if test="releaseEnd != null">
-        #{releaseEnd,jdbcType=TIMESTAMP},
-      </if>
-      <if test="remarks != null">
-        #{remarks,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="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="annexUrl != null">
-        #{annexUrl,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="photoUrl != null">
-        #{photoUrl,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
+     insert into public_release
+     <trim prefix="(" suffix=")" suffixOverrides=",">
+       <if test="uid != null">
+         `uid`,
+       </if>
+       <if test="aid != null">
+         aid,
+       </if>
+       <if test="releaseStart != null">
+         release_start,
+       </if>
+       <if test="releaseEnd != null">
+         release_end,
+       </if>
+       <if test="remarks != null">
+         remarks,
+       </if>
+       <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>
+       <if test="supplement != null">
+         supplement,
+       </if>
+       <if test="auditInfo != null">
+         audit_info,
+       </if>
+     </trim>
+     <trim prefix="values (" suffix=")" suffixOverrides=",">
+       <if test="uid != null">
+         #{uid,jdbcType=VARCHAR},
+       </if>
+       <if test="aid != null">
+         #{aid,jdbcType=VARCHAR},
+       </if>
+       <if test="releaseStart != null">
+         #{releaseStart,jdbcType=TIMESTAMP},
+       </if>
+       <if test="releaseEnd != null">
+         #{releaseEnd,jdbcType=TIMESTAMP},
+       </if>
+       <if test="remarks != null">
+         #{remarks,jdbcType=VARCHAR},
+       </if>
+       <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>
+       <if test="supplement != null">
+         #{supplement,jdbcType=VARCHAR},
+       </if>
+       <if test="auditInfo != null">
+         #{auditInfo,jdbcType=VARCHAR},
+       </if>
+     </trim>
     <selectKey keyProperty="id" order="AFTER" resultType="int">
         SELECT LAST_INSERT_ID()
     </selectKey>
   </insert>
-  
+
   <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,
 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 
+a.latitude ,a.longitude ,a.clock_in clockIn
 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="type==0">
-	and a.aid= #{aid} 
+	and a.aid= #{aid}
 	</if>
 	<if test="type==1">
 	and c.superior_id = #{aid}
@@ -508,18 +503,18 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	<if test="clockIn !=null">
 	and a.clock_in = #{clockIn}
 	</if>
-	ORDER BY (case when a.status=1 then 1 else 2 end),a.status ,a.create_time 
+	ORDER BY (case when a.status=1 then 1 else 2 end),a.status ,a.create_time
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>
   </select>
   <select id="countPublicRelease" resultType="java.lang.Integer">
   select  count(*)
-	from public_release a left join `user` b on a.uid =b.id 
+	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="type==0">
-	and a.aid= #{aid} 
+	and a.aid= #{aid}
 	</if>
 	<if test="type==1">
 	and c.superior_id = #{aid}
@@ -540,7 +535,7 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	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,
 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,
@@ -553,12 +548,12 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	<if test="ufid !=null">
 	and a.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 
+  	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
 	<if test="aid != null">
@@ -578,8 +573,8 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 			${page_sql}
 	</if>
   </select>
-  
-  
+
+
   <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
 	where 1=1
@@ -597,7 +592,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	</if>
 	group by aid)x
   </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,
@@ -624,7 +619,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 			${page_sql}
 	</if>
   </select>
-  
+
   <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
@@ -645,12 +640,12 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	and a.clock_in= #{clockIn}
 	</if>
   </select>
-  
+
   <select id="checkTime" resultType="java.lang.Integer">
  select count(*) from public_release where aid=#{aid} and status in (0,1,2)
  and ( (release_start &gt;= #{start} and release_start &lt; #{end})
   or  (release_start &lt; #{start} and release_end &gt; #{start})
   or  (release_start &lt; #{end} and release_end &gt; #{end}))
   </select>
-  
+
 </mapper>

+ 326 - 500
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -3,506 +3,332 @@ package com.goafanti.common.model;
 import java.io.Serializable;
 import java.util.Date;
 
+/**
+ * public_release
+ * @author 
+ */
 public class PublicRelease implements Serializable {
+    private Integer id;
+
+    /**
+     * 客户id
+     */
+    private String uid;
+
+    /**
+     * 公出人
+     */
+    private String aid;
+
+    /**
+     * 公出开始时间
+     */
+    private Date releaseStart;
+
+    /**
+     * 公出结束时间
+     */
+    private Date releaseEnd;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 附件
+     */
+    private String annexUrl;
+
+    /**
+     * 公出企业名称
+     */
+    private String userName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 状态 0驳回 1发起 2同意
+     */
+    private Integer status;
+
+    /**
+     * 发起时间
+     */
+    private Date createTime;
+
+    /**
+     * 打卡
+     */
+    private Integer clockIn;
+
+    /**
+     * 打卡时间
+     */
+    private Date clockInTime;
+
+    /**
+     * 照片
+     */
+    private String photoUrl;
+
+    /**
+     * 项目编号
+     */
+    private String pid;
+
+    /**
+     * 项目名称
+     */
+    private String pname;
+
+    /**
+     * 跟进id
+     */
+    private String ufid;
+
+    /**
+     * 时长
+     */
+    private Double duration;
+
+    /**
+     * 有效日期
+     */
+    private String validDate;
+
+    /**
+     * 客户类型 0新客户 1老客户
+     */
+    private Integer newUser;
+
+    /**
+     * 签单数
+     */
+    private Integer signSum;
+
+    /**
+     * 0辅助根据 1主要跟进
+     */
+    private Integer mainStatus;
+
+    /**
+     * 公出补充
+     */
+    private String supplement;
+
+    /**
+     * 审核信息
+     */
+    private String auditInfo;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public Date getReleaseStart() {
+        return releaseStart;
+    }
+
+    public void setReleaseStart(Date releaseStart) {
+        this.releaseStart = releaseStart;
+    }
+
+    public Date getReleaseEnd() {
+        return releaseEnd;
+    }
+
+    public void setReleaseEnd(Date releaseEnd) {
+        this.releaseEnd = releaseEnd;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getAnnexUrl() {
+        return annexUrl;
+    }
+
+    public void setAnnexUrl(String annexUrl) {
+        this.annexUrl = annexUrl;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
 
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.id
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.uid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String uid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.aid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String aid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.release_start
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Date releaseStart;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.release_end
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Date releaseEnd;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.remarks
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String remarks;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.user_name
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String userName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.longitude
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String longitude;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.latitude
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String latitude;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.status
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Integer status;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.create_time
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.clock_in
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Integer clockIn;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.clock_in_time
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Date clockInTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.pid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String pid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.pname
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String pname;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.ufid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String ufid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.duration
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private Double duration;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.valid_date
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String validDate;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.annex_url
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String annexUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release.photo_url
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private String photoUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.id
-	 * @return  the value of public_release.id
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.id
-	 * @param id  the value for public_release.id
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.uid
-	 * @return  the value of public_release.uid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getUid() {
-		return uid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.uid
-	 * @param uid  the value for public_release.uid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setUid(String uid) {
-		this.uid = uid == null ? null : uid.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.aid
-	 * @return  the value of public_release.aid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getAid() {
-		return aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.aid
-	 * @param aid  the value for public_release.aid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setAid(String aid) {
-		this.aid = aid == null ? null : aid.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.release_start
-	 * @return  the value of public_release.release_start
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Date getReleaseStart() {
-		return releaseStart;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.release_start
-	 * @param releaseStart  the value for public_release.release_start
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setReleaseStart(Date releaseStart) {
-		this.releaseStart = releaseStart;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.release_end
-	 * @return  the value of public_release.release_end
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Date getReleaseEnd() {
-		return releaseEnd;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.release_end
-	 * @param releaseEnd  the value for public_release.release_end
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setReleaseEnd(Date releaseEnd) {
-		this.releaseEnd = releaseEnd;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.remarks
-	 * @return  the value of public_release.remarks
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.remarks
-	 * @param remarks  the value for public_release.remarks
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks == null ? null : remarks.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.user_name
-	 * @return  the value of public_release.user_name
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getUserName() {
-		return userName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.user_name
-	 * @param userName  the value for public_release.user_name
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setUserName(String userName) {
-		this.userName = userName == null ? null : userName.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.longitude
-	 * @return  the value of public_release.longitude
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getLongitude() {
-		return longitude;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.longitude
-	 * @param longitude  the value for public_release.longitude
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setLongitude(String longitude) {
-		this.longitude = longitude == null ? null : longitude.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.latitude
-	 * @return  the value of public_release.latitude
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getLatitude() {
-		return latitude;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.latitude
-	 * @param latitude  the value for public_release.latitude
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setLatitude(String latitude) {
-		this.latitude = latitude == null ? null : latitude.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.status
-	 * @return  the value of public_release.status
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.status
-	 * @param status  the value for public_release.status
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.create_time
-	 * @return  the value of public_release.create_time
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.create_time
-	 * @param createTime  the value for public_release.create_time
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.clock_in
-	 * @return  the value of public_release.clock_in
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Integer getClockIn() {
-		return clockIn;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.clock_in
-	 * @param clockIn  the value for public_release.clock_in
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setClockIn(Integer clockIn) {
-		this.clockIn = clockIn;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.clock_in_time
-	 * @return  the value of public_release.clock_in_time
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Date getClockInTime() {
-		return clockInTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.clock_in_time
-	 * @param clockInTime  the value for public_release.clock_in_time
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setClockInTime(Date clockInTime) {
-		this.clockInTime = clockInTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.pid
-	 * @return  the value of public_release.pid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getPid() {
-		return pid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.pid
-	 * @param pid  the value for public_release.pid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setPid(String pid) {
-		this.pid = pid == null ? null : pid.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.pname
-	 * @return  the value of public_release.pname
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getPname() {
-		return pname;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.pname
-	 * @param pname  the value for public_release.pname
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setPname(String pname) {
-		this.pname = pname == null ? null : pname.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.ufid
-	 * @return  the value of public_release.ufid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getUfid() {
-		return ufid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.ufid
-	 * @param ufid  the value for public_release.ufid
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setUfid(String ufid) {
-		this.ufid = ufid == null ? null : ufid.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.duration
-	 * @return  the value of public_release.duration
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public Double getDuration() {
-		return duration;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.duration
-	 * @param duration  the value for public_release.duration
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setDuration(Double duration) {
-		this.duration = duration;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.valid_date
-	 * @return  the value of public_release.valid_date
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getValidDate() {
-		return validDate;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.valid_date
-	 * @param validDate  the value for public_release.valid_date
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setValidDate(String validDate) {
-		this.validDate = validDate == null ? null : validDate.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.annex_url
-	 * @return  the value of public_release.annex_url
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getAnnexUrl() {
-		return annexUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.annex_url
-	 * @param annexUrl  the value for public_release.annex_url
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setAnnexUrl(String annexUrl) {
-		this.annexUrl = annexUrl == null ? null : annexUrl.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release.photo_url
-	 * @return  the value of public_release.photo_url
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public String getPhotoUrl() {
-		return photoUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release.photo_url
-	 * @param photoUrl  the value for public_release.photo_url
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	public void setPhotoUrl(String photoUrl) {
-		this.photoUrl = photoUrl == null ? null : photoUrl.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release
-	 * @mbg.generated  Thu Jun 10 15:22:12 CST 2021
-	 */
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(getClass().getSimpleName());
-		sb.append(" [");
-		sb.append("Hash = ").append(hashCode());
-		sb.append(", id=").append(id);
-		sb.append(", uid=").append(uid);
-		sb.append(", aid=").append(aid);
-		sb.append(", releaseStart=").append(releaseStart);
-		sb.append(", releaseEnd=").append(releaseEnd);
-		sb.append(", remarks=").append(remarks);
-		sb.append(", userName=").append(userName);
-		sb.append(", longitude=").append(longitude);
-		sb.append(", latitude=").append(latitude);
-		sb.append(", status=").append(status);
-		sb.append(", createTime=").append(createTime);
-		sb.append(", clockIn=").append(clockIn);
-		sb.append(", clockInTime=").append(clockInTime);
-		sb.append(", pid=").append(pid);
-		sb.append(", pname=").append(pname);
-		sb.append(", ufid=").append(ufid);
-		sb.append(", duration=").append(duration);
-		sb.append(", validDate=").append(validDate);
-		sb.append(", annexUrl=").append(annexUrl);
-		sb.append(", photoUrl=").append(photoUrl);
-		sb.append(", serialVersionUID=").append(serialVersionUID);
-		sb.append("]");
-		return sb.toString();
-	}
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getClockIn() {
+        return clockIn;
+    }
+
+    public void setClockIn(Integer clockIn) {
+        this.clockIn = clockIn;
+    }
+
+    public Date getClockInTime() {
+        return clockInTime;
+    }
+
+    public void setClockInTime(Date clockInTime) {
+        this.clockInTime = clockInTime;
+    }
+
+    public String getPhotoUrl() {
+        return photoUrl;
+    }
+
+    public void setPhotoUrl(String photoUrl) {
+        this.photoUrl = photoUrl;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public String getUfid() {
+        return ufid;
+    }
+
+    public void setUfid(String ufid) {
+        this.ufid = ufid;
+    }
+
+    public Double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Double duration) {
+        this.duration = duration;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+
+    public Integer getNewUser() {
+        return newUser;
+    }
+
+    public void setNewUser(Integer newUser) {
+        this.newUser = newUser;
+    }
+
+    public Integer getSignSum() {
+        return signSum;
+    }
+
+    public void setSignSum(Integer signSum) {
+        this.signSum = signSum;
+    }
+
+    public Integer getMainStatus() {
+        return mainStatus;
+    }
+
+    public void setMainStatus(Integer mainStatus) {
+        this.mainStatus = mainStatus;
+    }
+
+    public String getSupplement() {
+        return supplement;
+    }
+
+    public void setSupplement(String supplement) {
+        this.supplement = supplement;
+    }
+
+    public String getAuditInfo() {
+        return auditInfo;
+    }
+
+    public void setAuditInfo(String auditInfo) {
+        this.auditInfo = auditInfo;
+    }
 }

+ 30 - 2
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -4,6 +4,7 @@ import com.goafanti.common.utils.excel.Excel;
 
 public class OutPublicDtails {
 
+	private Integer id;
 	@Excel(name = "客户名称")
 	private String nickname;
 	@Excel(name = "公出地点")
@@ -24,10 +25,37 @@ public class OutPublicDtails {
 	private String clockInTimes;
 	@Excel(name = "创建时间" )
 	private String createTimes;
+	@Excel(name = "公出原因" )
+	private String remarks;
+	@Excel(name = "审核信息" )
+	private String auditInfo;
 	private String annexUrl;
 	private String photoUrl;
-	
-	
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getAuditInfo() {
+		return auditInfo;
+	}
+
+	public void setAuditInfo(String auditInfo) {
+		this.auditInfo = auditInfo;
+	}
+
 	public String getCreateTimes() {
 		return createTimes;
 	}

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

@@ -184,12 +184,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Double duration) {
 		PublicRelease p=new PublicRelease();
 		Date date =new Date();
+		String aid=TokenManager.getAdminId();
 		p.setId(id);
 		p.setStatus(status);
 		PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
 		if (use.getStatus()!=1) {
 			throw new BusinessException("只能修改已发起的状态");
 		}
+		StringBuffer str=new StringBuffer();
+		Admin ad=adminMapper.selectByPrimaryKey(aid);
+		str=str.append("(").append(ad.getName()).append(")");
+		if (status==0){str=str.append("驳回,");}
+		else if(status==2){str=str.append("同意,");}
+		str=str.append(remarks);
+		p.setAuditInfo(str.toString());
 		publicReleaseMapper.updateByPrimaryKeySelective(p);
 		PublicReleaseLog log=new PublicReleaseLog(id,TokenManager.getAdminId(),status,remarks,new Date());
 		publicReleaseLogMapper.insertSelective(log);