Commit c40aa14d authored by 廖旭伟's avatar 廖旭伟

修改H5绩效申诉详情显示测试bug

parent a55f8d07
package com.mortals.xhx.module.perform.web;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.*;
......@@ -12,12 +16,15 @@ import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
import com.mortals.xhx.module.perform.model.PerformErrorMessageEntity;
import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
import com.mortals.xhx.module.perform.service.PerformErrorMessageService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
......@@ -168,8 +175,15 @@ public class PerformErrorMessageController extends BaseCRUDJsonBodyMappingContro
PerformAttendAppealQuery appealQuery = new PerformAttendAppealQuery();
appealQuery.setCheckRecordId(entity.getCheckRecordId());
appealQuery.setPerformType(entity.getPerformType());
PerformAttendAppealEntity appealEntity = performAttendAppealService.selectOne(appealQuery);
ret.put("appealData", appealEntity);
appealQuery.setOrderColList(Arrays.asList(new OrderCol("appealTime", OrderCol.DESCENDING)));
LocalDateTime currentDate = LocalDateTime.now();
LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
appealQuery.setAppealTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
PageInfo pageInfo = new PageInfo(-1);
Result<PerformAttendAppealEntity> result = performAttendAppealService.getDao().getListExt(appealQuery,pageInfo);
if(CollectionUtils.isNotEmpty(result.getList())) {
ret.put("appealData", result.getList().get(0));
}
}
} catch (Exception var8) {
this.doException(this.request, busiDesc, model, var8);
......
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