diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java index 278bf04..2cfc03d 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysAreaEntity.java @@ -29,9 +29,9 @@ public class SysAreaEntity implements Serializable { private String areaCode; private String areaName; private String areaType; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String parentCode; private String parentCodes; @@ -45,9 +45,9 @@ public class SysAreaEntity implements Serializable { private String treeNames; private BigDecimal treeSort; private String treeSorts; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; public SysAreaEntity() { diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java index 93aa65a..ed97ebb 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java @@ -29,9 +29,9 @@ public class SysCompanyEntity implements Serializable { private String companyName; private String corpCode; private String corpName; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String fullName; private String parentCode; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java index e801e9d..a063223 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysMenuEntity.java @@ -27,9 +27,9 @@ public class SysMenuEntity implements Serializable { @TableId private String menuCode; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String isShow; private String menuColor; @@ -51,9 +51,9 @@ public class SysMenuEntity implements Serializable { private String treeNames; private BigDecimal treeSort; private String treeSorts; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; private BigDecimal weight; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java index 6f3aa0b..583f7c4 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java @@ -26,9 +26,9 @@ public class SysOfficeEntity implements Serializable { private String address; private String corpCode; private String corpName; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String email; private String fullName; @@ -45,9 +45,9 @@ public class SysOfficeEntity implements Serializable { private String treeNames; private BigDecimal treeSort; private String treeSorts; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; private String viewCode; private String zipCode; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java index 883e7b1..1905959 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysPostEntity.java @@ -26,9 +26,9 @@ public class SysPostEntity extends Model implements Serializable private String postCode; private String corpCode; private String corpName; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String postName; private BigDecimal postSort; @@ -37,9 +37,9 @@ public class SysPostEntity extends Model implements Serializable @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private SysPostStatusEnum status; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; public SysPostEntity() { diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java index 974ba2f..b5a5ad8 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java @@ -22,9 +22,9 @@ public class SysRoleEntity implements Serializable { private String roleCode; private String corpCode; private String corpName; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String dataScope; private String isSys; @@ -33,9 +33,9 @@ public class SysRoleEntity implements Serializable { private BigDecimal roleSort; private String roleType; private String status; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; private String userType; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java index 0db3368..963b75f 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java @@ -34,9 +34,9 @@ public class SysUserEntity extends Model implements Serializable private String avatar; private String corpCode; private String corpName; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; private String email; private String freezeCause; @@ -75,9 +75,9 @@ public class SysUserEntity extends Model implements Serializable @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private SysUserStatusEnum status; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; private String userName; private String empName; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java index cc56b6b..7eba7ff 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java @@ -1,7 +1,6 @@ package com.tamguo.modules.tiku.model; import java.util.Date; - import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableField; @@ -22,13 +21,13 @@ public class CourseEntity { private Integer pointNum; private String remarks; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java index 999cf9d..af27368 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java @@ -17,13 +17,13 @@ public class SubjectEntity { private String name; private String sort; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date createDate; - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateDate; private String remarks; diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java index c99209f..efd6b7e 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/ICourseService.java @@ -15,4 +15,13 @@ public interface ICourseService extends IService{ /** 修改科目*/ void update(CourseEntity course); + /** 删除科目*/ + void delete(String uid); + + /** 激活科目*/ + void enable(String uid); + + /** 停用科目*/ + void disabled(String uid); + } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java index 5ba8cc5..32449e9 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java @@ -54,7 +54,36 @@ public class CourseServiceImpl extends ServiceImpl i @Transactional(readOnly=false) @Override public void update(CourseEntity course) { - courseMapper.updateById(course); + CourseEntity entity = courseMapper.selectById(course.getUid()); + entity.setName(course.getName()); + entity.setSubjectId(course.getSubjectId()); + entity.setSort(course.getSort()); + entity.setRemarks(course.getRemarks()); + courseMapper.updateById(entity); + } + + @Transactional(readOnly=false) + @Override + public void delete(String uid) { + CourseEntity entity = courseMapper.selectById(uid); + entity.setStatus(CourseStatusEnum.DELETE); + courseMapper.updateById(entity); + } + + @Transactional(readOnly=false) + @Override + public void enable(String uid) { + CourseEntity entity = courseMapper.selectById(uid); + entity.setStatus(CourseStatusEnum.NORMAL); + courseMapper.updateById(entity); + } + + @Transactional(readOnly=false) + @Override + public void disabled(String uid) { + CourseEntity entity = courseMapper.selectById(uid); + entity.setStatus(CourseStatusEnum.DISABLED); + courseMapper.updateById(entity); } } diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java index d3f105c..d0a9850 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/CourseController.java @@ -85,4 +85,37 @@ public class CourseController { return ExceptionSupport.resolverResult("修改科目", this.getClass(), e); } } + + @RequestMapping(path="delete",method=RequestMethod.POST) + @ResponseBody + public Result delete(String uid) { + try { + iCourseService.delete(uid); + return Result.result(0, null, "删除科目成功"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("删除科目", this.getClass(), e); + } + } + + @RequestMapping(path="enable",method=RequestMethod.POST) + @ResponseBody + public Result enable(String uid) { + try { + iCourseService.enable(uid); + return Result.result(0, null, "激活科目成功"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("激活科目", this.getClass(), e); + } + } + + @RequestMapping(path="disabled",method=RequestMethod.POST) + @ResponseBody + public Result disabled(String uid) { + try { + iCourseService.disabled(uid); + return Result.result(0, null, "停用科目成功"); + } catch (Exception e) { + return ExceptionSupport.resolverResult("停用科目", this.getClass(), e); + } + } }