Browse Source

工时表BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
338f06f058

+ 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"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_mid"/>
+    <table schema="aft" tableName="t_order_task"/>
   </context>
 </generatorConfiguration>

+ 16 - 14
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -12,85 +12,85 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 
@@ -108,5 +108,7 @@ public interface TOrderTaskMapper {
 
 	List<String> listNameByDepAndName(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
+	String selectByidGetCname(String pid);
+
 
 }

File diff suppressed because it is too large
+ 1423 - 1284
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml


File diff suppressed because it is too large
+ 272 - 111
src/main/java/com/goafanti/common/model/TOrderTask.java


+ 466 - 16
src/main/java/com/goafanti/common/model/TOrderTaskExample.java

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2510,11 +2510,461 @@ public class TOrderTaskExample {
 			addCriterion("outsource not between", value1, value2, "outsource");
 			return (Criteria) this;
 		}
+
+		public Criteria andSplitSuperIsNull() {
+			addCriterion("split_super is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIsNotNull() {
+			addCriterion("split_super is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperEqualTo(Integer value) {
+			addCriterion("split_super =", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotEqualTo(Integer value) {
+			addCriterion("split_super <>", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperGreaterThan(Integer value) {
+			addCriterion("split_super >", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_super >=", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperLessThan(Integer value) {
+			addCriterion("split_super <", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperLessThanOrEqualTo(Integer value) {
+			addCriterion("split_super <=", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIn(List<Integer> values) {
+			addCriterion("split_super in", values, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotIn(List<Integer> values) {
+			addCriterion("split_super not in", values, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperBetween(Integer value1, Integer value2) {
+			addCriterion("split_super between", value1, value2, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_super not between", value1, value2, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusIsNull() {
+			addCriterion("split_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusIsNotNull() {
+			addCriterion("split_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusEqualTo(Integer value) {
+			addCriterion("split_status =", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusNotEqualTo(Integer value) {
+			addCriterion("split_status <>", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusGreaterThan(Integer value) {
+			addCriterion("split_status >", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_status >=", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusLessThan(Integer value) {
+			addCriterion("split_status <", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("split_status <=", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusIn(List<Integer> values) {
+			addCriterion("split_status in", values, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusNotIn(List<Integer> values) {
+			addCriterion("split_status not in", values, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusBetween(Integer value1, Integer value2) {
+			addCriterion("split_status between", value1, value2, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_status not between", value1, value2, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdIsNull() {
+			addCriterion("split_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdIsNotNull() {
+			addCriterion("split_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdEqualTo(Integer value) {
+			addCriterion("split_id =", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdNotEqualTo(Integer value) {
+			addCriterion("split_id <>", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdGreaterThan(Integer value) {
+			addCriterion("split_id >", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_id >=", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdLessThan(Integer value) {
+			addCriterion("split_id <", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdLessThanOrEqualTo(Integer value) {
+			addCriterion("split_id <=", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdIn(List<Integer> values) {
+			addCriterion("split_id in", values, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdNotIn(List<Integer> values) {
+			addCriterion("split_id not in", values, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdBetween(Integer value1, Integer value2) {
+			addCriterion("split_id between", value1, value2, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_id not between", value1, value2, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidIsNull() {
+			addCriterion("split_aid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidIsNotNull() {
+			addCriterion("split_aid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidEqualTo(String value) {
+			addCriterion("split_aid =", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotEqualTo(String value) {
+			addCriterion("split_aid <>", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidGreaterThan(String value) {
+			addCriterion("split_aid >", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidGreaterThanOrEqualTo(String value) {
+			addCriterion("split_aid >=", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidLessThan(String value) {
+			addCriterion("split_aid <", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidLessThanOrEqualTo(String value) {
+			addCriterion("split_aid <=", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidLike(String value) {
+			addCriterion("split_aid like", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotLike(String value) {
+			addCriterion("split_aid not like", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidIn(List<String> values) {
+			addCriterion("split_aid in", values, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotIn(List<String> values) {
+			addCriterion("split_aid not in", values, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidBetween(String value1, String value2) {
+			addCriterion("split_aid between", value1, value2, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotBetween(String value1, String value2) {
+			addCriterion("split_aid not between", value1, value2, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeIsNull() {
+			addCriterion("split_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeIsNotNull() {
+			addCriterion("split_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeEqualTo(Date value) {
+			addCriterion("split_time =", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeNotEqualTo(Date value) {
+			addCriterion("split_time <>", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeGreaterThan(Date value) {
+			addCriterion("split_time >", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("split_time >=", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeLessThan(Date value) {
+			addCriterion("split_time <", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeLessThanOrEqualTo(Date value) {
+			addCriterion("split_time <=", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeIn(List<Date> values) {
+			addCriterion("split_time in", values, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeNotIn(List<Date> values) {
+			addCriterion("split_time not in", values, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeBetween(Date value1, Date value2) {
+			addCriterion("split_time between", value1, value2, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeNotBetween(Date value1, Date value2) {
+			addCriterion("split_time not between", value1, value2, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameIsNull() {
+			addCriterion("cname is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameIsNotNull() {
+			addCriterion("cname is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameEqualTo(String value) {
+			addCriterion("cname =", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameNotEqualTo(String value) {
+			addCriterion("cname <>", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameGreaterThan(String value) {
+			addCriterion("cname >", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameGreaterThanOrEqualTo(String value) {
+			addCriterion("cname >=", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameLessThan(String value) {
+			addCriterion("cname <", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameLessThanOrEqualTo(String value) {
+			addCriterion("cname <=", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameLike(String value) {
+			addCriterion("cname like", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameNotLike(String value) {
+			addCriterion("cname not like", value, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameIn(List<String> values) {
+			addCriterion("cname in", values, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameNotIn(List<String> values) {
+			addCriterion("cname not in", values, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameBetween(String value1, String value2) {
+			addCriterion("cname between", value1, value2, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andCnameNotBetween(String value1, String value2) {
+			addCriterion("cname not between", value1, value2, "cname");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameIsNull() {
+			addCriterion("receiver_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameIsNotNull() {
+			addCriterion("receiver_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameEqualTo(String value) {
+			addCriterion("receiver_name =", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameNotEqualTo(String value) {
+			addCriterion("receiver_name <>", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameGreaterThan(String value) {
+			addCriterion("receiver_name >", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameGreaterThanOrEqualTo(String value) {
+			addCriterion("receiver_name >=", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameLessThan(String value) {
+			addCriterion("receiver_name <", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameLessThanOrEqualTo(String value) {
+			addCriterion("receiver_name <=", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameLike(String value) {
+			addCriterion("receiver_name like", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameNotLike(String value) {
+			addCriterion("receiver_name not like", value, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameIn(List<String> values) {
+			addCriterion("receiver_name in", values, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameNotIn(List<String> values) {
+			addCriterion("receiver_name not in", values, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameBetween(String value1, String value2) {
+			addCriterion("receiver_name between", value1, value2, "receiverName");
+			return (Criteria) this;
+		}
+
+		public Criteria andReceiverNameNotBetween(String value1, String value2) {
+			addCriterion("receiver_name not between", value1, value2, "receiverName");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Wed Mar 18 16:59:00 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -193,6 +193,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setTaskStatus(TaskState.WFP.getCode());
 		t.setProjectStatus(ProjectNewStage.DTJ.getCode());
 		if(t.getCommodityPrice()!=null)order.setTotalAmount(order.getTotalAmount());
+		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
+		t.setCname(str);
 		return tOrderTaskMapper.insertSelective(t);
 	}
 

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

@@ -136,6 +136,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else if(specially==2) { //咨询师推给咨询师经理
 			t.setConsultantId(null);
 		}
+		t.setReceiverName(a.getName());
 		tOrderTaskMapper.updateByPrimaryKey(t);
 		List<String> aids = new ArrayList<>();
 		aids.add(taskReceiverId);