姑苏实验室去除价格确认过程

kongzy

2023-10-23 1eeae82f74cbb3469ad8931e45b6fc77a945b912

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

@@ -67,11 +67,13 @@
    SysSequenceService sysSequenceService;
   @Resource
   private SysUserService sysUserService;
    @Resource
    private BaseMetaService baseMetaService;

    @Transactional(propagation = Propagation.REQUIRED)
    public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
    public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, String controlProduct,Timestamp endDeadline, Integer status,
                                          String applyUserId, String approveUserId, String queryCas,
                                          Integer first, Integer pageSize,String applyCode,String applyUserName) {
                                          Integer first, Integer pageSize,String applyCode,String applyUserName,Byte isShow) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(reagentName)) {
@@ -80,6 +82,8 @@
            params.put("startDeadline", startDeadline);
            params.put("endDeadline", endDeadline);
            params.put("status", status);
            params.put("isShow", isShow);
            params.put("controlProduct", controlProduct);

            if (StringUtils.isNotBlank(applyUserId)) {
             SysUser sysUser = sysUserService.getSysUser(applyUserId);
@@ -191,8 +195,8 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
                                     String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName) {
    public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
                                     String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName,Byte isShow) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(reagentName)) {
@@ -201,6 +205,8 @@
            params.put("startDeadline", startDeadline);
            params.put("endDeadline", endDeadline);
            params.put("status", status);
            params.put("isShow", isShow);
            params.put("controlProduct", controlProduct);

          if (StringUtils.isNotBlank(applyUserId)) {
             SysUser sysUser = sysUserService.getSysUser(applyUserId);
@@ -556,7 +562,7 @@
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            if (isExpired) {
                params.put("status",ApplyStatus.EXPIRED);
                params.put("status",ApplyStatus.EXPIRED.getKey());
            }else{
                params.put("status", status);
            }
@@ -581,7 +587,7 @@
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            if (isExpired) {
                params.put("status",ApplyStatus.EXPIRED);
                params.put("status",ApplyStatus.EXPIRED.getKey());
            }else{
                params.put("status", status);
            }
@@ -863,7 +869,7 @@
                //申购数量
                opeApply.setNum(num);
                //申购人
                opeApply.setApplyUserId(user.getId());
                opeApply.setApplyUserId(applyUser.getId());
                //选择的审批人
                opeApply.setApproveUserId(approveUser.getId());
                //选择的课题组信息
@@ -884,4 +890,39 @@
        return opeApplyDao.getOpeApplyReserveListByNameForRowData(rowKey);
    }

    @Override
    public int getOpeApplySupplerRequireMngTotalCount(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int status, byte isShow) {
        Map<String, Object> params = new HashMap<>();
        params.put("reagentName",reagentName );
        params.put("startDeadline", startDeadline);
        params.put("endDeadline", endDeadline);
        params.put("status", status);
        params.put("isShow", isShow);
        //看到供应商是自己的单位的数据
        String company = baseMetaService.getBaseMetaValue(user.getCompany());
        if (user.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                && user.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
            params.put("company", company);
        }
        return this.opeApplyDao.getOpeApplySupplerRequireMngTotalCount(params);
    }

    @Override
    public List<OpeApply> getOpeApplySupplerRequireMngList(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int status, int first, int pageSize, byte isShow) {
        Map<String, Object> params = new HashMap<>();
        params.put("reagentName", reagentName);
        params.put("startDeadline", startDeadline);
        params.put("endDeadline", endDeadline);
        params.put("status", status);
        params.put("isShow", isShow);
        //看到供应商是自己的单位的数据
        String company = baseMetaService.getBaseMetaValue(user.getCompany());
        if (user.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
                && user.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
            params.put("company", company);
        }

        return this.opeApplyDao.getOpeApplySupplerRequireMngList(params);
    }

}