功能大调整

李林

2024-03-19 825da6ff9fbab76ca933930e35575cc8b0e811bd

功能大调整

 cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.StandardMethod;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.service.StandardMethodService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
@@ -37,4 +38,21 @@
        return Result.success(standardMethodService.selectStandardMethods());
    }

    @ApiOperation(value = "添加标准方法")
    @PostMapping("/addStandardMethod")
    public Result addStandardMethod(@RequestBody StandardMethod standardMethod) {
        return Result.success(standardMethodService.addStandardMethod(standardMethod));
    }

    @ApiOperation(value = "删除标准方法")
    @PostMapping("/delStandardMethod")
    public Result<?> delStandardMethod(Integer id) {
        return Result.success(standardMethodService.delStandardMethod(id));
    }

    @ApiOperation(value = "修改标准方法")
    @PostMapping("/upStandardMethod")
    public Result<?> upStandardMethod(@RequestBody StandardMethod standardMethod) {
        return Result.success(standardMethodService.upStandardMethod(standardMethod));
    }
}

 cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java

@@ -36,9 +36,15 @@
     * æ ‡å‡†æ–¹æ³•
     */
    @ValueTableShow(2)
    @ApiModelProperty(value = "标准方法")
    @ApiModelProperty(value = "标准描述")
    private String name;

    private Integer structureTestObjectId;

    @ValueTableShow(3)
    @ApiModelProperty("检验对象")
    private String sampleType;

    /**
     * å¤‡æ³¨
     */

 cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java

@@ -50,7 +50,7 @@
    private String unit;

    @ValueTableShow(5)
    @ApiModelProperty(value = "标准方法")
    @ApiModelProperty(value = "试验方法")
    private String method;

    @ValueTableShow(6)
@@ -99,7 +99,7 @@

    @ValueTableShow(5)
    @ApiModelProperty(value = "检验对象")
    private String sample;
    private Integer sample;

    @ValueTableShow(14)
    @ApiModelProperty(value = "原始记录模板")

 cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java

@@ -19,4 +19,10 @@

    List<StandardMethod> selectStandardMethods();

    int addStandardMethod(StandardMethod standardMethod);

    int delStandardMethod(Integer id);

    int upStandardMethod(StandardMethod standardMethod);

}

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java

@@ -6,6 +6,7 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.PageTestObjectDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.mapper.StructureTestObjectMapper;
import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -72,7 +73,10 @@

    @Override
    public int addTestObject(StructureTestObject testObject) {
        System.out.println(testObject);
        Long count = structureTestObjectMapper.selectCount(Wrappers.<StructureTestObject>lambdaQuery().eq(StructureTestObject::getSpecimenName, testObject.getSpecimenName()));
        if(count.compareTo(0L) > 0){
            throw new ErrorException("检验对象不能重复");
        }
        return structureTestObjectMapper.insert(testObject);
    }

@@ -88,7 +92,7 @@

    @Override
    public List<StructureTestObject> selectTestObjectByName() {
        return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName));
        return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId));
    }
}


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java

@@ -45,6 +45,21 @@
    public List<StandardMethod> selectStandardMethods() {
        return standardMethodMapper.selectList(Wrappers.<StandardMethod>lambdaQuery().select(StandardMethod::getId,StandardMethod::getCode,StandardMethod::getName));
    }

    @Override
    public int addStandardMethod(StandardMethod standardMethod) {
        return standardMethodMapper.insert(standardMethod);
    }

    @Override
    public int delStandardMethod(Integer id) {
        return standardMethodMapper.deleteById(id);
    }

    @Override
    public int upStandardMethod(StandardMethod standardMethod) {
        return standardMethodMapper.updateById(standardMethod);
    }
}



 cnas-server/src/main/resources/mapper/StandardMethodMapper.xml

@@ -25,6 +25,8 @@
        select sm.id,
        sm.code,
        sm.name,
        sm.structure_test_object_id,
        sto.specimen_name sample_type,
        sm.remark,
        u1.name create_user_name,
        sm.create_time,
@@ -33,6 +35,7 @@
        from standard_method sm
        left join user u1 on sm.create_user = u1.id
        left join user u2 on sm.update_user = u2.id
        left join structure_test_object sto on sm.structure_test_object_id = sto.id
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}

 framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java

