anderx 4 years ago
parent
commit
ebe979eb4f

+ 2 - 2
src/main/java/com/goafanti/common/model/TOrderBack.java

@@ -7,7 +7,7 @@ public class TOrderBack {
      *
      *
      * This field was generated by MyBatis Generator.
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column t_order_back.id
      * This field corresponds to the database column t_order_back.id
-     *
+     *
      * @mbggenerated Tue Nov 20 11:06:11 CST 2018
      * @mbggenerated Tue Nov 20 11:06:11 CST 2018
      */
      */
     private Integer id;
     private Integer id;
@@ -295,7 +295,7 @@ public class TOrderBack {
      * @param reasonAttachmentUrl the value for t_order_back.reason_attachment_url
      * @param reasonAttachmentUrl the value for t_order_back.reason_attachment_url
      *
      *
      * @mbggenerated Tue Nov 20 11:06:11 CST 2018
      * @mbggenerated Tue Nov 20 11:06:11 CST 2018
->>>>>>> refs/remotes/origin/test
+>>>>>>> refs/remotes/origin/test
      */
      */
     public void setReasonAttachmentUrl(String reasonAttachmentUrl) {
     public void setReasonAttachmentUrl(String reasonAttachmentUrl) {
         this.reasonAttachmentUrl = reasonAttachmentUrl;
         this.reasonAttachmentUrl = reasonAttachmentUrl;

+ 49 - 49
src/main/java/com/goafanti/common/model/TOrderBonusExample.java

@@ -8,39 +8,39 @@ import java.util.Iterator;
 public class TOrderBonusExample {
 public class TOrderBonusExample {
     /**
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	protected String orderByClause;
 	protected String orderByClause;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	protected boolean distinct;
 	protected boolean distinct;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	protected List<Criteria> oredCriteria;
 	protected List<Criteria> oredCriteria;
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public TOrderBonusExample() {
 	public TOrderBonusExample() {
 		oredCriteria = new ArrayList<Criteria>();
 		oredCriteria = new ArrayList<Criteria>();
@@ -48,11 +48,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public void setOrderByClause(String orderByClause) {
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
 		this.orderByClause = orderByClause;
@@ -60,11 +60,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public String getOrderByClause() {
 	public String getOrderByClause() {
 		return orderByClause;
 		return orderByClause;
@@ -72,11 +72,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public void setDistinct(boolean distinct) {
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
 		this.distinct = distinct;
@@ -84,11 +84,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public boolean isDistinct() {
 	public boolean isDistinct() {
 		return distinct;
 		return distinct;
@@ -96,11 +96,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public List<Criteria> getOredCriteria() {
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
 		return oredCriteria;
@@ -108,11 +108,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public void or(Criteria criteria) {
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
 		oredCriteria.add(criteria);
@@ -120,11 +120,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public Criteria or() {
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
 		Criteria criteria = createCriteriaInternal();
@@ -134,11 +134,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public Criteria createCriteria() {
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
 		Criteria criteria = createCriteriaInternal();
@@ -150,11 +150,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	protected Criteria createCriteriaInternal() {
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
 		Criteria criteria = new Criteria();
@@ -163,11 +163,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public void clear() {
 	public void clear() {
 		oredCriteria.clear();
 		oredCriteria.clear();
@@ -177,11 +177,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bonus
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	protected abstract static class GeneratedCriteria {
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
 		protected List<Criterion> criteria;
@@ -835,11 +835,11 @@ public class TOrderBonusExample {
 
 
 	/**
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bonus
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bonus
-<<<<<<< HEAD
+<<<<<<< HEAD
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	 */
 	public static class Criterion {
 	public static class Criterion {
 		private String condition;
 		private String condition;
@@ -932,4 +932,4 @@ public class TOrderBonusExample {
             super();
             super();
         }
         }
     }
     }
-}
+}

+ 3 - 3
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -94,14 +94,14 @@ public interface DemandService {
 
 
 	Pagination<DemandSearchListBo> listMyDemand(Integer pNo, Integer pSize);
 	Pagination<DemandSearchListBo> listMyDemand(Integer pNo, Integer pSize);
 
 
-
+
 	int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 	int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
 
-
+
 	Pagination<DemandManageListBo> selectMyDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 	Pagination<DemandManageListBo> selectMyDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
 	
 	
 	Pagination<DemandManageListBo> selectManageDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 	Pagination<DemandManageListBo> selectManageDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,

+ 4 - 4
src/main/java/com/goafanti/news/bo/NewsPortalList.java

@@ -8,7 +8,7 @@ public class NewsPortalList extends NewsSummary {
 	private String title;
 	private String title;
 	
 	
 	private String DataS;
 	private String DataS;
-
+
 	private String source;
 	private String source;
 	/**
 	/**
 	 * 置顶
 	 * 置顶
@@ -18,12 +18,12 @@ public class NewsPortalList extends NewsSummary {
 	/**
 	/**
 	 * 热门
 	 * 热门
 	 */
 	 */
-	private Integer hotspot;
+	private Integer hotspot;
 
 
 	public String getTitle() {
 	public String getTitle() {
 		return title;
 		return title;
 	}
 	}
-
+
 	public void setTitle(String title) {
 	public void setTitle(String title) {
 		this.title = title;
 		this.title = title;
 	}
 	}
@@ -34,7 +34,7 @@ public class NewsPortalList extends NewsSummary {
 
 
 	public void setContent(String content) {
 	public void setContent(String content) {
 		this.content = content;
 		this.content = content;
-	}
+	}
 	
 	
 	public String getSource() {
 	public String getSource() {
 		return source;
 		return source;