From fe704bc0e5020a32d0d3e68ab58d9cbab15d300f Mon Sep 17 00:00:00 2001 From: wanghb <17803890193@163.com> Date: Thu, 7 Mar 2024 15:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=A1=88=E4=BE=8B=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E5=86=99=E6=AD=BB=E4=B8=80=E4=BA=9B=E8=B5=84=E6=96=99?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E6=9C=89=E5=AD=A6=E6=A0=A1=E9=83=BD=E5=8F=AF?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/TrainingLessonPlan.java | 75 +- .../entity/TrainingLessonPlanExample.java | 94 ++- .../mappers/TrainingLessonPlanMapper.java | 23 +- .../service/TrainingLessonPlanService.java | 9 +- .../mappers/TrainingLessonPlanMapper.xml | 649 +++++++++--------- 5 files changed, 482 insertions(+), 368 deletions(-) diff --git a/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlan.java b/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlan.java index 6068186..6509bca 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlan.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlan.java @@ -8,7 +8,7 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private String id; @@ -17,7 +17,7 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.name * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private String name; @@ -26,7 +26,7 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.file_path * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private String filePath; @@ -35,7 +35,7 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.school_id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private Integer schoolId; @@ -44,7 +44,7 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.creator_id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private Integer creatorId; @@ -53,7 +53,7 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.creator_name * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private String creatorName; @@ -62,17 +62,26 @@ public class TrainingLessonPlan { * This field was generated by MyBatis Generator. * This field corresponds to the database column sys_training_lesson_plan.create_time * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ private Date createTime; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column sys_training_lesson_plan.built_data + * + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 + */ + private Integer builtData; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column sys_training_lesson_plan.id * * @return the value of sys_training_lesson_plan.id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public String getId() { return id; @@ -84,7 +93,7 @@ public class TrainingLessonPlan { * * @param id the value for sys_training_lesson_plan.id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setId(String id) { this.id = id == null ? null : id.trim(); @@ -96,7 +105,7 @@ public class TrainingLessonPlan { * * @return the value of sys_training_lesson_plan.name * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public String getName() { return name; @@ -108,7 +117,7 @@ public class TrainingLessonPlan { * * @param name the value for sys_training_lesson_plan.name * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setName(String name) { this.name = name == null ? null : name.trim(); @@ -120,7 +129,7 @@ public class TrainingLessonPlan { * * @return the value of sys_training_lesson_plan.file_path * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public String getFilePath() { return filePath; @@ -132,7 +141,7 @@ public class TrainingLessonPlan { * * @param filePath the value for sys_training_lesson_plan.file_path * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setFilePath(String filePath) { this.filePath = filePath == null ? null : filePath.trim(); @@ -144,7 +153,7 @@ public class TrainingLessonPlan { * * @return the value of sys_training_lesson_plan.school_id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public Integer getSchoolId() { return schoolId; @@ -156,7 +165,7 @@ public class TrainingLessonPlan { * * @param schoolId the value for sys_training_lesson_plan.school_id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setSchoolId(Integer schoolId) { this.schoolId = schoolId; @@ -168,7 +177,7 @@ public class TrainingLessonPlan { * * @return the value of sys_training_lesson_plan.creator_id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public Integer getCreatorId() { return creatorId; @@ -180,7 +189,7 @@ public class TrainingLessonPlan { * * @param creatorId the value for sys_training_lesson_plan.creator_id * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setCreatorId(Integer creatorId) { this.creatorId = creatorId; @@ -192,7 +201,7 @@ public class TrainingLessonPlan { * * @return the value of sys_training_lesson_plan.creator_name * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public String getCreatorName() { return creatorName; @@ -204,7 +213,7 @@ public class TrainingLessonPlan { * * @param creatorName the value for sys_training_lesson_plan.creator_name * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setCreatorName(String creatorName) { this.creatorName = creatorName == null ? null : creatorName.trim(); @@ -216,7 +225,7 @@ public class TrainingLessonPlan { * * @return the value of sys_training_lesson_plan.create_time * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public Date getCreateTime() { return createTime; @@ -228,9 +237,33 @@ public class TrainingLessonPlan { * * @param createTime the value for sys_training_lesson_plan.create_time * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setCreateTime(Date createTime) { this.createTime = createTime; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column sys_training_lesson_plan.built_data + * + * @return the value of sys_training_lesson_plan.built_data + * + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 + */ + public Integer getBuiltData() { + return builtData; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column sys_training_lesson_plan.built_data + * + * @param builtData the value for sys_training_lesson_plan.built_data + * + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 + */ + public void setBuiltData(Integer builtData) { + this.builtData = builtData; + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlanExample.java b/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlanExample.java index f2cf7bb..16ff661 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlanExample.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/entity/TrainingLessonPlanExample.java @@ -9,7 +9,7 @@ public class TrainingLessonPlanExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ protected String orderByClause; @@ -17,7 +17,7 @@ public class TrainingLessonPlanExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ protected boolean distinct; @@ -25,7 +25,7 @@ public class TrainingLessonPlanExample { * This field was generated by MyBatis Generator. * This field corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ protected List oredCriteria; @@ -33,7 +33,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public TrainingLessonPlanExample() { oredCriteria = new ArrayList<>(); @@ -43,7 +43,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setOrderByClause(String orderByClause) { this.orderByClause = orderByClause; @@ -53,7 +53,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public String getOrderByClause() { return orderByClause; @@ -63,7 +63,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void setDistinct(boolean distinct) { this.distinct = distinct; @@ -73,7 +73,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public boolean isDistinct() { return distinct; @@ -83,7 +83,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public List getOredCriteria() { return oredCriteria; @@ -93,7 +93,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void or(Criteria criteria) { oredCriteria.add(criteria); @@ -103,7 +103,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public Criteria or() { Criteria criteria = createCriteriaInternal(); @@ -115,7 +115,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public Criteria createCriteria() { Criteria criteria = createCriteriaInternal(); @@ -129,7 +129,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ protected Criteria createCriteriaInternal() { Criteria criteria = new Criteria(); @@ -140,7 +140,7 @@ public class TrainingLessonPlanExample { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public void clear() { oredCriteria.clear(); @@ -152,7 +152,7 @@ public class TrainingLessonPlanExample { * This class was generated by MyBatis Generator. * This class corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ protected abstract static class GeneratedCriteria { protected List criteria; @@ -654,13 +654,73 @@ public class TrainingLessonPlanExample { addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } + + public Criteria andBuiltDataIsNull() { + addCriterion("built_data is null"); + return (Criteria) this; + } + + public Criteria andBuiltDataIsNotNull() { + addCriterion("built_data is not null"); + return (Criteria) this; + } + + public Criteria andBuiltDataEqualTo(Integer value) { + addCriterion("built_data =", value, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataNotEqualTo(Integer value) { + addCriterion("built_data <>", value, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataGreaterThan(Integer value) { + addCriterion("built_data >", value, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataGreaterThanOrEqualTo(Integer value) { + addCriterion("built_data >=", value, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataLessThan(Integer value) { + addCriterion("built_data <", value, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataLessThanOrEqualTo(Integer value) { + addCriterion("built_data <=", value, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataIn(List values) { + addCriterion("built_data in", values, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataNotIn(List values) { + addCriterion("built_data not in", values, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataBetween(Integer value1, Integer value2) { + addCriterion("built_data between", value1, value2, "builtData"); + return (Criteria) this; + } + + public Criteria andBuiltDataNotBetween(Integer value1, Integer value2) { + addCriterion("built_data not between", value1, value2, "builtData"); + return (Criteria) this; + } } /** * This class was generated by MyBatis Generator. * This class corresponds to the database table sys_training_lesson_plan * - * @mbg.generated do_not_delete_during_merge Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated do_not_delete_during_merge Thu Mar 07 15:03:26 CST 2024 */ public static class Criteria extends GeneratedCriteria { protected Criteria() { @@ -672,7 +732,7 @@ public class TrainingLessonPlanExample { * This class was generated by MyBatis Generator. * This class corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ public static class Criterion { private String condition; diff --git a/src/main/java/com/sztzjy/forex/trading_trading/mappers/TrainingLessonPlanMapper.java b/src/main/java/com/sztzjy/forex/trading_trading/mappers/TrainingLessonPlanMapper.java index dea0de8..4b4da1f 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/mappers/TrainingLessonPlanMapper.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/mappers/TrainingLessonPlanMapper.java @@ -6,14 +6,13 @@ import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; - @Mapper public interface TrainingLessonPlanMapper { /** * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ long countByExample(TrainingLessonPlanExample example); @@ -21,7 +20,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int deleteByExample(TrainingLessonPlanExample example); @@ -29,7 +28,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int deleteByPrimaryKey(String id); @@ -37,7 +36,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int insert(TrainingLessonPlan record); @@ -45,7 +44,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int insertSelective(TrainingLessonPlan record); @@ -53,7 +52,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ List selectByExample(TrainingLessonPlanExample example); @@ -61,7 +60,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ TrainingLessonPlan selectByPrimaryKey(String id); @@ -69,7 +68,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int updateByExampleSelective(@Param("record") TrainingLessonPlan record, @Param("example") TrainingLessonPlanExample example); @@ -77,7 +76,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int updateByExample(@Param("record") TrainingLessonPlan record, @Param("example") TrainingLessonPlanExample example); @@ -85,7 +84,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int updateByPrimaryKeySelective(TrainingLessonPlan record); @@ -93,7 +92,7 @@ public interface TrainingLessonPlanMapper { * This method was generated by MyBatis Generator. * This method corresponds to the database table sys_training_lesson_plan * - * @mbg.generated Thu Jul 06 16:31:12 CST 2023 + * @mbg.generated Thu Mar 07 15:03:26 CST 2024 */ int updateByPrimaryKey(TrainingLessonPlan record); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingLessonPlanService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingLessonPlanService.java index f0458ee..69625fd 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingLessonPlanService.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/service/TrainingLessonPlanService.java @@ -8,8 +8,10 @@ import com.sztzjy.forex.trading_trading.config.security.JwtUser; import com.sztzjy.forex.trading_trading.entity.TrainingLessonPlan; import com.sztzjy.forex.trading_trading.entity.TrainingLessonPlanExample; import com.sztzjy.forex.trading_trading.mappers.TrainingLessonPlanMapper; +import com.sztzjy.forex.trading_trading.util.ResultEntity; import com.sztzjy.forex.trading_trading.util.file.IFileUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -40,6 +42,7 @@ public class TrainingLessonPlanService { trainingLessonPlan.setCreatorId(Integer.valueOf(currentUser.getUserId())); trainingLessonPlan.setCreatorName(currentUser.getName()); trainingLessonPlan.setSchoolId(currentUser.getSchoolId()); + trainingLessonPlan.setBuiltData(0); trainingLessonPlanMapper.insert(trainingLessonPlan); } @@ -62,7 +65,8 @@ public class TrainingLessonPlanService { if (StringUtils.hasText(name)) { criteria.andNameLike('%' + name + '%'); } - // criteria.andSchoolIdEqualTo(currentUser.getSchoolId()); + example.or().andBuiltDataEqualTo(1); + criteria.andSchoolIdEqualTo(currentUser.getSchoolId()); return new PageInfo<>(trainingLessonPlanMapper.selectByExample(example)); @@ -71,6 +75,9 @@ public class TrainingLessonPlanService { public void deleteById(String id) { TrainingLessonPlan trainingLessonPlan = findById(id); + if (trainingLessonPlan.getBuiltData() == 1){ + return; + } Assert.notNull(trainingLessonPlan, "教案不存在"); fileUtil.remove(trainingLessonPlan.getFilePath()); trainingLessonPlanMapper.deleteByPrimaryKey(id); diff --git a/src/main/resources/mappers/TrainingLessonPlanMapper.xml b/src/main/resources/mappers/TrainingLessonPlanMapper.xml index 81a0adc..e7b5233 100644 --- a/src/main/resources/mappers/TrainingLessonPlanMapper.xml +++ b/src/main/resources/mappers/TrainingLessonPlanMapper.xml @@ -1,318 +1,333 @@ - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, name, file_path, school_id, creator_id, creator_name, create_time - - - - - - delete from sys_training_lesson_plan - where id = #{id,jdbcType=VARCHAR} - - - - delete from sys_training_lesson_plan - - - - - - - insert into sys_training_lesson_plan (id, name, file_path, - school_id, creator_id, creator_name, - create_time) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, - #{schoolId,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{creatorName,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}) - - - - insert into sys_training_lesson_plan - - - id, - - - name, - - - file_path, - - - school_id, - - - creator_id, - - - creator_name, - - - create_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{filePath,jdbcType=VARCHAR}, - - - #{schoolId,jdbcType=INTEGER}, - - - #{creatorId,jdbcType=INTEGER}, - - - #{creatorName,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - - update sys_training_lesson_plan - - - id = #{record.id,jdbcType=VARCHAR}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - file_path = #{record.filePath,jdbcType=VARCHAR}, - - - school_id = #{record.schoolId,jdbcType=INTEGER}, - - - creator_id = #{record.creatorId,jdbcType=INTEGER}, - - - creator_name = #{record.creatorName,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - - update sys_training_lesson_plan - set id = #{record.id,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, - file_path = #{record.filePath,jdbcType=VARCHAR}, - school_id = #{record.schoolId,jdbcType=INTEGER}, - creator_id = #{record.creatorId,jdbcType=INTEGER}, - creator_name = #{record.creatorName,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - - update sys_training_lesson_plan - - - name = #{name,jdbcType=VARCHAR}, - - - file_path = #{filePath,jdbcType=VARCHAR}, - - - school_id = #{schoolId,jdbcType=INTEGER}, - - - creator_id = #{creatorId,jdbcType=INTEGER}, - - - creator_name = #{creatorName,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=VARCHAR} - - - - update sys_training_lesson_plan - set name = #{name,jdbcType=VARCHAR}, - file_path = #{filePath,jdbcType=VARCHAR}, - school_id = #{schoolId,jdbcType=INTEGER}, - creator_id = #{creatorId,jdbcType=INTEGER}, - creator_name = #{creatorName,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=VARCHAR} - + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + id, name, file_path, school_id, creator_id, creator_name, create_time, built_data + + + + + + delete from sys_training_lesson_plan + where id = #{id,jdbcType=VARCHAR} + + + + delete from sys_training_lesson_plan + + + + + + + insert into sys_training_lesson_plan (id, name, file_path, + school_id, creator_id, creator_name, + create_time, built_data) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, + #{schoolId,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{creatorName,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{builtData,jdbcType=INTEGER}) + + + + insert into sys_training_lesson_plan + + + id, + + + name, + + + file_path, + + + school_id, + + + creator_id, + + + creator_name, + + + create_time, + + + built_data, + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{filePath,jdbcType=VARCHAR}, + + + #{schoolId,jdbcType=INTEGER}, + + + #{creatorId,jdbcType=INTEGER}, + + + #{creatorName,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{builtData,jdbcType=INTEGER}, + + + + + + + update sys_training_lesson_plan + + + id = #{record.id,jdbcType=VARCHAR}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + file_path = #{record.filePath,jdbcType=VARCHAR}, + + + school_id = #{record.schoolId,jdbcType=INTEGER}, + + + creator_id = #{record.creatorId,jdbcType=INTEGER}, + + + creator_name = #{record.creatorName,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + built_data = #{record.builtData,jdbcType=INTEGER}, + + + + + + + + + update sys_training_lesson_plan + set id = #{record.id,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, + file_path = #{record.filePath,jdbcType=VARCHAR}, + school_id = #{record.schoolId,jdbcType=INTEGER}, + creator_id = #{record.creatorId,jdbcType=INTEGER}, + creator_name = #{record.creatorName,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + built_data = #{record.builtData,jdbcType=INTEGER} + + + + + + + update sys_training_lesson_plan + + + name = #{name,jdbcType=VARCHAR}, + + + file_path = #{filePath,jdbcType=VARCHAR}, + + + school_id = #{schoolId,jdbcType=INTEGER}, + + + creator_id = #{creatorId,jdbcType=INTEGER}, + + + creator_name = #{creatorName,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + built_data = #{builtData,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=VARCHAR} + + + + update sys_training_lesson_plan + set name = #{name,jdbcType=VARCHAR}, + file_path = #{filePath,jdbcType=VARCHAR}, + school_id = #{schoolId,jdbcType=INTEGER}, + creator_id = #{creatorId,jdbcType=INTEGER}, + creator_name = #{creatorName,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + built_data = #{builtData,jdbcType=INTEGER} + where id = #{id,jdbcType=VARCHAR} + \ No newline at end of file