检验任务筛选增加人员字段+检验和复核支持样品编号的修改

zss

2 天以前 e72766e5c5cceae416c0fa17ef075a01cd3fd396

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -139,16 +139,21 @@
        map.put("head", PrintChina.printChina(InsOrderPlanVO.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
        String laboratory = null;
        String userName = null;
        String myName = null;
        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
            userName = userMapper.selectById(map1.get("userId")).getName();
            myName = userMapper.selectById(map1.get("userId")).getName();
            insOrderPlanDTO.setUserId(null);
        }
        //检验人
        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserName())){
            myName=(ObjectUtils.isNotNull(myName)?myName+",":"")+insOrderPlanDTO.getUserName();
            insOrderPlanDTO.setUserName(null);
        }
        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
        insOrderPlanDTO.setSonLaboratory(null);
        String sampleCode = insOrderPlanDTO.getSampleCode();
        insOrderPlanDTO.setSampleCode(null);
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory,sampleCode);
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), myName, sonLaboratory, laboratory,sampleCode);
        map.put("body", insOrderPage);
        return map;
    }
@@ -928,6 +933,15 @@
        return 1;
    }

    //样品编号更改
    @Override
    public int changeSampleCode(Integer sampleId, String sampleCode) {
        InsSample insSample = new InsSample();
        insSample.setId(sampleId);
        insSample.setSampleCode(sampleCode);
        return  insSampleMapper.updateById(insSample);
    }

    /**
     * 震动doc文件解析
     * @param urlString