修改按钮权限、删除实验室时同时删除存储柜、添加存储柜时条码你不能重复
已修改10个文件
83 ■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java
@@ -93,7 +93,8 @@
        String id=getUserId();
        SysUser sysUser = sysUserService.getSysUser(id);
        // 不是管理员时
        if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
        if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
            this.approvalFlag=false;
        }else {
            this.approvalFlag=true;
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.SysLaboratoryContainerService;
import com.nanometer.smartlab.service.SysProjectService;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -42,6 +43,8 @@
    @Resource
    private SysLaboratoryService sysLaboratoryService;
    @Resource
    private SysLaboratoryContainerService sysLaboratoryContainerService;
    @Resource
    private BaseMetaService baseMetaService;
    @Resource
@@ -264,6 +267,7 @@
            }
            this.sysLaboratoryService.deleteSysLaboratory(this.selectedList);
            this.sysLaboratoryContainerService.delBySlcIds(this.selectedList);
            FacesUtils.info("删除成功。");
        } catch (Exception e) {
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -426,7 +426,8 @@
        System.out.println(getUser().getSeeFlag().getKey());
        //SysUser u=sysUserService.getSysUser(getUserId());
        //System.out.println(u);
        if (getUser().getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
        if (getUser().getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                && getUser().getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
            editFlag=0;
        }else{
            editFlag=1;
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
@@ -48,4 +48,8 @@
    List<Map> exportExcelList(Map params);
    List<String> selectProjectsByContainerCode(String containerCode);
    int delSlcIds(List<String> ids);
    int getSysLaboratoryContainerExist(Map<String, Object> params);
}
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml
@@ -24,7 +24,13 @@
  <update id="updateInfo" parameterType="java.util.Map">
    update sys_laboratory_container set temp=#{temp},humidity=#{humidity},voc1=#{voc1},flag=#{flag} where id=#{containerId}
  </update>
  <update id="delSlcIds" parameterType="java.util.List">
    update sys_laboratory_container set valid_flag=0, update_time=now()
    where laboratory_id in
    <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
      #{item}
    </foreach>
  </update>
  <select id="getSysLaboratoryContainerInfoList" parameterType="java.util.Map"  resultMap="SysLaboratoryContainer" >
    select container_code,name,valid_flag,type,character_left,character_right from sys_laboratory_container where update_time >= #{startTime} and #{endTime} > update_time
  </select>
@@ -254,4 +260,15 @@
    AND slc.valid_flag = 1
    AND sl.valid_flag = 1
  </select>
  <select id="getSysLaboratoryContainerExist" resultType="java.lang.Integer">
    select count(1)
    from sys_laboratory_container as su
    where su.valid_flag = 1
    <if test="containerCode != null and containerCode != ''">
      and su.container_code = #{containerCode}
    </if>
    <if test="editId != null and editId != ''">
      and su.id != #{editId}
    </if>
  </select>
</mapper>
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -71,7 +71,8 @@
            if (StringUtils.isNotBlank(applyUserId)) {
                SysUser sysUser = sysUserService.getSysUser(applyUserId);
                // 不是管理员时,加入applyUserId
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                     params.put("applyUserId", applyUserId);
                }
@@ -112,7 +113,8 @@
            if (StringUtils.isNotBlank(approveUserId)) {
                SysUser sysUser = sysUserService.getSysUser(approveUserId);
                // 不是管理员时,加入applyUserId
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                    params.put("approveUserId", approveUserId);
                }
            }
@@ -151,7 +153,8 @@
            if (StringUtils.isNotBlank(approveUserId)) {
                SysUser sysUser = sysUserService.getSysUser(approveUserId);
                // 不是管理员时,加入applyUserId
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                    params.put("approveUserId", approveUserId);
                }
            }
@@ -189,7 +192,8 @@
            if (StringUtils.isNotBlank(applyUserId)) {
                SysUser sysUser = sysUserService.getSysUser(applyUserId);
                // 不是管理员时,加入applyUserId
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                     params.put("applyUserId", applyUserId);
                }
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java
@@ -335,7 +335,8 @@
            // 不是管理员时,加入userid
            //if (sysUser.getSeeFlag().getKey() == SeeFlag.MANAGE.getKey()||sysUser.getSeeFlag().getKey() == SeeFlag.LEADING.getKey()) {
            if (sysUser.getSeeFlag().getKey() == SeeFlag.MANAGE.getKey()) {
            if (sysUser.getSeeFlag().getKey() == SeeFlag.MANAGE.getKey()
                    && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
            } else {
                params.put("userId", userId);
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java
@@ -1,5 +1,6 @@
package com.nanometer.smartlab.service;
import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import com.nanometer.smartlab.entity.SysUser;
@@ -37,4 +38,5 @@
    List<String> selectProjectsByContainerCode(String containerCode);
    boolean delBySlcIds(List<SysLaboratory> selectedList);
}
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -187,8 +187,7 @@
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("containerCode", containerCode);
            params.put("editId", editId);
            int count = this.sysLaboratoryContainerDao.getSysLaboratoryContainerTotalCount(params);
            int count = this.sysLaboratoryContainerDao.getSysLaboratoryContainerExist(params);
            return count > 0;
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -302,4 +301,28 @@
        return null;
    }
    @Override
    public boolean delBySlcIds(List<SysLaboratory> sysLaboratoryList) {
        try {
            if (sysLaboratoryList == null || sysLaboratoryList.size() == 0) {
                return false;
            }
            List<String> ids = new ArrayList<String>();
            for (SysLaboratory sysLaboratory : sysLaboratoryList) {
                ids.add(sysLaboratory.getId());
            }
            int row = this.sysLaboratoryContainerDao.delSlcIds(ids);
            return row != 0;
        } catch (DataIntegrityViolationException ex) {
            logger.warn(ex.getMessage(), ex);
            throw new AlarmException(AlarmCode.DATA_CONFICT, MessageUtil.getMessage(AlarmCode.DATA_CONFICT.getCode()));
        } catch (DataAccessException ex) {
            logger.error(ex.getMessage(), ex);
            throw new BusinessException(ExceptionEnumCode.DB_ERR,
                    MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), ex);
        }
    }
}
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -120,7 +120,8 @@
        if (StringUtils.isNotBlank(createrUser)) {
            SysUser sysUser = sysUserService.getSysUser(createrUser);
            // 不是管理员时,加入applyUserId
            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                    && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                params.put("createrUser", createrUser);
            }
        }
@@ -144,7 +145,8 @@
        if (StringUtils.isNotBlank(createrUser)) {
            SysUser sysUser = sysUserService.getSysUser(createrUser);
            // 不是管理员时,加入applyUserId
            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
            if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                    && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                params.put("createrUser", createrUser);
            }
        }