取消领用

gdg

2021-02-03 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73

 src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java

@@ -4,6 +4,9 @@
import com.nanometer.smartlab.dao.SysUserDao;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import com.nanometer.smartlab.entity.dto.SysUserDto;
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.exception.AlarmCode;
@@ -40,7 +43,7 @@
    SysUserDao sysUserDao;

    @Transactional(propagation = Propagation.REQUIRED)
    public List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize) {
    public List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company, Integer first, Integer pageSize) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(arp)) {
@@ -52,6 +55,8 @@
            if (StringUtils.isNotBlank(departmentName)) {
                params.put("departmentNameLike", "%" + departmentName + "%");
            }
            params.put("project", project);
            params.put("company", company);
            params.put("first", first);
            params.put("pageSize", pageSize);
            return this.sysUserDao.getSysUserList(params);
@@ -61,7 +66,7 @@
        }
    }
    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysUserTotalCount(String arp, String name,String departmentName) {
    public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(arp)) {
@@ -73,6 +78,8 @@
            if (StringUtils.isNotBlank(departmentName)) {
                params.put("departmentNameLike", "%" + departmentName + "%");
            }
            params.put("project", project);
            params.put("company", company);
            return this.sysUserDao.getSysUserTotalCount(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -282,9 +289,9 @@
            if (userList.size()>0) {
                for (SysUser user:userList) {
                    if (this.isSysUserExist(user.getArp(), null, null, null)) {

                        throw new DuplicateKeyException("arp重复");
                    }else if(!com.alibaba.druid.util.StringUtils.isEmpty(user.getIdCard()) && this.isSysUserExist(null, null, user.getIdCard(), null)){

                        throw new DuplicateKeyException("idCard为空或重复");
                    }else {
                        SysUser sysUser=sysUserDao.selectByAccount(user);
                        if(sysUser==null){
@@ -344,5 +351,28 @@

    }

    @Override
    public List<SysUserDto> getUserInfo() {
        return sysUserDao.selectUserInfo();
    }

    @Override
    public HazardousWasteUser getUserByAccount(String account,String name) {
        Map<String, String> params = new HashMap<>();
        params.put("account", account);
        params.put("name", name);
        return sysUserDao.getUserByAccount(params);
    }

    @Override
    public List<LaboratoryVo.LaboratoryUser> getUserByProject(String project) {
        return sysUserDao.getUserByProject(project);
    }

    @Override
    public List<SysUser> getUserByArp(String arp) {
        return sysUserDao.getUserByArp(arp);
    }


}