BJ_ZTEITS-Developers / zteits-oa

Commit 101bbdd67a42e2fea0502efc3c8ce9cc1581b315

Authored by xiejianpeng
1 parent 5bb13adb

日报提交

Inline Side-by-side
Showing 5 changed files with 13 additions and 12 deletions
src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java
  View file @101bbdd
... ... @@ -67,5 +67,5 @@ public interface AsraDailyQueryService {
67 67 * @Date: 2018/8/1 17:02
68 68 *
69 69 */
70   - BizResult<Integer> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request);
  70 + BizResult<Long> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request);
71 71 }
... ...
src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
  View file @101bbdd
... ... @@ -131,7 +131,7 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
131 131  
132 132  
133 133 @Override
134   - public BizResult<Integer> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request) {
  134 + public BizResult<Long> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request) {
135 135 AsraDaily asraDaily = new AsraDaily();
136 136 BeanUtils.copyProperties(request, asraDaily);
137 137 asraDaily.setModfiyDate(new Date());
... ... @@ -140,20 +140,20 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
140 140 Date dailyDate = DateUtil.parseDate(request.getDailyDate());
141 141 asraDaily.setDailyDate(dailyDate);
142 142  
143   - int num;
  143 + Long id;
144 144 if (null == request.getId()) {
145 145 //新增
146 146 asraDaily.setDataState(1);
147 147 asraDaily.setCreateDate(new Date());
148 148 asraDaily.setCreateEmpid(request.getAsarOpId()+"");
149 149 asraDaily.setCreateEmpName(request.getAsarOpName() + "");
150   - num = asraDailyDao.saveAsraDaily(asraDaily);
  150 + id = asraDailyDao.saveAsraDaily(asraDaily);
151 151 } else {
152 152 //更新
153   - num = asraDailyDao.updateAsraDaily(asraDaily);
154   -
  153 + int num = asraDailyDao.updateAsraDaily(asraDaily);
  154 + id = Long.valueOf(num+"");
155 155 }
156 156  
157   - return new BizResult<>(num);
  157 + return new BizResult<>(id);
158 158 }
159 159 }
... ...
src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
  View file @101bbdd
... ... @@ -55,7 +55,7 @@ public interface AsraDailyDao {
55 55 * @Date: 2018/8/1 17:11
56 56 *
57 57 */
58   - int saveAsraDaily(AsraDaily asraDaily);
  58 + Long saveAsraDaily(AsraDaily asraDaily);
59 59  
60 60 /**
61 61 * 修改日报信息
... ...
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
  View file @101bbdd
... ... @@ -50,8 +50,9 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
50 50 }
51 51  
52 52 @Override
53   - public int saveAsraDaily(AsraDaily asraDaily) {
54   - return asraDailyMapper.insertSelective(asraDaily);
  53 + public Long saveAsraDaily(AsraDaily asraDaily) {
  54 + int flg = asraDailyMapper.insertSelective(asraDaily);
  55 + return asraDaily.getId();
55 56 }
56 57  
57 58 @Override
... ...
src/main/java/com/zteits/oa/report/web/AsraDailyController.java
  View file @101bbdd
... ... @@ -103,7 +103,7 @@ public class AsraDailyController {
103 103  
104 104 @ApiOperation("保存或者修改工时日报")
105 105 @PostMapping("/saveOrUpdateAsraDaily")
106   - public BizResult<Integer> saveOrUpdateAsraDaily(@RequestBody AsraDailySaveOrUpdateReq asraDailySaveOrUpdateReq,HttpServletRequest request) {
  106 + public BizResult<Long> saveOrUpdateAsraDaily(@RequestBody AsraDailySaveOrUpdateReq asraDailySaveOrUpdateReq,HttpServletRequest request) {
107 107 logger.info("日报系统-日报管理-根据登录人提交日报信息入参:{}", JSONObject.toJSON(asraDailySaveOrUpdateReq));
108 108 /**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
109 109 AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
... ... @@ -116,7 +116,7 @@ public class AsraDailyController {
116 116 asraDailySaveOrUpdateReq.setDataState(1);
117 117 BeanUtils.copyProperties(asraDailyDateChangeDTO,asraDailySaveOrUpdateReq);
118 118  
119   - BizResult<Integer> bizResult = asraDailyQueryService.saveOrUpdateAsraDaily(asraDailySaveOrUpdateReq);
  119 + BizResult<Long> bizResult = asraDailyQueryService.saveOrUpdateAsraDaily(asraDailySaveOrUpdateReq);
120 120 return bizResult;
121 121 }
122 122  
... ...