diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 948fcc8..26bf1a3 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -339,8 +339,7 @@ public class DateUtil { } } - public static Date yyyyMMParse(String time) - { + public static Date yyyyMMParse(String time) { Date date = null; try { date = yyyy_mm.parse(time); @@ -429,8 +428,8 @@ public class DateUtil { } } - public static Date paseYMDH(String s){ - if(s == null){ + public static Date paseYMDH(String s) { + if (s == null) { return null; } lock.lock(); @@ -444,8 +443,8 @@ public class DateUtil { } } - public static String getYMDH(Date d){ - if(d == null){ + public static String getYMDH(Date d) { + if (d == null) { return null; } lock.lock(); @@ -966,9 +965,9 @@ public class DateUtil { months = months - 1; } } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); - }finally { + } finally { lock.unlock(); } return months; 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 31fc13c..364f991 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 @@ -8,10 +8,12 @@ import com.lyms.platform.operate.web.service.ITemporaryUserService; import com.lyms.platform.pojo.TemporaryUserModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; @Controller @RequestMapping(value = "/temporary") 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 790342c..98236d4 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 @@ -112,8 +112,27 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor } PageResult pageResult = findMongoPage(TemporaryUserModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List bloodSugars = (List) pageResult.getGrid(); + List list = new ArrayList(); + for (TemporaryUserModel temporaryUser : bloodSugars) { + Map map = new HashMap<>(); + map.put("userName", temporaryUser.getUserName()); + map.put("birth", DateUtil.getAge(temporaryUser.getBirth(), new Date())); + map.put("phone", temporaryUser.getPhone()); + map.put("lastMenses", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date())); + map.put("beforeWeight", temporaryUser.getBeforeWeight()); + map.put("beforeHeight", temporaryUser.getBeforeHeight()); + map.put("nowWeight", temporaryUser.getNowWeight()); + map.put("cardID", temporaryUser.getCardID()); + map.put("riskFactorId", temporaryUser.getRiskFactorId()); + map.put("bregmatic", temporaryUser.getBirth()); + map.put("id", temporaryUser.getId()); + map.put("created", temporaryUser.getCreated()); + map.put("putOnRecordWeek", DateUtil.getWeek(temporaryUser.getLastMenses(), temporaryUser.getCreated())); - pageResult.setGrid(bloodSugars); + list.add(map); + } + + pageResult.setGrid(list); return RespBuilder.buildSuccess(pageResult); }