Commit ad91f2f3 authored by 赵啸非's avatar 赵啸非

修改考勤汇总

parent 11bedae8
...@@ -361,8 +361,10 @@ export default { ...@@ -361,8 +361,10 @@ export default {
} }
} }
}); });
console.log("search val",val)
newData[item] = this.decodeVal(val); newData[item] = this.decodeVal(val);
}); });
console.log("search val1",val)
return newData; return newData;
}, },
decodeVal(val) { decodeVal(val) {
......
...@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
...@@ -73,6 +74,15 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba ...@@ -73,6 +74,15 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
super.init(model, context); super.init(model, context);
} }
@Override
protected void doListBefore(FeedbackEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
} else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
}
}
@Override @Override
protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException { protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
if (CollectionUtils.isNotEmpty(entity.getFeedbackQuestionList())) { if (CollectionUtils.isNotEmpty(entity.getFeedbackQuestionList())) {
......
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