liujunchi 2 years ago
parent
commit
a3eaf0d19d

+ 21 - 0
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/AuditReasonController.java

@@ -1,5 +1,7 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,10 +20,14 @@ import com.yonge.cooleshow.biz.dal.dto.search.AuditReasonSearch;
 import com.yonge.cooleshow.biz.dal.entity.AuditReason;
 import com.yonge.cooleshow.biz.dal.service.AuditReasonService;
 
+import java.util.Date;
+
 @RestController
 @RequestMapping("/auditReason")
 @Api(value = "审核原因表", tags = "审核原因表")
 public class AuditReasonController extends BaseController {
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
     @Autowired
     private AuditReasonService auditReasonService;
@@ -51,6 +57,14 @@ public class AuditReasonController extends BaseController {
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入auditReason")
 	public HttpResponseResult save(@Valid @RequestBody AuditReason auditReason) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null  || sysUser.getId() == null) {
+			return failed("用户信息获取失败");
+		}
+		auditReason.setCreateBy(sysUser.getId());
+		auditReason.setCreateTime(new Date());
+		auditReason.setUpdateBy(sysUser.getId());
+		auditReason.setUpdateTime(new Date());
     	return status(auditReasonService.save(auditReason));
 	}
     
@@ -60,6 +74,13 @@ public class AuditReasonController extends BaseController {
 	@PostMapping("/update")
 	@ApiOperation(value = "修改", notes = "传入auditReason")
 	public HttpResponseResult update(@Valid @RequestBody AuditReason auditReason) {
+
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null  || sysUser.getId() == null) {
+			return failed("用户信息获取失败");
+		}
+		auditReason.setUpdateBy(sysUser.getId());
+		auditReason.setUpdateTime(new Date());
         return status(auditReasonService.updateById(auditReason));
 	}
 

+ 13 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/AuditReasonSearch.java

@@ -16,6 +16,19 @@ public class AuditReasonSearch extends QueryInfo{
 	@ApiModelProperty("审核原因分类 TEACHER: 达人认证,MUSIC:乐谱审核/下架,VIDEO:视频课审核/下架,STYLE:个人风采审核,LIVE:直播课下架")
 	private String type;
 
+	@ApiModelProperty("话术")
+	private String search;
+
+	@Override
+	public String getSearch() {
+		return search;
+	}
+
+	@Override
+	public void setSearch(String search) {
+		this.search = search;
+	}
+
 	public String getType() {
 		return type;
 	}

+ 3 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AuditReason.java

@@ -12,6 +12,8 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Size;
+
 /**
  * 审核原因表
  */
@@ -24,6 +26,7 @@ public class AuditReason implements Serializable {
     private Long id;
     @ApiModelProperty("审核原因 ")
 	@TableField(value = "name_")
+    @Size(max = 50,message = "话术最长50个字")
     private String name;
     @ApiModelProperty("审核原因分类 TEACHER: 达人认证,MUSIC:乐谱审核/下架,VIDEO:视频课审核/下架,STYLE:个人风采审核,LIVE:直播课下架")
 	@TableField(value = "type_")

+ 3 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/AuditReasonMapper.xml

@@ -40,6 +40,9 @@
             <if test="param.type != null and param.type != ''">
                 and t.type_ = #{param.type}
             </if>
+            <if test="param.search != null and param.search != ''">
+                and t.name like concat('%', #{param.search},'%')
+            </if>
         </where>
 	</select>
 </mapper>