@@ -42,8 +42,8 @@

    @Override
    protected void addInterceptors(InterceptorRegistry registry) {
        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
        registry.addInterceptor(powerConfig).addPathPatterns("/**");
//        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
//        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(logConfig).addPathPatterns("/**");
        super.addInterceptors(registry);
    }

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

@@ -4,22 +4,19 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -29,6 +26,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
@Api("检验单模块")
public class InsOrderController {

    private InsOrderService insOrderService;
@@ -36,6 +34,8 @@
    private InsSampleService insSampleService;

    private InsProductService insProductService;

    private InsOrderTemplateService insOrderTemplateService;

    //获取检验下单数据
    @ApiOperation(value = "查询检验下单数据")
@@ -48,7 +48,7 @@

    @ApiOperation(value = "检验下发")
    @PostMapping("/upInsOrder")
    public Result<?> upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
    }

@@ -69,4 +69,47 @@
        return Result.success("成功", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
    }

    @ApiOperation(value = "查询检验下单内容详情")
    @PostMapping("/getInsOrder")
    @ValueAuth
    public Result<?> getInsOrder(Integer orderId) {
        return Result.success(insOrderService.getInsOrder(orderId));
    }

    @ApiOperation(value = "审核检验单机进行状态修改")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "检验单id"),
            @ApiImplicitParam(name = "state", value = "审核结果 1:通过 2：不通过")
    })
    @PostMapping("/upInsOrderOfState")
    public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
        return Result.success(insOrderService.upInsOrderOfState(insOrder));
    }

    @ApiOperation(value = "添加检验单模板")
    @PostMapping("/addInsOrderTemplate")
    public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
        return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
    }

    @ApiOperation(value = "查询检验单模板")
    @GetMapping("/selectInsOrderTemplate")
    @ValueAuth
    public Result<?> selectInsOrderTemplate() {
        return Result.success(insOrderTemplateService.selectInsOrderTemplate());
    }

    @ApiOperation(value = "通过检验单模板id获取检验单模板内容")
    @PostMapping("/selectInsOrderTemplateById")
    @ValueAuth
    public Result<?> selectInsOrderTemplateById(Integer id) {
        return Result.success("成功", insOrderTemplateService.selectInsOrderTemplateById(id));
    }

    @ApiOperation(value = "删除检验单模板")
    @PostMapping("/delInsOrderTemplate")
    @ValueAuth
    public Result<?> delInsOrderTemplate(Integer id) {
        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
    }
}

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

@@ -92,4 +92,11 @@
        return Result.success(standardProductListService.selectStandardProductList(insSample));
    }

    @ApiOperation(value = "通过检验标准查询检验项目")
    @PostMapping("/selectStandardProductListByMethodId")
    @ValueAuth
    public Result selectStandardProductListByMethodId(Integer id){
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id));
    }

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java

@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsOrder;

import java.util.List;

/**
 * @author gaoaoy
 * @description é’ˆå¯¹è¡¨ã€ins_order(检验下单)】的数据库操作Mapper

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderTemplateMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order_template】的数据库操作Mapper
* @createDate 2024-03-18 14:14:54
* @Entity com.yuanchu.mom.pojo.InsOrderTemplate
*/
public interface InsOrderTemplateMapper extends BaseMapper<InsOrderTemplate> {

}





 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
* @author Administrator
@@ -18,6 +21,8 @@

    IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") InsOrderPlanDTO insOrderPlanDTO);

    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);

}



 inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java

@@ -1,6 +1,7 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.dto.FactoryDto;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,7 +20,9 @@

    StandardProductList selectStandardProductById(Integer id);

    List<StandardProductList> getStandardProductListBySample(String sample);
    List<StandardProductList> getStandardProductListBySample(String sampleType);

    List<StandardMethodList> getStandardMethodListBySample(String sampleType);

}


 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java

