Commit ce2fe368 authored by wzs162's avatar wzs162

复评申请-历史任务评定信息列表

parent aa2209e4
...@@ -63,7 +63,7 @@ public class ReTaskController { ...@@ -63,7 +63,7 @@ public class ReTaskController {
/** /**
* 复评申请-历史评定信息 * 复评申请-历史评定信息
*/ */
@GetMapping("/retask-hisinfo-list") @GetMapping("/hisinfo-list")
public Result<List<ChAprTaskVo>> getRetaskHisList(){ public Result<List<ChAprTaskVo>> getRetaskHisList(){
List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList(); List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList();
return Result.success(chAprTaskVos); return Result.success(chAprTaskVos);
......
...@@ -57,6 +57,22 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem ...@@ -57,6 +57,22 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem
@Override @Override
public List<ChAprTaskVo> geReTaskHisInfoList() { public List<ChAprTaskVo> geReTaskHisInfoList() {
// 历史评定信息列表 // 历史评定信息列表
return null; List<ChAprTaskVo> reTaskHisInfoList = reTaskMapper.getReTaskHisInfoList();
if (reTaskHisInfoList.size()!=0){
reTaskHisInfoList.stream().forEach(item-> {
String provincialCityArea = item.getProvincialCityArea();
provincialCityArea=item.getDistrictProvincial()+item.getDistrictCity()+item.getDistrictArea();
item.setProvincialCityArea(provincialCityArea);
try {
item.setAge(DateUtils.getAge(item.getBirthDay()));
} catch (Exception e) {
e.printStackTrace();
}
String pcasd = item.getPcasd();
pcasd=item.getAcptProvincial()+item.getAcptCity()+item.getAcptArea()+item.getAcptStreet()+item.getAcptAddress();
item.setPcasd(pcasd);
});
}
return reTaskHisInfoList;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment