功能大调整

李林

2024-03-22 53da067c76ca7d4406b57c1a78565bd7b990868d

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

@@ -1,8 +1,11 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
@@ -27,10 +30,7 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @author gaoaoy
@@ -67,20 +67,19 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
    public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
        InsOrder insOrder = new InsOrder();
        insOrder.setId(orderId);
        insOrder.setAppointed(LocalDate.parse(appointed));
        insOrder.setSendTime(LocalDateTime.now());
        insOrderMapper.updateById(insOrder);
        InsSample insSample = new InsSample();
        insSample.setId(sampleId);
        insSample.setAppointed(LocalDate.parse(appointed));
        insSample.setSendTime(LocalDateTime.now());
        insSampleMapper.updateById(insSample);
        InsSampleUser insSampleUser = new InsSampleUser();
        insSampleUser.setState(0);
        insSampleUser.setUserId(userId);
        insSampleUser.setInsSampleId(sampleId);
        insSampleUserMapper.insert(insSampleUser);
        if(userId!=null){
            InsSampleUser insSampleUser = new InsSampleUser();
            insSampleUser.setState(0);
            insSampleUser.setUserId(userId);
            insSampleUser.setInsSampleId(orderId);
            insSampleUserMapper.insert(insSampleUser);
        }
        return 1;
    }

@@ -88,14 +87,17 @@
    @Transactional(rollbackFor = Exception.class)
    public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
        insOrder.setState(0);
        insOrder.setEntrustCode(giveCode.giveCode("JCZX-", "ins_order"));
        String code = insOrderMapper.getLaboratoryCode(insOrder.getLaboratory());
        insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
        insOrderMapper.insert(insOrder);
        list.forEach(a->{
        list.forEach(a -> {
            a.setId(null);
            a.setInsOrderId(insOrder.getId());
            a.setInsProgress(0);
            if(StrUtil.isEmpty(a.getSampleCode())){
                a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
            }
            insSampleMapper.insert(a);
            if(ObjectUtil.isNotEmpty(a.getInsProduct())){
            if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
                for (InsProduct product : a.getInsProduct()) {
                    product.setId(null);
                    product.setCreateTime(null);