@@ -71,7 +71,7 @@
    * çº¦å®šæ—¶é—´
    */
    @ValueTableShow(7)
    @ApiModelProperty("需求时间")
    @ApiModelProperty("约定时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate appointed;

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderTemplate.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.Data;

/**
 * 
 * @TableName ins_order_template
 */
@TableName(value ="ins_order_template")
@Data
public class InsOrderTemplate implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * æ¨¡æ¿åç§°
     */
    @ApiModelProperty("模板名称")
    private String name;

    /**
     * æ¨¡æ¿å†…容
     */
    @ApiModelProperty("模板内容")
    private String thing;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java

@@ -135,6 +135,9 @@
    @ApiModelProperty("要求值")
    private String ask;

    @ApiModelProperty("要求值")
    private String tell;

    /**
     * å¤–键：标准方法id
     */
@@ -179,4 +182,7 @@
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @ApiModelProperty("1：有效 0：无效")
    private Integer state;
}

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

@@ -26,4 +26,8 @@

    int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);

    Map<String, Object> getInsOrder(Integer id);

    int upInsOrderOfState(InsOrder insOrder);

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order_template】的数据库操作Service
* @createDate 2024-03-18 14:14:54
*/
public interface InsOrderTemplateService extends IService<InsOrderTemplate> {

    int addInsOrderTemplate(InsOrderTemplate insOrderTemplate);

    List<InsOrderTemplate> selectInsOrderTemplate();

    String selectInsOrderTemplateById(Integer id);

    int delInsOrderTemplate(Integer id);

}

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

@@ -21,4 +21,6 @@

    List<StandardProductList> selectStandardProductList(InsSample insSample);

    List<StandardProductList> selectStandardProductListByMethodId(Integer id);

}

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

@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,6 +27,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;
@@ -93,17 +95,34 @@
            a.setInsOrderId(insOrder.getId());
            a.setInsProgress(0);
            insSampleMapper.insert(a);
            for (InsProduct product : a.getInsProduct()) {
                product.setId(null);
                product.setCreateTime(null);
                product.setUpdateTime(null);
                product.setUpdateTime(null);
                product.setUpdateUser(null);
                product.setInsSampleId(a.getId());
                insProductMapper.insert(product);
            if(ObjectUtil.isNotEmpty(a.getInsProduct())){
                for (InsProduct product : a.getInsProduct()) {
                    product.setId(null);
                    product.setCreateTime(null);
                    product.setUpdateTime(null);
                    product.setUpdateTime(null);
                    product.setUpdateUser(null);
                    product.setInsSampleId(a.getId());
                    insProductMapper.insert(product);
                }
            }
        });
        return 1;
        return insOrder.getId();
    }

    @Override
    public Map<String, Object> getInsOrder(Integer id) {
        Map<String, Object> map = new HashMap<>();
        List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId(id);
        InsOrder insOrder = insOrderMapper.selectById(id);
        map.put("insOrder", insOrder);
        map.put("sampleProduct", list);
        return map;
    }

    @Override
    public int upInsOrderOfState(InsOrder insOrder) {
        return insOrderMapper.updateById(insOrder);
    }
}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.yuanchu.mom.service.impl;

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.pojo.InsOrderTemplate;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.mapper.InsOrderTemplateMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_order_template】的数据库操作Service实现
* @createDate 2024-03-18 14:14:54
*/
@Service
@AllArgsConstructor
public class InsOrderTemplateServiceImpl extends ServiceImpl<InsOrderTemplateMapper, InsOrderTemplate>
    implements InsOrderTemplateService{

    private InsOrderTemplateMapper insOrderTemplateMapper;

    private GetLook getLook;

    @Override
    public int addInsOrderTemplate(InsOrderTemplate insOrderTemplate) {
        return insOrderTemplateMapper.insert(insOrderTemplate);
    }

    @Override
    public List<InsOrderTemplate> selectInsOrderTemplate() {
        return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery().eq(InsOrderTemplate::getCreateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")).select(InsOrderTemplate.class, info->!info.getColumn().equals("thing")));
    }

    @Override
    public String selectInsOrderTemplateById(Integer id) {
        return insOrderTemplateMapper.selectById(id).getThing();
    }

    @Override
    public int delInsOrderTemplate(Integer id) {
        return insOrderTemplateMapper.deleteById(id);
    }
}





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

@@ -78,32 +78,26 @@
    public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
        String[] trees = tree.split(" - ");
        List<StandardMethodList> standardMethodLists = null;
        List<StandardProductList> standardProductLists = null;
        switch (trees.length){
            case 5:
                standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],trees[3],trees[4]);
                standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2]).eq(StandardProductList::getSample, trees[3]).eq(StandardProductList::getModel, trees[4]));
