|
|
@@ -9,6 +9,8 @@ import java.util.*;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
@@ -17,6 +19,8 @@ import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.oa.vo.SyCarryPage;
|
|
|
+import org.jeecg.modules.system.entity.SysUser;
|
|
|
+import org.jeecg.modules.system.service.ISysUserService;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
@@ -40,7 +44,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
-
|
|
|
+
|
|
|
* @Description: 搬运装卸费用-搬运工对账单-主表
|
|
|
* @Author: jeecg-boot
|
|
|
* @Date: 2023-01-10
|
|
|
@@ -54,6 +58,8 @@ public class SyCarryController {
|
|
|
private ISyCarryService syCarryService;
|
|
|
@Autowired
|
|
|
private ISyCarryBService syCarryBService;
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService sysUserService;
|
|
|
|
|
|
|
|
|
* 分页列表查询
|
|
|
@@ -251,7 +257,26 @@ public class SyCarryController {
|
|
|
syCarryB.setContainerNo(row.getCell(6).getStringCellValue());
|
|
|
syCarryB.setPrice(row.getCell(7).getNumericCellValue());
|
|
|
syCarryB.setTotalPrice(row.getCell(8).getNumericCellValue());
|
|
|
- syCarryB.setJhyByData(row.getCell(9).getStringCellValue());
|
|
|
+ syCarryB.setJhyNameData(row.getCell(9).getStringCellValue());
|
|
|
+ if(StringUtils.isNotBlank(syCarryB.getJhyNameData())){
|
|
|
+ String[] names = syCarryB.getJhyNameData().split("/");
|
|
|
+ StringBuffer sb = new StringBuffer();
|
|
|
+ for (String o:names){
|
|
|
+ QueryWrapper wrapper = new QueryWrapper<SysUser>();
|
|
|
+ wrapper.eq("realname",o);
|
|
|
+ List<SysUser> list = sysUserService.list(wrapper);
|
|
|
+ String user = list.get(0).getUsername();
|
|
|
+ if(user != null){
|
|
|
+ if(StringUtils.isBlank(sb.toString())){
|
|
|
+ sb.append(user);
|
|
|
+ }else{
|
|
|
+ sb.append(",").append(user);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ syCarryB.setJhyByData(sb.toString());
|
|
|
+ }
|
|
|
syCarryB.setReason(row.getCell(10)==null?"":row.getCell(10).getStringCellValue());
|
|
|
syCarryB.setDemo(row.getCell(11)==null?"":row.getCell(11).getStringCellValue());
|
|
|
syCarryBList.add(syCarryB);
|
liuchaohui