培训后优化

zss

2024-10-31 0644a19b927f4cd40ce45552b01064bb9b6521ad

培训后优化

 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java

@@ -23,5 +23,5 @@
    private Integer isLeave;

    private LocalDate issueTime;

    private String issueName;
}

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

@@ -1112,8 +1112,8 @@
        info.setViewStatus(false);
        info.setJumpPath("b1-inspect-order-plan");
        informationNotificationService.addInformationNotification(info);
        //todo 企业微信消息推送@zss
            HashMap<String, Object> map = new HashMap<>();
        // todo 企业微信消息推送@zss
            /*HashMap<String, Object> map = new HashMap<>();
            String account = userMapper.selectById(userId).getAccount();
            map.put("touser", account);//接收消息成员的账号'ZT-031292'这种类型(如果有多个用'|'分隔)
            map.put("toparty", "");//接收部门id
@@ -1126,7 +1126,7 @@
            map.put("safe", 0);//是否保密消息.0否
            map.put("enable_id_trans", 0);//是否开启id转译.0否
            map.put("enable_duplicate_check", 0);//是否开启重复消息检查.0否
            qywxApi.send(map);
            qywxApi.send(map);*/
//        }
        //复核人--检验单相关负责人
        InsSampleUser insSampleUser = new InsSampleUser();
@@ -1139,11 +1139,11 @@
        if (submitPlanDto.getLaboratory().equals("电路试验")) {
            wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
            //todo 电路站点报告 正式库部署放开
//            try {
//                wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
//            } catch (Exception e) {
//                throw new ErrorException("电路试验的站点报告生成有误,请联系开发人员调整!");
//            }
            /*try {
                wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
            } catch (Exception e) {
                throw new ErrorException("电路试验的站点报告生成有误,请联系开发人员调整!");
            }*/
        }
        /*// 删除数采采集次数
        String key = "frequency" + ":" + submitPlanDto.getEntrustCode() + ":*";

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

@@ -329,8 +329,8 @@
            //审核通过才会生成委托编号
            insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
            insOrder.setSendTime(LocalDateTime.now());
            /*todo 根据订单类型判断是否需要推送企业微信 @zss*/
            if (!order.getFormType().equals("其他成品")) {
            //todo 根据订单类型判断是否需要推送企业微信 @zss
            /*if (!order.getFormType().equals("其他成品")) {
                String account = userMapper.selectById(order.getIssueUser()).getAccount();
                HashMap<String, Object> map = new HashMap<>();
                map.put("touser", account);//接收消息成员的账号'ZT-031292'这种类型(如果有多个用'|'分隔)
@@ -343,7 +343,7 @@
                map.put("enable_id_trans", 0);//是否开启id转译.0否
                map.put("enable_duplicate_check", 0);//是否开启重复消息检查.0否
                qywxApi.send(map);
            }
            }*/
        }
        return insOrderMapper.updateById(insOrder);
    }
@@ -528,15 +528,6 @@
    public List<SampleProductDto3> labelPrinting(String ids) {
        List<Integer> list = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
        List<SampleProductDto3> sampleProductDtos = insSampleMapper.selectSampleProductListByOrderId3(list);
        Set<String> processedCodes = new HashSet<>();
       /* List<SampleProductDto3> sampleProductDto3s = sampleProductDtos.stream().filter(sampleProductDto3 -> {
            if (processedCodes.contains(sampleProductDto3.getCode())) {
                return false;
            } else {
                processedCodes.add(sampleProductDto3.getCode());
                return true;
            }
        }).collect(Collectors.toList());*/
        return sampleProductDtos;
    }


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

@@ -41,11 +41,15 @@

    @Override
    public int updateInspected(Integer id, String ids) {
        InsOrder insOrder = new InsOrder();
        insOrder.setId(id);
        InsOrder insOrder = insOrderMapper.selectById(id);
        insOrder.setIsRevocation(1);//需要审核
        insOrder.setRevocationInsProductIds(ids);
        return insOrderMapper.updateById(insOrder);
        insOrderMapper.updateById(insOrder);
        //如果是内部单无需审核撤销
        if (insOrder.getOrderType().equals("C")) {
            checkUpdate(id, 1);
        }
        return 1;
    }

    @Override

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -538,10 +538,12 @@
        ip.model ip_model,
        ip.state,
        io.issue_time,
        u.name issueName,
        ins_sample_id
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        left join ins_order io on io.id = ins_order_id
        left join user u on io.issue_user = u.id
        where ip.state = 1
        and ins_order_id in
        <foreach collection="ids" open="(" close=")" item="id" separator=",">
@@ -854,6 +856,7 @@
        <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="issueTime" column="issue_time" />
        <result property="issueName" column="issueName" />
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>