From 7d6a59e9c82f0de46862a10c8b582597130ecbaa Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Mon, 6 May 2019 17:23:27 +0800 Subject: [PATCH] update --- .../operate/web/controller/TemporaryUserController.java | 2 +- .../operate/web/service/impl/TemporaryUserServiceImpl.java | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java index 3222f1d..31fc13c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java @@ -24,7 +24,7 @@ public class TemporaryUserController extends BaseController { @ResponseBody @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST) @TokenRequired - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) { + public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) { return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java index 0b6a975..4ad4637 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java @@ -51,8 +51,8 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor @Override public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, Integer userId) { if (null != temporaryUser.getId()) { - temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUser.getId())), temporaryUser); temporaryUser.setModified(new Date()); + temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUser.getId())), temporaryUser); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); } if (StringUtils.isNotEmpty(temporaryUser.getCardID()) || StringUtils.isNotEmpty(temporaryUser.getPhone())) { @@ -60,12 +60,10 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor criteria = criteria.orOperator(Criteria.where("cardID").is(temporaryUser.getCardID()), Criteria.where("phone").is(temporaryUser.getPhone())); TemporaryUserModel temporaryUserModels = mongoTemplate.findOne(Query.query(criteria), TemporaryUserModel.class); if (temporaryUserModels != null) { - temporaryUserModels.setModified(new Date()); - WriteResult s = mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(temporaryUser.getId())), Update.update("yn", "1"), TemporaryUserModel.class); - if (s.getN() >= 1) { - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(""); - } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该用户已建档!"); + temporaryUser.setModified(new Date()); + temporaryUser.setYn("1"); + temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUserModels.getId())), temporaryUser); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("完成!"); } } temporaryUser.setCreated(new Date()); -- 1.8.3.1