Преглед на файлове

更新UU互联手机接口

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7257 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq преди 9 години
родител
ревизия
1a728fbba1
променени са 33 файла, в които са добавени 94 реда и са изтрити 76 реда
  1. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/FeePleaseController.java
  2. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/SignCardLogController.java
  3. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/UserCenterController.java
  4. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/VacationController.java
  5. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/WorkDailyController.java
  6. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/WorkOvertimeController.java
  7. 1 1
      src/main/java/com/uas/platform/b2b/mobile/controller/WorkScheduleController.java
  8. 1 1
      src/main/java/com/uas/platform/b2b/mobile/dao/OutPlanDao.java
  9. 1 1
      src/main/java/com/uas/platform/b2b/mobile/dao/OutSignDao.java
  10. 1 1
      src/main/java/com/uas/platform/b2b/mobile/dao/UserCenterDao.java
  11. 19 5
      src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java
  12. 3 3
      src/main/java/com/uas/platform/b2b/mobile/model/OutPlan.java
  13. 5 5
      src/main/java/com/uas/platform/b2b/mobile/model/OutPlanDetail.java
  14. 5 5
      src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java
  15. 3 3
      src/main/java/com/uas/platform/b2b/mobile/model/SignCardLog.java
  16. 3 3
      src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java
  17. 5 5
      src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java
  18. 5 5
      src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java
  19. 5 5
      src/main/java/com/uas/platform/b2b/mobile/model/WorkData.java
  20. 5 5
      src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertimeDet.java
  21. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/SignCardLogService.java
  22. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/UserCenterService.java
  23. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/VacationService.java
  24. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/WorkDailyService.java
  25. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/WorkOvertimeService.java
  26. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/WorkScheduleService.java
  27. 9 5
      src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java
  28. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/impl/SignCardLogServiceImpl.java
  29. 1 1
      src/main/java/com/uas/platform/b2b/mobile/service/impl/UserCenterServiceImpl.java
  30. 2 2
      src/main/java/com/uas/platform/b2b/mobile/service/impl/VacationServiceImpl.java
  31. 3 3
      src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDailyServiceImpl.java
  32. 2 2
      src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkOvertimeServiceImpl.java
  33. 2 2
      src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkScheduleServiceImpl.java

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

