|
|
@@ -4,7 +4,6 @@ import cn.com.ctop.common.module.service.ISysUserService;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.reimburse.mondule.entity.ReimburseExpress;
|
|
|
import cn.com.ctop.reimburse.mondule.service.IReimburseExpressService;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
@@ -14,35 +13,18 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.entity.SysUser;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
-import org.jeecg.common.util.oConvertUtils;
|
|
|
-import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
-import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
-import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
|
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.PutMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
-import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
|
-import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.UnsupportedEncodingException;
|
|
|
-import java.net.URLDecoder;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 报销申请——快递记录表
|
|
|
@@ -79,14 +61,14 @@ public class ReimburseExpressController {
|
|
|
HttpServletRequest req) {
|
|
|
Result<IPage<ReimburseExpress>> result = new Result<>();
|
|
|
String statDate = reimburseExpress.getStatDate();
|
|
|
- String userId = reimburseExpress.getUserId();
|
|
|
+ String userName = reimburseExpress.getUserName();
|
|
|
reimburseExpress = new ReimburseExpress();
|
|
|
QueryWrapper<ReimburseExpress> queryWrapper = QueryGenerator.initQueryWrapper(reimburseExpress, req.getParameterMap());
|
|
|
if (!Check.isNull(statDate)) {
|
|
|
queryWrapper.likeLeft("stat_date", statDate);
|
|
|
}
|
|
|
- if (!Check.isNull(userId)) {
|
|
|
- queryWrapper.likeLeft("user_id", userId);
|
|
|
+ if (!Check.isNull(userName)) {
|
|
|
+ queryWrapper.like("user_name", userName);
|
|
|
}
|
|
|
|
|
|
Page<ReimburseExpress> page = new Page<ReimburseExpress>(pageNo, pageSize);
|