更新UU互联和商务平台接口

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

src/main/java/com/uas/platform/b2b/mobile/controller/ClockAddressController.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.mobile.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -57,9 +56,9 @@ public class ClockAddressController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE)
+	@RequestMapping(value = "/deleteById", method = RequestMethod.POST)
 	@ResponseBody
-	private ModelMap deleteById(@PathVariable Long id) {
+	private ModelMap deleteById(Long id) {
 		return clockAddressService.deleteById(id);
 	}
 }

src/main/java/com/uas/platform/b2b/mobile/controller/ClockSetCenterController.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2b.mobile.controller;
 
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +31,7 @@ public class ClockSetCenterController {
 	 */
 	@RequestMapping(value = "/getSignCardInfo", method = RequestMethod.GET)
 	@ResponseBody
-	private List<ClockSet> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
+	private ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
 		return clockSetCenterService.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
 	}
 

src/main/java/com/uas/platform/b2b/mobile/controller/FeePleaseController.java

@@ -56,4 +56,5 @@ public class FeePleaseController {
 	private ModelMap getFeePlease(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		return feePleaseService.getFeePlease(enuu, emcode, pageNumber, pageSize);
 	}
+		
 }

src/main/java/com/uas/platform/b2b/mobile/controller/OutPlanController.java

@@ -95,4 +95,15 @@ public class OutPlanController {
 		OutSign outSign = JSONObject.parseObject(formStore, OutSign.class);
 		return outSignService.saveOutSign(outSign);
 	}
+
+	/**
+	 * 获取当前人员的外勤计划
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/getOutPlan", method = RequestMethod.GET)
+	@ResponseBody
+	private ModelMap getOutPlan() {
+		return outPlanService.getOutPlan();
+	}
 }

src/main/java/com/uas/platform/b2b/mobile/controller/SignCardLogController.java

@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.mobile.model.SignCard;
 import com.uas.platform.b2b.mobile.service.SignCardLogService;
 
 /**
@@ -42,6 +44,7 @@ public class SignCardLogController {
 	@RequestMapping(value = "/saveSignCard", method = RequestMethod.POST)
 	@ResponseBody
 	private ModelMap saveSignCard(String formStore) {
-		return null;
+		SignCard signCard = JSON.parseObject(formStore, SignCard.class);
+		return signCardLogService.saveSignCard(signCard);
 	}
 }

src/main/java/com/uas/platform/b2b/mobile/controller/WorkDailyController.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2b.mobile.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -73,9 +72,21 @@ public class WorkDailyController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE)
+	@RequestMapping(value = "/deleteById", method = RequestMethod.POST)
 	@ResponseBody
-	private ModelMap deleteById(@PathVariable Long id) {
+	private ModelMap deleteById(Long id) {
 		return workDailyService.deleteById(id);
 	}
+
+	/**
+	 * 通过id查看详情
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "getWorkDailyById", method = RequestMethod.GET)
+	@ResponseBody
+	private WorkDaily getById(Long id) {
+		return workDailyService.getById(id);
+	}
 }

src/main/java/com/uas/platform/b2b/mobile/controller/WorkDataController.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.mobile.model.WorkData;
 import com.uas.platform.b2b.mobile.service.WorkDataService;
 
 @Controller("mobile.workDataController")
@@ -35,15 +37,22 @@ public class WorkDataController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE)
+	@RequestMapping(value = "/deleteById/{id}", method = RequestMethod.POST)
 	@ResponseBody
 	private ModelMap deleteById(@PathVariable Long id) {
 		return workDataService.deleteById(id);
 	};
 
+	/**
+	 * 设置员工班次
+	 * 
+	 * @param formStore
+	 * @return
+	 */
 	@RequestMapping(value = "/saveWorkData", method = RequestMethod.POST)
 	@ResponseBody
 	private ModelMap saveWorkData(String formStore) {
-		return null;
+		WorkData workData = JSON.parseObject(formStore, WorkData.class);
+		return workDataService.saveWorkData(workData);
 	}
 }

src/main/java/com/uas/platform/b2b/mobile/controller/WorkOvertimeController.java

@@ -42,6 +42,15 @@ public class WorkOvertimeController {
 		return workOvertimeService.saveWorkOvertime(workOvertime, workOvertimeDets);
 	}
 
