修改接口

xuhy

3 天以前 a230f6653b7c87c3529bd5640886c22d688509c4

修改接口

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java

@@ -116,6 +116,7 @@
        TQaProduceReportDTO dto = JSON.parseObject(param,TQaProduceReportDTO.class);
        // 通过当前用户查询项目组
        Long userId = tokenService.getLoginUser().getUserId();
        String nickName = tokenService.getLoginUser().getUser().getNickName();
        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getUserId, userId)
                .last("LIMIT 1"));
@@ -149,6 +150,7 @@
                .like(TQaProduceReport::getReportCode, reportCode));
        reportCode = reportCode + "-" + String.format("%03d", count+1);
        dto.setReportCode(reportCode);
        dto.setDevelopPerson(nickName);
        qaProduceReportService.save(dto);
        // 添加检测报告文件
        List<TQaReportFile> qaReportFiles = dto.getQaReportFiles();

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFeasibilityReportFile.java

@@ -40,6 +40,10 @@
    @TableField("file_name")
    private String fileName;

    @ApiModelProperty(value = "文件地址")
    @TableField("file_url")
    private String fileUrl;

    @ApiModelProperty(value = "文件大小")
    @TableField("file_size")
    private Double fileSize;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java

@@ -65,7 +65,7 @@
    @TableField("report_type")
    private Integer reportType;

    @ApiModelProperty(value = "审批人")
    @ApiModelProperty(value = "审批人id")
    @TableField("audit_person_id")
    private Long auditPersonId;


 ruoyi-system/src/main/java/com/ruoyi/system/model/TQaReportFile.java

@@ -40,6 +40,10 @@
    @TableField("file_name")
    private String fileName;

    @ApiModelProperty(value = "文件地址")
    @TableField("file_url")
    private String fileUrl;

    @ApiModelProperty(value = "文件大小")
    @TableField("file_size")
    private Double fileSize;

 ruoyi-system/src/main/java/com/ruoyi/system/query/TQaProduceReportQuery.java

@@ -20,6 +20,9 @@
    @ApiModelProperty(value = "报告编号")
    private String reportCode;

    @ApiModelProperty(value = "报告类型 1=中试 2=辅料 3=产品报告")
    private Integer reportType;

    @ApiModelProperty(value = "状态  -1=草稿箱 1=待审核 2=已通过待评定 3=已评定 4=已驳回 5=已撤销 ")
    private Integer status;


 ruoyi-system/src/main/resources/mapper/system/TFeasibilityReportFileMapper.xml

@@ -8,6 +8,7 @@
        <result column="report_id" property="reportId" />
        <result column="file_name" property="fileName" />
        <result column="file_size" property="fileSize" />
        <result column="file_url" property="fileUrl" />
        <result column="status" property="status" />
        <result column="report_type" property="reportType" />
        <result column="create_time" property="createTime" />
@@ -16,7 +17,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, report_id, file_name, file_size, status, report_type, create_time, create_by
        id, report_id, file_name,file_url, file_size, status, report_type, create_time, create_by
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TQaProduceReportMapper.xml

@@ -47,17 +47,20 @@
            <if test="query.teamName != null and query.teamName != ''">
                and tpt.team_name like concat('%', #{query.teamName}, '%')
            </if>
            <if test="query.reportType != null">
                and tqpr.report_type = #{query.reportType}
            </if>
            <if test="query.status != null">
                and tqpr.status = #{query.status}
            </if>
            <if test="query.status == null">
                and tqpr.status != -1
            </if>
            <if test="query.teamIds != null and query.teamIds.size() > 0">
                and tqpr.team_id in
                <foreach collection="query.teamIds" item="teamId" open="(" separator="," close=")">
                    #{teamId}
                </foreach>
            </if>
            <if test="query.status == null">
                and tqpr.status != -1
            </if>
            AND tqpr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
@@ -80,6 +83,9 @@
            <if test="query.teamName != null and query.teamName != ''">
                and tpt.team_name like concat('%', #{query.teamName}, '%')
            </if>
            <if test="query.reportType != null">
                and tqpr.report_type = #{query.reportType}
            </if>
            <if test="query.status != null">
                and tqpr.status = #{query.status}
            </if>

 ruoyi-system/src/main/resources/mapper/system/TQaReportFileMapper.xml

@@ -8,6 +8,7 @@
        <result column="report_id" property="reportId" />
        <result column="file_name" property="fileName" />
        <result column="file_size" property="fileSize" />
        <result column="file_url" property="fileUrl" />
        <result column="status" property="status" />
        <result column="report_type" property="reportType" />
        <result column="create_time" property="createTime" />
@@ -16,7 +17,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, report_id, file_name, file_size, status, report_type, create_time, create_by
        id, report_id, file_name, file_size,file_url, status, report_type, create_time, create_by
    </sql>

</mapper>