diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java index f440c69..a0f3679 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java @@ -90,7 +90,6 @@ public class AdminAccountCloseController extends BaseController { /** * 结算表 - * 注意:也会从url中传递参数!! * @param rejson * @return */ diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java index edfdf45..36743e9 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java @@ -4,16 +4,14 @@ package cn.chjyj.szwh.service.impl; import cn.chjyj.szwh.bean.AccountRatioDetail; import cn.chjyj.szwh.bean.AccountRatioSetting; import cn.chjyj.szwh.bean.PaySetting; -import cn.chjyj.szwh.mapper.AccountRatioDetailMapper; -import cn.chjyj.szwh.mapper.AccountRatioSettingMapper; -import cn.chjyj.szwh.mapper.OrderUserMapper; -import cn.chjyj.szwh.mapper.PaySettingMapper; +import cn.chjyj.szwh.mapper.*; import cn.chjyj.szwh.service.AccountCloseService; import cn.chjyj.szwh.vo.SettleVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -29,6 +27,9 @@ public class AccountCloseServiceImpl implements AccountCloseService { private AccountRatioSettingMapper accountRatioSettingMapper; @Autowired private AccountRatioDetailMapper accountRatioDetailMapper; + //查找创建人员 + @Autowired + private AdminMapper adminMapper; @Override public Map getPaySetting() { @@ -126,16 +127,21 @@ public class AccountCloseServiceImpl implements AccountCloseService { retmap.put("per_page",ilimit); retmap.put("total",total); + // 时间格式化 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List acrlist = accountRatioSettingMapper.getRatioSettingList(query,startrs,ilimit); List retlist = new ArrayList(); for(AccountRatioSetting acs:acrlist){ Map amap =new HashMap(); - amap.put("reule_name",acs.getRuleName()); + amap.put("rule_name",acs.getRuleName()); amap.put("id",acs.getId()); amap.put("user_id",acs.getUserId()); - amap.put("createtime",acs.getCreatetime()); + amap.put("createtime",sdf.format(acs.getCreatetime())); amap.put("is_deleted",acs.getIsDeleted()); amap.put("status",acs.getStatus()); + // 创建人员 + String username = adminMapper.getAdminById(acs.getUserId()).getAccountName(); + amap.put("username",username); retlist.add(amap); } retmap.put("data",retlist);