+	/**
+	 * 获取加班申请
+	 * 
+	 * @param enuu
+	 * @param emcode
+	 * @param pageNumber
+	 * @param pageSize
+	 * @return
+	 */
 	@RequestMapping(value = "/getWorkOvertime", method = RequestMethod.GET)
 	@ResponseBody
 	private ModelMap getWorkOvertime(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {

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

@@ -3,14 +3,11 @@ 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.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -104,10 +101,6 @@ public class ClockAddress implements Serializable {
 	@Column(name = "cla_recorddate")
 	private Date cs_recorddate;
 
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "cla_cloid", nullable = false)
-	private ClockSetCenter clockSetCenter;
-
 	public Long getCs_id() {
 		return cs_id;
 	}
@@ -204,12 +197,4 @@ public class ClockAddress implements Serializable {
 		this.recorderuu = recorderuu;
 	}
 
-	public ClockSetCenter getClockSetCenter() {
-		return clockSetCenter;
-	}
-
-	public void setClockSetCenter(ClockSetCenter clockSetCenter) {
-		this.clockSetCenter = clockSetCenter;
-	}
-
 }

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

@@ -2,17 +2,12 @@ package com.uas.platform.b2b.mobile.model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Set;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -216,14 +211,6 @@ public class ClockSetCenter implements Serializable {
 	@Column(name = "clo_sucess")
 	private String success;
 
-	/**
-	 * 公司位置
-	 */
-	@OneToMany(mappedBy = "clockSetCenter", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
-			CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("cla_id")
-	private Set<ClockAddress> address;
-
 	/**
 	 * 班次日期
 	 */
@@ -471,14 +458,6 @@ public class ClockSetCenter implements Serializable {
 		this.success = success;
 	}
 
-	public Set<ClockAddress> getAddress() {
-		return address;
-	}
-
-	public void setAddress(Set<ClockAddress> address) {
-		this.address = address;
-	}
-
 	public Date getDate() {
 		return date;
 	}

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

@@ -123,7 +123,13 @@ public class OutPlanDetail implements Serializable {
 	 * 状态
 	 */
 	@Column(name = "opd_status")
-	private Short mpd_status;
+	private String mpd_status;
+
+	/**
+	 * 状态码
+	 */
+	@Column(name = "opd_statuscode")
+	private String mpd_statuscode;
 
 	/**
 	 * 主表
@@ -244,11 +250,11 @@ public class OutPlanDetail implements Serializable {
 		this.mpd_recorddate = mpd_recorddate;
 	}
 
-	public Short getMpd_status() {
+	public String getMpd_status() {
 		return mpd_status;
 	}
 
-	public void setMpd_status(Short mpd_status) {
+	public void setMpd_status(String mpd_status) {
 		this.mpd_status = mpd_status;
 	}
 
@@ -262,4 +268,12 @@ public class OutPlanDetail implements Serializable {
 		this.outPlan = outPlan;
 	}
 
+	public String getMpd_statuscode() {
+		return mpd_statuscode;
+	}
+
+	public void setMpd_statuscode(String mpd_statuscode) {
+		this.mpd_statuscode = mpd_statuscode;
+	}
+
 }

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

@@ -81,7 +81,7 @@ public class WorkDaily implements Serializable {
 	 * 状态码
 	 */
 	@Column(name = "wd_statuscode")
-	private Short wd_statuscode;
+	private String wd_statuscode;
 
 	/**
 	 * 日期
@@ -159,11 +159,11 @@ public class WorkDaily implements Serializable {
 		this.wd_status = wd_status;
 	}
 
-	public Short getWd_statuscode() {
+	public String getWd_statuscode() {
 		return wd_statuscode;
 	}
 
-	public void setWd_statuscode(Short wd_statuscode) {
+	public void setWd_statuscode(String wd_statuscode) {
 		this.wd_statuscode = wd_statuscode;
 	}
 

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

@@ -94,6 +94,12 @@ public class WorkOvertime implements Serializable {
 	@Column(name = "wo_enuu")
 	private Long enuu;
 	
+	/**
+	 * 录入时间
+	 */
+	@Column(name = "wo_date")
+	private Date wo_date;
+
 	/**
 	 * 加班明细
 	 */
@@ -190,4 +196,12 @@ public class WorkOvertime implements Serializable {
 		this.workOvertimeDet = workOvertimeDet;
 	}
 
+	public Date getWo_date() {
+		return wo_date;
+	}
+
+	public void setWo_date(Date wo_date) {
+		this.wo_date = wo_date;
+	}
+
 }