@@ -53,7 +53,7 @@ public class FeePleaseController {
 	 */
 	@RequestMapping(value = "/getFeePlease", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getFeePlease(Long enuu, String emcode, Integer pageNumber, Integer pageSize) {
+	private ModelMap getFeePlease(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		return feePleaseService.getFeePlease(enuu, emcode, pageNumber, pageSize);
 	}
 }

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

@@ -29,7 +29,7 @@ public class SignCardLogController {
 	 */
 	@RequestMapping(value = "/getListdata", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getListData(String emcode, Integer pageNumber, Integer pageSize) {
+	private ModelMap getListData(Long emcode, Integer pageNumber, Integer pageSize) {
 		return signCardLogService.getListData(emcode, pageNumber, pageSize);
 	};
 

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/controller/UserCenterController.java

@@ -31,7 +31,7 @@ public class UserCenterController {
 	 */
 	@RequestMapping(value = "/getUserInfo", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getUserInfoByEmcodeAndEnuu(String emcode, Long enuu) {
+	private ModelMap getUserInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
 		return userCenterService.getUserInfoByEmCodeAndEnuu(emcode, enuu);
 
 	}

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

@@ -35,7 +35,7 @@ public class VacationController {
 	 */
 	@RequestMapping(value = "/getAllVacation", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getAllVacation(String emcode, Integer pageNumber, Integer pageSize, Long enuu) {
+	private ModelMap getAllVacation(Long emcode, Integer pageNumber, Integer pageSize, Long enuu) {
 		return vacationService.getAllVacation(emcode, pageNumber, pageSize, enuu);
 	}
 

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

@@ -51,7 +51,7 @@ public class WorkDailyController {
 	@RequestMapping(value = "/getWorkDaily", method = RequestMethod.GET)
 	@ResponseBody
 	private ModelMap getWorkDaily(Long emcode, Integer pageNumber, Integer pageSize, Long enuu) {
-		return null;
+		return workDailyService.getWorkDaily(emcode, pageNumber, pageSize, enuu);
 	}
 
 	/**

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

@@ -44,7 +44,7 @@ public class WorkOvertimeController {
 
 	@RequestMapping(value = "/getWorkOvertime", method = RequestMethod.GET)
 	@ResponseBody
-	private ModelMap getWorkOvertime(Long enuu, String emcode, Integer pageNumber, Integer pageSize) {
+	private ModelMap getWorkOvertime(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		return workOvertimeService.getWorkOvertime(enuu, emcode, pageNumber, pageSize);
 	}
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/controller/WorkScheduleController.java

@@ -25,6 +25,6 @@ public class WorkScheduleController {
 	@RequestMapping(value = "/getWorkSchedule", method = RequestMethod.GET)
 	@ResponseBody
 	private ModelMap getWorkSchedule(Long emcode, Long enuu) {
-		return null;
+		return WorkScheduleService.getWorkSchedule(emcode, enuu);
 	}
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/dao/OutPlanDao.java

@@ -18,7 +18,7 @@ public interface OutPlanDao extends JpaRepository<OutPlan, Long>, JpaSpecificati
 	 * @param enuu
 	 * @return
 	 */
-	List<OutPlan> findByRecorderCodeAndEnuu(String recordercode, Long enuu);
+	List<OutPlan> findByRecorderCodeAndEnuu(Long recordercode, Long enuu);
 
 	/**
 	 * 通过enuu查询企业所有的外勤计划

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/dao/OutSignDao.java

@@ -18,7 +18,7 @@ public interface OutSignDao extends JpaRepository<OutSign, Long>, JpaSpecificati
 	 * @param mo_mancode
 	 * @return
 	 */
-	List<OutSign> findByEnuuAndMancode(Long enuu, String mancode);
+	List<OutSign> findByEnuuAndEmcode(Long enuu, Long emcode);
 
 	/**
 	 * 通过企业uu获取外勤记录

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/dao/UserCenterDao.java

@@ -9,5 +9,5 @@ import com.uas.platform.b2b.mobile.model.UserCenter;
 @Repository
 public interface UserCenterDao extends JpaRepository<UserCenter, Long>, JpaSpecificationExecutor<UserCenter> {
 
-	public UserCenter getUserInfoByEmcodeAndEnuu(String emcode, Long enuu);
+	public UserCenter getUserInfoByEmcodeAndEnuu(Long emcode, Long enuu);
 }

+ 19 - 5
src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java

@@ -104,7 +104,7 @@ public class FeePlease implements Serializable {
 	 * 企业uu
 	 */
 	@Column(name = "fp_enuu")
-	private Long fp_enuu;
+	private Long enuu;
 
 	/**
 	 * 外勤明细
@@ -114,6 +114,12 @@ public class FeePlease implements Serializable {
 	@OrderBy("fpd_id")
 	private Set<FeePleaseDetail> feePleaseDetails;
 
+	/**
+	 * 人员编号
+	 */
+	@Column(name = "fp_emcode")
+	private Long emcode;
+
 	public Long getFp_id() {
 		return fp_id;
 	}
@@ -202,12 +208,12 @@ public class FeePlease implements Serializable {
 		this.fp_status = fp_status;
 	}
 
-	public Long getFp_enuu() {
-		return fp_enuu;
+	public Long getEnuu() {
+		return enuu;
 	}
 
-	public void setFp_enuu(Long fp_enuu) {
-		this.fp_enuu = fp_enuu;
+	public void setFp_enuu(Long enuu) {
+		this.enuu = enuu;
 	}
 
 	public Set<FeePleaseDetail> getFeePleaseDetails() {
@@ -218,4 +224,12 @@ public class FeePlease implements Serializable {
 		this.feePleaseDetails = feePleaseDetails;
 	}
 
+	public Long getEmcode() {
+		return emcode;
+	}
+
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
+	}
+
 }

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

@@ -47,7 +47,7 @@ public class OutPlan implements Serializable {
 	 * 记录人编号
 	 */
 	@Column(name = "op_recordercode")
-	private String recorderCode;
+	private Long recorderCode;
 
 	/**
 	 * 外勤编号
@@ -97,11 +97,11 @@ public class OutPlan implements Serializable {
 		this.mp_recorder = mp_recorder;
 	}
 
-	public String getRecorderCode() {
+	public Long getRecorderCode() {
 		return recorderCode;
 	}
 
-	public void setRecorderCode(String recorderCode) {
+	public void setRecorderCode(Long recorderCode) {
 		this.recorderCode = recorderCode;
 	}
 

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

@@ -51,7 +51,7 @@ public class OutPlanDetail implements Serializable {
 	 * 记录人编号
 	 */
 	@Column(name = "opd_recordercode")
-	private String mpd_recorderCode;
+	private Long recorderCode;
 	
 	/**
 	 * 记录人
@@ -148,12 +148,12 @@ public class OutPlanDetail implements Serializable {
 		this.mpd_code = mpd_code;
 	}
 
-	public String getMpd_recorderCode() {
-		return mpd_recorderCode;
+	public Long getRecorderCode() {
+		return recorderCode;
 	}
 
-	public void setMpd_recorderCode(String mpd_recorderCode) {
-		this.mpd_recorderCode = mpd_recorderCode;
+	public void setRecorderCode(Long recorderCode) {
+		this.recorderCode = recorderCode;
 	}
 
 	public String getMpd_recorder() {

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

@@ -66,7 +66,7 @@ public class OutSign implements Serializable {
 	 * 人员编号
 	 */
 	@Column(name = "sign_emcode")
-	private String mancode;
+	private Long emcode;
 
 	public Long getMo_id() {
 		return mo_id;
@@ -116,12 +116,12 @@ public class OutSign implements Serializable {
 		this.mo_remark = mo_remark;
 	}
 
-	public String getMancode() {
-		return mancode;
+	public Long getEmcode() {
+		return emcode;
 	}
 
-	public void setMancode(String mancode) {
-		this.mancode = mancode;
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
 	}
 
 }

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

@@ -45,7 +45,7 @@ public class SignCardLog implements Serializable {
 	 * 员工编号
 	 */
 	@Column(name = "sgl_emcode")
-	private String emcode;
+	private Long emcode;
 
 	/**
 	 * 打卡日期
@@ -75,11 +75,11 @@ public class SignCardLog implements Serializable {
 		this.enuu = enuu;
 	}
 
-	public String getEmcode() {
+	public Long getEmcode() {
 		return emcode;
 	}
 
-	public void setEmcode(String emcode) {
+	public void setEmcode(Long emcode) {
 		this.emcode = emcode;
 	}
 

+ 3 - 3
src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java

@@ -44,7 +44,7 @@ public class UserCenter implements Serializable {
 	 * 用户编号
 	 */
 	@Column(name = "user_code")
-	private String emcode;
+	private Long emcode;
 	
 	/**
 	 * 是否管理员<br>
@@ -70,11 +70,11 @@ public class UserCenter implements Serializable {
 		this.enuu = enuu;
 	}
 
-	public String getCode() {
+	public Long getCode() {
 		return emcode;
 	}
 
-	public void setCode(String emcode) {
+	public void setCode(Long emcode) {
 		this.emcode = emcode;
 	}
 

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

@@ -63,7 +63,7 @@ public class Vacation implements Serializable {
 	 * 人员编号
 	 */
 	@Column(name = "va_emcode")
-	private String va_emcode;
+	private Long emcode;
 
 	/**
 	 * 姓名
@@ -147,12 +147,12 @@ public class Vacation implements Serializable {
 		this.va_statuscode = va_statuscode;
 	}
 
-	public String getVa_emcode() {
-		return va_emcode;
+	public Long getEmcode() {
+		return emcode;
 	}
 
-	public void setVa_emcode(String va_emcode) {
-		this.va_emcode = va_emcode;
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
 	}
 
 	public String getVa_emname() {

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

@@ -45,7 +45,7 @@ public class WorkDaily implements Serializable {
 	 * 员工编号
 	 */
 	@Column(name = "wd_empcode")
-	private String wd_empcode;
+	private Long emcode;
 
 	/**
 	 * 员工姓名
@@ -111,12 +111,12 @@ public class WorkDaily implements Serializable {
 		this.wd_code = wd_code;
 	}
 
-	public String getWd_empcode() {
-		return wd_empcode;
+	public Long getEmcode() {
+		return emcode;
 	}
 
-	public void setWd_empcode(String wd_empcode) {
-		this.wd_empcode = wd_empcode;
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
 	}
 
 	public String getWd_emp() {

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

@@ -111,7 +111,7 @@ public class WorkData implements Serializable {
 	 * 员工编码
 	 */
 	@Column(name = "wd_emcode")
-	private String wd_emcode;
+	private Long emcode;
 	
 	/**
 	 * 员工姓名
@@ -259,12 +259,12 @@ public class WorkData implements Serializable {
 		this.wd_offdutyThree = wd_offdutyThree;
 	}
 
-	public String getWd_emcode() {
-		return wd_emcode;
+	public Long getEmcode() {
+		return emcode;
 	}
 
-	public void setWd_emcode(String wd_emcode) {
-		this.wd_emcode = wd_emcode;
+	public void setEmcode(Long emcode) {
+		this.emcode = emcode;
 	}
 
 	public String getWd_man() {

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

@@ -51,7 +51,7 @@ public class WorkOvertimeDet implements Serializable {
 	 * 人员编号
 	 */
 	@Column(name = "wod_empcode")
-	private String wod_empcode;
+	private Long empcode;
 
 	/**
 	 * 姓名
@@ -100,12 +100,12 @@ public class WorkOvertimeDet implements Serializable {
 		this.wod_detno = wod_detno;
 	}
 
-	public String getWod_empcode() {
-		return wod_empcode;
+	public Long getEmpcode() {
+		return empcode;
 	}
 
-	public void setWod_empcode(String wod_empcode) {
-		this.wod_empcode = wod_empcode;
+	public void setEmpcode(Long empcode) {
+		this.empcode = empcode;
 	}
 
 	public String getWod_empname() {

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

@@ -12,5 +12,5 @@ public interface SignCardLogService {
 	 * @param pageSize
 	 * @return
 	 */
-	public ModelMap getListData(String emcode, Integer pageNumber, Integer pageSize);
+	public ModelMap getListData(Long emcode, Integer pageNumber, Integer pageSize);
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/service/UserCenterService.java

@@ -11,6 +11,6 @@ public interface UserCenterService {
 	 * @param enuu
 	 * @return
 	 */
-	public ModelMap getUserInfoByEmCodeAndEnuu(String emcode, Long enuu);
+	public ModelMap getUserInfoByEmCodeAndEnuu(Long emcode, Long enuu);
 
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/service/VacationService.java

@@ -15,7 +15,7 @@ public interface VacationService {
 	 * @param enuu
 	 * @return
 	 */
-	public ModelMap getAllVacation(String emcode, Integer pageNumber, Integer pageSize, Long enuu);
+	public ModelMap getAllVacation(Long emcode, Integer pageNumber, Integer pageSize, Long enuu);
 
 	/**
 	 * 保存请假单

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/service/WorkDailyService.java

@@ -23,7 +23,7 @@ public interface WorkDailyService {
 	 * @param enuu
 	 * @return
 	 */
-	public ModelMap getWorkDaily(String emcode, Integer pageNumber, Integer pageSize, Long enuu);
+	public ModelMap getWorkDaily(Long emcode, Integer pageNumber, Integer pageSize, Long enuu);
 
 	/**
 	 * 更新工作日报

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/service/WorkOvertimeService.java

@@ -27,6 +27,6 @@ public interface WorkOvertimeService {
 	 * @param pageSize
 	 * @return
 	 */
-	public ModelMap getWorkOvertime(Long enuu, String emcode, Integer pageNumber, Integer pageSize);
+	public ModelMap getWorkOvertime(Long enuu, Long emcode, Integer pageNumber, Integer pageSize);
 
 }

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

@@ -11,5 +11,5 @@ public interface WorkScheduleService {
 	 * @param enuu
 	 * @return
 	 */
-	public ModelMap getWorkSchedule(String emcode, Long enuu);
+	public ModelMap getWorkSchedule(Long emcode, Long enuu);
 }

+ 9 - 5
src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 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.model.FeePlease;
 import com.uas.platform.b2b.mobile.model.FeePleaseDetail;
@@ -28,6 +29,9 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 	@Autowired
 	private FeePleaseDetailDao feePleaseDetailDao;
 
+	@Autowired
+	private FeePleaseDao feePleaseDao;
+
 	@Override
 	public ModelMap saveFeePlease(FeePlease feePlease, List<FeePleaseDetail> feePleaseDetails) {
 		ModelMap map = new ModelMap();
@@ -45,19 +49,19 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 	}
 
 	@Override
-	public ModelMap getFeePlease(Long enuu, String emcode, Integer pageNumber, Integer pageSize) {
+	public ModelMap getFeePlease(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
 		final PageInfo pageInfo = new PageInfo();
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.setPageNumber(pageNumber);
-		pageInfo.filter("fp_emcode", emcode);
+		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
-		Page<FeePleaseDetail> feePleaseDetails = feePleaseDetailDao.findAll(new Specification<FeePleaseDetail>() {
-			public Predicate toPredicate(Root<FeePleaseDetail> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+		Page<FeePlease> feePleases = feePleaseDao.findAll(new Specification<FeePlease>() {
+			public Predicate toPredicate(Root<FeePlease> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		map.put("data", feePleaseDetails.getContent());
+		map.put("data", feePleases.getContent());
 		return map;
 	}
 }

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

@@ -22,7 +22,7 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 	@Autowired
 	private SignCardLogDao signCardLogDao;
 	@Override
-	public ModelMap getListData(String emcode, Integer pageNumber, Integer pageSize) {
+	public ModelMap getListData(Long emcode, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
 		final PageInfo pageInfo = new PageInfo();
 		pageInfo.setPageNumber(pageNumber);

+ 1 - 1
src/main/java/com/uas/platform/b2b/mobile/service/impl/UserCenterServiceImpl.java

@@ -14,7 +14,7 @@ public class UserCenterServiceImpl implements UserCenterService {
 	private UserCenterDao userCenterDao;
 
 	@Override
-	public ModelMap getUserInfoByEmCodeAndEnuu(String emcode, Long enuu) {
+	public ModelMap getUserInfoByEmCodeAndEnuu(Long emcode, Long enuu) {
 		ModelMap map = new ModelMap();
 		map.put("data", userCenterDao.getUserInfoByEmcodeAndEnuu(emcode, enuu));
 		return map;

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

@@ -23,12 +23,12 @@ public class VacationServiceImpl implements VacationService {
 	private VacationDao vacationDao;
 
 	@Override
-	public ModelMap getAllVacation(String emcode, Integer pageNumber, Integer pageSize, Long enuu) {
+	public ModelMap getAllVacation(Long emcode, Integer pageNumber, Integer pageSize, Long enuu) {
 		ModelMap map = new ModelMap();
 		final PageInfo pageInfo = new PageInfo();
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.setPageNumber(pageNumber);
-		pageInfo.filter("va_emcode", emcode);
+		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<Vacation> vacations = vacationDao.findAll(new Specification<Vacation>() {
 			public Predicate toPredicate(Root<Vacation> root, CriteriaQuery<?> query, CriteriaBuilder builder) {

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

@@ -30,13 +30,13 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 	}
 
 	@Override
-	public ModelMap getWorkDaily(String emcode, Integer pageNumber, Integer pageSize, Long enuu) {
+	public ModelMap getWorkDaily(Long emcode, Integer pageNumber, Integer pageSize, Long enuu) {
 		ModelMap map = new ModelMap();
 		final PageInfo pageInfo = new PageInfo();
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.filter("enuu", enuu);
-		pageInfo.filter("wd_empcode", emcode);
+		pageInfo.filter("emcode", emcode);
 		Page<WorkDaily> workDaily = workDailyDao.findAll(new Specification<WorkDaily>() {
 			public Predicate toPredicate(Root<WorkDaily> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
@@ -50,7 +50,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 	public ModelMap updateWorkDaily(WorkDaily workDaily) {
 		ModelMap map = new ModelMap();
 		WorkDaily oldDaily = workDailyDao.findOne(workDaily.getWd_id());
-		oldDaily.setWd_empcode(workDaily.getWd_empcode());
+		oldDaily.setEmcode(workDaily.getEmcode());
 		oldDaily.setWd_comment(workDaily.getWd_comment());
 		oldDaily.setWd_experience(workDaily.getWd_experience());
 		oldDaily.setWd_plan(workDaily.getWd_plan());

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

@@ -45,12 +45,12 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 	}
 
 	@Override
-	public ModelMap getWorkOvertime(Long enuu, String emcode, Integer pageNumber, Integer pageSize) {
+	public ModelMap getWorkOvertime(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
 		final PageInfo pageInfo = new PageInfo();
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.setPageNumber(pageNumber);
-		pageInfo.filter("wo_emcode", emcode);
+		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<WorkOvertimeDet> workOvertimeDets = workOvertimeDetDao.findAll(new Specification<WorkOvertimeDet>() {
 			public Predicate toPredicate(Root<WorkOvertimeDet> root, CriteriaQuery<?> query, CriteriaBuilder builder) {

+ 2 - 2
src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkScheduleServiceImpl.java

@@ -29,13 +29,13 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 	private OutSignDao outSignDao;
 
 	@Override
-	public ModelMap getWorkSchedule(String emcode, Long enuu) {
+	public ModelMap getWorkSchedule(Long emcode, Long enuu) {
 		ModelMap map = new ModelMap();
 		UserCenter user = userCenterDao.getUserInfoByEmcodeAndEnuu(emcode, enuu);
 		WorkSchedule workSchedule = new WorkSchedule();
 		if (user != null) {
 			List<OutPlan> outPlan = outPlanDao.findByRecorderCodeAndEnuu(emcode, enuu);
-			List<OutSign> outSign = outSignDao.findByEnuuAndMancode(enuu, emcode);
+			List<OutSign> outSign = outSignDao.findByEnuuAndEmcode(enuu, emcode);
 			workSchedule.setOutPlan(outPlan);
 			workSchedule.setVisitRecord(outSign);
 			map.put("me", workSchedule);