Explorar o código

修改统计

Signed-off-by: anderx <312518615@qq.com>
anderx %!s(int64=5) %!d(string=hai) anos
pai
achega
a28b14185d

+ 3 - 3
GeneratorConfig.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-  <!-- <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> -->
-   <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" />
+   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> 
+   <!-- <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" /> -->
   <context id="context1">	
     <jdbcConnection connectionURL="jdbc:mysql://101.37.32.31:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="dev123456" userId="dev" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_task"/>
+    <table schema="aft" tableName="t_order_mid"/>
   </context>
 </generatorConfiguration>

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

@@ -11,67 +11,67 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderMidMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	long countByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int deleteByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int insert(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int insertSelective(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	List<TOrderMid> selectByExample(TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	TOrderMid selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderMid record, @Param("example") TOrderMidExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderMid record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderMid record);
 

+ 37 - 20
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -17,12 +17,13 @@
     <result column="final_Receivables_time" jdbcType="TIMESTAMP" property="finalReceivablesTime" />
     <result column="invoice_amount" jdbcType="DECIMAL" property="invoiceAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
   </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 Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -56,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -90,16 +91,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables, 
-    final_Receivables_time, invoice_amount, create_time
+    final_Receivables_time, invoice_amount, create_time, buyer_name
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderMidExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     select
     <if test="distinct">
@@ -118,7 +119,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -129,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     delete from t_order_mid
     where id = #{id,jdbcType=INTEGER}
@@ -138,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     delete from t_order_mid
     <if test="_parameter != null">
@@ -149,22 +150,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     insert into t_order_mid (id, order_no, salesman_id, 
       finance_id, salesman_name, finance_name, 
       final_receivables, final_Receivables_time, 
-      invoice_amount, create_time)
+      invoice_amount, create_time, buyer_name
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, 
       #{financeId,jdbcType=VARCHAR}, #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, 
       #{finalReceivables,jdbcType=DECIMAL}, #{finalReceivablesTime,jdbcType=TIMESTAMP}, 
-      #{invoiceAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP})
+      #{invoiceAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{buyerName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderMid">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     insert into t_order_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -198,6 +201,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="buyerName != null">
+        buyer_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -230,13 +236,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="buyerName != null">
+        #{buyerName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderMidExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     select count(*) from t_order_mid
     <if test="_parameter != null">
@@ -247,7 +256,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -281,6 +290,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.buyerName != null">
+        buyer_name = #{record.buyerName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -290,7 +302,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     update t_order_mid
     set id = #{record.id,jdbcType=INTEGER},
@@ -302,7 +314,8 @@
       final_receivables = #{record.finalReceivables,jdbcType=DECIMAL},
       final_Receivables_time = #{record.finalReceivablesTime,jdbcType=TIMESTAMP},
       invoice_amount = #{record.invoiceAmount,jdbcType=DECIMAL},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      buyer_name = #{record.buyerName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -311,7 +324,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     update t_order_mid
     <set>
@@ -342,6 +355,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="buyerName != null">
+        buyer_name = #{buyerName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -349,7 +365,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Dec 09 14:31:25 CST 2019.
+      This element was generated on Wed Mar 18 15:17:11 CST 2020.
     -->
     update t_order_mid
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -360,7 +376,8 @@
       final_receivables = #{finalReceivables,jdbcType=DECIMAL},
       final_Receivables_time = #{finalReceivablesTime,jdbcType=TIMESTAMP},
       invoice_amount = #{invoiceAmount,jdbcType=DECIMAL},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      buyer_name = #{buyerName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByOrderNo" resultMap="BaseResultMap">

+ 31 - 12
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1067,14 +1067,34 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
   </select>
   
    <select id="selectTaskHoursListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,a.project_status projectStatus,
-    a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity,a.commodity_price commodityPrice,
-    e.contract_no as contractNo,date_format(e.create_time,'%Y-%m-%d %H:%i:%S')as creteTime,date_format(e.sign_time,'%Y-%m-%d')as signTime,a.outsource,
-    date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S')taskDistributionTime, date_format(a.task_end_time,'%Y-%m-%d')taskEndTime,tm.salesman_name salesmanName
-  	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
-    left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join department dep on e.order_dep=dep.id  
-    left join user f on e.buyer_id=f.id left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign !=1 and a.super_id is null
+  	   select
+	a.id,
+	a.commodity_name as taskName,
+	a.order_no as orderNo,
+	a.cname,
+	a.receiver_name as receiverName,
+	dep.name as depName,
+	a.project_status projectStatus,
+	a.task_status as taskStatus,
+	tm.buyer_name as userName,
+	ifnull(g.hours, 0) as hours,
+	a.commodity_quantity as commodityQuantity,
+	a.commodity_price commodityPrice,
+	e.contract_no as contractNo,
+	date_format(e.create_time, '%Y-%m-%d %H:%i:%S')as creteTime,
+	date_format(e.sign_time, '%Y-%m-%d')as signTime,
+	a.outsource,
+	date_format(a.task_distribution_time, '%Y-%m-%d %H:%i:%S')taskDistributionTime,
+	date_format(a.task_end_time, '%Y-%m-%d')taskEndTime,
+	tm.salesman_name salesmanName
+from t_order_task a
+left join business_project b on a.commodity_id = b.id
+left join business_category c on b.cid = c.id
+left join t_order_new e on a.order_no = e.order_no
+left join department dep on e.order_dep = dep.id
+left join task_hours_count g on a.id = g.tid
+left join t_order_mid tm on a.order_no = tm.order_no
+where e.delete_sign != 1 and a.super_id is null
   	<if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>
@@ -1105,7 +1125,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
   	<if test="starTime !=null and endTime !=null">
   	and  e.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
-  	order by  a.task_start_time desc,e.create_time desc
+  	<!-- order by  a.task_start_time desc,e.create_time desc -->
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -1113,9 +1133,8 @@ from t_order_task a left join business_project b on a.commodity_id=b.id left joi
   
    <select id="selectTaskHoursListCount" resultType="java.lang.Integer">
   	select  count(*) from t_order_task a left join business_project b on a.commodity_id=b.id
-  	left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
-    left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign !=1 and a.super_id is null
+    left join t_order_new e on a.order_no=e.order_no left join t_order_mid tm on a.order_no=tm.order_no 
+    where e.delete_sign !=1 and a.super_id is null
   <if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>

+ 53 - 30
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -7,59 +7,64 @@ public class TOrderMid {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.order_no
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private String salesmanId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private String financeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.salesman_name
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private String salesmanName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.finance_name
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private String financeName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_receivables
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private BigDecimal finalReceivables;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.final_Receivables_time
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private Date finalReceivablesTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.invoice_amount
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private BigDecimal invoiceAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.create_time
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_mid.buyer_name
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 */
+	private String buyerName;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.id
 	 * @return  the value of t_order_mid.id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -68,7 +73,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.id
 	 * @param id  the value for t_order_mid.id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -77,7 +82,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.order_no
 	 * @return  the value of t_order_mid.order_no
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -86,7 +91,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.order_no
 	 * @param orderNo  the value for t_order_mid.order_no
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -95,7 +100,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_id
 	 * @return  the value of t_order_mid.salesman_id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -104,7 +109,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_id
 	 * @param salesmanId  the value for t_order_mid.salesman_id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -113,7 +118,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_id
 	 * @return  the value of t_order_mid.finance_id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -122,7 +127,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_id
 	 * @param financeId  the value for t_order_mid.finance_id
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -131,7 +136,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.salesman_name
 	 * @return  the value of t_order_mid.salesman_name
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public String getSalesmanName() {
 		return salesmanName;
@@ -140,7 +145,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.salesman_name
 	 * @param salesmanName  the value for t_order_mid.salesman_name
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setSalesmanName(String salesmanName) {
 		this.salesmanName = salesmanName;
@@ -149,7 +154,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.finance_name
 	 * @return  the value of t_order_mid.finance_name
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public String getFinanceName() {
 		return financeName;
@@ -158,7 +163,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.finance_name
 	 * @param financeName  the value for t_order_mid.finance_name
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setFinanceName(String financeName) {
 		this.financeName = financeName;
@@ -167,7 +172,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_receivables
 	 * @return  the value of t_order_mid.final_receivables
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
@@ -176,7 +181,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_receivables
 	 * @param finalReceivables  the value for t_order_mid.final_receivables
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setFinalReceivables(BigDecimal finalReceivables) {
 		this.finalReceivables = finalReceivables;
@@ -185,7 +190,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.final_Receivables_time
 	 * @return  the value of t_order_mid.final_Receivables_time
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public Date getFinalReceivablesTime() {
 		return finalReceivablesTime;
@@ -194,7 +199,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.final_Receivables_time
 	 * @param finalReceivablesTime  the value for t_order_mid.final_Receivables_time
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setFinalReceivablesTime(Date finalReceivablesTime) {
 		this.finalReceivablesTime = finalReceivablesTime;
@@ -203,7 +208,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.invoice_amount
 	 * @return  the value of t_order_mid.invoice_amount
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -212,7 +217,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.invoice_amount
 	 * @param invoiceAmount  the value for t_order_mid.invoice_amount
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -221,7 +226,7 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.create_time
 	 * @return  the value of t_order_mid.create_time
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -230,9 +235,27 @@ public class TOrderMid {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.create_time
 	 * @param createTime  the value for t_order_mid.create_time
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_mid.buyer_name
+	 * @return  the value of t_order_mid.buyer_name
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 */
+	public String getBuyerName() {
+		return buyerName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_mid.buyer_name
+	 * @param buyerName  the value for t_order_mid.buyer_name
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
+	 */
+	public void setBuyerName(String buyerName) {
+		this.buyerName = buyerName;
+	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderMidExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public TOrderMidExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderMidExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -813,11 +813,81 @@ public class TOrderMidExample {
 			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andBuyerNameIsNull() {
+			addCriterion("buyer_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameIsNotNull() {
+			addCriterion("buyer_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameEqualTo(String value) {
+			addCriterion("buyer_name =", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameNotEqualTo(String value) {
+			addCriterion("buyer_name <>", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameGreaterThan(String value) {
+			addCriterion("buyer_name >", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameGreaterThanOrEqualTo(String value) {
+			addCriterion("buyer_name >=", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameLessThan(String value) {
+			addCriterion("buyer_name <", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameLessThanOrEqualTo(String value) {
+			addCriterion("buyer_name <=", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameLike(String value) {
+			addCriterion("buyer_name like", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameNotLike(String value) {
+			addCriterion("buyer_name not like", value, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameIn(List<String> values) {
+			addCriterion("buyer_name in", values, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameNotIn(List<String> values) {
+			addCriterion("buyer_name not in", values, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameBetween(String value1, String value2) {
+			addCriterion("buyer_name between", value1, value2, "buyerName");
+			return (Criteria) this;
+		}
+
+		public Criteria andBuyerNameNotBetween(String value1, String value2) {
+			addCriterion("buyer_name not between", value1, value2, "buyerName");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_mid
-	 * @mbg.generated  Mon Dec 09 14:31:25 CST 2019
+	 * @mbg.generated  Wed Mar 18 15:17:11 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 8 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -54,6 +54,7 @@ import com.goafanti.common.dao.TOrderOutsourceMapper;
 import com.goafanti.common.dao.TOrderRefundMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.UserLockReleaseMapper;
+import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
@@ -72,6 +73,7 @@ import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.model.User;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.SendEmailUtil;
@@ -142,6 +144,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private TOrderOutsourceMapper tOrderOutsourceMapper;
 	@Autowired
 	private UserLockReleaseMapper	userLockReleaseMapper;
+	@Autowired
+	private UserMapper	userMapper;
 	@Value(value = "${mobileRemindCodeTemplate}")
 	private String					mobileRemindCodeTemplate	= null;
 	@Value(value = "${upload.path}")
@@ -326,8 +330,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
+		User u=userMapper.selectByPrimaryKey(t.getBuyerId());
 		if (tm==null) tm=new TOrderMid();
 			tm.setOrderNo(t.getOrderNo());
+		if (u!=null&&u.getNickname()!=null) {
+			tm.setBuyerName(u.getNickname());
+		}
 		if (admin!=null&&admin.getName()!=null) {
 			tm.setFinanceId(admin.getId());
 			tm.setFinanceName(admin.getName());

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

@@ -483,7 +483,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(StringUtils.isNotBlank(ib.getCid()))params.put("cid", ib.getCid());
 		if(null!=ib.getOutsource())params.put("outsource", ib.getOutsource());
 		Integer i=null;
-		if (TokenManager.hasRole(AFTConstants.FINANCE))i=1;
+	if (TokenManager.hasRole(AFTConstants.FINANCE))i=1;
 		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER))i=2;
 		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
 				TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||