检验任务添加一个撤销的功能(如果已经提交的撤销)

zss

2024-12-18 5bc0e587dc5dd7ca40f4285eed966429e69535e7

检验任务添加一个撤销的功能(如果已经提交的撤销)

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -124,6 +124,13 @@
        return num == 1 ? Result.success() : Result.fail("提交失败，部分项目还未进行检验");
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务撤销提交")
    @PostMapping("/cancelSubmitPlan")
    public Result cancelSubmitPlan(Integer orderStateId) {
        return Result.success(insOrderPlanService.cancelSubmitPlan(orderStateId));
    }

    @ValueClassify("设备")
    @ApiOperation(value = "是否允许修改采集值")
    @DeleteMapping("/isItAllowedToModifyTheCollectedValues")

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

@@ -41,6 +41,9 @@

    int submitPlan(SubmitPlanDto submitPlanDto);

    //撤销提交
    int cancelSubmitPlan(Integer orderStateId);

    List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
    List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num);

@@ -68,4 +71,6 @@
    int saveInsContext3(InsProductResult insProductResult);

    int saveInsContext2s(InsProductResultDtos insProductResultDtos);


}

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

@@ -1264,6 +1264,81 @@
        return 1;
    }

    @Override
    public int cancelSubmitPlan(Integer orderStateId) {
        InsOrderState orderState = insOrderStateMapper.selectById(orderStateId);
        InsOrder insOrder = insOrderMapper.selectById(orderState.getInsOrderId());
        InsSample insSample = insSampleMapper.selectById(orderState.getInsSampleId());
        /*删除记录检验任务每次的备注信息*/
        insOrderUserMapper.delete(Wrappers.<InsOrderUser>lambdaQuery()
        .eq(InsOrderUser::getInsOrderStateId,orderState.getId())
        .eq(InsOrderUser::getNum,orderState.getNum()));
        //撤销提交
        insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
                .eq(InsOrderState::getInsOrderId, orderState.getInsOrderId())
                .eq(InsOrderState::getInsSampleId, orderState.getInsSampleId())
                .eq(InsOrderState::getLaboratory, orderState.getLaboratory())
                .set(InsOrderState::getInsState, 2));
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        //LIMS系统消息推送
        InformationNotification info = new InformationNotification();
        info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
        info.setMessageType("2");
        info.setTheme("复核撤销通知");
        info.setContent("您有一条检验任务待复核已撤销的消息,订单号是：" + insOrder.getEntrustCode() + ",样品名称为：" + insSample.getSample());
        info.setSenderId(userId);
        info.setConsigneeId(orderState.getVerifyUser());
        info.setViewStatus(false);
        info.setJumpPath("b1-inspect-order-plan");
        informationNotificationService.addInformationNotification(info);
        //删除复核人--检验单相关负责人
        insSampleUserMapper.delete(Wrappers.<InsSampleUser>lambdaQuery()
        .eq(InsSampleUser::getState,1)
        .eq(InsSampleUser::getSonLaboratory,orderState.getLaboratory())
        .eq(InsSampleUser::getUserId,orderState.getVerifyUser())
        .eq(InsSampleUser::getInsSampleId,orderState.getInsSampleId()));
        //删除生成的报告
        if (orderState.getLaboratory().equals("电路试验")) {
            List<InsOrderFile> insOrderFiles = insOrderFileMapper.selectList(Wrappers.<InsOrderFile>lambdaQuery()
                    .eq(InsOrderFile::getType, 2)
                    .like(InsOrderFile::getFileName,"电路参数.docx")
                    .eq(InsOrderFile::getInsOrderId, insOrder.getId())
                    .eq(InsOrderFile::getInsSampleId, orderState.getInsSampleId())
                    .eq(InsOrderFile::getSonLaboratory, orderState.getLaboratory()));
            for (InsOrderFile insOrderFile : insOrderFiles) {
                File file = new File(wordUrl + "/" + insOrderFile.getFileUrl());
                file.delete();
                insOrderFileMapper.deleteById(insOrderFile.getId());
            }
        }

        /*删除生成产量工时*/
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, insSample.getId()));
        List<Integer> productIds = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
        auxiliaryOutputWorkingHoursMapper.delete(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
                .eq(AuxiliaryOutputWorkingHours::getSample,insSample.getSampleCode())
                .in(AuxiliaryOutputWorkingHours::getInsProductId,productIds)
                .eq(AuxiliaryOutputWorkingHours::getNum,orderState.getNum()));

        //  todo 企业微信消息推送@zss
        HashMap<String, Object> map = new HashMap<>();
        String account = userMapper.selectById(orderState.getVerifyUser()).getAccount();
        map.put("touser", account);//接收消息成员的账号'ZT-031292'这种类型(如果有多个用'|'分隔)
        map.put("toparty", "");//接收部门id
        map.put("totag", "");//消息标签id
        map.put("msgtype", "text");//消息类型 text:文本
        map.put("agentid", 1000517);//应用id
        HashMap<String, Object> hashMap = new HashMap<>();
        hashMap.put("content", "您有一条复核的消息已撤销,订单号是：" + insOrder.getEntrustCode() + ",样品名称为：" + insSample.getSample() +
                ",请前往LIMS系统查看。请点击<a href=\"https://ztwxlims.ztt.cn:7443/enter\">中天通信LIMS系统 </a>");
        map.put("text", hashMap);//消息内容
        map.put("safe", 0);//是否保密消息.0否
        map.put("enable_id_trans", 0);//是否开启id转译.0否
        map.put("enable_duplicate_check", 0);//是否开启重复消息检查.0否
        qywxApi.send(map);
        return 0;
    }

    public static String getWeek(String dayStr) {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        try {