//                standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2]).eq(StandardProductList::getSample, trees[3]).eq(StandardProductList::getModel, trees[4]));
                break;
            case 4:
                standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],trees[3],null);
                standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2]).eq(StandardProductList::getSample, trees[3]));
                break;
            case 3:
                standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],null,null);
                standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2]));
                break;
            case 2:
                standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],null,null,null);
                standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]));
                break;
            case 1:
                standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],null,null,null,null);
                standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]));
                break;
        }
        Map<String, List<?>> map = new HashMap<>();
        map.put("standardMethodList", standardMethodLists);
        map.put("standardProductList", standardProductLists);
        return map;
    }


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

@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +13,7 @@

import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -39,17 +41,41 @@
    @Override
    public List<StandardProductList> selectStandardProductList(InsSample insSample) {
        List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()).eq(StandardProductList::getModel, insSample.getModel()));
        if (list.size() == 0) {
            list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()));
        list = list.stream().filter(a -> {
            try {
                list = list.stream().filter(a -> {
                    String[] split = a.getSection().split("~");
                    return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
                }).collect(Collectors.toList());
            } catch (Exception e) {}
        }
                if(a.getSection()!=null && !Objects.equals(a.getSection(), "")){
                    if (a.getSection().contains("~")) {
                        String[] split = a.getSection().split("~");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
                    } else if (a.getSection().contains("≥") || a.getSection().contains(">=")) {
                        String param = a.getSection().replace("≥", "").replace(">=","");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > -1;
                    } else if (a.getSection().contains("≤") || a.getSection().contains("<=")) {
                        String param = a.getSection().replace("≤", "").replace("<=","");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 1;
                    } else if (a.getSection().contains(">")) {
                        String param = a.getSection().replace(">", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) > 0;
                    } else if (a.getSection().contains("<")) {
                        String param = a.getSection().replace("<", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) < 0;
                    } else if (a.getSection().contains("=")) {
                        String param = a.getSection().replace("=", "");
                        return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(param)) == 0;
                    }
                }
            } catch (Exception ignored) {
                return false;
            }
            return true;
        }).collect(Collectors.toList());
        return list;
    }

    @Override
    public List<StandardProductList> selectStandardProductListByMethodId(Integer id) {
        return standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, id));
    }
}



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

@@ -1,7 +1,9 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.FactoryDto;
@@ -11,9 +13,11 @@
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardMethodListService;
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -39,6 +43,8 @@

    private StandardProductListMapper standardProductListMapper;

    private StandardProductListService standardProductListService;

    @Override
    public List<FactoryDto> selectStandardTreeList() {
        return standardTreeMapper.selectStandardTreeList();
@@ -47,14 +53,28 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addStandardTree(StandardTree standardTree) {
        if(standardTree.getSample()!=null){
            List<StandardProductList> list = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType());
            for (StandardProductList standardProductList : list) {
        List<StandardProductList> productList = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType());
        List<StandardMethodList> methodList = standardTreeMapper.getStandardMethodListBySample(standardTree.getSampleType());
        for (StandardMethodList standardMethod : methodList) {
            standardMethod.setFactory(standardTree.getFactory());
            standardMethod.setLaboratory(standardTree.getLaboratory());
            standardMethod.setSampleType(standardTree.getSampleType());
            standardMethod.setSample(standardTree.getSample());
            standardMethod.setModel(standardTree.getModel());
            standardMethodListMapper.insert(standardMethod);
            for (StandardProductList standardProductList : productList) {
                standardProductList.setFactory(standardTree.getFactory());
                standardProductList.setLaboratory(standardTree.getLaboratory());
                standardProductList.setSampleType(standardTree.getSampleType());
                standardProductList.setSample(standardTree.getSample());
                standardProductList.setModel(standardTree.getModel());
                standardProductList.setStandardMethodListId(standardMethod.getId());
                standardProductList.setState(1);
                standardProductList.setId(null);
                standardProductList.setCreateUser(null);
                standardProductList.setCreateTime(null);
                standardProductList.setUpdateUser(null);
                standardProductList.setUpdateTime(null);
                standardProductListMapper.insert(standardProductList);
            }
        }
@@ -83,11 +103,15 @@
                break;
        }
        Map<String, List<?>> listMap = standardMethodListService.selectsStandardMethodByFLSSM(tree);
        if(listMap.get("standardMethodList").size() != 0){
        if (listMap.get("standardMethodList").size() != 0) {
            for (Object o : listMap.get("standardMethodList")) {
                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
                List<StandardProductList> list = standardProductListService.selectStandardProductListByMethodId((Integer) jsonObject.get("id"));
                if(list.size()!=0){
                    standardProductListMapper.deleteBatchIds(list);
                }
            }
            standardMethodListMapper.deleteBatchIds(listMap.get("standardMethodList"));
        }
        if(listMap.get("standardProductList").size() != 0){
            standardProductListMapper.deleteBatchIds(listMap.get("standardProductList"));
        }
        return 1;
    }
@@ -102,16 +126,20 @@
            standardProductList.setFactory(trees[0]);
            try {
                standardProductList.setLaboratory(trees[1]);
            }catch (Exception e){}
            } catch (Exception e) {
            }
            try {
                standardProductList.setSampleType(trees[2]);
            }catch (Exception e){}
            } catch (Exception e) {
            }
            try {
                standardProductList.setSample(trees[3]);
            }catch (Exception e){}
            } catch (Exception e) {
            }
            try {
                standardProductList.setModel(trees[4]);
            }catch (Exception e){}
            } catch (Exception e) {
            }
            standardProductListMapper.insert(standardProductList);
        }
        return 1;

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsOrderTemplateMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderTemplate">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="thing" column="thing" jdbcType="VARCHAR"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,name,thing,
        create_user,update_user,create_time,
        update_time
    </sql>
