bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MysqlGenerator.java

@@ -3,7 +3,7 @@ package cn.wisenergy.chnmuseum.party.common.mybatis;
 public class MysqlGenerator {
 
     private static final String[] tableNames = new String[]{
-            "learning_content_board"
+            "t_audit"
     };
 //        private static final String projectPath = "D:\\develop\\Project\\chnmuseum-party";
     private static final String projectPath = "/opt/ss";

src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java

 package cn.wisenergy.chnmuseum.party.model;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
+import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
-import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
-import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -45,68 +33,65 @@ public class Audit implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("id")
+    @ApiModelProperty("审核ID")
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    @NotNull(message = "id不能为空", groups = {Update.class})
+    @NotNull(message = "审核ID不能为空", groups = {Update.class})
     private String id;
 
     @ApiModelProperty("审核内容")
-    @TableField("audit_content")
-    private String auditContent;
-    
-    @ApiModelProperty("所属机构id")
+    @TableField("content")
+    private String content;
+
+    @ApiModelProperty("所属机构ID")
     @TableField("organ_id")
     private String organId;
-    
-    @ApiModelProperty("关联表id")
-    @TableField("rel_id")
-    private String relId;
-    
+
+    @ApiModelProperty("审核项ID")
+    @TableField("ref_item_id")
+    @NotBlank(message = "审核项ID不能为空", groups = {Add.class, Update.class})
+    private String refItemId;
+
     @ApiModelProperty("提交人员")
     @TableField("user_id")
-        @NotBlank(message = "提交人员不能为空", groups = {Add.class})
-        private String userId;
-    
+    @NotBlank(message = "提交人员不能为空", groups = {Add.class, Update.class})
+    private String userId;
+
     @ApiModelProperty("0,看板；1 视频；2 学习内容；3 账号禁用")
-    @NotNull(message = "type不能为空", groups = {Update.class})
     @TableField("type")
-    private Integer type;
-    
-    @ApiModelProperty("0 新增；1 修改；2 删除;3 禁用")
-    @TableField("item")
-    private Integer item;
-    
-    @ApiModelProperty("1待初审 2 驳回 3 待复审 4通过")
-    @NotNull(message = "type不能为空", groups = {Update.class})
+    @NotBlank(message = "0,看板；1 视频；2 学习内容；3 账号禁用不能为空", groups = {Add.class, Update.class})
+    private String type;
+
+    @ApiModelProperty("操作类型")
+    @TableField("operation")
+    private String operation;
+
+    @ApiModelProperty("审核状态")
     @TableField("status")
-    private Integer status;
-    
-    @ApiModelProperty("创建时间")
+    private String status;
+
+    @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-        @NotNull(message = "创建时间不能为空", groups = {Add.class})
-        private LocalDateTime createTime;
-    
+    @NotNull(message = "创建日期不能为空", groups = {Add.class, Update.class})
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新日期")
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
     @ApiModelProperty("0：未删除，1：已删除")
     @TableField("is_deleted")
     private Boolean isDeleted;
-    
+
     @ApiModelProperty("备注")
     @TableField("remarks")
     private String remarks;
-    
-    @ApiModelProperty("层级 1.初审 2.复审")
-    @TableField("level")
-    private Integer level;
-
 
     @ApiModelProperty("机构名")
     @TableField(exist = false)
     private String orgName;
 
-
     @ApiModelProperty("提交人名")
     @TableField(exist = false)
     private String userName;
 
-
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
-import cn.wisenergy.chnmuseum.party.model.TUser;
-import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
-import cn.wisenergy.chnmuseum.party.model.Audit;
-import cn.wisenergy.chnmuseum.party.service.AuditService;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
-import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
-
+import cn.wisenergy.chnmuseum.party.model.Audit;
+import cn.wisenergy.chnmuseum.party.service.AuditService;
+import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
+import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 
@@ -51,7 +43,6 @@ public class AuditController extends BaseController {
     @Resource
     private TUserServiceImpl userService;
 
-
     @GetMapping("/getUserList")
     @RequiresPermissions("/audit/getUserList")
     @ApiOperation(value = "获取用户禁用审核列表", notes = "获取用户禁用审核列表")
@@ -60,7 +51,7 @@ public class AuditController extends BaseController {
             @ApiImplicitParam(name = "status", value = "1待初审 2 驳回 3 待复审 4通过", paramType = "query", dataType = "String")
     })
     public Map<String, Object> getUserList(String name, Integer status) {
-        Page<Audit> auditList = null;
+        Page<Audit> auditList;
         try {
             auditList = auditService.getUserList(getPage(), name, status);
             return getResult(auditList);
@@ -70,52 +61,34 @@ public class AuditController extends BaseController {
         return getFailResult();
     }
 
-
-    @PostMapping("/add")
-    @RequiresPermissions("/audit/add")
-    @ApiOperation(value = "添加禁用审核", notes = "添加禁用审核")
-    public Map<String, Object> saveAudit(@Validated(value = {Add.class}) Audit audit) {
-        // 保存业务节点信息
-        boolean result = auditService.save(audit);
-        // 返回操作结果
-        if (result) {
-            return getSuccessResult();
-        } else {
-            // 保存失败
-            return getFailResult();
-        }
-    }
-
     @PutMapping("/update")
     @RequiresPermissions("/audit/update")
     @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
     public Map<String, Object> updateAudit(@Validated(value = {Update.class}) Audit audit) {
-        boolean flag = false;
-        if (audit.getStatus()==3){
-            audit.setLevel(2);
-        }
-        if (audit.getStatus()!=2){
-            audit.setRemarks("");
-        }
-        try {
-            if (audit.getType() == 3) {
-                Audit audit1 = auditService.getById(audit.getId());
-                TUser user = new TUser();
-                user.setId(audit1.getRelId());
-                user.setAuditStatus(audit.getStatus().toString());
-                if (audit.getStatus()==4) {
-                    user.setStatus("2");
-                }
-                flag = userService.updateById(user);
-            }
-            flag = auditService.updateById(audit);
-            if (!flag) {
-                return getFailResult();
-            }
-            return getSuccessResult();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        boolean flag;
+        //todo 禁止使用整形值标识状态值，应使用enum来标识
+//        if (audit.getStatus() != 2){
+//            audit.setRemarks("");
+//        }
+//        try {
+//            if (audit.getType() == 3) {
+//                Audit audit1 = auditService.getById(audit.getId());
+//                TUser user = new TUser();
+//                user.setId(audit1.getRefItemId());
+//                user.setAuditStatus(audit.getStatus());
+//                if (audit.getStatus()==4) {
+//                    user.setStatus("2");
+//                }
+//                userService.updateById(user);
+//            }
+//            flag = auditService.updateById(audit);
+//            if (!flag) {
+//                return getFailResult();
+//            }
+//            return getSuccessResult();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
         return getFailResult();
     }
 
@@ -158,7 +131,7 @@ public class AuditController extends BaseController {
         LambdaQueryWrapper<Audit> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
         if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
-            queryWrapper.like(Audit::getAuditContent, genericPageParam.getNameOrCode());
+            queryWrapper.like(Audit::getContent, genericPageParam.getNameOrCode());
         }
         // 根据创建时间区间检索
         if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
@@ -170,12 +143,9 @@ public class AuditController extends BaseController {
         // 设置查询内容
         queryWrapper.select(
                 Audit::getId,
-                Audit::getAuditContent,
+                Audit::getContent,
                 Audit::getCreateTime);
         Page<Audit> page = this.auditService.page(getPage(), queryWrapper);
-        for (Audit audit : page.getRecords()) {
-
-        }
         return getResult(page);
     }
 

src/main/resources/mapper/AuditMapper.xml

@@ -3,26 +3,24 @@
 <mapper namespace="cn.wisenergy.chnmuseum.party.mapper.AuditMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.Audit">
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.TAudit">
         <id column="id" property="id"/>
-        <result column="audit_content" property="auditContent"/>
+        <result column="content" property="content"/>
         <result column="organ_id" property="organId"/>
-        <result column="rel_id" property="relId"/>
+        <result column="ref_item_id" property="refItemId"/>
         <result column="user_id" property="userId"/>
         <result column="type" property="type"/>
-        <result column="item" property="item"/>
+        <result column="operation" property="operation"/>
         <result column="status" property="status"/>
         <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="remarks" property="remarks"/>
-        <result column="level" property="level"/>
-        <result column="org_name" property="orgName"/>
-        <result column="user_name" property="userName"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, audit_content, organ_id, rel_id, user_id, type, item, status, create_time, is_deleted, remarks, level
+        id, content, organ_id, ref_item_id, user_id, type, operation, status, create_time, update_time, is_deleted, remarks
     </sql>
 
     <select id="getUserList" resultMap="BaseResultMap">
@@ -31,17 +29,16 @@
         left join t_organ o on o.id = a.organ_id
         left join t_user u on u.id = a.user_id
         where 1 = 1
-        <if test=" name != null and name != '' ">
+        <if test="name != null and name != ''">
             and (u.user_name LIKE concat('%', #{name}, '%') or a.audit_content LIKE concat('%', #{name}, '%'))
         </if>
-        <if test=" status != null">
+        <if test="status != null">
             and a.status = #{status}
         </if>
         and a.is_deleted = false
-        and a.type = 3
-        and a.item = 3
+        and a.type = 'ACCOUNT'
+        and a.operation = 'DISABLE'
         order by a.create_time desc
     </select>
 
-
 </mapper>