Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-06-21 4d3856e802d5c9d28d8654f35da426bdb517d7d4

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

@@ -15,6 +15,7 @@
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.DuplicateKeyException;
@@ -41,10 +42,13 @@

    @Resource(name = "opeApplyDao")
    OpeApplyDao opeApplyDao;
    @Lazy
    @Resource
    OpeOrderService opeOrderService;
    @Lazy
    @Resource
    OpeReagentStatusService opeReagentStatusService;
    @Lazy
    @Resource
    OpeWarehouseReserveService opeWarehouseReserveService;

@@ -67,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);
             }

@@ -108,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);
                }
            }
@@ -147,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);
                }
            }
@@ -185,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);
             }

@@ -526,7 +534,7 @@
   }

    @Override
    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) {
    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentName);
@@ -534,7 +542,11 @@
            params.put("userId",id);
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            params.put("status",status);
            if (isExpired) {
                params.put("status",ApplyStatus.EXPIRED);
            }else{
                params.put("status", status);
            }
            params.put("isAllApply",isAllApply);
            return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
        } catch (DataAccessException e) {
@@ -545,7 +557,7 @@
    }
    @Override
    public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
                                                              Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) {
                                                              Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentName);
@@ -555,7 +567,11 @@
            params.put("pageSize", pageSize);
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            params.put("status",status);
            if (isExpired) {
                params.put("status",ApplyStatus.EXPIRED);
            }else{
                params.put("status", status);
            }
            params.put("isAllApply",isAllApply);
            return this.opeApplyDao.getOpeApplyReserveListFor(params);
        } catch (DataAccessException e) {