</mapper>

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

@@ -5,50 +5,43 @@
<mapper namespace="com.yuanchu.mom.mapper.InsProductMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
            <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
            <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
            <result property="factory" column="factory" jdbcType="VARCHAR"/>
            <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
            <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
            <result property="sample" column="sample" jdbcType="VARCHAR"/>
            <result property="model" column="model" jdbcType="VARCHAR"/>
            <result property="unit" column="unit" jdbcType="VARCHAR"/>
            <result property="price" column="price" jdbcType="DECIMAL"/>
            <result property="manHour" column="man_hour" jdbcType="INTEGER"/>
            <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
            <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
            <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
            <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
            <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
            <result property="section" column="section" jdbcType="VARCHAR"/>
            <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
            <result property="method" column="method" jdbcType="VARCHAR"/>
            <result property="manDay" column="man_day" jdbcType="INTEGER"/>
            <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
            <result property="ask" column="ask" jdbcType="VARCHAR"/>
            <result property="state" column="state" jdbcType="INTEGER"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="factory" column="factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
        <result property="unit" column="unit" jdbcType="VARCHAR"/>
        <result property="price" column="price" jdbcType="DECIMAL"/>
        <result property="manHour" column="man_hour" jdbcType="DOUBLE"/>
        <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
        <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
        <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
        <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
        <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
        <result property="section" column="section" jdbcType="VARCHAR"/>
        <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
        <result property="method" column="method" jdbcType="VARCHAR"/>
        <result property="manDay" column="man_day" jdbcType="INTEGER"/>
        <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
        <result property="ask" column="ask" jdbcType="VARCHAR"/>
        <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
        <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="template_id" jdbcType="INTEGER"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,inspection_item,inspection_item_classify,
        inspection_item_subclass,factory,laboratory,
        sample_type,sample,model,
        unit,price,man_hour,
        man_hour_group,inspection_item_type,inspection_value_type,
        device_group,checkout_number,section,
        value_type,method,man_day,
        bsm,ask,state,
        create_user,update_user,create_time,
        update_time
    </sql>
    <select id="selectOrderManDay" resultType="java.lang.Integer">
        select coalesce(sum(ip.man_day), 0) from ins_sample i
        select coalesce(max(ip.man_day), 0) from ins_sample i
        left join ins_product ip on i.id = ip.ins_sample_id
        where i.id = #{sampleId}
    </select>

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

