Browse Source

财务专员同意分配新增备注

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
bde2076ee5

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="task_hours_count"/>
+    <table schema="aft" tableName="t_order_log"/>
   </context>
 </generatorConfiguration>

+ 11 - 11
src/main/java/com/goafanti/common/dao/TOrderLogMapper.java

@@ -12,67 +12,67 @@ public interface TOrderLogMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	long countByExample(TOrderLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int deleteByExample(TOrderLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int insert(TOrderLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int insertSelective(TOrderLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	List<TOrderLog> selectByExample(TOrderLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	TOrderLog selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderLog record, @Param("example") TOrderLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderLog record, @Param("example") TOrderLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderLog record);
 

+ 38 - 21
src/main/java/com/goafanti/common/mapper/TOrderLogMapper.xml

@@ -5,19 +5,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="process" jdbcType="INTEGER" property="process" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -51,7 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -85,15 +86,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
-    id, order_no, process, create_time, aid
+    id, order_no, process, create_time, aid, remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderLogExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     select
     <if test="distinct">
@@ -112,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -123,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     delete from t_order_log
     where id = #{id,jdbcType=INTEGER}
@@ -132,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     delete from t_order_log
     <if test="_parameter != null">
@@ -143,18 +144,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     insert into t_order_log (id, order_no, process, 
-      create_time, aid)
+      create_time, aid, remarks
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{process,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR})
+      #{createTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     insert into t_order_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -173,6 +176,9 @@
       <if test="aid != null">
         aid,
       </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -190,13 +196,16 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderLogExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     select count(*) from t_order_log
     <if test="_parameter != null">
@@ -207,7 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     update t_order_log
     <set>
@@ -226,6 +235,9 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -235,14 +247,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     update t_order_log
     set id = #{record.id,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
       process = #{record.process,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      aid = #{record.aid,jdbcType=VARCHAR}
+      aid = #{record.aid,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -251,7 +264,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     update t_order_log
     <set>
@@ -267,6 +280,9 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -274,16 +290,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Apr 12 15:30:47 CST 2019.
+      This element was generated on Thu Nov 28 11:28:43 CST 2019.
     -->
     update t_order_log
     set order_no = #{orderNo,jdbcType=VARCHAR},
       process = #{process,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      aid = #{aid,jdbcType=VARCHAR}
+      aid = #{aid,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="selectOrderByNo" 	parameterType="string"	resultType="com.goafanti.order.bo.TOrderLogBo">
+  <select id="selectOrderByNo" parameterType="string" resultType="com.goafanti.order.bo.TOrderLogBo">
   select a.id,a.order_no as orderNo,a.aid,a.process,a.create_time as createTime, b.name as adminName
 	from t_order_log a left join admin b on a.aid=b.id
 	where a.order_no= #{orderNo,jdbcType=VARCHAR}

+ 38 - 15
src/main/java/com/goafanti/common/model/TOrderLog.java

@@ -6,34 +6,39 @@ public class TOrderLog {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_log.id
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_log.order_no
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_log.process
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	private Integer process;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_log.create_time
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_log.aid
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_log.remarks
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
+	 */
+	private String remarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_log.id
 	 * @return  the value of t_order_log.id
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -42,7 +47,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_log.id
 	 * @param id  the value for t_order_log.id
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -51,7 +56,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_log.order_no
 	 * @return  the value of t_order_log.order_no
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -60,7 +65,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_log.order_no
 	 * @param orderNo  the value for t_order_log.order_no
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -69,7 +74,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_log.process
 	 * @return  the value of t_order_log.process
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public Integer getProcess() {
 		return process;
@@ -78,7 +83,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_log.process
 	 * @param process  the value for t_order_log.process
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setProcess(Integer process) {
 		this.process = process;
@@ -87,7 +92,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_log.create_time
 	 * @return  the value of t_order_log.create_time
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -96,7 +101,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_log.create_time
 	 * @param createTime  the value for t_order_log.create_time
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -105,7 +110,7 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_log.aid
 	 * @return  the value of t_order_log.aid
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public String getAid() {
 		return aid;
@@ -114,9 +119,27 @@ public class TOrderLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_log.aid
 	 * @param aid  the value for t_order_log.aid
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_log.remarks
+	 * @return  the value of t_order_log.remarks
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_log.remarks
+	 * @param remarks  the value for t_order_log.remarks
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 }

+ 86 - 16
src/main/java/com/goafanti/common/model/TOrderLogExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class TOrderLogExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public TOrderLogExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class TOrderLogExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -482,11 +482,81 @@ public class TOrderLogExample {
 			addCriterion("aid not between", value1, value2, "aid");
 			return (Criteria) this;
 		}
+
+		public Criteria andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_log
-	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
+	 * @mbg.generated  Thu Nov 28 11:28:43 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 2
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -163,12 +163,12 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * 财务审核
 	 */
 	@RequestMapping(value="/financeApproval", method = RequestMethod.POST)
-	public Result financeApproval(String orderNo) {
+	public Result financeApproval(String orderNo,String remarks) {
 		Result res=new Result();
 		if (StringUtils.isBlank(orderNo)) {
 			res.getError().add(buildError("","订单必须指定。"));
 		}
-		res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo));
+		res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo,remarks));
 		return res;
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/order/service/FundManageOrderService.java

@@ -96,8 +96,9 @@ public interface FundManageOrderService {
 	/**
 	 * 财务特批审核
 	 * @param orderNo
+	 * @param remarks 
 	 * @return
 	 */
-	int updateFinanceApproval(String orderNo);
+	int updateFinanceApproval(String orderNo, String remarks);
 	
 }

+ 9 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -488,7 +488,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	@Override
-	public int updateFinanceApproval(String orderNo) {
+	public int updateFinanceApproval(String orderNo,String remarks) {
 		TOrderNew new1 = tOrderNewMapper.selectByPrimaryKey(orderNo);
 		TOrderNew t=new TOrderNew();
 		checkDeleteSign(orderNo);
@@ -500,10 +500,18 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
 			aids.add(admin.getId());
 		}
+		TOrderLog tl=new TOrderLog();
+		tl.setAid(TokenManager.getAdminId());
+		tl.setOrderNo(t.getOrderNo());
+		tl.setProcess(OrderLogProcess.CWPD.getCode());
+		tl.setRemarks(remarks);
+		tOrderLogMapper.insertSelective(tl);
 		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),t.getOrderNo(), TokenManager.getAdminId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
+	
+
 }
 
 

+ 26 - 12
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -251,7 +251,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setApproval(ApprovalNewState.DSH.getCode());
 			}
 			//生成流转
-			addOrderLog(t.getOrderNo(),OrderLogProcess.TJ.getCode());
+			TOrderLog tl=new TOrderLog();
+			tl.setOrderNo(t.getOrderNo());
+			tl.setProcess(OrderLogProcess.TJ.getCode());
+			tl.setAid(TokenManager.getAdminId());
+			addOrderLog(tl);
 			if (StringUtils.isBlank(t2.getContractNo())) {
 				//没有合同编号则生成
 				createContractNo(t);
@@ -365,11 +369,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	
 
-	public void addOrderLog(String orderNo, Integer code) {
-		TOrderLog tl=new TOrderLog();
-		tl.setOrderNo(orderNo);
-		tl.setProcess(code);
-		tl.setAid(TokenManager.getAdminId());
+	public void addOrderLog(TOrderLog tl) {
 		tOrderLogMapper.insertSelective(tl);
 		
 	}
@@ -463,6 +463,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		List<String> aids = new ArrayList<>();
 		Integer type=null;
+		TOrderLog tl=new TOrderLog();
+		tl.setAid(TokenManager.getAdminId());
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			t.setOutsource(outsource);
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||
@@ -476,7 +478,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 						aids.add(admin.getId());
 					}
 					t.setProcessStatus(ProcessStatus.YPWBSH.getCode());
-					addOrderLog(orderNo, OrderLogProcess.FQWB.getCode());
+					tl.setOrderNo(orderNo);
+					tl.setProcess(OrderLogProcess.FQWB.getCode());
+					addOrderLog(tl);
 					//外包
 					o.setRefundStatus(0);
 					if(o.getId()==null) {
@@ -494,12 +498,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			}
 			type=NoticeStatus.ORDER_YES.getCode();
-			addOrderLog(orderNo, OrderLogProcess.SH.getCode());
+			tl.setOrderNo(orderNo);
+			tl.setProcess(OrderLogProcess.SH.getCode());
+			addOrderLog(tl);
 		}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 				if (outsource==0) {//非外包
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 				addBackOrder(orderNo, reason);
-				addOrderLog(orderNo, OrderLogProcess.BH.getCode());
+				tl.setOrderNo(orderNo);
+				tl.setProcess(OrderLogProcess.SH.getCode());
+				addOrderLog(tl);
 			}
 				aids.add(t2.getSalesmanId());
 				type=NoticeStatus.ORDER_NO.getCode();
@@ -594,7 +602,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tOrder.setOrderNo(t.getOrderNo());
 		tOrder.setOrderStatus(OrderNewState.TDZ.getCode());
 		tOrderNewMapper.updateByPrimaryKeySelective(tOrder);
-		addOrderLog(t.getOrderNo(), OrderLogProcess.FQTD.getCode());
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(t.getOrderNo());
+		tl.setProcess(OrderLogProcess.FQTD.getCode());
+		addOrderLog(tl);
 		return tOrderRefundMapper.insertSelective(t);
 	}
 
@@ -607,6 +618,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		List<String> aids = new ArrayList<>();
 		Integer type=null;
+		TOrderLog tl=new TOrderLog();
+		tl.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
 			if(t2.getOutsource()==0) {
@@ -619,16 +632,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			}
 			type=NoticeStatus.ORDER_APPROVA_YES.getCode();
-			addOrderLog(orderNo, OrderLogProcess.TP.getCode());
+			tl.setProcess(OrderLogProcess.TP.getCode());
 		} else {
 			t.setApproval(3);
 			t.setOrderStatus(OrderNewState.YBH.getCode());
 			t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 			addBackOrder(orderNo, reason);
-			addOrderLog(orderNo, OrderLogProcess.BH.getCode());
+			tl.setProcess(OrderLogProcess.BH.getCode());
 			aids.add(t2.getSalesmanId());
 			type=NoticeStatus.ORDER_APPROVA_NO.getCode();
 		}
+		addOrderLog(tl);
 		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}