fix

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/EnrollmentController.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -80,16 +79,7 @@ public class EnrollmentController {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		String username = enrollment.getUsername();
-		String realname = enrollment.getRealname();
-		String operator = enrollment.getOperator();
-		enrollment.setUsername(null);
-		enrollment.setRealname(null);
-		enrollment.setOperator(null);
 		QueryWrapper<Enrollment> queryWrapper = QueryGenerator.initQueryWrapper(enrollment, req.getParameterMap());
-		queryWrapper.like(StringUtils.isNotBlank(username),"username",username);
-		queryWrapper.like(StringUtils.isNotBlank(realname),"realname",realname);
-		queryWrapper.like(StringUtils.isNotBlank(operator),"operator",operator);
 		Page<Enrollment> page = new Page<Enrollment>(pageNo, pageSize);
 		IPage<Enrollment> pageList = enrollmentService.page(page, queryWrapper);
 		return Result.ok(pageList);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCarryController.java

@@ -1,24 +1,24 @@
 package org.jeecg.modules.oa.controller;
 
-import java.io.Serializable;
-import java.io.InputStream;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.oa.entity.SyCarry;
+import org.jeecg.modules.oa.entity.SyCarryB;
+import org.jeecg.modules.oa.service.ISyCarryBService;
+import org.jeecg.modules.oa.service.ISyCarryService;
 import org.jeecg.modules.oa.vo.SyCarryPage;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -27,23 +27,23 @@ 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.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.oa.entity.SyCarryB;
-import org.jeecg.modules.oa.entity.SyCarry;
-import org.jeecg.modules.oa.service.ISyCarryService;
-import org.jeecg.modules.oa.service.ISyCarryBService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 搬运装卸费用-搬运工对账单-主表
@@ -291,7 +291,7 @@ public class SyCarryController {
 				}
 				syCarryB.setOrderDate(row.getCell(0).getDateCellValue());
 			 	if(row.getCell(1)!=null){
-					row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
+					row.getCell(1).setCellType(CellType.STRING);
 				}
 			 	syCarryB.setInvoiceNo(row.getCell(1)==null?"":row.getCell(1).getStringCellValue());
 			 	syCarryB.setSaleInvoiceNo(row.getCell(2)==null?"":row.getCell(2).getStringCellValue());

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/AssetInServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.oa.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.oa.entity.Asset;
 import org.jeecg.modules.oa.entity.AssetIn;
 import org.jeecg.modules.oa.entity.AssetInDetail;
@@ -9,6 +10,8 @@ import org.jeecg.modules.oa.mapper.AssetInMapper;
 import org.jeecg.modules.oa.mapper.AssetMapper;
 import org.jeecg.modules.oa.service.IAssetInService;
 import org.jeecg.modules.oa.service.IAssetService;
+import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.vo.CodeVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,10 +39,29 @@ public class AssetInServiceImpl extends ServiceImpl<AssetInMapper, AssetIn> impl
 	private IAssetService assetService;
 	@Autowired
 	private AssetMapper assetMapper;
+
+	@Autowired
+	private SysUserMapper sysUserMapper;
 	
 	@Override
 	@Transactional
 	public void saveMain(AssetIn assetIn, List<AssetInDetail> assetInDetailList) {
+
+		CodeVo codeVo=new CodeVo();
+		codeVo.setSeqName("HT");
+		sysUserMapper.getNextNo(codeVo);
+		String nowDate = DateUtils.getDate("yyMMdd");
+		String inNo = "";
+		if(codeVo.getSeqNo() < 10){
+			inNo = "ZCRK"+nowDate+"00"+codeVo.getSeqNo();
+		}else if(codeVo.getSeqNo() > 9 && codeVo.getSeqNo() < 100){
+			inNo = "ZCRK"+nowDate+"0"+codeVo.getSeqNo();
+		}else{
+			inNo = "ZCRK"+nowDate+""+codeVo.getSeqNo();
+		}
+		assetIn.setInNo(inNo);
+
+
 		assetInMapper.insert(assetIn);
 		if(assetInDetailList!=null && assetInDetailList.size()>0) {
 			for(AssetInDetail entity:assetInDetailList) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -118,19 +118,7 @@ public class SysUserController {
 
         String syHireType = user.getSyHireType();
         user.setSyHireType(null);
-
-        String username = user.getUsername();
-        if(StringUtils.isNotBlank(username) && username.indexOf(",")<0) {
-            user.setUsername(null);
-        }
-        String realname = user.getRealname();
-        user.setRealname(null);
-
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-        if(StringUtils.isNotBlank(username) && username.indexOf(",")<0) {
-            queryWrapper.like(StringUtils.isNotBlank(username),"username",username);
-        }
-        queryWrapper.like(StringUtils.isNotBlank(realname),"realname",realname);
 		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
 		//根据公司id过滤
 //        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
@@ -1703,7 +1691,7 @@ public class SysUserController {
                 if(codeVo.getSeqNo() < 10){
                     return name+nowDate+"00"+codeVo.getSeqNo();
                 }else if(codeVo.getSeqNo() > 9 && codeVo.getSeqNo() < 100){
-                    return "name"+nowDate+"-0"+codeVo.getSeqNo();
+                    return name+nowDate+"0"+codeVo.getSeqNo();
                 }else{
                     return name+nowDate+""+codeVo.getSeqNo();
                 }