增加排序字段，流程处理人设置为从填写的第一个开始

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7375 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java

@@ -120,6 +120,12 @@ public class FeePlease implements Serializable {
 	@Column(name = "fp_emcode")
 	private Long emcode;
 
+	/**
+	 * 排序时间
+	 */
+	@Column(name = "fp_orderdate")
+	private Date orderdate;
+
 	public Long getFp_id() {
 		return fp_id;
 	}
@@ -232,4 +238,12 @@ public class FeePlease implements Serializable {
 		this.emcode = emcode;
 	}
 
+	public Date getOrderdate() {
+		return orderdate;
+	}
+
+	public void setOrderdate(Date orderdate) {
+		this.orderdate = orderdate;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java

@@ -3,11 +3,14 @@ package com.uas.platform.b2b.mobile.model;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -68,6 +71,13 @@ public class OutSign implements Serializable {
 	@Column(name = "sign_emcode")
 	private Long emcode;
 
+	/**
+	 * 外勤计划
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH })
+	@JoinColumn(name = "sign_opid", insertable = false, updatable = false)
+	private OutPlan outplan;
+
 	public Long getMo_id() {
 		return mo_id;
 	}
@@ -124,4 +134,12 @@ public class OutSign implements Serializable {
 		this.emcode = emcode;
 	}
 
+	public OutPlan getOutplan() {
+		return outplan;
+	}
+
+	public void setOutplan(OutPlan outplan) {
+		this.outplan = outplan;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java

@@ -107,6 +107,12 @@ public class Vacation implements Serializable {
 	@Column(name = "va_remark")
 	private String va_remark;
 
+	/**
+	 * 排序时间
+	 */
+	@Column(name = "va_orderdate")
+	private Date orderdate;
+
 	public Long getVa_id() {
 		return va_id;
 	}
@@ -187,14 +193,6 @@ public class Vacation implements Serializable {
 		this.va_recorder = va_recorder;
 	}
 
-	public Date getVa_date() {
-		return va_date;
-	}
-
-	public void setVa_date(Date va_date) {
-		this.va_date = va_date;
-	}
-
 	public Long getEnuu() {
 		return enuu;
 	}
@@ -211,4 +209,20 @@ public class Vacation implements Serializable {
 		this.va_remark = va_remark;
 	}
 
+	public Date getVa_date() {
+		return va_date;
+	}
+
+	public void setVa_date(Date va_date) {
+		this.va_date = va_date;
+	}
+
+	public Date getOrderdate() {
+		return orderdate;
+	}
+
+	public void setOrderdate(Date orderdate) {
+		this.orderdate = orderdate;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/model/VisitRecord.java

@@ -1,67 +1,226 @@
 package com.uas.platform.b2b.mobile.model;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class VisitRecord {
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
-	private String vr_detail;
-	private String visitman;
-	private Long id;
-	private Date vr_visitend;
-	private String address;
-	private String vr_nichename;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 拜访记录表
+ * 
+ * @author hejq
+ * @time 创建时间：2017年3月27日
+ */
+@Entity
+@Table(name = "mobile$visitrecord")
+public class VisitRecord implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$visitRecord_gen")
+	@SequenceGenerator(name = "mobile$visitRecord_gen", sequenceName = "mobile$visitRecord_seq", allocationSize = 1)
+	@Column(name = "vr_id")
+	private Long vr_id;
+
+	/**
+	 * 拜访类别
+	 */
+	@Column(name = "vr_class")
+	private String vr_class;
+
+	/**
+	 * 编号
+	 */
+	@Column(name = "vr_code")
+	private String code;
+
+	/**
+	 * 录入日期
+	 */
+	@Column(name = "vr_date")
+	private Date vr_date;
+
+	/**
+	 * 开始时间
+	 */
+	@Column(name = "vr_startdate")
+	private Date vr_startdate;
+
+	/**
+	 * 结束时间
+	 */
+	@Column(name = "vr_enddate")
+	private Date vr_enddate;
+
+	/**
+	 * 录入人uu
+	 */
+	@Column(name = "vr_emuu")
+	private Long emuu;
+
+	/**
+	 * 录入人姓名
+	 */
+	@Column(name = "vr_emname")
+	private String vr_emname;
+
+	/**
+	 * 企业uu
+	 */
+	@Column(name = "vr_enuu")
+	private Long enuu;
+
+	/**
+	 * 状态
+	 */
+	@Column(name = "vr_status")
+	private String status;
+
+	/**
+	 * 状态码
+	 */
+	@Column(name = "vr_statuscode")
+	private String statuscode;
+
+	/**
+	 * 拜访类型
+	 */
+	@Column(name = "vr_title")
 	private String vr_title;
-	private Date vr_visittime;
-	private String var_nichestep;
-	private String var_vr_cucontact;
-	private String custname;
+	
+	/**
+	 * 拜访内容
+	 */
+	@Column(name = "vr_detail")
+	@Length(max = 2000)
+	private String vr_detail;
+	
+	/**
+	 * 客户编号
+	 */
+	@Column(name = "vr_cucode")
+	private String vr_cucode;
+	
+	/**
+	 * 客户姓名
+	 */
+	@Column(name = "vr_cuname")
+	private String vr_cuname;
 
-	public String getVr_detail() {
-		return vr_detail;
+	/**
+	 * 客户地址
+	 */
+	@Column(name = "vr_cuaddress")
+	@Length(max = 500)
+	private String vr_cuaddress;
+
+	/**
+	 * 客户联系人
+	 */
+	@Column(name = "vr_cucontact")
+	private String vr_cucontact;
+
+	public Long getVr_id() {
+		return vr_id;
 	}
 
-	public void setVr_detail(String vr_detail) {
-		this.vr_detail = vr_detail;
+	public void setVr_id(Long vr_id) {
+		this.vr_id = vr_id;
+	}
+
+	public String getVr_class() {
+		return vr_class;
+	}
+
+	public void setVr_class(String vr_class) {
+		this.vr_class = vr_class;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Date getVr_date() {
+		return vr_date;
+	}
+
+	public void setVr_date(Date vr_date) {
+		this.vr_date = vr_date;
+	}
+
+	public Date getVr_startdate() {
+		return vr_startdate;
+	}
+
+	public void setVr_startdate(Date vr_startdate) {
+		this.vr_startdate = vr_startdate;
 	}
 
-	public String getVisitman() {
-		return visitman;
+	public Date getVr_enddate() {
+		return vr_enddate;
 	}
 
-	public void setVisitman(String visitman) {
-		this.visitman = visitman;
+	public void setVr_enddate(Date vr_enddate) {
+		this.vr_enddate = vr_enddate;
 	}
 
-	public Long getId() {
-		return id;
+	public Long getEmuu() {
+		return emuu;
 	}
 
-	public void setId(Long id) {
-		this.id = id;
+	public void setEmuu(Long emuu) {
+		this.emuu = emuu;
 	}
 
-	public Date getVr_visitend() {
-		return vr_visitend;
+	public String getVr_emname() {
+		return vr_emname;
 	}
 
-	public void setVr_visitend(Date vr_visitend) {
-		this.vr_visitend = vr_visitend;
+	public void setVr_emname(String vr_emname) {
+		this.vr_emname = vr_emname;
 	}
 
-	public String getAddress() {
-		return address;
+	public Long getEnuu() {
+		return enuu;
 	}
 
-	public void setAddress(String address) {
-		this.address = address;
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
 	}
 
-	public String getVr_nichename() {
-		return vr_nichename;
+	public String getStatus() {
+		return status;
 	}
 
-	public void setVr_nichename(String vr_nichename) {
-		this.vr_nichename = vr_nichename;
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getStatuscode() {
+		return statuscode;
+	}
+
+	public void setStatuscode(String statuscode) {
+		this.statuscode = statuscode;
 	}
 
 	public String getVr_title() {
@@ -72,36 +231,44 @@ public class VisitRecord {
 		this.vr_title = vr_title;
 	}
 
-	public Date getVr_visittime() {
-		return vr_visittime;
+	public String getVr_detail() {
+		return vr_detail;
+	}
+
+	public void setVr_detail(String vr_detail) {
+		this.vr_detail = vr_detail;
+	}
+
+	public String getVr_cucode() {
+		return vr_cucode;
 	}
 
-	public void setVr_visittime(Date vr_visittime) {
-		this.vr_visittime = vr_visittime;
+	public void setVr_cucode(String vr_cucode) {
+		this.vr_cucode = vr_cucode;
 	}
 
-	public String getVar_nichestep() {
-		return var_nichestep;
+	public String getVr_cuname() {
+		return vr_cuname;
 	}
 
-	public void setVar_nichestep(String var_nichestep) {
-		this.var_nichestep = var_nichestep;
+	public void setVr_cuname(String vr_cuname) {
+		this.vr_cuname = vr_cuname;
 	}
 
-	public String getVar_vr_cucontact() {
-		return var_vr_cucontact;
+	public String getVr_cuaddress() {
+		return vr_cuaddress;
 	}
 
-	public void setVar_vr_cucontact(String var_vr_cucontact) {
-		this.var_vr_cucontact = var_vr_cucontact;
+	public void setVr_cuaddress(String vr_cuaddress) {
+		this.vr_cuaddress = vr_cuaddress;
 	}
 
-	public String getCustname() {
-		return custname;
+	public String getVr_cucontact() {
+		return vr_cucontact;
 	}
 
-	public void setCustname(String custname) {
-		this.custname = custname;
+	public void setVr_cucontact(String vr_cucontact) {
+		this.vr_cucontact = vr_cucontact;
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java

@@ -95,6 +95,12 @@ public class WorkDaily implements Serializable {
 	@Column(name = "wd_enuu")
 	private Long enuu;
 
+	/**
+	 * 排序时间
+	 */
+	@Column(name = "wd_orderdate")
+	private Date orderdate;
+
 	public Long getWd_id() {
 		return wd_id;
 	}
@@ -167,6 +173,14 @@ public class WorkDaily implements Serializable {
 		this.wd_statuscode = wd_statuscode;
 	}
 
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
 	public Date getWd_date() {
 		return wd_date;
 	}
@@ -175,12 +189,12 @@ public class WorkDaily implements Serializable {
 		this.wd_date = wd_date;
 	}
 
-	public Long getEnuu() {
-		return enuu;
+	public Date getOrderdate() {
+		return orderdate;
 	}
 
-	public void setEnuu(Long enuu) {
-		this.enuu = enuu;
+	public void setOrderdate(Date orderdate) {
+		this.orderdate = orderdate;
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertime.java

@@ -100,6 +100,12 @@ public class WorkOvertime implements Serializable {
 	@Column(name = "wo_date")
 	private Date wo_date;
 
+	/**
+	 * 排序时间
+	 */
+	@Column(name = "wo_orderdate")
+	private Date orderdate;
+
 	/**
 	 * 加班明细
 	 */
@@ -204,4 +210,14 @@ public class WorkOvertime implements Serializable {
 		this.wo_date = wo_date;
 	}
 
+	public Date getOrderdate() {
+		return orderdate;
+	}
+
+	public void setOrderdate(Date orderdate) {
+		this.orderdate = orderdate;
+	}
+
+
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/WorkScheduleService.java

@@ -1,7 +1,11 @@
 package com.uas.platform.b2b.mobile.service;
 
+import java.util.List;
+
 import org.springframework.ui.ModelMap;
 
+import com.uas.platform.b2b.mobile.model.VisitRecord;
+
 public interface WorkScheduleService {
 
 	/**
@@ -12,4 +16,19 @@ public interface WorkScheduleService {
 	 * @return
 	 */
 	public ModelMap getWorkSchedule(Long emcode, Long enuu);
+
+	/**
+	 * 保存拜访记录
+	 * 
+	 * @param visitRecord
+	 * @return
+	 */
+	public ModelMap saveVisitRecord(VisitRecord visitRecord);
+	
+	/**
+	 * 查找一个月以内的拜访记录
+	 * 
+	 * @return
+	 */
+	public List<VisitRecord> getRecordsInOneMonth(Long emuu, Long enuu);
 }