@@ -5,96 +5,156 @@
<mapper namespace="com.yuanchu.mom.mapper.InsSampleMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsSample">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
            <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
            <result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
            <result property="joinName" column="join_name" jdbcType="VARCHAR"/>
            <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
            <result property="factory" column="factory" jdbcType="VARCHAR"/>
            <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
            <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
            <result property="sample" column="sample" jdbcType="VARCHAR"/>
            <result property="model" column="model" jdbcType="VARCHAR"/>
            <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
            <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
            <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
            <result property="insState" column="ins_state" jdbcType="INTEGER"/>
            <result property="sendTime" column="send_time" jdbcType="TIMESTAMP"/>
            <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
            <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
        <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
        <result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
        <result property="joinName" column="join_name" jdbcType="VARCHAR"/>
        <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
        <result property="factory" column="factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
        <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
        <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
        <result property="insState" column="ins_state" jdbcType="INTEGER"/>
        <result property="sendTime" column="send_time" jdbcType="TIMESTAMP"/>
        <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,ins_result,ins_order_id,
        join_model,join_name,sample_code,
        factory,laboratory,sample_type,
        sample,model,is_leave,
        leave_num,ins_progress,ins_state,
        send_time,join_num,remark,
        appointed,create_user,update_user,
        create_time,update_time
    </sql>
    <select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
        SELECT DISTINCT
            io.entrust_code,
            io.type,
            tempA.id,
            tempA.sample,
            tempA.sample_code,
            tempA.send_time,
            tempA.appointed,
            tempA.ins_state,
            tempA.ins_result,
            tempA.user_id,
            tempA.ins_order_id,
            tempA.sample_user_id,
            ipr.son_laboratory
        io.entrust_code,
        io.type,
        tempA.id,
        tempA.sample,
        tempA.sample_code,
        tempA.send_time,
        tempA.appointed,
        tempA.ins_state,
        tempA.ins_result,
        tempA.user_id,
        tempA.ins_order_id,
        tempA.sample_user_id,
        ipr.son_laboratory
        FROM
            (
                SELECT
                    temp.*
                FROM
                    (
                        SELECT
                            isa.id,
                            isa.sample,
                            isa.sample_code,
                            isa.send_time,
                            isa.appointed,
                            isa.ins_state,
                            isa.ins_result,
                            isu.user_id,
                            isa.ins_order_id,
                            isu.id as sample_user_id
                        FROM
                            ins_sample isa
                                LEFT JOIN ins_sample_user isu ON isa.id = isu.ins_sample_id
                    ) AS temp
                WHERE
                    temp.user_id = #{ew.userId}
                   OR ( SELECT COUNT(*) FROM ins_sample_user WHERE ins_sample_id = temp.id ) = 0
            ) AS tempA
                LEFT JOIN ins_order io ON tempA.ins_order_id = io.id
                LEFT JOIN ins_product ipr ON tempA.id = ipr.ins_sample_id
        (
        SELECT
        temp.*
        FROM
        (
        SELECT
        isa.id,
        isa.sample,
        isa.sample_code,
        isa.send_time,
        isa.appointed,
        isa.ins_state,
        isa.ins_result,
        isu.user_id,
        isa.ins_order_id,
        isu.id as sample_user_id
        FROM
        ins_sample isa
        LEFT JOIN ins_sample_user isu ON isa.id = isu.ins_sample_id
        ) AS temp
        WHERE
          io.state = #{ew.state}
          AND ipr.state = 1
          AND ipr.son_laboratory = #{ew.childrenLaboratory}
          <if test="ew.insState!=null and ew.insState!=''">
              AND tempA.ins_state = #{ew.insState}
          </if>
          <if test="ew.sampleName!=null and ew.sampleName!=''">
              AND tempA.sample like concat('%',#{ew.sampleName},'%')
          </if>
          <if test="ew.viewSelf==true">
              AND tempA.sample_user_id is not null
          </if>
          ORDER BY io.type DESC
        temp.user_id = #{ew.userId}
        OR ( SELECT COUNT(*) FROM ins_sample_user WHERE ins_sample_id = temp.id ) = 0
        ) AS tempA
        LEFT JOIN ins_order io ON tempA.ins_order_id = io.id
        LEFT JOIN ins_product ipr ON tempA.id = ipr.ins_sample_id
        WHERE
        io.state = #{ew.state}
        AND ipr.state = 1
        AND ipr.son_laboratory = #{ew.childrenLaboratory}
        <if test="ew.insState!=null and ew.insState!=''">
            AND tempA.ins_state = #{ew.insState}
        </if>
        <if test="ew.sampleName!=null and ew.sampleName!=''">
            AND tempA.sample like concat('%',#{ew.sampleName},'%')
        </if>
        <if test="ew.viewSelf==true">
            AND tempA.sample_user_id is not null
        </if>
        ORDER BY io.type DESC,tempA.id
    </select>

    <select id="selectSampleProductListByOrderId" resultMap="sampleDto">
        select isa.*,ip.id, inspection_item, inspection_item_classify, inspection_item_subclass, ip.factory, ip.laboratory, ip.sample_type, ip.sample, ip.model, son_laboratory, unit, price, man_hour, man_hour_group, inspection_item_type, inspection_value_type, device_group, checkout_number, section, value_type, method, man_day, bsm, ask, `last_value`, ip.ins_result, state, ins_sample_id, ip.create_user, ip.update_user, ip.create_time, ip.update_time, template_id
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        where ins_order_id = #{id}
    </select>

    <resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
        <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
        <result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
        <result property="joinName" column="join_name" jdbcType="VARCHAR"/>
        <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
        <result property="factory" column="factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="sample" jdbcType="VARCHAR"/>
        <result property="model" column="model" jdbcType="VARCHAR"/>
        <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
        <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
        <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
        <result property="insState" column="ins_state" jdbcType="INTEGER"/>
        <result property="sendTime" column="send_time" jdbcType="TIMESTAMP"/>
        <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <collection property="insProduct" resultMap="product"/>
    </resultMap>

    <resultMap id="product" type="com.yuanchu.mom.pojo.InsProduct">
        <id property="id" column="ip.id" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="factory" column="ip.factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="ip.laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="ip.sample_type" jdbcType="VARCHAR"/>
        <result property="sample" column="ip.sample" jdbcType="VARCHAR"/>
        <result property="model" column="ip.model" jdbcType="VARCHAR"/>
        <result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
        <result property="unit" column="unit" jdbcType="VARCHAR"/>
        <result property="price" column="price" jdbcType="DECIMAL"/>
        <result property="manHour" column="man_hour" jdbcType="DOUBLE"/>
        <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
        <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
        <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
        <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
        <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
        <result property="section" column="section" jdbcType="VARCHAR"/>
        <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
        <result property="method" column="method" jdbcType="VARCHAR"/>
        <result property="manDay" column="man_day" jdbcType="INTEGER"/>
        <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
        <result property="ask" column="ask" jdbcType="VARCHAR"/>
        <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
        <result property="insResult" column="ip.ins_result" jdbcType="INTEGER"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
        <result property="createUser" column="ip.create_user" jdbcType="INTEGER"/>
        <result property="updateUser" column="ip.update_user" jdbcType="INTEGER"/>
        <result property="createTime" column="ip.create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="ip.update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="ip.template_id" jdbcType="INTEGER"/>
    </resultMap>
</mapper>

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

@@ -47,6 +47,18 @@
        <if test="data5 != null">
            and model = #{data5}
        </if>
        <if test="data2 == null">
            and laboratory is null
        </if>
        <if test="data3 == null">
            and sample_type is null
        </if>
        <if test="data4 == null">
            and sample is null
        </if>
        <if test="data5 == null">
            and model is null 
        </if>
    </select>
    <select id="selectParameterList" resultType="standardProductList">
        select

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

@@ -76,7 +76,6 @@
    </select>
    <select id="getStandardProductListBySample" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select inspection_item,
               inspection_item_classify,
               inspection_item_subclass,
               laboratory,
               son_laboratory,
@@ -95,7 +94,13 @@
               sample,
               bsm,
               template_id
        from structure_item_parameter
        where sample = #{sample}
        from structure_item_parameter sp
        left join structure_test_object sto on sto.id = sp.sample
        where sto.specimen_name = #{sampleType}
    </select>
    <select id="getStandardMethodListBySample" resultType="com.yuanchu.mom.pojo.StandardMethodList">
        select sm.code,sm.name,sm.remark from standard_method sm
        left join structure_test_object sto on sm.structure_test_object_id = sto.id
        where sto.specimen_name = #{sampleType}
    </select>
</mapper>

 inspect-server/src/test/java/TestClass.java

ÎļþÒÑɾ³ý