diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 574fb9d5..b9097a2a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -78,16 +78,7 @@ public class DepositoryRecordController { result.put("OutCount",OutCount); return new RestResponse(result,result.size(),200); } - /*@GetMapping("/myApply") - public RestResponse findDepositoryRecordByCondition(@RequestParam Map map,HttpServletRequest request){ - UserByPort userToken= (UserByPort) request.getAttribute("userToken"); - map.put("applicantId",userToken.getId()); - List list=depositoryRecordService.findDepositoryRecordPByCondition(map); - for (int i = 0; i < list.size(); i++) { - list.get(i).setPrice(list.get(i).getPrice() / 100); - } - return new RestResponse(list,depositoryRecordService.findCountByCondition(map),200); - }*/ + @GetMapping("/myTask") public RestResponse myTask(@RequestParam Map map,HttpServletRequest request){ UserByPort userToken= (UserByPort) request.getAttribute("userToken"); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 195929b2..ee9d7314 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -412,6 +412,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime())); list.get(i).setApplicantName(userByPortById.getName()); list.get(i).setApplicantTime(time); + list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null?"":list.get(i).getApplyRemark()); } return list; } @@ -441,6 +442,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime())); list.get(i).setApplicantName(userByPortById.getName()); list.get(i).setApplicantTime(time); + list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null?"":list.get(i).getApplyRemark()); } return list; }