检验任务的缺漏代码

李林

2024-04-06 c7e24959364e65e6632e71546d607433560bb403

检验任务的缺漏代码

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

@@ -9,6 +9,8 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -114,5 +116,15 @@
    public Result selectDevicePrincipal() {
        return Result.success(deviceService.selectDevicePrincipal());
    }

    @ApiOperation(value = "通过设备分类获取设备列表")
    @PostMapping("/selectDeviceByCategory")
    @ValueAuth
    @ApiImplicitParams({
            @ApiImplicitParam(name = "category", value = "设备分类"),
    })
    public Result selectDeviceByCategory(String category) {
        return Result.success(deviceService.selectDeviceByCategory(category));
    }
}


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

@@ -90,7 +90,7 @@

    @ValueTableShow(6)
    @ApiModelProperty(value = "设备状态")
    private String deviceStatus;
    private Integer deviceStatus;

    @ValueTableShow(19)
    @ApiModelProperty(value = "存放点")

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

@@ -81,7 +81,6 @@
    @ApiModelProperty(value = "设备组")
    private String deviceGroup;

    @ValueTableShow(11)
    @ApiModelProperty(value = "检验次数")
    private Integer checkoutNumber;


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

@@ -28,5 +28,7 @@

    List<Device> selectDevicePrincipal();

    List<Device> selectDeviceByCategory(String category);

}


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

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

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
@@ -70,5 +71,10 @@
    public List<Device> selectDevicePrincipal() {
        return deviceMapper.selectDevicePrincipal();
    }

    @Override
    public List<Device> selectDeviceByCategory(String category) {
        return deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getLargeCategory, category).eq(Device::getDeviceStatus, 0));
    }
}


 framework/src/main/java/com/yuanchu/mom/mybatis_config/MyMetaObjectHandler.java

@@ -21,16 +21,24 @@

    @Override
    public void insertFill(MetaObject metaObject) {
        Integer userId = null;
        try {
            userId = Integer.parseInt(JSONUtil.parseObj(jwt.readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
        }catch (Exception ignored){}
        this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now()); // èµ·å§‹ç‰ˆæœ¬ 3.3.0(推荐使用)
        this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // èµ·å§‹ç‰ˆæœ¬ 3.3.0(推荐使用)
        this.strictInsertFill(metaObject, "createUser", Integer.class, Integer.parseInt(JSONUtil.parseObj(jwt.readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + ""));
        this.strictInsertFill(metaObject, "updateUser", Integer.class, Integer.parseInt(JSONUtil.parseObj(jwt.readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + ""));
        this.strictInsertFill(metaObject, "createUser", Integer.class, userId);
        this.strictInsertFill(metaObject, "updateUser", Integer.class, userId);
    }

    @Override
    public void updateFill(MetaObject metaObject) {
        Integer userId = null;
        try {
            userId = Integer.parseInt(JSONUtil.parseObj(jwt.readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
        }catch (Exception ignored){}
        // update的时候使用，更新的时候强制进行填充
        this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // èµ·å§‹ç‰ˆæœ¬ 3.3.0(推荐)
        this.strictUpdateFill(metaObject, "updateUser", Integer.class, Integer.parseInt(JSONUtil.parseObj(jwt.readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + ""));
        this.strictUpdateFill(metaObject, "updateUser", Integer.class, userId);
    }
}

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

@@ -6,6 +6,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.yuanchu.mom.service.InsOrderService;
@@ -113,4 +114,13 @@
        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
    }

    @ApiOperation(value = "通过检验单查询检验数据（数据查看）")
    @PostMapping("/selectSampleAndProductByOrderId")
    @ValueAuth
    public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
        return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
    }

}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -64,4 +65,12 @@
        int num = insOrderPlanService.submitPlan(orderId, laboratory);
        return num==1?Result.success():Result.fail("提交失败，部分项目还未进行检验");
    }

    @ApiOperation(value = "保存检验内容")
    @PostMapping("/saveInsContext")
    @ValueAuth
    public Result<?> saveInsContext(@RequestBody Map<String, Object> param){
        insOrderPlanService.saveInsContext(param);
        return Result.success();
    }
}

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

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

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import lombok.Data;

import java.io.Serializable;

@Data
public class SampleProductDto2 extends OrderBy implements Serializable {

    private Integer id;

    @ValueTableShow(name = "样品编号")
    private String sampleCode;

    @ValueTableShow(value = 2, name = "样品名称")
    private String sample;

    @ValueTableShow(value = 4, name = "样品型号")
    private String model;

    @ValueTableShow(value = 5, name = "样品状态")
    private Integer insState;

    @ValueTableShow(value = 15, name = "单位")
    private String unit;

    @ValueTableShow(value = 7, name = "检验项")
    private String inspectionItem;

    @ValueTableShow(value = 8, name = "检验子项")
    private String inspectionItemSubclass;

    @ValueTableShow(value = 17, name = "实验室")
    private String sonLaboratory;

    private String inspectionItemType;

