UU互联手机端接口功能更新

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

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

@@ -1,9 +1,8 @@
 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;
@@ -26,14 +25,20 @@ public class AdvancedSettingsController {
 	 */
 	@RequestMapping(value = "/saveAdvancedSettings", method = RequestMethod.POST)
 	@ResponseBody
-	private void saveAdvancedSettings(String formStore) {
+	private ModelMap saveAdvancedSettings(String formStore) {
 		AdvancedSettings advancedSettings = JSON.parseObject(formStore, AdvancedSettings.class);
-		advancedSettingsService.saveAdvancedSettings(advancedSettings);
+		return advancedSettingsService.saveAdvancedSettings(advancedSettings);
 	}
 
+	/**
+	 * 得到高级设置
+	 * 
+	 * @param enuu
+	 * @return
+	 */
 	@RequestMapping(value = "/getAdvancedSettings", method = RequestMethod.GET)
 	@ResponseBody
-	private List<AdvancedSettings> getAdvancedSettings(Long enuu) {
+	private AdvancedSettings getAdvancedSettings(Long enuu) {
 		return advancedSettingsService.getSettingsByEnuu(enuu);
 	}
 }

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

@@ -46,6 +46,7 @@ public class ClockAddressController {
 	@ResponseBody
 	private ModelMap saveSignCardAddress(String fromStore) {
 		ClockAddress address = JSON.parseObject(fromStore, ClockAddress.class);
+		System.out.println(JSON.toJSON(address));
 		return clockAddressService.saveSignCardAddress(address);
 
 	}

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

@@ -31,8 +31,8 @@ public class ClockSetCenterController {
 	 */
 	@RequestMapping(value = "/getSignCardInfo", method = RequestMethod.GET)
 	@ResponseBody
-	private ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
-		return clockSetCenterService.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
+	private ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu, String date) {
+		return clockSetCenterService.getSignCardInfoByEmcodeAndEnuu(emcode, enuu, date);
 	}
 
 }

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

@@ -68,6 +68,18 @@ public class OutPlanController {
 		return outSetService.saveOutSet(outSet);
 	}
 
+	/**
+	 * 获取外勤设置
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	@RequestMapping(value = "/getOutSet", method = RequestMethod.GET)
+	@ResponseBody
+	private OutSet getOutSet(Long enuu) {
+		return outSetService.getOutSet(enuu);
+	}
+
 	/**
 	 * 保存新增外勤计划
 	 * 
@@ -77,7 +89,7 @@ public class OutPlanController {
 	 */
 	@RequestMapping(value = "/saveOutPlan", method = RequestMethod.POST)
 	@ResponseBody
-	private ModelMap saveOutPlan(String param, String formStore) {
+	private OutPlan saveOutPlan(String param, String formStore) {
 		OutPlan outPlan = JSONObject.parseObject(formStore, OutPlan.class);
 		List<OutPlanDetail> outPlanDetails = JSONObject.parseArray(param, OutPlanDetail.class);
 		return outPlanService.saveOutPlan(outPlan, outPlanDetails);
@@ -103,7 +115,7 @@ public class OutPlanController {
 	 */
 	@RequestMapping(value = "/getOutPlan", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getOutPlan() {
-		return outPlanService.getOutPlan();
+	private ModelMap getOutPlan(Long emcode, Long enuu) {
+		return outPlanService.getOutPlan(emcode, enuu);
 	}
 }

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

@@ -28,11 +28,13 @@ public class SignCardLogController {
 	 * 获取员工的打卡记录
 	 * 
 	 * @return
+	 * @throws Exception
 	 */
 	@RequestMapping(value = "/getListdata", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize) {
-		return signCardLogService.getListData(emcode, enuu, pageNumber, pageSize);
+	private ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize, String date)
+			throws Exception {
+		return signCardLogService.getListData(emcode, enuu, pageNumber, pageSize, date);
 	};
 
 	/**

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

@@ -1,7 +1,5 @@
 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;
@@ -18,5 +16,5 @@ public interface AdvancedSettingsDao
 	 * @param enuu
 	 * @return
 	 */
-	public List<AdvancedSettings> getSettingsByEnuu(Long enuu);
+	public AdvancedSettings getSettingsByEnuu(Long enuu);
 }

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

@@ -10,13 +10,4 @@ import com.uas.platform.b2b.mobile.model.ClockSetCenter;
 public interface ClockSetCenterDao
 		extends JpaRepository<ClockSetCenter, Long>, JpaSpecificationExecutor<ClockSetCenter> {
 
-	/**
-	 * 通过emcode和enu查询打卡班次
-	 * 
-	 * @param emcode
-	 * @param enuu
-	 * @return
-	 */
-	public ClockSetCenter getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
-
 }

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

@@ -9,4 +9,11 @@ import com.uas.platform.b2b.mobile.model.OutAddress;
 @Repository
 public interface OutAddressDao extends JpaRepository<OutAddress, Long>, JpaSpecificationExecutor<OutAddress> {
 
+	/**
+	 * 按企业名称查找拜访企业
+	 * 
+	 * @param company
+	 * @return
+	 */
+	public OutAddress findByCompany(String company);
 }

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

@@ -9,4 +9,11 @@ import com.uas.platform.b2b.mobile.model.OutSet;
 @Repository
 public interface OutSetDao extends JpaRepository<OutSet, Long>, JpaSpecificationExecutor<OutSet> {
 
+	/**
+	 * 查询企业的外勤设置
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	public OutSet getOutSetByEnuu(Long enuu);
 }

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

@@ -61,8 +61,8 @@ public class AdvancedSettings implements Serializable {
 	/**
 	 * 自动打卡
 	 */
-	@Column(name = "adv_autosige")
-	private Integer autosige;
+	@Column(name = "adv_autosign")
+	private Short autosign;
 
 	/**
 	 * 企业uu
@@ -116,12 +116,12 @@ public class AdvancedSettings implements Serializable {
 		this.nonclass = nonclass;
 	}
 
-	public Integer getAutosige() {
-		return autosige;
+	public Short getAutosign() {
+		return autosign;
 	}
 
-	public void setAutosige(Integer autosige) {
-		this.autosige = autosige;
+	public void setAutosign(Short autosign) {
+		this.autosign = autosign;
 	}
 
 	public Long getEnuu() {

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

@@ -63,7 +63,7 @@ public class BulletinCenter implements Serializable {
 	 * 状态
 	 */
 	@Column(name = "bul_status")
-	private Short status;
+	private String status;
 
 	/**
 	 * 行号
@@ -111,11 +111,11 @@ public class BulletinCenter implements Serializable {
 		this.no_apptime = no_apptime;
 	}
 
-	public Short getStatus() {
+	public String getStatus() {
 		return status;
 	}
 
-	public void setStatus(Short status) {
+	public void setStatus(String status) {
 		this.status = status;
 	}
 

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

@@ -51,19 +51,19 @@ public class ClockAddress implements Serializable {
 	 * 打卡范围
 	 */
 	@Column(name = "cla_validrange")
-	private Integer cs_validrange;
+	private Double cs_validrange;
 
 	/**
 	 * 经度
 	 */
 	@Column(name = "cla_longitude")
-	private String cs_longitude;
+	private Double cs_longitude;
 
 	/**
 	 * 纬度
 	 */
 	@Column(name = "cla_latitude")
-	private String cs_latitude;
+	private Double cs_latitude;
 	
 	/**
 	 * 公司名称
@@ -93,7 +93,7 @@ public class ClockAddress implements Serializable {
 	 * 记录人uu
 	 */
 	@Column(name = "cla_recorderuu")
-	private Long recorderuu;
+	private Long emcode;
 
 	/**
 	 * 录入时间
@@ -125,30 +125,14 @@ public class ClockAddress implements Serializable {
 		this.cs_workaddr = cs_workaddr;
 	}
 
-	public Integer getCs_validrange() {
+	public Double getCs_validrange() {
 		return cs_validrange;
 	}
 
-	public void setCs_validrange(Integer cs_validrange) {
+	public void setCs_validrange(Double cs_validrange) {
 		this.cs_validrange = cs_validrange;
 	}
 
-	public String getCs_longitude() {
-		return cs_longitude;
-	}
-
-	public void setCs_longitude(String cs_longitude) {
-		this.cs_longitude = cs_longitude;
-	}
-
-	public String getCs_latitude() {
-		return cs_latitude;
-	}
-
-	public void setCs_latitude(String cs_latitude) {
-		this.cs_latitude = cs_latitude;
-	}
-
 	public String getCs_shortname() {
 		return cs_shortname;
 	}
@@ -165,14 +149,6 @@ public class ClockAddress implements Serializable {
 		this.cs_code = cs_code;
 	}
 
-	public Double getCs_innerdistance() {
-		return cs_innerdistance;
-	}
-
-	public void setCs_innerdistance(Double cs_innerdistance) {
-		this.cs_innerdistance = cs_innerdistance;
-	}
-
 	public String getCs_recorder() {
 		return cs_recorder;
 	}
@@ -189,12 +165,36 @@ public class ClockAddress implements Serializable {
 		this.cs_recorddate = cs_recorddate;
 	}
 
-	public Long getRecorderuu() {
-		return recorderuu;
+	public Long getEmcode() {
+		return emcode;
 	}
 
-	public void setRecorderuu(Long recorderuu) {
-		this.recorderuu = recorderuu;
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
+	}
+
+	public Double getCs_longitude() {
+		return cs_longitude;
+	}
+
+	public void setCs_longitude(Double cs_longitude) {
+		this.cs_longitude = cs_longitude;
+	}
+
+	public Double getCs_latitude() {
+		return cs_latitude;
+	}
+
+	public void setCs_latitude(Double cs_latitude) {
+		this.cs_latitude = cs_latitude;
+	}
+
+	public Double getCs_innerdistance() {
+		return cs_innerdistance;
+	}
+
+	public void setCs_innerdistance(Double cs_innerdistance) {
+		this.cs_innerdistance = cs_innerdistance;
 	}
 
 }

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

@@ -47,7 +47,7 @@ public class ClockSetCenter implements Serializable {
 	 * 2. 否
 	 */
 	@Column(name = "clo_isdefaultclass")
-	private String ifDefaultClass;
+	private Short ifDefaultClass;
 
 	/**
 	 * 员工编号
@@ -65,7 +65,7 @@ public class ClockSetCenter implements Serializable {
 	 * 最早上班时间
 	 */
 	@Column(name = "clo_earlytime")
-	private String wd_earlytime;
+	private Integer wd_earlytime;
 
 	/**
 	 * 排班编号
@@ -89,49 +89,49 @@ public class ClockSetCenter implements Serializable {
 	 * 是否需要打卡
 	 */
 	@Column(name = "clo_ifneedsigncard")
-	private String ifNeedSignCard;
+	private Short ifNeedSignCard;
 
 	/**
 	 * 内勤距离
 	 */
 	@Column(name = "clo_innerdistance")
-	private Integer innerdistance;
+	private Double innerdistance;
 
 	/**
 	 * 外勤距离
 	 */
 	@Column(name = "clo_distance")
-	private Integer distance;
+	private Double distance;
 
 	/**
 	 * 公司距离设置
 	 */
 	@Column(name = "clo_comaddressset")
-	private Integer comaddressset;
+	private Double comaddressset;
 
 	/**
 	 * 经度
 	 */
 	@Column(name = "clo_longitude")
-	private String longitude;
+	private Double longitude;
 
 	/**
 	 * 纬度
 	 */
 	@Column(name = "clo_latitude")
-	private String latitude;
+	private Double latitude;
 
 	/**
 	 * 天数
 	 */
 	@Column(name = "clo_day")
-	private Integer day;
+	private String day;
 
 	/**
 	 * 数量
 	 */
 	@Column(name = "clo_count")
-	private Integer count;
+	private String count;
 
 	/**
 	 * 工作时间1
@@ -215,7 +215,7 @@ public class ClockSetCenter implements Serializable {
 	 * 班次日期
 	 */
 	@Column(name = "clo_date")
-	private Date date;
+	private Date wd_date;
 
 
 	public Long getWd_id() {
@@ -234,11 +234,11 @@ public class ClockSetCenter implements Serializable {
 		this.enuu = enuu;
 	}
 
-	public String getIfDefaultClass() {
+	public Short getIfDefaultClass() {
 		return ifDefaultClass;
 	}
 
-	public void setIfDefaultClass(String ifDefaultClass) {
+	public void setIfDefaultClass(Short ifDefaultClass) {
 		this.ifDefaultClass = ifDefaultClass;
 	}
 
@@ -258,11 +258,11 @@ public class ClockSetCenter implements Serializable {
 		this.wd_degree = wd_degree;
 	}
 
-	public String getWd_earlytime() {
+	public Integer getWd_earlytime() {
 		return wd_earlytime;
 	}
 
-	public void setWd_earlytime(String wd_earlytime) {
+	public void setWd_earlytime(Integer wd_earlytime) {
 		this.wd_earlytime = wd_earlytime;
 	}
 
@@ -290,67 +290,67 @@ public class ClockSetCenter implements Serializable {
 		this.name = name;
 	}
 
-	public String getIfNeedSignCard() {
+	public Short getIfNeedSignCard() {
 		return ifNeedSignCard;
 	}
 
-	public void setIfNeedSignCard(String ifNeedSignCard) {
+	public void setIfNeedSignCard(Short ifNeedSignCard) {
 		this.ifNeedSignCard = ifNeedSignCard;
 	}
 
-	public Integer getInnerdistance() {
+	public Double getInnerdistance() {
 		return innerdistance;
 	}
 
-	public void setInnerdistance(Integer innerdistance) {
+	public void setInnerdistance(Double innerdistance) {
 		this.innerdistance = innerdistance;
 	}
 
-	public Integer getDistance() {
+	public Double getDistance() {
 		return distance;
 	}
 
-	public void setDistance(Integer distance) {
+	public void setDistance(Double distance) {
 		this.distance = distance;
 	}
 
-	public Integer getComaddressset() {
+	public Double getComaddressset() {
 		return comaddressset;
 	}
 
-	public void setComaddressset(Integer comaddressset) {
+	public void setComaddressset(Double comaddressset) {
 		this.comaddressset = comaddressset;
 	}
 
-	public String getLongitude() {
+	public Double getLongitude() {
 		return longitude;
 	}
 
-	public void setLongitude(String longitude) {
+	public void setLongitude(Double longitude) {
 		this.longitude = longitude;
 	}
 
-	public String getLatitude() {
+	public Double getLatitude() {
 		return latitude;
 	}
 
-	public void setLatitude(String latitude) {
+	public void setLatitude(Double latitude) {
 		this.latitude = latitude;
 	}
 
-	public Integer getDay() {
+	public String getDay() {
 		return day;
 	}
 
-	public void setDay(Integer day) {
+	public void setDay(String day) {
 		this.day = day;
 	}
 
-	public Integer getCount() {
+	public String getCount() {
 		return count;
 	}
 
-	public void setCount(Integer count) {
+	public void setCount(String count) {
 		this.count = count;
 	}
 
@@ -458,12 +458,12 @@ public class ClockSetCenter implements Serializable {
 		this.success = success;
 	}
 
-	public Date getDate() {
-		return date;
+	public Date getWd_date() {
+		return wd_date;
 	}
 
-	public void setDate(Date date) {
-		this.date = date;
+	public void setWd_date(Date wd_date) {
+		this.wd_date = wd_date;
 	}
 
 	public ClockSetCenter() {

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

@@ -54,7 +54,7 @@ public class OutAddress implements Serializable {
 	 * 拜访次数
 	 */
 	@Column(name = "oad_visitcount")
-	private Double md_visitcount;
+	private Integer md_visitcount;
 
 	/**
 	 * 经度
@@ -72,7 +72,7 @@ public class OutAddress implements Serializable {
 	 * 企业
 	 */
 	@Column(name = "oad_company")
-	private String md_company;
+	private String company;
 
 	public Long getMd_id() {
 		return md_id;
@@ -106,14 +106,22 @@ public class OutAddress implements Serializable {
 		this.md_visittime = md_visittime;
 	}
 
-	public Double getMd_visitcount() {
+	public Integer getMd_visitcount() {
 		return md_visitcount;
 	}
 
-	public void setMd_visitcount(Double md_visitcount) {
+	public void setMd_visitcount(Integer md_visitcount) {
 		this.md_visitcount = md_visitcount;
 	}
 
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
 	public Double getMd_longitude() {
 		return md_longitude;
 	}
@@ -130,12 +138,4 @@ public class OutAddress implements Serializable {
 		this.md_latitude = md_latitude;
 	}
 
-	public String getMd_company() {
-		return md_company;
-	}
-
-	public void setMd_company(String md_company) {
-		this.md_company = md_company;
-	}
-
 }

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

@@ -81,6 +81,18 @@ public class OutPlan implements Serializable {
 	@Column(name = "op_enuu")
 	private Long enuu;
 
+	/**
+	 * 记录时间
+	 */
+	@Column(name = "op_recorddate")
+	private Date mp_recorddate;
+
+	/**
+	 * 到达时间
+	 */
+	@Column(name = "op_arrivedate")
+	private Date mp_arrivedate;
+
 	public Long getMp_id() {
 		return mp_id;
 	}
@@ -145,4 +157,24 @@ public class OutPlan implements Serializable {
 		this.enuu = enuu;
 	}
 
+	public Date getMp_recorddate() {
+		return mp_recorddate;
+	}
+
+	public void setMp_recorddate(Date mp_recorddate) {
+		this.mp_recorddate = mp_recorddate;
+	}
+
+	public Date getMp_arrivedate() {
+		return mp_arrivedate;
+	}
+
+	public void setMp_arrivedate(Date mp_arrivedate) {
+		this.mp_arrivedate = mp_arrivedate;
+	}
+
+	public void setOutPlanDetails(Set<OutPlanDetail> outPlanDetails) {
+		this.outPlanDetails = outPlanDetails;
+	}
+
 }

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

@@ -75,7 +75,7 @@ public class OutPlanDetail implements Serializable {
 	 * 部门编号
 	 */
 	@Column(name = "opd_detno")
-	private String mpd_detno;
+	private Integer mpd_detno;
 
 	/**
 	 * 其他拜访
@@ -131,6 +131,12 @@ public class OutPlanDetail implements Serializable {
 	@Column(name = "opd_statuscode")
 	private String mpd_statuscode;
 
+	/**
+	 * 距离
+	 */
+	@Column(name = "opd_distance")
+	private Double mpd_distance;
+
 	/**
 	 * 主表
 	 */
@@ -186,14 +192,6 @@ public class OutPlanDetail implements Serializable {
 		this.mpd_kind = mpd_kind;
 	}
 
-	public String getMpd_detno() {
-		return mpd_detno;
-	}
-
-	public void setMpd_detno(String mpd_detno) {
-		this.mpd_detno = mpd_detno;
-	}
-
 	public String getMpd_remark() {
 		return mpd_remark;
 	}
@@ -276,4 +274,20 @@ public class OutPlanDetail implements Serializable {
 		this.mpd_statuscode = mpd_statuscode;
 	}
 
+	public Integer getMpd_detno() {
+		return mpd_detno;
+	}
+
+	public void setMpd_detno(Integer mpd_detno) {
+		this.mpd_detno = mpd_detno;
+	}
+
+	public Double getMpd_distance() {
+		return mpd_distance;
+	}
+
+	public void setMpd_distance(Double mpd_distance) {
+		this.mpd_distance = mpd_distance;
+	}
+
 }

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

@@ -35,7 +35,7 @@ public class OutSet implements Serializable {
 	 * 距离
 	 */
 	@Column(name = "out_distance")
-	private Integer mo_distance;
+	private Double mo_distance;
 
 	/**
 	 * 分钟
@@ -63,11 +63,11 @@ public class OutSet implements Serializable {
 		this.mo_id = mo_id;
 	}
 
-	public Integer getMo_distance() {
+	public Double getMo_distance() {
 		return mo_distance;
 	}
 
-	public void setMo_distance(Integer mo_distance) {
+	public void setMo_distance(Double mo_distance) {
 		this.mo_distance = mo_distance;
 	}
 

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

@@ -69,7 +69,7 @@ public class SignCard implements Serializable {
 	 * 距离
 	 */
 	@Column(name = "sig_distance")
-	private Integer cl_distance;
+	private Double cl_distance;
 	
 	/**
 	 * 打卡时间
@@ -131,11 +131,11 @@ public class SignCard implements Serializable {
 		this.cl_location = cl_location;
 	}
 
-	public Integer getCl_distance() {
+	public Double getCl_distance() {
 		return cl_distance;
 	}
 
-	public void setCl_distance(Integer cl_distance) {
+	public void setCl_distance(Double cl_distance) {
 		this.cl_distance = cl_distance;
 	}
 

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

@@ -159,7 +159,7 @@ public class WorkData implements Serializable {
 	 * 参与部门编号
 	 */
 	@Column(name = "wd_defaultorcode")
-	private String wd_defaultorCode;
+	private Integer wd_defaultorCode;
 	
 	/**
 	 * 参与部门
@@ -311,11 +311,11 @@ public class WorkData implements Serializable {
 		this.wd_man = wd_man;
 	}
 
-	public String getWd_defaultorCode() {
+	public Integer getWd_defaultorCode() {
 		return wd_defaultorCode;
 	}
 
-	public void setWd_defaultorCode(String wd_defaultorCode) {
+	public void setWd_defaultorCode(Integer wd_defaultorCode) {
 		this.wd_defaultorCode = wd_defaultorCode;
 	}
 

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

@@ -45,7 +45,7 @@ public class WorkOvertimeDet implements Serializable {
 	 * 部门编号
 	 */
 	@Column(name = "wod_detno")
-	private String wod_detno;
+	private Integer wod_detno;
 
 	/**
 	 * 人员编号
@@ -92,11 +92,11 @@ public class WorkOvertimeDet implements Serializable {
 		this.wod_id = wod_id;
 	}
 
-	public String getWod_detno() {
+	public Integer getWod_detno() {
 		return wod_detno;
 	}
 
-	public void setWod_detno(String wod_detno) {
+	public void setWod_detno(Integer wod_detno) {
 		this.wod_detno = wod_detno;
 	}
 

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

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.mobile.service;
 
-import java.util.List;
+import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.mobile.model.AdvancedSettings;
 
@@ -12,7 +12,7 @@ public interface AdvancedSettingsService {
 	 * @param advancedSettings
 	 * @return
 	 */
-	public void saveAdvancedSettings(AdvancedSettings advancedSettings);
+	public ModelMap saveAdvancedSettings(AdvancedSettings advancedSettings);
 
 	/**
 	 * 获取企业的高级设置
@@ -20,6 +20,6 @@ public interface AdvancedSettingsService {
 	 * @param enuu
 	 * @return
 	 */
-	public List<AdvancedSettings> getSettingsByEnuu(Long enuu);
+	public AdvancedSettings getSettingsByEnuu(Long enuu);
 
 }

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

@@ -12,5 +12,5 @@ public interface ClockSetCenterService {
 	 * @param enuu
 	 * @return
 	 */
-	public ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
+	public ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu, String date);
 }

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

@@ -16,12 +16,12 @@ public interface OutPlanService {
 	 * @param outPlanDetails
 	 * @return
 	 */
-	public ModelMap saveOutPlan(OutPlan outPlan, List<OutPlanDetail> outPlanDetails);
+	public OutPlan saveOutPlan(OutPlan outPlan, List<OutPlanDetail> outPlanDetails);
 
 	/**
 	 * 获取外勤计划
 	 * 
 	 * @return
 	 */
-	public ModelMap getOutPlan();
+	public ModelMap getOutPlan(Long emcode, Long enuu);
 }

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

@@ -13,4 +13,12 @@ public interface OutSetService {
 	 * @return
 	 */
 	public ModelMap saveOutSet(OutSet outSet);
+
+	/**
+	 * 得到外勤设置信息
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	public OutSet getOutSet(Long enuu);
 }

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

@@ -14,7 +14,8 @@ public interface SignCardLogService {
 	 * @param pageSize
 	 * @return
 	 */
-	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize);
+	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize, String date)
+			throws Exception;
 
 	/**
 	 * 保存打卡记录

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

@@ -1,14 +1,12 @@
 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 org.springframework.ui.ModelMap;
 
 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 {
@@ -17,14 +15,19 @@ public class AdvancedSettingsServiceImpl implements AdvancedSettingsService {
 	private AdvancedSettingsDao advancedSettingsDao;
 
 	@Override
-	public void saveAdvancedSettings(AdvancedSettings advancedSettings) {
-		advancedSettings.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-		advancedSettings.setEmcode(SystemSession.getUser().getUserUU());
-		advancedSettingsDao.save(advancedSettings);
+	public ModelMap saveAdvancedSettings(AdvancedSettings advancedSettings) {
+		ModelMap map = new ModelMap();
+		advancedSettings = advancedSettingsDao.save(advancedSettings);
+		if (advancedSettings.getId() != null) {
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
+		return map;
 	}
 
 	@Override
-	public List<AdvancedSettings> getSettingsByEnuu(Long enuu) {
+	public AdvancedSettings getSettingsByEnuu(Long enuu) {
 		return advancedSettingsDao.getSettingsByEnuu(enuu);
 	}
 

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

@@ -10,7 +10,6 @@ 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 {
@@ -30,9 +29,6 @@ public class ClockAddressServiceImpl implements ClockAddressService {
 		ModelMap map = new ModelMap();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyMMHHss");
 		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);

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

@@ -3,10 +3,10 @@ package com.uas.platform.b2b.mobile.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import com.uas.platform.b2b.mobile.dao.ClockAddressDao;
-import com.uas.platform.b2b.mobile.dao.ClockSetCenterDao;
 import com.uas.platform.b2b.mobile.model.ClockAddress;
 import com.uas.platform.b2b.mobile.model.ClockSetCenter;
 import com.uas.platform.b2b.mobile.service.ClockSetCenterService;
@@ -16,15 +16,24 @@ import com.uas.platform.b2b.temporary.model.ClockSet;
 @Service
 public class ClockSetCenterServiceImpl implements ClockSetCenterService {
 
-	@Autowired
-	private ClockSetCenterDao clockSetCenterDao;
 
 	@Autowired
 	private ClockAddressDao clockAddressDao;
 
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
 	@Override
-	public ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
-		ClockSetCenter clock = clockSetCenterDao.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
+	public ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu, String date) {
+		String sql = "select p.clo_id wd_id, p.clo_enuu enuu, p.clo_isdefaultclass ifDefaultClass, p.clo_emcode emcode, p.clo_degree wd_degree, p.clo_earlytime wd_earlytime, "
+				+ "p.clo_code wd_code , p.clo_pcount wd_pcount, p.clo_name name, p.clo_ifneedsigncard ifNeedSignCard, p.clo_innerdistance innerdistance, p.clo_distance distance, p.clo_comaddressset comaddressset, "
+				+ "p.clo_longitude longitude, p.clo_latitude latitude, p.clo_day day, p.clo_count count, p.clo_ondutyone wd_ondutyOne, p.clo_offdutyone wd_offdutyOne, p.clo_onbegone wd_onbegOne, "
+				+ "p.clo_offendone wd_offendOne, p.clo_ondutytwo wd_ondutyTwo, p.clo_offdutytwo wd_offdutyTwo, p.clo_onbegtwo wd_onbegTwo, p.clo_offendtwo wd_offendTwo, p.clo_ondutythree wd_ondutyThree, p.clo_offdutythree wd_offdutyThree, "
+				+ "p.clo_onbegthree wd_onbegThree, p.clo_offendthree wd_offendThree, p.clo_sucess success, p.clo_date wd_date from mobile$clocksetcenter p where clo_enuu = "
+				+ enuu + " and " + "clo_emcode = " + emcode
+				+ " and to_date(to_char(wd_recorddate,'yyyy mm dd'),'yyyy mm dd') = to_date ('" + date
+				+ "','yyyy mm dd')";
+		ClockSetCenter clock = jdbcTemplate.queryForObject(sql, ClockSetCenter.class);
 		ClockSet set = new ClockSet();
 		if (clock != null) {
 				List<ClockAddress> address = clockAddressDao.getAddressByEnuu(enuu);
@@ -49,7 +58,7 @@ public class ClockSetCenterServiceImpl implements ClockSetCenterService {
 				set.setClass3(obj3);
 				set.setComaddressset(clock.getComaddressset());
 				set.setCount(clock.getCount());
-				set.setDate(clock.getDate());
+			set.setDate(clock.getWd_date());
 				set.setDistance(clock.getDistance());
 				set.setEmcode(clock.getEmcode());
 				set.setDay(clock.getDay());

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

@@ -16,7 +16,13 @@ public class OutAddressServiceImpl implements OutAddressService {
 	@Override
 	public ModelMap saveOutAddress(OutAddress outAddress) {
 		ModelMap map = new ModelMap();
-		outAddress = outAddressDao.save(outAddress);
+		OutAddress old = outAddressDao.findByCompany(outAddress.getCompany());
+		if (old != null) {
+			old.setMd_visitcount(old.getMd_visitcount() + 1);
+			outAddress = outAddressDao.save(old);
+		} else {
+			outAddress = outAddressDao.save(outAddress);
+		}
 		if (outAddress.getMd_id() != null) {
 			map.put("success", true);
 			map.put("md_id", outAddress.getMd_id());

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

@@ -29,7 +29,7 @@ public class OutPlanServiceImpl implements OutPlanService {
 	private CommonDao commonDao;
 
 	@Override
-	public ModelMap saveOutPlan(OutPlan outPlan, List<OutPlanDetail> outPlanDetails) {
+	public OutPlan saveOutPlan(OutPlan outPlan, List<OutPlanDetail> outPlanDetails) {
 		ModelMap map = new ModelMap();
 		outPlan.setEnuu(SystemSession.getUser().getEnterprise().getUu());
 		SimpleDateFormat sdf = new SimpleDateFormat("yyMMhhss");
@@ -52,19 +52,18 @@ public class OutPlanServiceImpl implements OutPlanService {
 			}
 		}
 		outPlanDetails = outPlanDetailDao.save(outDetail);
-		for(OutPlanDetail outPlanInfo:outPlanDetails){
+		for (OutPlanDetail outPlanInfo : outPlanDetails) {
 			map.put("mpd_id", outPlanInfo.getMpd_id());
 			map.put("mp_id", outPlanInfo.getMpd_id());
 			map.put("success", true);
+			map.put("mp_code", outPlanInfo.getMpd_code());
 		}
-		return map;
+		return outPlanDetails.get(0).getOutPlan();
 	}
 
 	@Override
-	public ModelMap getOutPlan() {
+	public ModelMap getOutPlan(Long emcode, Long enuu) {
 		ModelMap map = new ModelMap();
-		Long enuu = SystemSession.getUser().getEnterprise().getUu();
-		Long emcode = SystemSession.getUser().getUserUU();
 		String sql = "select p.op_id mp_id,p.op_recorder mp_recorder,p.op_recordercode recorderCode,p.op_code mp_code,p.op_address mp_address,"
 				+ "p.op_visittime mp_visittime,p.op_enuu enuu from mobile$outplan p where op_enuu = " + enuu
 				+ " and op_recordercode = " + emcode + " order by op_id desc";

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

@@ -22,4 +22,9 @@ public class OutSetServiceImpl implements OutSetService {
 		return map;
 	}
 
+	@Override
+	public OutSet getOutSet(Long enuu) {
+		return outSetDao.getOutSetByEnuu(enuu);
+	}
+
 }

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

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -16,9 +18,9 @@ import org.springframework.ui.ModelMap;
 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;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.persistence.criteria.PredicateUtils;
 
 @Service
 public class SignCardLogServiceImpl implements SignCardLogService {
@@ -27,7 +29,8 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 	private SignCardDao signCardDao;
 
 	@Override
-	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize) {
+	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize, String date)
+			throws ParseException {
 		ModelMap map = new ModelMap();
 		PageParams params = new PageParams();
 		params.setCount(pageSize);
@@ -35,6 +38,11 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		if (date != null) {
+			pageInfo.expression(PredicateUtils.gte("cl_date", sdf.parse(date), false));
+			pageInfo.expression(PredicateUtils.lt("cl_date", sdf.parse(String.valueOf(Long.valueOf(date) + 1)), false));
+		}
 		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();
@@ -49,9 +57,6 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 	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);

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

@@ -18,7 +18,6 @@ import com.uas.platform.b2b.mobile.dao.WorkDailyDao;
 import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
 import com.uas.platform.b2b.mobile.model.WorkDaily;
 import com.uas.platform.b2b.mobile.service.WorkDailyService;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 
@@ -31,8 +30,6 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 	@Override
 	public ModelMap saveWorkDaily(WorkDaily workDaily) {
 		ModelMap map = new ModelMap();
-		workDaily.setEmcode(SystemSession.getUser().getUserUU());
-		workDaily.setEnuu(SystemSession.getUser().getEnterprise().getUu());
 		workDaily.setWd_date(new Date());
 		workDaily.setWd_status(MobileStatus.ENTERING.getPhrase());
 		workDaily.setWd_statuscode(MobileStatus.ENTERING.name());

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

@@ -1,5 +1,8 @@
 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;
@@ -41,6 +44,10 @@ public class WorkDataServiceImpl implements WorkDataService {
 	@Override
 	public ModelMap saveWorkData(WorkData workData) {
 		ModelMap map = new ModelMap();
+		if (workData.getEmcode() == null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyMMddss");
+			workData.setWd_code("WD" + sdf.format(new Date()));
+		}
 		workData = workDataDao.save(workData);
 		if (workData.getWd_id() != null) {
 			map.put("id", workData.getWd_id());

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

@@ -41,8 +41,6 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 	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());

src/main/java/com/uas/platform/b2b/temporary/model/ClockSet.java

@@ -27,7 +27,7 @@ public class ClockSet implements Serializable {
 	 * 1. 是 <br>
 	 * 2. 否
 	 */
-	private String ifDefaultClass;
+	private Short ifDefaultClass;
 
 	/**
 	 * 员工编号
@@ -42,7 +42,7 @@ public class ClockSet implements Serializable {
 	/**
 	 * 最早上班时间
 	 */
-	private String wd_earlytime;
+	private Integer wd_earlytime;
 
 	/**
 	 * 排班编号
@@ -62,42 +62,42 @@ public class ClockSet implements Serializable {
 	/**
 	 * 是否需要打卡<br>
 	 */
-	private String ifNeedSignCard;
+	private Short ifNeedSignCard;
 
 	/**
 	 * 内勤距离
 	 */
-	private Integer innerdistance;
+	private Double innerdistance;
 
 	/**
 	 * 外勤距离
 	 */
-	private Integer distance;
+	private Double distance;
 
 	/**
 	 * 公司距离设置
 	 */
-	private Integer comaddressset;
+	private Double comaddressset;
 
 	/**
 	 * 经度
 	 */
-	private String longitude;
+	private Double longitude;
 
 	/**
 	 * 纬度
 	 */
-	private String latitude;
+	private Double latitude;
 
 	/**
 	 * 天数
 	 */
-	private Integer day;
+	private String day;
 
 	/**
 	 * 数量
 	 */
-	private Integer count;
+	private String count;
 
 	/**
 	 * 班次1
@@ -145,11 +145,11 @@ public class ClockSet implements Serializable {
 		this.enuu = enuu;
 	}
 
-	public String getIfDefaultClass() {
+	public Short getIfDefaultClass() {
 		return ifDefaultClass;
 	}
 
-	public void setIfDefaultClass(String ifDefaultClass) {
+	public void setIfDefaultClass(Short ifDefaultClass) {
 		this.ifDefaultClass = ifDefaultClass;
 	}
 
@@ -169,13 +169,6 @@ public class ClockSet implements Serializable {
 		this.wd_degree = wd_degree;
 	}
 
-	public String getWd_earlytime() {
-		return wd_earlytime;
-	}
-
-	public void setWd_earlytime(String wd_earlytime) {
-		this.wd_earlytime = wd_earlytime;
-	}
 
 	public String getWd_code() {
 		return wd_code;
@@ -201,70 +194,54 @@ public class ClockSet implements Serializable {
 		this.name = name;
 	}
 
-	public String getIfNeedSignCard() {
+	public Short getIfNeedSignCard() {
 		return ifNeedSignCard;
 	}
 
-	public void setIfNeedSignCard(String ifNeedSignCard) {
+	public void setIfNeedSignCard(Short ifNeedSignCard) {
 		this.ifNeedSignCard = ifNeedSignCard;
 	}
 
-	public Integer getInnerdistance() {
+	public Double getInnerdistance() {
 		return innerdistance;
 	}
 
-	public void setInnerdistance(Integer innerdistance) {
+	public void setInnerdistance(Double innerdistance) {
 		this.innerdistance = innerdistance;
 	}
 
-	public Integer getDistance() {
+	public Double getDistance() {
 		return distance;
 	}
 
-	public void setDistance(Integer distance) {
+	public void setDistance(Double distance) {
 		this.distance = distance;
 	}
 
-	public Integer getComaddressset() {
+	public Double getComaddressset() {
 		return comaddressset;
 	}
 
-	public void setComaddressset(Integer comaddressset) {
+	public void setComaddressset(Double comaddressset) {
 		this.comaddressset = comaddressset;
 	}
 
-	public String getLongitude() {
+	public Double getLongitude() {
 		return longitude;
 	}
 
-	public void setLongitude(String longitude) {
+	public void setLongitude(Double longitude) {
 		this.longitude = longitude;
 	}
 
-	public String getLatitude() {
+	public Double getLatitude() {
 		return latitude;
 	}
 
-	public void setLatitude(String latitude) {
+	public void setLatitude(Double latitude) {
 		this.latitude = latitude;
 	}
 
-	public Integer getDay() {
-		return day;
-	}
-
-	public void setDay(Integer day) {
-		this.day = day;
-	}
-
-	public Integer getCount() {
-		return count;
-	}
-
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-
 	public ClassObject getClass1() {
 		return class1;
 	}
@@ -314,4 +291,28 @@ public class ClockSet implements Serializable {
 		this.date = date;
 	}
 
+	public Integer getWd_earlytime() {
+		return wd_earlytime;
+	}
+
+	public void setWd_earlytime(Integer wd_earlytime) {
+		this.wd_earlytime = wd_earlytime;
+	}
+
+	public String getDay() {
+		return day;
+	}
+
+	public void setDay(String day) {
+		this.day = day;
+	}
+
+	public String getCount() {
+		return count;
+	}
+
+	public void setCount(String count) {
+		this.count = count;
+	}
+
 }