修改bug

value

2023-09-01 a0849402cbf35d956eea058ba648922e4258a631

修改bug

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.enums.InterfaceType;
import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -14,7 +16,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -99,5 +100,11 @@
        return Result.success(reportService.getReportContext(code));
    }

    @GetMapping("/getEnterprise")
    @ApiOperation("获取企业信息")
    @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.checkTheReport,isAdd = true)
    public Result getEnterprise() {
        return Result.success(reportService.getEnterprise());
    }
}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;

@@ -49,5 +50,7 @@
    String delreport(Integer id);

    Map<String, Object> getReportContext(String code);

    Enterprise getEnterprise();
}


 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java

@@ -1,13 +1,17 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.EnterpriseMapper;
import com.yuanchu.limslaboratory.mapper.ReportMapper;
import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
@@ -25,6 +29,9 @@

    @Resource
    private ReportMapper reportMapper;

    @Resource
    private EnterpriseMapper enterpriseMapper;

    /**
     * 查询检验报告
@@ -75,5 +82,11 @@
        return reportMapper.getReportContext(code);
    }

    @Override
    public Enterprise getEnterprise() {
        return enterpriseMapper.selectOne(new QueryWrapper<Enterprise>());
    }


}


 inspection-server/src/main/resources/mapper/ReportMapper.xml

@@ -36,6 +36,7 @@
    <resultMap id="report" type="map">
        <id property="rcode" column="rcode"/>
        <result property="name" column="name"/>
        <result property="num" column="num"/>
        <result property="specifications" column="specifications"/>
        <result property="supplier" column="supplier"/>
        <result property="insCode" column="ins_code"/>
@@ -57,7 +58,7 @@
    </resultMap>

    <select id="getReportContext" resultMap="report">
        SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,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
        SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.num,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

 sys/src/main/resources/application-dev.yml

@@ -40,12 +40,12 @@
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: user
    password: 123456
#    url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    username: root
#    url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    username: user
#    password: 123456
    url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: root
    password: 123456
    druid:
      #   Druid数据源配置
      initialSize: 5 # 初始连接数
@@ -68,8 +68,8 @@
    # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突
    database: 0
    # redis服务器地址（默认为localhost）
    host: 192.168.110.209
#    host: localhost
#    host: 192.168.110.209
    host: localhost
    # redis端口（默认为6379）
    port: 6380
    # redis访问密码（默认为空）

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java

@@ -1,17 +1,15 @@
package com.yuanchu.limslaboratory.pojo;

import com.baomidou.mybatisplus.annotation.*;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;

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

/**
 * <p>
@@ -36,6 +34,9 @@
    @ApiModelProperty(value = "企业名字")
    private String name;

    @ApiModelProperty(value = "企业英文名字")
    private String nameEn;

    @ApiModelProperty(value = "企业简称")
    private String byname;

@@ -45,6 +46,18 @@
    @ApiModelProperty(value = "联系人电话")
    private String linkPhone;

    @ApiModelProperty(value = "企业地址")
    private String address;

    @ApiModelProperty(value = "英文企业地址")
    private String addressEn;

    @ApiModelProperty(value = "邮政编码")
    private String code;

    @ApiModelProperty(value = "邮箱")
    private String email;

    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
    private Date createTime;