From 101bbdd67a42e2fea0502efc3c8ce9cc1581b315 Mon Sep 17 00:00:00 2001
From: xiejianpeng <xiejp@zte-its.com>
Date: Fri, 3 Aug 2018 10:15:15 +0800
Subject: [PATCH] 日报提交

---
 src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java |  2 +-
 src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java           | 12 ++++++------
 src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java                        |  2 +-
 src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java               |  5 +++--
 src/main/java/com/zteits/oa/report/web/AsraDailyController.java                 |  4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java b/src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java
index a5b1d6a..d8f2466 100644
--- a/src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java
+++ b/src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java
@@ -67,5 +67,5 @@ public interface AsraDailyQueryService {
 	 * @Date: 2018/8/1 17:02
 	 *
 	 */
-	BizResult<Integer> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request);
+	BizResult<Long> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request);
 }
diff --git a/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java b/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
index b3e767e..bf4ca44 100644
--- a/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
+++ b/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
@@ -131,7 +131,7 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
 	
 	
     @Override
-    public BizResult<Integer> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request) {
+    public BizResult<Long> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request) {
         AsraDaily asraDaily = new AsraDaily();
         BeanUtils.copyProperties(request, asraDaily);
         asraDaily.setModfiyDate(new Date());
@@ -140,20 +140,20 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
         Date dailyDate = DateUtil.parseDate(request.getDailyDate());
         asraDaily.setDailyDate(dailyDate);
 
-        int num;
+        Long id;
         if (null == request.getId()) {
             //新增
             asraDaily.setDataState(1);
             asraDaily.setCreateDate(new Date());
             asraDaily.setCreateEmpid(request.getAsarOpId()+"");
             asraDaily.setCreateEmpName(request.getAsarOpName() + "");
-            num = asraDailyDao.saveAsraDaily(asraDaily);
+			id = asraDailyDao.saveAsraDaily(asraDaily);
         } else {
             //更新
-            num = asraDailyDao.updateAsraDaily(asraDaily);
-
+            int num = asraDailyDao.updateAsraDaily(asraDaily);
+			id = Long.valueOf(num+"");
         }
 
-        return new BizResult<>(num);
+        return new BizResult<>(id);
     }
 }
diff --git a/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java b/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
index 29f8862..c4dfc74 100644
--- a/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
+++ b/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
@@ -55,7 +55,7 @@ public interface AsraDailyDao {
      * @Date: 2018/8/1 17:11
      *
      */
-    int saveAsraDaily(AsraDaily asraDaily);
+    Long saveAsraDaily(AsraDaily asraDaily);
 
     /**
      * 修改日报信息
diff --git a/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java b/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
index 1bc25ad..046085f 100644
--- a/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
+++ b/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
@@ -50,8 +50,9 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
     }
 
     @Override
-    public int saveAsraDaily(AsraDaily asraDaily) {
-        return asraDailyMapper.insertSelective(asraDaily);
+    public Long saveAsraDaily(AsraDaily asraDaily) {
+		int flg = asraDailyMapper.insertSelective(asraDaily);
+        return asraDaily.getId();
     }
 
     @Override
diff --git a/src/main/java/com/zteits/oa/report/web/AsraDailyController.java b/src/main/java/com/zteits/oa/report/web/AsraDailyController.java
index 0e2fd5a..8a003ed 100644
--- a/src/main/java/com/zteits/oa/report/web/AsraDailyController.java
+++ b/src/main/java/com/zteits/oa/report/web/AsraDailyController.java
@@ -103,7 +103,7 @@ public class AsraDailyController {
 
 	@ApiOperation("保存或者修改工时日报")
 	@PostMapping("/saveOrUpdateAsraDaily")
-	public BizResult<Integer> saveOrUpdateAsraDaily(@RequestBody AsraDailySaveOrUpdateReq asraDailySaveOrUpdateReq,HttpServletRequest request) {
+	public BizResult<Long> saveOrUpdateAsraDaily(@RequestBody AsraDailySaveOrUpdateReq asraDailySaveOrUpdateReq,HttpServletRequest request) {
 		logger.info("日报系统-日报管理-根据登录人提交日报信息入参:{}", JSONObject.toJSON(asraDailySaveOrUpdateReq));
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
 		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
@@ -116,7 +116,7 @@ public class AsraDailyController {
 		asraDailySaveOrUpdateReq.setDataState(1);
 		BeanUtils.copyProperties(asraDailyDateChangeDTO,asraDailySaveOrUpdateReq);
 
-		BizResult<Integer> bizResult = asraDailyQueryService.saveOrUpdateAsraDaily(asraDailySaveOrUpdateReq);
+		BizResult<Long> bizResult = asraDailyQueryService.saveOrUpdateAsraDaily(asraDailySaveOrUpdateReq);
 		return bizResult;
 	}
 
--
libgit2 0.21.4