diff --git a/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReport.java b/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReport.java index 4f57984..2c13aac 100644 --- a/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReport.java +++ b/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReport.java @@ -2,13 +2,10 @@ package com.sztzjy.digital_credit.entity; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import org.springframework.format.annotation.DateTimeFormat; - /** * - * @author tz + * @author whb * stu_practical_training_report */ public class StuPracticalTrainingReport { @@ -18,8 +15,6 @@ public class StuPracticalTrainingReport { @ApiModelProperty("报告名称") private String reportName; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("上传时间") private Date uploadTime; @@ -49,6 +44,9 @@ public class StuPracticalTrainingReport { private Integer status; + @ApiModelProperty("大模块") + private String ascription; + public Integer getId() { return id; } @@ -144,4 +142,12 @@ public class StuPracticalTrainingReport { public void setStatus(Integer status) { this.status = status; } + + public String getAscription() { + return ascription; + } + + public void setAscription(String ascription) { + this.ascription = ascription == null ? null : ascription.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReportExample.java b/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReportExample.java index 9bdbd96..007d594 100644 --- a/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReportExample.java +++ b/src/main/java/com/sztzjy/digital_credit/entity/StuPracticalTrainingReportExample.java @@ -884,6 +884,76 @@ public class StuPracticalTrainingReportExample { addCriterion("status not between", value1, value2, "status"); return (Criteria) this; } + + public Criteria andAscriptionIsNull() { + addCriterion("ascription is null"); + return (Criteria) this; + } + + public Criteria andAscriptionIsNotNull() { + addCriterion("ascription is not null"); + return (Criteria) this; + } + + public Criteria andAscriptionEqualTo(String value) { + addCriterion("ascription =", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotEqualTo(String value) { + addCriterion("ascription <>", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionGreaterThan(String value) { + addCriterion("ascription >", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionGreaterThanOrEqualTo(String value) { + addCriterion("ascription >=", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionLessThan(String value) { + addCriterion("ascription <", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionLessThanOrEqualTo(String value) { + addCriterion("ascription <=", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionLike(String value) { + addCriterion("ascription like", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotLike(String value) { + addCriterion("ascription not like", value, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionIn(List values) { + addCriterion("ascription in", values, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotIn(List values) { + addCriterion("ascription not in", values, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionBetween(String value1, String value2) { + addCriterion("ascription between", value1, value2, "ascription"); + return (Criteria) this; + } + + public Criteria andAscriptionNotBetween(String value1, String value2) { + addCriterion("ascription not between", value1, value2, "ascription"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/digital_credit/entity/dto/StuBlockProductWithDTO.java b/src/main/java/com/sztzjy/digital_credit/entity/dto/StuBlockProductWithDTO.java index 39c6062..843b6de 100644 --- a/src/main/java/com/sztzjy/digital_credit/entity/dto/StuBlockProductWithDTO.java +++ b/src/main/java/com/sztzjy/digital_credit/entity/dto/StuBlockProductWithDTO.java @@ -1,37 +1,19 @@ package com.sztzjy.digital_credit.entity.dto; +import lombok.Data; + /** * @author 17803 * @date 2023-10-17 11:23 */ +@Data public class StuBlockProductWithDTO { private String module; private String schoolId; private String userId; + private String ascription; - public String getSchoolId() { - return schoolId; - } - - public void setSchoolId(String schoolId) { - this.schoolId = schoolId == null ? null : schoolId.trim(); - } - - public String getModule() { - return module; - } - - public void setModule(String module) { - this.module = module == null ? null : module.trim(); - } - - public String getUserId() { - return userId; - } - public void setUserId(String userId) { - this.userId = userId == null ? null : userId.trim(); - } } diff --git a/src/main/java/com/sztzjy/digital_credit/mapper/StuPracticalTrainingReportMapper.java b/src/main/java/com/sztzjy/digital_credit/mapper/StuPracticalTrainingReportMapper.java index 505527c..294478e 100644 --- a/src/main/java/com/sztzjy/digital_credit/mapper/StuPracticalTrainingReportMapper.java +++ b/src/main/java/com/sztzjy/digital_credit/mapper/StuPracticalTrainingReportMapper.java @@ -3,10 +3,8 @@ package com.sztzjy.digital_credit.mapper; import com.sztzjy.digital_credit.entity.StuPracticalTrainingReport; import com.sztzjy.digital_credit.entity.StuPracticalTrainingReportExample; import java.util.List; - -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -@Mapper + public interface StuPracticalTrainingReportMapper { long countByExample(StuPracticalTrainingReportExample example); diff --git a/src/main/java/com/sztzjy/digital_credit/service/impl/StuConceptBlockServiceImpl.java b/src/main/java/com/sztzjy/digital_credit/service/impl/StuConceptBlockServiceImpl.java index b33891e..2a2fd59 100644 --- a/src/main/java/com/sztzjy/digital_credit/service/impl/StuConceptBlockServiceImpl.java +++ b/src/main/java/com/sztzjy/digital_credit/service/impl/StuConceptBlockServiceImpl.java @@ -151,7 +151,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { } StuPracticalTrainingReportExample stuPracticalTrainingReportExample = new StuPracticalTrainingReportExample(); - stuPracticalTrainingReportExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId()).andModuleEqualTo(stuBlockProductWithBLOBs.getModule()); + stuPracticalTrainingReportExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId()).andModuleEqualTo(stuBlockProductWithBLOBs.getModule()).andAscriptionEqualTo(stuBlockProductWithBLOBs.getAscription()); List stuPracticalTrainingReports = stuPracticalTrainingReportMapper.selectByExample(stuPracticalTrainingReportExample); String originalFilename = file.getOriginalFilename(); @@ -188,6 +188,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { stuPracticalTrainingReport.setId(info); stuPracticalTrainingReport.setReportName(name + ".pdf"); stuPracticalTrainingReport.setModule(stuBlockProductWithBLOBs.getModule()); + stuPracticalTrainingReport.setAscription(stuBlockProductWithBLOBs.getAscription()); stuPracticalTrainingReport.setSize((int) fileSize); stuPracticalTrainingReport.setUploadTime(new Date()); stuPracticalTrainingReport.setUrl(url); @@ -209,6 +210,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { StuScoreDetails scoreDetails = new StuScoreDetails(); scoreDetails.setUserId(stuBlockProductWithBLOBs.getUserId()); scoreDetails.setModule(stuBlockProductWithBLOBs.getModule()); + scoreDetails.setAscription(stuBlockProductWithBLOBs.getAscription()); scoreDetails.setScoreWeight(reportWeight.doubleValue()); scoreDetails.setId(id); scoreDetails.setLearningProjects("实训报告"); @@ -280,6 +282,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { stuPracticalTrainingReport.setId(info); stuPracticalTrainingReport.setReportName(name + ".pdf"); stuPracticalTrainingReport.setModule(stuBlockProductWithBLOBs.getModule()); + stuPracticalTrainingReport.setAscription(stuBlockProductWithBLOBs.getAscription()); stuPracticalTrainingReport.setSize((int) fileSize); stuPracticalTrainingReport.setUploadTime(new Date()); stuPracticalTrainingReport.setUrl(upload); @@ -301,6 +304,7 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService { StuScoreDetails scoreDetails = new StuScoreDetails(); scoreDetails.setUserId(stuBlockProductWithBLOBs.getUserId()); scoreDetails.setModule(stuBlockProductWithBLOBs.getModule()); + scoreDetails.setAscription(stuBlockProductWithBLOBs.getAscription()); scoreDetails.setScoreWeight(reportWeight.doubleValue()); scoreDetails.setId(id); scoreDetails.setLearningProjects("实训报告"); diff --git a/src/main/resources/mappers/StuPracticalTrainingReportMapper.xml b/src/main/resources/mappers/StuPracticalTrainingReportMapper.xml index a51f00b..a9941ba 100644 --- a/src/main/resources/mappers/StuPracticalTrainingReportMapper.xml +++ b/src/main/resources/mappers/StuPracticalTrainingReportMapper.xml @@ -14,6 +14,7 @@ + @@ -75,7 +76,7 @@ id, report_name, upload_time, size, rating, module, userId, url, socre_id, teacher_comments, - school_id, status + school_id, status, ascription @@ -243,6 +250,9 @@ status = #{record.status,jdbcType=INTEGER}, + + ascription = #{record.ascription,jdbcType=VARCHAR}, + @@ -261,7 +271,8 @@ socre_id = #{record.socreId,jdbcType=INTEGER}, teacher_comments = #{record.teacherComments,jdbcType=VARCHAR}, school_id = #{record.schoolId,jdbcType=VARCHAR}, - status = #{record.status,jdbcType=INTEGER} + status = #{record.status,jdbcType=INTEGER}, + ascription = #{record.ascription,jdbcType=VARCHAR} @@ -302,6 +313,9 @@ status = #{status,jdbcType=INTEGER}, + + ascription = #{ascription,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} @@ -317,8 +331,8 @@ socre_id = #{socreId,jdbcType=INTEGER}, teacher_comments = #{teacherComments,jdbcType=VARCHAR}, school_id = #{schoolId,jdbcType=VARCHAR}, - status = #{status,jdbcType=INTEGER} + status = #{status,jdbcType=INTEGER}, + ascription = #{ascription,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} - \ No newline at end of file