    @ValueTableShow(value = 11, name = "检验值类型")
    private String inspectionValueType;

    @ValueTableShow(value = 12, name = "要求值")
    private String ask;

    @ValueTableShow(value = 13, name = "最终值")
    private String lastValue;

    @ValueTableShow(value = 14, name = "是否合格")
    private Integer insResult;

    @ValueTableShow(value = 16, name = "设备")
    private String equipValue;

}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;

import java.util.List;
@@ -25,6 +26,8 @@

    String getLaboratoryCode(String name);

    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew);

}



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

@@ -5,8 +5,8 @@

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product_result】的数据库操作Mapper
* @createDate 2024-03-08 09:45:20
* @description é’ˆå¯¹è¡¨ã€ins_product_result(检验项目的结果)】的数据库操作Mapper
* @createDate 2024-03-28 10:29:37
* @Entity com.yuanchu.mom.pojo.InsProductResult
*/
public interface InsProductResultMapper extends BaseMapper<InsProductResult> {

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

@@ -188,4 +188,7 @@

    @TableField(exist = false)
    private Map<String, Object> style;

    @TableField(exist = false)
    private InsProductResult insProductResult;
}

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

@@ -11,7 +11,7 @@
import lombok.Data;

/**
 * 
 * æ£€éªŒé¡¹ç›®çš„结果
 * @TableName ins_product_result
 */
@TableName(value ="ins_product_result")
@@ -20,7 +20,7 @@
    /**
     * 
     */
    @TableId
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
@@ -34,34 +34,26 @@
    private String insValue;

    /**
     * 1：合格 0：不合格
     * è®¡ç®—值
     */
    private Integer insResult;
    private String comValue;

    /**
     * æœ€ç»ˆå€¼
     * è®¾å¤‡å€¼
     */
    private String lastValue;
    private String equipValue;

    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    /**
     *
     */

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

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;
    /**
     *
     */

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -15,6 +15,8 @@

    boolean claimInsOrderPlan(InsOrderPlanDTO entity);

    void saveInsContext(Map<String, Object> insContext);

    Map<String, Object> doInsOrder(Integer id, String laboratory);

    int upPlanUser(Integer userId, Integer orderId);

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

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.pojo.InsOrder;

import java.util.List;
@@ -32,4 +29,6 @@

    Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);

    Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);

}

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

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

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

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product_result(检验项目的结果)】的数据库操作Service
* @createDate 2024-03-28 10:29:37
*/
public interface InsProductResultService extends IService<InsProductResult> {

}

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

@@ -17,9 +17,9 @@
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
@@ -40,6 +40,8 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;

/**
 * æ£€éªŒä»»åŠ¡-业务实现层
@@ -73,6 +75,10 @@

    @Resource
    private InsReportMapper insReportMapper;

    private InsProductResultMapper insProductResultMapper;

    private InsProductMapper insProductMapper;

    @Override
    public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
@@ -147,7 +153,7 @@
                                }
                            }
                            if (tableData.size() > 0) {
                                if (Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) {
                                if ((Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) && !(o.get("v") + "").equals("{\"ht\":\"0\"}")) {
                                    r = Integer.parseInt(o.get("r") + "");
                                    tableData.add(o);
                                } else {
@@ -166,6 +172,79 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveInsContext(Map<String, Object> insContext) {
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        CompletableFuture.supplyAsync(() -> {
            AtomicInteger count = new AtomicInteger();
            insContext.forEach((k, v) -> {
                JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
                InsProduct insProduct = new InsProduct();
                insProduct.setId(Integer.parseInt(k));
                InsProductResult result = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
                if (BeanUtil.isEmpty(result)) {
                    result = new InsProductResult();
                }
                result.setInsProductId(Integer.parseInt(k));
                JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
                List<Map<String, Object>> iv = new ArrayList<>();
                for (Object o : jsonArray) {
                    JSONObject insValue = JSON.parseObject(JSON.toJSONString(o));
                    Map<String, Object> map = new HashMap<>();
                    map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
                    if (insValue.get("u") == null && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
                        map.put("u", userId);
                    }else {
                        map.put("u", insValue.get("u"));
                    }
                    iv.add(map);
                }
                result.setInsValue(JSON.toJSONString(iv));
                JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("comValue")));
                List<Map<String, Object>> cv = new ArrayList<>();
                for (Object o : jsonArray2) {
                    JSONObject comValue = JSON.parseObject(JSON.toJSONString(o));
                    Map<String, Object> map = new HashMap<>();
                    map.put("v", JSON.parseObject(JSON.toJSONString(comValue.get("v"))).get("v"));
                    cv.add(map);
                }
                result.setComValue(JSON.toJSONString(cv));
                JSONObject resValue = JSON.parseObject(JSON.toJSONString(jo.get("resValue")));
                insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
                JSONObject equipValue = JSON.parseObject(JSON.toJSONString(jo.get("equipValue")));
                try {
                    result.setEquipValue(JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v") + "");
                }catch (Exception ignored){
                    result.setEquipValue(null);
                }
                JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
                insProduct.setInsResult(Integer.parseInt(JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + ""));
                if (BeanUtil.isEmpty(result.getId())) {
                    result.setCreateUser(userId);
                    result.setUpdateUser(userId);
                    insProductResultMapper.insert(result);
                } else {
                    result.setUpdateUser(userId);
                    result.setUpdateTime(LocalDateTime.now());
                    insProductResultMapper.updateById(result);
                }
                insProduct.setUpdateUser(userId);
                insProductMapper.updateById(insProduct);
                if(count.get() == 0){
                    InsSample insSample = insSampleMapper.selectById(insProductMapper.selectById(insProduct.getId()).getInsSampleId());
                    insSample.setInsState(1);
                    count.addAndGet(1);
                }
            });
            return null;
        }).thenAccept(res -> {
        }).exceptionally(e -> {
            e.printStackTrace();
            return null;
        });
    }

    @Override
    public int upPlanUser(Integer userId, Integer orderId) {
        InsSampleUser insSampleUser = new InsSampleUser();
        insSampleUser.setUserId(userId);

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

@@ -9,10 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderService;
@@ -144,6 +141,14 @@
        map.put("sampleProduct", list);
        return map;
    }

    @Override
    public Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(SampleProductDto2.class));
        map.put("body", insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto)));
        return map;
    }
}



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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.service.InsProductResultService;
import com.yuanchu.mom.mapper.InsProductResultMapper;
import org.springframework.stereotype.Service;

/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€ins_product_result(检验项目的结果)】的数据库操作Service实现
* @createDate 2024-03-28 10:29:37
*/
@Service
public class InsProductResultServiceImpl extends ServiceImpl<InsProductResultMapper, InsProductResult>
    implements InsProductResultService{

}





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

