value
2023-08-26 783c5e37fbe6b689f8e14d8e9691dbe81f4e799a
新增报告预览数据接口
已修改6个文件
已删除2个文件
233 ■■■■ 文件已修改
framework/src/main/java/com/yuanchu/limslaboratory/controllerServerApi/LaboratoryServerApi.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/limslaboratory/utils/HttpUtils.java 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/resources/mapper/ReportMapper.xml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/limslaboratory/controllerServerApi/LaboratoryServerApi.java
ÎļþÒÑɾ³ý
framework/src/main/java/com/yuanchu/limslaboratory/utils/HttpUtils.java
ÎļþÒÑɾ³ý
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -84,5 +84,14 @@
        return Result.success(reportService.delreport(id));
    }
    @ApiOperation("获取报告内的数据")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "code", value = "报告单号", dataTypeClass = String.class, required = true)
    })
    @PostMapping("/getReportContext")
    public Result getReportContext(String code) {
        return Result.success(reportService.getReportContext(code));
    }
}
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
@@ -6,6 +6,8 @@
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import java.util.Map;
/**
 * <p>
 *  Mapper æŽ¥å£
@@ -23,6 +25,8 @@
     */
    IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
    Map<String, Object> getReportContext(String code);
}
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
@@ -6,6 +6,8 @@
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import java.util.Map;
/**
 * <p>
 * æœåŠ¡ç±»
@@ -45,5 +47,7 @@
     * @return
     */
    String delreport(Integer id);
    Map<String, Object> getReportContext(String code);
}
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
/**
 * <p>
@@ -69,5 +70,10 @@
        return "删除成功!";
    }
    @Override
    public Map<String, Object> getReportContext(String code) {
        return reportMapper.getReportContext(code);
    }
}
inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -32,4 +32,38 @@
        order by r.id
    </select>
    <resultMap id="report" type="map">
        <id property="rcode" column="rcode"/>
        <result property="name" column="name"/>
        <result property="specifications" column="specifications"/>
        <result property="supplier" column="supplier"/>
        <result property="insCode" column="ins_code"/>
        <result property="type" column="type"/>
        <collection property="products" resultMap="products" javaType="java.util.List"/>
    </resultMap>
    <resultMap id="products" type="map">
        <id property="code" column="id"/>
        <result property="ipName" column="ip_name"/>
        <result property="unit" column="unit"/>
        <result property="required" column="required"/>
        <result property="testValue" column="test_value"/>
        <result property="testState" column="test_state"/>
    </resultMap>
    <select id="getReportContext" resultMap="report">
        SELECT r.`code` rcode,im.`name`,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
        FROM report r
                 LEFT JOIN inspection i
                           ON r.inspection_id = i.id
                 LEFT JOIN inspection_material im
                           ON im.inspection_id = i.id
                 LEFT JOIN inspection_product ip
                           ON ip.inspection_material_id = im.id
        WHERE ip.state != 0
          and im.state != 0
          and i.state != 0
          and r.`code` = #{code}
    </select>
</mapper>
user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
@@ -1,6 +1,5 @@
package com.yuanchu.limslaboratory.clients;
import com.yuanchu.limslaboratory.controllerServerApi.LaboratoryServerApi;
import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Menu;