Browse Source

基本完成

lwx_dev
erdanergou 3 years ago
parent
commit
edc22d69ed
  1. 11
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 2
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

11
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -78,16 +78,7 @@ public class DepositoryRecordController {
result.put("OutCount",OutCount); result.put("OutCount",OutCount);
return new RestResponse(result,result.size(),200); return new RestResponse(result,result.size(),200);
} }
/*@GetMapping("/myApply")
public RestResponse findDepositoryRecordByCondition(@RequestParam Map<String,Object> map,HttpServletRequest request){
UserByPort userToken= (UserByPort) request.getAttribute("userToken");
map.put("applicantId",userToken.getId());
List<DepositoryRecordP> 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") @GetMapping("/myTask")
public RestResponse myTask(@RequestParam Map<String,Object> map,HttpServletRequest request){ public RestResponse myTask(@RequestParam Map<String,Object> map,HttpServletRequest request){
UserByPort userToken= (UserByPort) request.getAttribute("userToken"); UserByPort userToken= (UserByPort) request.getAttribute("userToken");

2
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())); String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime()));
list.get(i).setApplicantName(userByPortById.getName()); list.get(i).setApplicantName(userByPortById.getName());
list.get(i).setApplicantTime(time); list.get(i).setApplicantTime(time);
list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null?"":list.get(i).getApplyRemark());
} }
return list; return list;
} }
@ -441,6 +442,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime())); String time = DateUtil.TimeStampToDateTime(Long.valueOf(list.get(i).getApplicantTime()));
list.get(i).setApplicantName(userByPortById.getName()); list.get(i).setApplicantName(userByPortById.getName());
list.get(i).setApplicantTime(time); list.get(i).setApplicantTime(time);
list.get(i).setApplyRemark(list.get(i).getApplyRemark() == null?"":list.get(i).getApplyRemark());
} }
return list; return list;
} }

Loading…
Cancel
Save