@@ -87,7 +87,8 @@
        FROM
        ins_order io
        LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
        LEFT JOIN ( SELECT id, ins_order_id, is_ratify FROM ins_report WHERE is_ratify = 1 ) ir ON io.id = ir.ins_order_id
        LEFT JOIN ( SELECT id, ins_order_id, is_ratify FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
        ir.ins_order_id
        GROUP BY
        io.id
        ) a
@@ -96,9 +97,25 @@
        </if>
    </select>
    <select id="getLaboratoryCode" resultType="java.lang.String">
        select laboratory_number from laboratory
        select laboratory_number
        from laboratory
        where laboratory_name = #{name}
    </select>
    <select id="selectSampleAndProductByOrderId" resultType="com.yuanchu.mom.dto.SampleProductDto2">
        select *
        from (
        select i.id,isa.sample_code,isa.sample,isa.model,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
        ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.ask,ip.`last_value`,ip.ins_result,ipr.equip_value
        from ins_sample isa
        left join ins_order i on isa.ins_order_id = i.id
        left join ins_product ip on isa.id = ip.ins_sample_id
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
        where ip.state = 1
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>

    <update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
        UPDATE ins_order

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

@@ -8,17 +8,11 @@
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="insProductId" column="ins_product_id" jdbcType="INTEGER"/>
            <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
            <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
            <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
            <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
            <result property="equipValue" column="equip_value" 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,ins_product_id,ins_value,
        ins_result,last_value,create_user,
        update_user,create_time,update_time
    </sql>
</mapper>

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

@@ -101,9 +101,13 @@
               ip.update_user ip_update_user,
               ip.create_time ip_create_time,
               ip.update_time ip_update_time,
               template_id
               template_id,
               ipr.ins_value,
               ipr.com_value,
               ipr.equip_value
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
        where ins_order_id = #{id}
        and state = 1
    </select>
@@ -208,5 +212,12 @@
        <result property="createTime" column="ip_create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="template_id" jdbcType="INTEGER"/>
        <collection property="insProductResult" resultMap="insProductResult"/>
    </resultMap>

    <resultMap id="insProductResult" type="com.yuanchu.mom.pojo.InsProductResult">
        <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
        <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
        <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
    </resultMap>
</mapper>

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -150,8 +150,15 @@

    @ValueAuth
    @GetMapping("/getUserNow")
    @ApiOperation(value = "获取当前登录的用户信息")
    @ApiOperation(value = "获取当前登录的客户信息")
    public Result<?> getUserNow(){
        return Result.success(userService.getUserNow());
    }

    @ValueAuth
    @GetMapping("/getUserInfo")
    @ApiOperation(value = "获取当前登录的用户信息")
    public Result<?> getUserInfo(){
        return Result.success(userService.getUserInfo());
    }
}

 user-server/src/main/java/com/yuanchu/mom/service/UserService.java

@@ -28,4 +28,6 @@

    User getUserNow();

    User getUserInfo();

}

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -80,4 +80,10 @@
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
        return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId,User::getCompany,User::getName,User::getCode));
    }

    @Override
    public User getUserInfo() {
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
        return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).select(User::getId,User::getCompany,User::getName,User::getCode));
    }
}