更新UU互联接口功能

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

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

@@ -0,0 +1,39 @@
+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;
+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.AdvancedSettings;
+import com.uas.platform.b2b.mobile.service.AdvancedSettingsService;
+
+@Controller("mobile.AdvancedSettingsController")
+@RequestMapping("/mobile/advancedSettings")
+public class AdvancedSettingsController {
+
+	@Autowired
+	private AdvancedSettingsService advancedSettingsService;
+
+	/**
+	 * 保存高级设置
+	 * 
+	 * @param formStore
+	 */
+	@RequestMapping(value = "/saveAdvancedSettings", method = RequestMethod.POST)
+	@ResponseBody
+	private void saveAdvancedSettings(String formStore) {
+		AdvancedSettings advancedSettings = JSON.parseObject(formStore, AdvancedSettings.class);
+		advancedSettingsService.saveAdvancedSettings(advancedSettings);
+	}
+
+	@RequestMapping(value = "/getAdvancedSettings", method = RequestMethod.GET)
+	@ResponseBody
+	private List<AdvancedSettings> getAdvancedSettings(Long enuu) {
+		return advancedSettingsService.getSettingsByEnuu(enuu);
+	}
+}

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

@@ -3,10 +3,13 @@ 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;
 
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.mobile.model.ClockAddress;
 import com.uas.platform.b2b.mobile.service.ClockAddressService;
 
 /**
@@ -21,6 +24,7 @@ public class ClockAddressController {
 
 	@Autowired
 	private ClockAddressService clockAddressService;
+
 	/**
 	 * 获取企业的打卡地点
 	 * 
@@ -32,4 +36,30 @@ public class ClockAddressController {
 	private ModelMap getSignCardAddress(Long enuu) {
 		return clockAddressService.getSignCardAddress(enuu);
 	};
+
+	/**
+	 * 保存打卡地址
+	 * 
+	 * @param fromStore
+	 * @return
+	 */
+	@RequestMapping(value = "/saveSignCardAddress", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap saveSignCardAddress(String fromStore) {
+		ClockAddress address = JSON.parseObject(fromStore, ClockAddress.class);
+		return clockAddressService.saveSignCardAddress(address);
+
+	}
+	
+	/**
+	 * 删除打卡地址
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE)
+	@ResponseBody
+	private ModelMap deleteById(@PathVariable Long id) {
+		return clockAddressService.deleteById(id);
+	}
 }

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

@@ -1,13 +1,15 @@
 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.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.platform.b2b.mobile.service.ClockSetCenterService;
+import com.uas.platform.b2b.temporary.model.ClockSet;
 
 /**
  * 打卡班次表
@@ -31,7 +33,7 @@ public class ClockSetCenterController {
 	 */
 	@RequestMapping(value = "/getSignCardInfo", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getSignCardInfoByEmcodeAndEnuu(String emcode, Long enuu) {
+	private List<ClockSet> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
 		return clockSetCenterService.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
 	}
 

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

@@ -30,7 +30,7 @@ public class NoticeCenterController {
 	 * @param enuu
 	 * @return
 	 */
-	@RequestMapping(value = "getAllNotices", method = RequestMethod.GET)
+	@RequestMapping(value = "/getAllNotices", method = RequestMethod.GET)
 	@ResponseBody
 	private ModelMap getAllNoticesByEnuu(Integer pageNumber, Integer pageSize, Long enuu) {
 		return noticeCenterService.getAllNoticesByEnuu(pageNumber, pageSize, enuu);

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

@@ -29,8 +29,19 @@ public class SignCardLogController {
 	 */
 	@RequestMapping(value = "/getListdata", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getListData(Long emcode, Integer pageNumber, Integer pageSize) {
-		return signCardLogService.getListData(emcode, pageNumber, pageSize);
+	private ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize) {
+		return signCardLogService.getListData(emcode, enuu, pageNumber, pageSize);
 	};
 
+	/**
+	 * 保存打卡记录
+	 * 
+	 * @param formStore
+	 * @return
+	 */
+	@RequestMapping(value = "/saveSignCard", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap saveSignCard(String formStore) {
+		return null;
+	}
 }

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

@@ -48,9 +48,8 @@ public class VacationController {
 	 */
 	@RequestMapping(value = "/saveVacation", method = RequestMethod.POST)
 	@ResponseBody
-	private ModelMap saveVacation(Long enuu, String formStore) {
+	private ModelMap saveVacation(String formStore) {
 		Vacation vacation = JSONObject.parseObject(formStore, Vacation.class);
-		vacation.setEnuu(enuu);
 		return vacationService.saveVacation(vacation);
 	}
 }

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

@@ -40,4 +40,10 @@ public class WorkDataController {
 	private ModelMap deleteById(@PathVariable Long id) {
 		return workDataService.deleteById(id);
 	};
+
+	@RequestMapping(value = "/saveWorkData", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap saveWorkData(String formStore) {
+		return null;
+	}
 }

src/main/java/com/uas/platform/b2b/mobile/dao/AdvancedSettingsDao.java

@@ -0,0 +1,22 @@
+package com.uas.platform.b2b.mobile.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.mobile.model.AdvancedSettings;
+
+@Repository
+public interface AdvancedSettingsDao
+		extends JpaRepository<AdvancedSettings, Long>, JpaSpecificationExecutor<AdvancedSettings> {
+
+	/**
+	 * 通过企业uu获取高级设置
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	public List<AdvancedSettings> getSettingsByEnuu(Long enuu);
+}

src/main/java/com/uas/platform/b2b/mobile/dao/ClockSetCenterDao.java

@@ -19,6 +19,6 @@ public interface ClockSetCenterDao
 	 * @param enuu
 	 * @return
 	 */
-	public List<ClockSetCenter> getSignCardInfoByEmcodeAndEnuu(String emcode, Long enuu);
+	public List<ClockSetCenter> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
 
 }

src/main/java/com/uas/platform/b2b/mobile/dao/SignCardDao.java

@@ -0,0 +1,12 @@
+package com.uas.platform.b2b.mobile.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.mobile.model.SignCard;
+
+@Repository
+public interface SignCardDao extends JpaRepository<SignCard, Long>, JpaSpecificationExecutor<SignCard> {
+
+}

src/main/java/com/uas/platform/b2b/mobile/enumeration/MobileStatus.java

@@ -0,0 +1,60 @@
+package com.uas.platform.b2b.mobile.enumeration;
+
+public enum MobileStatus {
+
+	/**
+	 * {@code 100 在录入}
+	 */
+	ENTERING(101, "在录入"),
+
+	/**
+	 * {@code 100 在录入}
+	 */
+	COMMITED(102, "已提交"),
+
+	/**
+	 * {@code 100 在录入}
+	 */
+	AUDITED(103, "已审核");
+
+	private MobileStatus(int value, String phrase) {
+		this.value = value;
+		this.phrase = phrase;
+	}
+
+	private final int value;
+	private final String phrase;
+
+	public int getValue() {
+		return this.value;
+	}
+
+	public String getPhrase() {
+		return this.phrase;
+	}
+
+	/**
+	 * @param statusCode
+	 *            状态的编码
+	 * @return 状态
+	 * @throws IllegalArgumentException
+	 *             如果statusCode不存在的话
+	 */
+	public static MobileStatus valueOf(int statusCode) {
+		for (MobileStatus status : values()) {
+			if (status.value == statusCode) {
+				return status;
+			}
+		}
+		throw new IllegalArgumentException("没有与编号 [" + statusCode + "]匹配的状态");
+	}
+
+	/**
+	 * 返回状态的编号
+	 */
+	@Override
+	public String toString() {
+		return Integer.toString(value);
+	}
+
+}

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

@@ -0,0 +1,143 @@
+package com.uas.platform.b2b.mobile.model;
+
+import java.io.Serializable;
+
+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;
+
+/**
+ * 高级设置
+ * 
+ * @author hejq
+ * @time 创建时间：2017年3月7日
+ */
+@Entity
+@Table(name = "mobile$advancedsettings")
+public class AdvancedSettings implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$advancedsettings_gen")
+	@SequenceGenerator(name = "mobile$advancedsettings_gen", sequenceName = "mobile$advancedsettings_seq", allocationSize = 1)
+	@Column(name = "adv_id")
+	private Long id;
+
+	/**
+	 * 迟到时间
+	 */
+	@Column(name = "adv_latetime")
+	private Integer latetime;
+	
+	/**
+	 * 严重迟到时间
+	 */
+	@Column(name = "adv_overlatetime")
+	private Integer overlatetime;
+
+	/**
+	 * 早退时间
+	 */
+	@Column(name = "adv_earlyoff")
+	private Integer earlyoff;
+
+	/**
+	 * 旷工时间
+	 */
+	@Column(name = "adv_nonclass")
+	private Integer nonclass;
+
+	/**
+	 * 自动打卡
+	 */
+	@Column(name = "adv_autosige")
+	private Integer autosige;
+
+	/**
+	 * 企业uu
+	 */
+	@Column(name = "adv_enuu")
+	private Long enuu;
+
+	/**
+	 * 员工uu
+	 */
+	@Column(name = "adv_emcode")
+	private Long emcode;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getLatetime() {
+		return latetime;
+	}
+
+	public void setLatetime(Integer latetime) {
+		this.latetime = latetime;
+	}
+
+	public Integer getOverlatetime() {
+		return overlatetime;
+	}
+
+	public void setOverlatetime(Integer overlatetime) {
+		this.overlatetime = overlatetime;
+	}
+
+	public Integer getEarlyoff() {
+		return earlyoff;
+	}
+
+	public void setEarlyoff(Integer earlyoff) {
+		this.earlyoff = earlyoff;
+	}
+
+	public Integer getNonclass() {
+		return nonclass;
+	}
+
+	public void setNonclass(Integer nonclass) {
+		this.nonclass = nonclass;
+	}
+
+	public Integer getAutosige() {
+		return autosige;
+	}
+
+	public void setAutosige(Integer autosige) {
+		this.autosige = autosige;
+	}
+
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+	public Long getEmcode() {
+		return emcode;
+	}
+
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
+	}
+
+}

src/main/java/com/uas/platform/b2b/mobile/model/ClockAddress.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.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -57,13 +60,13 @@ public class ClockAddress implements Serializable {
 	 * 经度
 	 */
 	@Column(name = "cla_longitude")
-	private Double cs_longitude;
+	private String cs_longitude;
 
 	/**
 	 * 纬度
 	 */
 	@Column(name = "cla_latitude")
-	private Double cs_latitude;
+	private String cs_latitude;
 	
 	/**
 	 * 公司名称
@@ -89,12 +92,22 @@ public class ClockAddress implements Serializable {
 	@Column(name = "cla_recorder")
 	private String cs_recorder;
 
+	/**
+	 * 记录人uu
+	 */
+	@Column(name = "cla_recorderuu")
+	private Long recorderuu;
+
 	/**
 	 * 录入时间
 	 */
 	@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;
 	}
@@ -127,19 +140,19 @@ public class ClockAddress implements Serializable {
 		this.cs_validrange = cs_validrange;
 	}
 
-	public Double getCs_longitude() {
+	public String getCs_longitude() {
 		return cs_longitude;
 	}
 
-	public void setCs_longitude(Double cs_longitude) {
+	public void setCs_longitude(String cs_longitude) {
 		this.cs_longitude = cs_longitude;
 	}
 
-	public Double getCs_latitude() {
+	public String getCs_latitude() {
 		return cs_latitude;
 	}
 
-	public void setCs_latitude(Double cs_latitude) {
+	public void setCs_latitude(String cs_latitude) {
 		this.cs_latitude = cs_latitude;
 	}
 
@@ -183,4 +196,20 @@ public class ClockAddress implements Serializable {
 		this.cs_recorddate = cs_recorddate;
 	}
 
+	public Long getRecorderuu() {
+		return recorderuu;
+	}
+
+	public void setRecorderuu(Long recorderuu) {
+		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,12 +2,17 @@ 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;
 
@@ -53,19 +58,19 @@ public class ClockSetCenter implements Serializable {
 	 * 员工编号
 	 */
 	@Column(name = "clo_emcode")
-	private String emcode;
+	private Long emcode;
 
 	/**
 	 * 班次数量
 	 */
 	@Column(name = "clo_degree")
-	private Double wd_degree;
+	private Integer wd_degree;
 
 	/**
 	 * 最早上班时间
 	 */
 	@Column(name = "clo_earlytime")
-	private Date wd_earlytime;
+	private String wd_earlytime;
 
 	/**
 	 * 排班编号
@@ -77,7 +82,7 @@ public class ClockSetCenter implements Serializable {
 	 * 参与人数
 	 */
 	@Column(name = "clo_pcount")
-	private Double wd_pcount;
+	private Integer wd_pcount;
 
 	/**
 	 * 标题
@@ -86,9 +91,7 @@ public class ClockSetCenter implements Serializable {
 	private String name;
 
 	/**
-	 * 是否需要打卡<br>
-	 * 1. 是<br>
-	 * 0. 否
+	 * 是否需要打卡
 	 */
 	@Column(name = "clo_ifneedsigncard")
 	private String ifNeedSignCard;
@@ -97,61 +100,115 @@ public class ClockSetCenter implements Serializable {
 	 * 内勤距离
 	 */
 	@Column(name = "clo_innerdistance")
-	private Double innerdistance;
+	private Integer innerdistance;
 
 	/**
 	 * 外勤距离
 	 */
 	@Column(name = "clo_distance")
-	private Double distance;
+	private Integer distance;
 
 	/**
 	 * 公司距离设置
 	 */
 	@Column(name = "clo_comaddressset")
-	private String comaddressset;
+	private Integer comaddressset;
 
 	/**
 	 * 经度
 	 */
 	@Column(name = "clo_longitude")
-	private Double longitude;
+	private String longitude;
 
 	/**
 	 * 纬度
 	 */
 	@Column(name = "clo_latitude")
-	private Double latitude;
+	private String latitude;
 
 	/**
 	 * 天数
 	 */
 	@Column(name = "clo_day")
-	private Double wd_day;
+	private Integer day;
 
 	/**
 	 * 数量
 	 */
 	@Column(name = "clo_count")
-	private Double count;
+	private Integer count;
 
 	/**
-	 * 班次对象1
+	 * 工作时间1
 	 */
-	@Column(name = "clo_class1", length = 1000)
-	private String class1;
+	@Column(name = "clo_ondutyone")
+	private String wd_ondutyOne;
 
 	/**
-	 * 班次对象2
+	 * 下班时间1
 	 */
-	@Column(name = "clo_class2", length = 1000)
-	private String class2;
+	@Column(name = "clo_offdutyone")
+	private String wd_offdutyOne;
 
 	/**
-	 * 班次对象3
+	 * 开始时间1
 	 */
-	@Column(name = "clo_class3", length = 1000)
-	private String class3;
+	@Column(name = "clo_onbegone")
+	private String wd_onbegOne;
+
+	/**
+	 * 结束时间1
+	 */
+	@Column(name = "clo_offendone")
+	private String wd_offendOne;
+
+	/**
+	 * 工作时间2
+	 */
+	@Column(name = "clo_ondutytwo")
+	private String wd_ondutyTwo;
+
+	/**
+	 * 下班时间2
+	 */
+	@Column(name = "clo_offdutytwo")
+	private String wd_offdutyTwo;
+
+	/**
+	 * 开始时间2
+	 */
+	@Column(name = "clo_onbegtwo")
+	private String wd_onbegTwo;
+
+	/**
+	 * 结束时间2
+	 */
+	@Column(name = "clo_offendtwo")
+	private String wd_offendTwo;
+
+	/**
+	 * 工作时间3
+	 */
+	@Column(name = "clo_ondutythree")
+	private String wd_ondutyThree;
+
+	/**
+	 * 下班时间3
+	 */
+	@Column(name = "clo_offdutythree")
+	private String wd_offdutyThree;
+
+	/**
+	 * 开始时间3
+	 */
+	@Column(name = "clo_onbegthree")
+	private String wd_onbegThree;
+
+	/**
+	 * 结束时间3
+	 */
+	@Column(name = "clo_offendthree")
+	private String wd_offendThree;
 
 	/**
 	 * 是否成功
@@ -162,8 +219,10 @@ public class ClockSetCenter implements Serializable {
 	/**
 	 * 公司位置
 	 */
-	@Column(name = "clo_comaddressdata", length = 2000)
-	private String comAddressdata;
+	@OneToMany(mappedBy = "clockSetCenter", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
+			CascadeType.MERGE }, fetch = FetchType.EAGER)
+	@OrderBy("cla_id")
+	private Set<ClockAddress> address;
 
 	/**
 	 * 班次日期
@@ -176,17 +235,14 @@ public class ClockSetCenter implements Serializable {
 		return wd_id;
 	}
 
-
 	public void setWd_id(Long wd_id) {
 		this.wd_id = wd_id;
 	}
 
-
 	public Long getEnuu() {
 		return enuu;
 	}
 
-
 	public void setEnuu(Long enuu) {
 		this.enuu = enuu;
 	}
@@ -199,59 +255,50 @@ public class ClockSetCenter implements Serializable {
 		this.ifDefaultClass = ifDefaultClass;
 	}
 
-	public String getEmcode() {
+	public Long getEmcode() {
 		return emcode;
 	}
 
-
-	public void setEmcode(String emcode) {
+	public void setEmcode(Long emcode) {
 		this.emcode = emcode;
 	}
 
-
-	public Double getWd_degree() {
+	public Integer getWd_degree() {
 		return wd_degree;
 	}
 
-
-	public void setWd_degree(Double wd_degree) {
+	public void setWd_degree(Integer wd_degree) {
 		this.wd_degree = wd_degree;
 	}
 
-
-	public Date getWd_earlytime() {
+	public String getWd_earlytime() {
 		return wd_earlytime;
 	}
 
-
-	public void setWd_earlytime(Date wd_earlytime) {
+	public void setWd_earlytime(String wd_earlytime) {
 		this.wd_earlytime = wd_earlytime;
 	}
 
-
 	public String getWd_code() {
 		return wd_code;
 	}
 
-
 	public void setWd_code(String wd_code) {
 		this.wd_code = wd_code;
 	}
 
-	public Double getWd_pcount() {
+	public Integer getWd_pcount() {
 		return wd_pcount;
 	}
 
-	public void setWd_pcount(Double wd_pcount) {
+	public void setWd_pcount(Integer wd_pcount) {
 		this.wd_pcount = wd_pcount;
 	}
 
-
 	public String getName() {
 		return name;
 	}
 
-
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -264,126 +311,185 @@ public class ClockSetCenter implements Serializable {
 		this.ifNeedSignCard = ifNeedSignCard;
 	}
 
-	public Double getInnerdistance() {
+	public Integer getInnerdistance() {
 		return innerdistance;
 	}
 
-	public void setInnerdistance(Double innerdistance) {
+	public void setInnerdistance(Integer innerdistance) {
 		this.innerdistance = innerdistance;
 	}
 
-	public Double getDistance() {
+	public Integer getDistance() {
 		return distance;
 	}
 
-	public void setDistance(Double distance) {
+	public void setDistance(Integer distance) {
 		this.distance = distance;
 	}
 
-
-	public String getComaddressset() {
+	public Integer getComaddressset() {
 		return comaddressset;
 	}
 
-
-	public void setComaddressset(String comaddressset) {
+	public void setComaddressset(Integer comaddressset) {
 		this.comaddressset = comaddressset;
 	}
 
-	public Double getLongitude() {
+	public String getLongitude() {
 		return longitude;
 	}
 
-	public void setLongitude(Double longitude) {
+	public void setLongitude(String longitude) {
 		this.longitude = longitude;
 	}
 
-	public Double getLatitude() {
+	public String getLatitude() {
 		return latitude;
 	}
 
-	public void setLatitude(Double latitude) {
+	public void setLatitude(String latitude) {
 		this.latitude = latitude;
 	}
 
-	public Double getWd_day() {
-		return wd_day;
+	public Integer getDay() {
+		return day;
 	}
 
-	public void setWd_day(Double wd_day) {
-		this.wd_day = wd_day;
+	public void setDay(Integer day) {
+		this.day = day;
 	}
 
-	public Double getCount() {
+	public Integer getCount() {
 		return count;
 	}
 
-	public void setCount(Double count) {
+	public void setCount(Integer count) {
 		this.count = count;
 	}
 
+	public String getWd_ondutyOne() {
+		return wd_ondutyOne;
+	}
 
-	public String getClass1() {
-		return class1;
+	public void setWd_ondutyOne(String wd_ondutyOne) {
+		this.wd_ondutyOne = wd_ondutyOne;
 	}
 
+	public String getWd_offdutyOne() {
+		return wd_offdutyOne;
+	}
 
-	public void setClass1(String class1) {
-		this.class1 = class1;
+	public void setWd_offdutyOne(String wd_offdutyOne) {
+		this.wd_offdutyOne = wd_offdutyOne;
 	}
 
+	public String getWd_onbegOne() {
+		return wd_onbegOne;
+	}
 
-	public String getClass2() {
-		return class2;
+	public void setWd_onbegOne(String wd_onbegOne) {
+		this.wd_onbegOne = wd_onbegOne;
 	}
 
+	public String getWd_offendOne() {
+		return wd_offendOne;
+	}
 
-	public void setClass2(String class2) {
-		this.class2 = class2;
+	public void setWd_offendOne(String wd_offendOne) {
+		this.wd_offendOne = wd_offendOne;
 	}
 
+	public String getWd_ondutyTwo() {
+		return wd_ondutyTwo;
+	}
 
-	public String getClass3() {
-		return class3;
+	public void setWd_ondutyTwo(String wd_ondutyTwo) {
+		this.wd_ondutyTwo = wd_ondutyTwo;
 	}
 
+	public String getWd_offdutyTwo() {
+		return wd_offdutyTwo;
+	}
 
-	public void setClass3(String class3) {
-		this.class3 = class3;
+	public void setWd_offdutyTwo(String wd_offdutyTwo) {
+		this.wd_offdutyTwo = wd_offdutyTwo;
 	}
 
+	public String getWd_onbegTwo() {
+		return wd_onbegTwo;
+	}
 
-	public String getSuccess() {
-		return success;
+	public void setWd_onbegTwo(String wd_onbegTwo) {
+		this.wd_onbegTwo = wd_onbegTwo;
 	}
 
+	public String getWd_offendTwo() {
+		return wd_offendTwo;
+	}
 
-	public void setSuccess(String success) {
-		this.success = success;
+	public void setWd_offendTwo(String wd_offendTwo) {
+		this.wd_offendTwo = wd_offendTwo;
+	}
+
+	public String getWd_ondutyThree() {
+		return wd_ondutyThree;
 	}
 
+	public void setWd_ondutyThree(String wd_ondutyThree) {
+		this.wd_ondutyThree = wd_ondutyThree;
+	}
 
-	public String getComAddressdata() {
-		return comAddressdata;
+	public String getWd_offdutyThree() {
+		return wd_offdutyThree;
 	}
 
+	public void setWd_offdutyThree(String wd_offdutyThree) {
+		this.wd_offdutyThree = wd_offdutyThree;
+	}
 
-	public void setComAddressdata(String comAddressdata) {
-		this.comAddressdata = comAddressdata;
+	public String getWd_onbegThree() {
+		return wd_onbegThree;
 	}
 
+	public void setWd_onbegThree(String wd_onbegThree) {
+		this.wd_onbegThree = wd_onbegThree;
+	}
+
+	public String getWd_offendThree() {
+		return wd_offendThree;
+	}
+
+	public void setWd_offendThree(String wd_offendThree) {
+		this.wd_offendThree = wd_offendThree;
+	}
+
+	public String getSuccess() {
+		return success;
+	}
+
+	public void setSuccess(String success) {
+		this.success = success;
+	}
+
+	public Set<ClockAddress> getAddress() {
+		return address;
+	}
+
+	public void setAddress(Set<ClockAddress> address) {
+		this.address = address;
+	}
 
 	public Date getDate() {
 		return date;
 	}
 
-
 	public void setDate(Date date) {
 		this.date = date;
 	}
 
-
 	public ClockSetCenter() {
 
 	}
+
+
 }

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

@@ -92,7 +92,7 @@ public class FeePlease implements Serializable {
 	 * 状态码
 	 */
 	@Column(name = "fp_statuscode")
-	private Short fp_statuscode;
+	private String fp_statuscode;
 
 	/**
 	 * 状态
@@ -192,11 +192,11 @@ public class FeePlease implements Serializable {
 		this.fp_auditdate = fp_auditdate;
 	}
 
-	public Short getFp_statuscode() {
+	public String getFp_statuscode() {
 		return fp_statuscode;
 	}
 
-	public void setFp_statuscode(Short fp_statuscode) {
+	public void setFp_statuscode(String fp_statuscode) {
 		this.fp_statuscode = fp_statuscode;
 	}
 
@@ -212,7 +212,7 @@ public class FeePlease implements Serializable {
 		return enuu;
 	}
 
-	public void setFp_enuu(Long enuu) {
+	public void setEnuu(Long enuu) {
 		this.enuu = enuu;
 	}
 

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

@@ -57,7 +57,7 @@ public class FeePleaseDetail implements Serializable {
 	 * 出差目的地
 	 */
 	@Column(name = "fpd_location")
-	private String location;
+	private String fpd_location;
 
 	/**
 	 * 地址
@@ -91,12 +91,12 @@ public class FeePleaseDetail implements Serializable {
 		this.feePlease = feePlease;
 	}
 
-	public String getLocation() {
-		return location;
+	public String getFpd_location() {
+		return fpd_location;
 	}
 
-	public void setLocation(String location) {
-		this.location = location;
+	public void setFpd_location(String fpd_location) {
+		this.fpd_location = fpd_location;
 	}
 
 	public String getFpd_address() {

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

@@ -0,0 +1,158 @@
+package com.uas.platform.b2b.mobile.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+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;
+
+/**
+ * 打卡记录
+ * 
+ * @author hejq
+ * @time 创建时间：2017年3月7日
+ */
+@Entity
+@Table(name = "mobile$signcard")
+public class SignCard implements Serializable {
+
+	/**
+	 * 序号
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signcard_gen")
+	@SequenceGenerator(name = "mobile$signcard_gen", sequenceName = "mobile$signcard_seq", allocationSize = 1)
+	@Column(name = "sig_id")
+	private Long id;
+	
+	/**
+	 * 员工编号
+	 */
+	@Column(name = "sig_emcode")
+	private Long emcode;
+	
+	/**
+	 * 姓名
+	 */
+	@Column(name = "sig_emname")
+	private String cl_emname;
+
+	/**
+	 * 打卡地址
+	 */
+	@Column(name = "sig_address")
+	private String cl_address;
+
+	/**
+	 * 电话
+	 */
+	@Column(name = "sig_phone")
+	private String cl_phone;
+
+	/**
+	 * 考勤地点
+	 */
+	@Column(name = "sig_location")
+	private String cl_location;
+	
+	/**
+	 * 距离
+	 */
+	@Column(name = "sig_distance")
+	private Integer cl_distance;
+	
+	/**
+	 * 打卡时间
+	 */
+	@Column(name = "sig_date")
+	private Date cl_date;
+
+	/**
+	 * 企业uu
+	 */
+	@Column(name = "sig_enuu")
+	private Long enuu;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getEmcode() {
+		return emcode;
+	}
+
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
+	}
+
+	public String getCl_emname() {
+		return cl_emname;
+	}
+
+	public void setCl_emname(String cl_emname) {
+		this.cl_emname = cl_emname;
+	}
+
+	public String getCl_address() {
+		return cl_address;
+	}
+
+	public void setCl_address(String cl_address) {
+		this.cl_address = cl_address;
+	}
+
+	public String getCl_phone() {
+		return cl_phone;
+	}
+
+	public void setCl_phone(String cl_phone) {
+		this.cl_phone = cl_phone;
+	}
+
+	public String getCl_location() {
+		return cl_location;
+	}
+
+	public void setCl_location(String cl_location) {
+		this.cl_location = cl_location;
+	}
+
+	public Integer getCl_distance() {
+		return cl_distance;
+	}
+
+	public void setCl_distance(Integer cl_distance) {
+		this.cl_distance = cl_distance;
+	}
+
+	public Date getCl_date() {
+		return cl_date;
+	}
+
+	public void setCl_date(Date cl_date) {
+		this.cl_date = cl_date;
+	}
+
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+}

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

@@ -53,12 +53,6 @@ public class SignCardLog implements Serializable {
 	@Column(name = "sgl_date")
 	private Date date;
 
-	/**
-	 * 打卡记录
-	 */
-	@Column(name = "sgl_listdata", length = 4000)
-	private String listdata;
-
 	public Long getId() {
 		return id;
 	}
@@ -91,12 +85,5 @@ public class SignCardLog implements Serializable {
 		this.date = date;
 	}
 
-	public String getListdata() {
-		return listdata;
-	}
-
-	public void setListdata(String listdata) {
-		this.listdata = listdata;
-	}
 
 }

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

@@ -57,7 +57,7 @@ public class Vacation implements Serializable {
 	 * 状态码
 	 */
 	@Column(name = "va_statuscode")
-	private Short va_statuscode;
+	private String va_statuscode;
 
 	/**
 	 * 人员编号
@@ -139,11 +139,11 @@ public class Vacation implements Serializable {
 		this.va_status = va_status;
 	}
 
-	public Short getVa_statuscode() {
+	public String getVa_statuscode() {
 		return va_statuscode;
 	}
 
-	public void setVa_statuscode(Short va_statuscode) {
+	public void setVa_statuscode(String va_statuscode) {
 		this.va_statuscode = va_statuscode;
 	}
 

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

@@ -83,6 +83,18 @@ public class WorkData implements Serializable {
 	@Column(name = "wd_offdutyone")
 	private String wd_offdutyOne;
 	
+	/**
+	 * 开始时间1
+	 */
+	@Column(name = "wd_onbegone")
+	private String wd_onbegOne;
+
+	/**
+	 * 结束时间1
+	 */
+	@Column(name = "wd_offendone")
+	private String wd_offendOne;
+
 	/**
 	 * 工作时间2
 	 */
@@ -95,6 +107,18 @@ public class WorkData implements Serializable {
 	@Column(name = "wd_offdutytwo")
 	private String wd_offdutyTwo;
 	
+	/**
+	 * 开始时间2
+	 */
+	@Column(name = "wd_onbegtwo")
+	private String wd_onbegTwo;
+
+	/**
+	 * 结束时间2
+	 */
+	@Column(name = "wd_offendtwo")
+	private String wd_offendTwo;
+
 	/**
 	 * 工作时间3
 	 */
@@ -107,6 +131,18 @@ public class WorkData implements Serializable {
 	@Column(name = "wd_offdutythree")
 	private String wd_offdutyThree;
 	
+	/**
+	 * 开始时间3
+	 */
+	@Column(name = "wd_onbegthree")
+	private String wd_onbegThree;
+
+	/**
+	 * 结束时间3
+	 */
+	@Column(name = "wd_offendthree")
+	private String wd_offendThree;
+
 	/**
 	 * 员工编码
 	 */
@@ -323,4 +359,52 @@ public class WorkData implements Serializable {
 		this.enuu = enuu;
 	}
 
+	public String getWd_onbegOne() {
+		return wd_onbegOne;
+	}
+
+	public void setWd_onbegOne(String wd_onbegOne) {
+		this.wd_onbegOne = wd_onbegOne;
+	}
+
+	public String getWd_offendOne() {
+		return wd_offendOne;
+	}
+
+	public void setWd_offendOne(String wd_offendOne) {
+		this.wd_offendOne = wd_offendOne;
+	}
+
+	public String getWd_onbegTwo() {
+		return wd_onbegTwo;
+	}
+
+	public void setWd_onbegTwo(String wd_onbegTwo) {
+		this.wd_onbegTwo = wd_onbegTwo;
+	}
+
+	public String getWd_offendTwo() {
+		return wd_offendTwo;
+	}
+
+	public void setWd_offendTwo(String wd_offendTwo) {
+		this.wd_offendTwo = wd_offendTwo;
+	}
+
+	public String getWd_onbegThree() {
+		return wd_onbegThree;
+	}
+
+	public void setWd_onbegThree(String wd_onbegThree) {
+		this.wd_onbegThree = wd_onbegThree;
+	}
+
+	public String getWd_offendThree() {
+		return wd_offendThree;
+	}
+
+	public void setWd_offendThree(String wd_offendThree) {
+		this.wd_offendThree = wd_offendThree;
+	}
+
 }

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

@@ -86,7 +86,7 @@ public class WorkOvertime implements Serializable {
 	 * 状态码
 	 */
 	@Column(name = "wo_statuscode")
-	private Short wo_statuscode;
+	private String wo_statuscode;
 	
 	/**
 	 * 企业uu
@@ -166,11 +166,11 @@ public class WorkOvertime implements Serializable {
 		this.wo_status = wo_status;
 	}
 
-	public Short getWo_statuscode() {
+	public String getWo_statuscode() {
 		return wo_statuscode;
 	}
 
-	public void setWo_statuscode(Short wo_statuscode) {
+	public void setWo_statuscode(String wo_statuscode) {
 		this.wo_statuscode = wo_statuscode;
 	}
 

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

@@ -0,0 +1,25 @@
+package com.uas.platform.b2b.mobile.service;
+
+import java.util.List;
+
+import com.uas.platform.b2b.mobile.model.AdvancedSettings;
+
+public interface AdvancedSettingsService {
+
+	/**
+	 * 保存更新
+	 * 
+	 * @param advancedSettings
+	 * @return
+	 */
+	public void saveAdvancedSettings(AdvancedSettings advancedSettings);
+
+	/**
+	 * 获取企业的高级设置
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	public List<AdvancedSettings> getSettingsByEnuu(Long enuu);
+
+}

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

@@ -2,6 +2,8 @@ package com.uas.platform.b2b.mobile.service;
 
 import org.springframework.ui.ModelMap;
 
+import com.uas.platform.b2b.mobile.model.ClockAddress;
+
 public interface ClockAddressService {
 
 	/**
@@ -11,4 +13,20 @@ public interface ClockAddressService {
 	 * @return
 	 */
 	public ModelMap getSignCardAddress(Long enuu);
+
+	/**
+	 * 保存打卡地址
+	 * 
+	 * @param address
+	 * @return
+	 */
+	public ModelMap saveSignCardAddress(ClockAddress address);
+
+	/**
+	 * 通过id删除
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public ModelMap deleteById(Long id);
 }

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

@@ -1,6 +1,8 @@
 package com.uas.platform.b2b.mobile.service;
 
-import org.springframework.ui.ModelMap;
+import java.util.List;
+
+import com.uas.platform.b2b.temporary.model.ClockSet;
 
 public interface ClockSetCenterService {
 
@@ -12,5 +14,5 @@ public interface ClockSetCenterService {
 	 * @param enuu
 	 * @return
 	 */
-	public ModelMap getSignCardInfoByEmcodeAndEnuu(String emcode, Long enuu);
+	public List<ClockSet> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
 }

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

@@ -2,6 +2,8 @@ package com.uas.platform.b2b.mobile.service;
 
 import org.springframework.ui.ModelMap;
 
+import com.uas.platform.b2b.mobile.model.SignCard;
+
 public interface SignCardLogService {
 
 	/**
@@ -12,5 +14,13 @@ public interface SignCardLogService {
 	 * @param pageSize
 	 * @return
 	 */
-	public ModelMap getListData(Long emcode, Integer pageNumber, Integer pageSize);
+	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize);
+
+	/**
+	 * 保存打卡记录
+	 * 
+	 * @param signCard
+	 * @return
+	 */
+	public ModelMap saveSignCard(SignCard signCard);
 }

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

@@ -2,6 +2,8 @@ package com.uas.platform.b2b.mobile.service;
 
 import org.springframework.ui.ModelMap;
 
+import com.uas.platform.b2b.mobile.model.WorkData;
+
 public interface WorkDataService {
 
 	/**
@@ -19,4 +21,12 @@ public interface WorkDataService {
 	 * @return
 	 */
 	public ModelMap deleteById(Long id);
+
+	/**
+	 * 保存班次
+	 * 
+	 * @param workData
+	 * @return
+	 */
+	public ModelMap saveWorkData(WorkData workData);
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/AdvancedSettingsServiceImpl.java

@@ -0,0 +1,31 @@
+package com.uas.platform.b2b.mobile.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.mobile.dao.AdvancedSettingsDao;
+import com.uas.platform.b2b.mobile.model.AdvancedSettings;
+import com.uas.platform.b2b.mobile.service.AdvancedSettingsService;
+import com.uas.platform.b2b.support.SystemSession;
+
+@Service
+public class AdvancedSettingsServiceImpl implements AdvancedSettingsService {
+
+	@Autowired
+	private AdvancedSettingsDao advancedSettingsDao;
+
+	@Override
+	public void saveAdvancedSettings(AdvancedSettings advancedSettings) {
+		advancedSettings.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		advancedSettings.setEmcode(SystemSession.getUser().getUserUU());
+		advancedSettingsDao.save(advancedSettings);
+	}
+
+	@Override
+	public List<AdvancedSettings> getSettingsByEnuu(Long enuu) {
+		return advancedSettingsDao.getSettingsByEnuu(enuu);
+	}
+
+}

src/main/java/com/uas/platform/b2b/mobile/service/impl/ClockAddressServiceImpl.java

@@ -1,11 +1,16 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.mobile.dao.ClockAddressDao;
+import com.uas.platform.b2b.mobile.model.ClockAddress;
 import com.uas.platform.b2b.mobile.service.ClockAddressService;
+import com.uas.platform.b2b.support.SystemSession;
 
 @Service
 public class ClockAddressServiceImpl implements ClockAddressService {
@@ -20,4 +25,29 @@ public class ClockAddressServiceImpl implements ClockAddressService {
 		return map;
 	}
 
+	@Override
+	public ModelMap saveSignCardAddress(ClockAddress address) {
+		ModelMap map = new ModelMap();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		address.setCs_code(sdf.format(new Date()));
+		address.setCs_recorder(SystemSession.getUser().getUserName());
+		address.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		address.setRecorderuu(SystemSession.getUser().getUserUU());
+		address = clockAddressDao.save(address);
+		if (address.getCs_id() != null) {
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
+		return map;
+	}
+
+	@Override
+	public ModelMap deleteById(Long id) {
+		ModelMap map = new ModelMap();
+		clockAddressDao.delete(id);
+		map.put("success", true);
+		return map;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/ClockSetCenterServiceImpl.java

@@ -1,11 +1,17 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.mobile.dao.ClockSetCenterDao;
+import com.uas.platform.b2b.mobile.model.ClockSetCenter;
 import com.uas.platform.b2b.mobile.service.ClockSetCenterService;
+import com.uas.platform.b2b.temporary.model.ClassObject;
+import com.uas.platform.b2b.temporary.model.ClockSet;
 
 @Service
 public class ClockSetCenterServiceImpl implements ClockSetCenterService {
@@ -14,10 +20,51 @@ public class ClockSetCenterServiceImpl implements ClockSetCenterService {
 	private ClockSetCenterDao clockSetCenterDao;
 
 	@Override
-	public ModelMap getSignCardInfoByEmcodeAndEnuu(String emcode, Long enuu) {
-		ModelMap map = new ModelMap();
-		map.put("data", clockSetCenterDao.findAll());
-		return map;
+	public List<ClockSet> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
+		List<ClockSetCenter> clocks = clockSetCenterDao.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
+		List<ClockSet> sets = new ArrayList<ClockSet>();
+		if (!CollectionUtils.isEmpty(clocks)) {
+			for (ClockSetCenter clock : clocks) {
+				ClockSet set = new ClockSet();
+				ClassObject obj1 = new ClassObject();
+				ClassObject obj2 = new ClassObject();
+				ClassObject obj3 = new ClassObject();
+				set.setAddress(clock.getAddress());
+				obj1.setWd_onbeg(clock.getWd_onbegOne());
+				obj1.setWd_onduty(clock.getWd_ondutyOne());
+				obj1.setWd_offduty(clock.getWd_offdutyOne());
+				obj1.setWd_offend(clock.getWd_offendOne());
+				set.setClass1(obj1);
+				obj2.setWd_onbeg(clock.getWd_onbegTwo());
+				obj2.setWd_onduty(clock.getWd_ondutyTwo());
+				obj2.setWd_offduty(clock.getWd_offdutyTwo());
+				obj2.setWd_offend(clock.getWd_offendTwo());
+				set.setClass2(obj2);
+				obj3.setWd_onbeg(clock.getWd_onbegThree());
+				obj3.setWd_onduty(clock.getWd_ondutyThree());
+				obj3.setWd_offduty(clock.getWd_offdutyThree());
+				obj3.setWd_offend(clock.getWd_offendThree());
+				set.setClass3(obj3);
+				set.setComaddressset(clock.getComaddressset());
+				set.setCount(clock.getCount());
+				set.setDate(clock.getDate());
+				set.setDistance(clock.getDistance());
+				set.setEmcode(clock.getEmcode());
+				set.setDay(clock.getDay());
+				set.setEnuu(clock.getEnuu());
+				set.setIfDefaultClass(clock.getIfDefaultClass());
+				set.setIfNeedSignCard(clock.getIfNeedSignCard());
+				set.setLatitude(clock.getLatitude());
+				set.setInnerdistance(clock.getInnerdistance());
+				set.setLongitude(clock.getLongitude());
+				set.setWd_code(clock.getWd_code());
+				set.setWd_degree(clock.getWd_degree());
+				set.setWd_earlytime(clock.getWd_earlytime());
+				set.setWd_pcount(clock.getWd_pcount());
+				sets.add(set);
+			}
+		}
+		return sets;
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -18,9 +20,11 @@ import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.mobile.dao.FeePleaseDao;
 import com.uas.platform.b2b.mobile.dao.FeePleaseDetailDao;
+import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
 import com.uas.platform.b2b.mobile.model.FeePlease;
 import com.uas.platform.b2b.mobile.model.FeePleaseDetail;
 import com.uas.platform.b2b.mobile.service.FeePleaseService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 
 @Service
@@ -35,16 +39,27 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 	@Override
 	public ModelMap saveFeePlease(FeePlease feePlease, List<FeePleaseDetail> feePleaseDetails) {
 		ModelMap map = new ModelMap();
-		Set<FeePleaseDetail> feeDetail = new HashSet<FeePleaseDetail>();
-		if (CollectionUtils.isEmpty(feePleaseDetails)) {
+		feePlease.setEmcode(SystemSession.getUser().getUserUU());
+		feePlease.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMmmSS");
+		feePlease.setFp_code("FP" + sdf.format(new Date()));
+		feePlease.setFp_status(MobileStatus.ENTERING.getPhrase());
+		feePlease.setFp_statuscode(MobileStatus.ENTERING.name());
+		feePlease.setFp_recorddate(new Date());
+		feePlease.setFp_people2(SystemSession.getUser().getUserName());
+		Set<FeePleaseDetail> feeDetails = new HashSet<FeePleaseDetail>();
+		if (!CollectionUtils.isEmpty(feePleaseDetails)) {
 			for (FeePleaseDetail feePleaseDetail : feePleaseDetails) {
-				feeDetail.add(feePleaseDetail);
-				feePlease.setFeePleaseDetails(feeDetail);
-
+				feeDetails.add(feePleaseDetail);
+				feePlease.setFeePleaseDetails(feeDetails);
 			}
 		}
-		feePleaseDetailDao.save(feeDetail);
-		map.put("success", true);
+		feePleaseDetails = feePleaseDetailDao.save(feeDetails);
+		if (feePleaseDetails.get(0).getFpd_id() != null) {
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
 		return map;
 	}
 

src/main/java/com/uas/platform/b2b/mobile/service/impl/OutAddressServiceImpl.java

@@ -17,8 +17,12 @@ public class OutAddressServiceImpl implements OutAddressService {
 	public ModelMap saveOutAddress(OutAddress outAddress) {
 		ModelMap map = new ModelMap();
 		outAddress = outAddressDao.save(outAddress);
-		map.put("success", true);
-		map.put("md_id", outAddress.getMd_id());
+		if (outAddress.getMd_id() != null) {
+			map.put("success", true);
+			map.put("md_id", outAddress.getMd_id());
+		} else {
+			map.put("success", false);
+		}
 		return map;
 	}
 

src/main/java/com/uas/platform/b2b/mobile/service/impl/SignCardLogServiceImpl.java

@@ -1,40 +1,67 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.util.Date;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.platform.b2b.mobile.dao.SignCardLogDao;
-import com.uas.platform.b2b.mobile.model.SignCardLog;
+import com.uas.platform.b2b.mobile.dao.SignCardDao;
+import com.uas.platform.b2b.mobile.model.SignCard;
 import com.uas.platform.b2b.mobile.service.SignCardLogService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 
 @Service
 public class SignCardLogServiceImpl implements SignCardLogService {
 
 	@Autowired
-	private SignCardLogDao signCardLogDao;
+	private SignCardDao signCardDao;
+
 	@Override
-	public ModelMap getListData(Long emcode, Integer pageNumber, Integer pageSize) {
+	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
 		final PageInfo pageInfo = new PageInfo();
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.filter("emcode", emcode);
-		Page<SignCardLog> sigLogs = signCardLogDao.findAll(new Specification<SignCardLog>() {
-			public Predicate toPredicate(Root<SignCardLog> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+		pageInfo.filter("enuu", enuu);
+		Page<SignCard> sigLogs = signCardDao.findAll(new Specification<SignCard>() {
+			public Predicate toPredicate(Root<SignCard> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		map.put("data", sigLogs.getContent());
+		if (!CollectionUtils.isEmpty(sigLogs.getContent())) {
+			map.put("listdata", sigLogs.getContent());
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
 		return map;
 	}
 
+	@Override
+	public ModelMap saveSignCard(SignCard signCard) {
+		ModelMap map = new ModelMap();
+		signCard.setCl_date(new Date());
+		signCard.setEmcode(SystemSession.getUser().getUserUU());
+		signCard.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		signCard.setCl_emname(SystemSession.getUser().getUserName());
+		signCard = signCardDao.save(signCard);
+		if (signCard.getId() != null) {
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
+		return null;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/VacationServiceImpl.java

@@ -1,5 +1,8 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
@@ -12,8 +15,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.mobile.dao.VacationDao;
+import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
 import com.uas.platform.b2b.mobile.model.Vacation;
 import com.uas.platform.b2b.mobile.service.VacationService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 
 @Service
@@ -35,15 +40,27 @@ public class VacationServiceImpl implements VacationService {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		map.put("data", vacations.getContent());
+		map.put("listdata", vacations.getContent());
 		return map;
 	}
 
 	@Override
 	public ModelMap saveVacation(Vacation vacation) {
 		ModelMap map = new ModelMap();
-		vacationDao.save(vacation);
-		map.put("success", true);
+		vacation.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		vacation.setEmcode(SystemSession.getUser().getUserUU());
+		vacation.setVa_emname(SystemSession.getUser().getUserName());
+		vacation.setVa_statuscode(MobileStatus.ENTERING.name());
+		vacation.setVa_status(MobileStatus.ENTERING.getPhrase());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMmmSS");
+		vacation.setVa_code("AL" + sdf.format(new Date()));
+		vacation.setVa_date(new Date());
+		vacation = vacationDao.save(vacation);
+		if (vacation.getVa_id() != null) {
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
 		return map;
 	}
 

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDataServiceImpl.java

@@ -38,4 +38,13 @@ public class WorkDataServiceImpl implements WorkDataService {
 		return map;
 	}
 
+	@Override
+	public ModelMap saveWorkData(WorkData workData) {
+		ModelMap map = new ModelMap();
+		workData = workDataDao.save(workData);
+		map.put("id", workData.getWd_id());
+		map.put("success", true);
+		return null;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkOvertimeServiceImpl.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -18,9 +20,11 @@ import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.mobile.dao.WorkOvertimeDao;
 import com.uas.platform.b2b.mobile.dao.WorkOvertimeDetDao;
+import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
 import com.uas.platform.b2b.mobile.model.WorkOvertime;
 import com.uas.platform.b2b.mobile.model.WorkOvertimeDet;
 import com.uas.platform.b2b.mobile.service.WorkOvertimeService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 
 @Service
@@ -35,16 +39,26 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 	@Override
 	public ModelMap saveWorkOvertime(WorkOvertime workOvertime, List<WorkOvertimeDet> workOvertimeDets) {
 		ModelMap map = new ModelMap();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMmmSS");
+		workOvertime.setEmcode(SystemSession.getUser().getUserUU());
+		workOvertime.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		workOvertime.setWo_code("WO" + sdf.format(new Date()));
+		workOvertime.setWo_status(MobileStatus.ENTERING.getPhrase());
+		workOvertime.setWo_statuscode(MobileStatus.ENTERING.name());
+		workOvertime.setWo_recorder(SystemSession.getUser().getUserName());
 		Set<WorkOvertimeDet> workOvertimeDetail = new HashSet<WorkOvertimeDet>();
-		if (CollectionUtils.isEmpty(workOvertimeDets)) {
+		if (!CollectionUtils.isEmpty(workOvertimeDets)) {
 			for (WorkOvertimeDet workOvertimeDet : workOvertimeDets) {
 				workOvertimeDetail.add(workOvertimeDet);
 				workOvertime.setWorkovertimedet(workOvertimeDetail);
-
 			}
 		}
-		workOvertimeDetDao.save(workOvertimeDetail);
-		map.put("success", true);
+		workOvertimeDets = workOvertimeDetDao.save(workOvertimeDetail);
+		if (!CollectionUtils.isEmpty(workOvertimeDets)) {
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
 		return map;
 	}
 
@@ -61,8 +75,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		map.put("data", workOvertimeDets.getContent());
+		map.put("listdata", workOvertimeDets.getContent());
 		return map;
 	}
-
 }