change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java

@@ -41,11 +41,11 @@
    private List<SysProject> selectedList;
    private List<BasePage> basePageList;
    private List<SysUser> sameDptUserList;
    private Map<String, String> userIdNameMap;
    private Map<Long, String> userIdNameMap;
    private List<SysUser> userSelectList;
    private int action;

    private String projectId;
    private String projectNo;
    private String projectName;
    private String sysUserName;

@@ -60,14 +60,12 @@
        return userSelectList;
    }

    public SysUser getSelectedUserById(String userId) {
        System.out.println(userId);
       List<SysUser> userList= userSelectList.stream().filter(u -> u.getId().equals(userId)).collect(Collectors.toList());
       if(userList.size()>0){
            return userList.get(0);
       }else{
    public SysUser getSelectedUserById(Long userId) {
        SysUser sysUser=this.sysUserService.getSysUser(userId);
        if(sysUser==null){
           return new SysUser();
       }
        return sysUser;
    }

    public List<SysUser> getUserSelectList(String keyword) {
@@ -87,12 +85,12 @@
        ProjectMngController.logger = logger;
    }

    public String getProjectId() {
        return projectId;
    public String getProjectNo() {
        return projectNo;
    }

    public void setProjectId(String projectId) {
        this.projectId = projectId;
    public void setProjectNo(String projectNo) {
        this.projectNo = projectNo;
    }

    public String getProjectName() {
@@ -142,16 +140,16 @@
                    return;
                }

                if (this.sysProject.getSysUserId() == null || this.sysProject.getSysUserId()=="") {
                if (this.sysProject.getSysUserId() == null) {
                    FacesUtils.warn("请选择课题负责人。");
                    return;
                }

                if (this.sysProject.getProjectId() == null || this.sysProject.getProjectId()=="") {
                if (this.sysProject.getProjectNo() == null || this.sysProject.getProjectNo()=="") {
                    FacesUtils.warn("请输入课题编号。");
                    return;
                }else {
                    if(sysProjectService.getProjectByProId(this.sysProject.getProjectId())!=null){
                    if(sysProjectService.getProjectByProNo(this.sysProject.getProjectNo())!=null){
                        FacesUtils.warn("课题编号已存在，请重新输入。");
                        return;
                    }
@@ -170,15 +168,15 @@
                    return;
                }

                if (StringUtils.isBlank(this.sysProject.getSysUserId())) {
                if (this.sysProject.getSysUserId()==null) {
                    FacesUtils.warn("请选择课题负责人。");
                    return;
                }
                if (this.sysProject.getProjectId() == null || this.sysProject.getProjectId()=="") {
                if (this.sysProject.getProjectNo() == null || this.sysProject.getProjectNo()=="") {
                    FacesUtils.warn("请输入课题编号。");
                    return;
                }else {
                    SysProject sp=this.sysProjectService.getProjectByProId(this.sysProject.getProjectId());
                    SysProject sp=this.sysProjectService.getProjectByProNo(this.sysProject.getProjectNo());
                    if(sp!=null){
                        if(!sp.getId().equals(this.sysProject.getId())){
                            FacesUtils.warn("课题编号已存在，请重新输入。");
@@ -186,11 +184,7 @@
                        }
                    }
                }
                SysProject pro=this.sysProjectService.getSysProject(this.sysProject.getId());
                this.sysProjectService.updateSysProject(this.sysProject);
                this.opeApplyService.updateOpeApplyProject(this.sysProject.getProjectId(),pro.getProjectId());


                FacesUtils.info("修改成功。");
                RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
            }
@@ -237,10 +231,10 @@
                    List<SysProject> list = null;
                    initUserSelectList();
                    try {
                        int count = sysProjectService.getSysProjectTotalCountUpdate(getUserId(),projectId,projectName,sysUserName);
                        int count = sysProjectService.getSysProjectTotalCountUpdate(getUserId(),projectNo,projectName,sysUserName);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectId,projectName,sysUserName);
                            list = sysProjectService.getSysProjectListUpdate(first, pageSize,getUserId(),projectNo,projectName,sysUserName);
                        }
                        selectedList = new ArrayList<>();
                    } catch (Exception e) {
@@ -261,7 +255,8 @@
//                            }
//                        }
//                    }
                    return sysProjectService.getSysProject(rowKey);
                    Long id=Long.valueOf(rowKey);
                    return sysProjectService.getSysProject(id);
                }
            };
        }
@@ -310,11 +305,11 @@
        this.sameDptUserList = sameDptUserList;
    }

    public Map<String, String> getUserIdNameMap() {
    public Map<Long, String> getUserIdNameMap() {
        return userIdNameMap;
    }

    public void setUserIdNameMap(Map<String, String> userIdNameMap) {
    public void setUserIdNameMap(Map<Long, String> userIdNameMap) {
        this.userIdNameMap = userIdNameMap;
    }
}