Skip to content

S
syyl
提交 ec80f074 authored 作者: renjiancai's avatar renjiancai
浏览文件
操作

--no commit message

上级 3b8fe989
隐藏空白字符变更
内嵌 并排
正在显示 包含 219 行增加 和 31 行删除
com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/content/LanguageExportForm.java 0 → 100644
浏览文件 @ ec80f074
package com.zrqx.core.form.sysuser.bg.content;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "LanguageExportForm", description = "采集主题查询form")
public class LanguageExportForm {
@ApiModelProperty("主题id")
private String oid;
@ApiModelProperty("用户类型")
private Integer userType;
@ApiModelProperty("标题/词条")
private String title;
}
com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/content/LanguageORUserSelectForm.java
浏览文件 @ ec80f074
......@@ -11,5 +11,7 @@ public class LanguageORUserSelectForm {
private String oid;
@ApiModelProperty("用户类型")
private Integer userType;
@ApiModelProperty("标题/词条")
private String title;
}
com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/content/QueryUserTypeForm.java 0 → 100644
浏览文件 @ ec80f074
package com.zrqx.core.form.sysuser.bg.content;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "QueryUserTypeForm", description = "用户和用户类型查询")
public class QueryUserTypeForm {
@ApiModelProperty("主题id")
private String oid;
@ApiModelProperty("用户类型")
private Integer userType;
@ApiModelProperty("部门")
private String dept;
}
com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/content/SaveUpdateSignLanguageForm.java
浏览文件 @ ec80f074
package com.zrqx.core.form.sysuser.bg.content;
import java.util.Date;
import java.util.List;
import javax.persistence.Transient;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -36,5 +33,8 @@ public class SaveUpdateSignLanguageForm {
private Date startTime;
@ApiModelProperty("有效期，结束日期")
private Date endTime;
@ApiModelProperty("上传文件格式 ：1仅上传视频 、2上传视频和标注文件（jpg/png 、 txt 、 eaf），txt和eaf文件请通过web端进行上传、 3上传视频，并根据情况选择性上传标注文件（jpg/png 、 txt 、 eaf）txt和eaf文件请通过web端进行上传")
private Integer format;
@ApiModelProperty("附件说明")
private String explain;
}
com.zrqx.core/src/main/java/com/zrqx/core/model/sysuser/content/SignLanguageUserRelation.java
浏览文件 @ ec80f074
......@@ -50,4 +50,6 @@ public class SignLanguageUserRelation {
private Date uploadTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("部门")
private String dept;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/bg/content/ExcelSignLanguageVO.java 0 → 100644
浏览文件 @ ec80f074
package com.zrqx.core.vo.sysuser.bg.content;
import java.util.Date;
import com.zrqx.core.util.excelutil.ExcelResources;
import com.zrqx.core.util.excelutil.ExcelSheetParams;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 采集主题导出
* @author rjc
* @date 2020年3月5日下午5:22:29
*/
@ExcelSheetParams(startRow = 2)
@Data
public class ExcelSignLanguageVO {
@ExcelResources(title="标题")
private String title;
@ExcelResources(title="词条")
private String content;
@ExcelResources(title="上传时间")
private Date uploadTime;
@ExcelResources(title="完成时间")
private String completeTime;
@ExcelResources(title="创建人")
private String founder;
@ExcelResources(title="分发人")
private String distributor;
@ExcelResources(title="审核状态")
private String status;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/bg/content/SignLanguageExcelListVO.java 0 → 100644
浏览文件 @ ec80f074
package com.zrqx.core.vo.sysuser.bg.content;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value="SignLanguageExcelListVO",description="查询集合返回的实体")
public class SignLanguageExcelListVO {
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("词条")
private String content;
@ApiModelProperty("上传时间")
private Date uploadTime;
@ApiModelProperty("创建人")
private String founder;
@ApiModelProperty("分发人")
private String distributor;
@ApiModelProperty("完成时间")
private String completeTime;
@ApiModelProperty("状态 1待分发 2已分发 3审核中 4审核通过 5审核未通过")
private String status;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/bg/content/SignLanguageVo.java → com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/bg/content/SignLanguageListVo.java
浏览文件 @ ec80f074
......@@ -8,8 +8,8 @@ import java.util.Date;
import lombok.Data;
@Data
@ApiModel(value = "SignLanguageVo", description = "查询内容管理列表返回的实体")
public class SignLanguageVo {
@ApiModel(value = "SignLanguageListVo", description = "查询内容管理列表返回的实体")
public class SignLanguageListVo {
@ApiModelProperty("内容id，新增时不需要填写")
private String id;
@ApiModelProperty("标题")
......
com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/bg/content/SignLanguageORUserVo.java
浏览文件 @ ec80f074
......@@ -18,6 +18,8 @@ public class SignLanguageORUserVo {
private String userName;
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("部门")
private String dept;
@ApiModelProperty("状态 1待分发 2已分发 3审核中 4审核通过 5审核未通过")
private Integer status;
@ApiModelProperty("状态 1待分发 2已分发 3审核中 4审核通过 5审核未通过")
......
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/content/ContentController.java
浏览文件 @ ec80f074
......@@ -29,7 +29,6 @@ import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.sysuser.bg.content.ContentOneVo;
import com.zrqx.core.vo.sysuser.bg.content.ContentVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageVo;
import com.zrqx.sysuser.bg.service.content.ContentService;
import com.zrqx.sysuser.bg.service.diytype.DiyTypeRelationService;
import com.zrqx.sysuser.bg.service.diytype.DiyTypeService;
......
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/content/SignLanguageController.java
浏览文件 @ ec80f074
......@@ -4,6 +4,9 @@ import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,10 +27,11 @@ import com.zrqx.core.exception.BaseException;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.form.sysuser.bg.comment.QueryCommentForm;
import com.zrqx.core.form.sysuser.bg.content.BatchUpdateSingnLanguageForm;
import com.zrqx.core.form.sysuser.bg.content.LanguageExportForm;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.form.sysuser.bg.content.QueryUserTypeForm;
import com.zrqx.core.form.sysuser.bg.content.SaveUpdateSignLanguageForm;
import com.zrqx.core.form.sysuser.bg.content.SaveUpdateUserForm;
import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
import com.zrqx.core.model.sysuser.comment.Comment;
import com.zrqx.core.model.sysuser.content.Content;
import com.zrqx.core.model.sysuser.content.ContentRelation;
......@@ -36,12 +40,15 @@ import com.zrqx.core.model.sysuser.content.SignLanguageRelation;
import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
import com.zrqx.core.util.datatype.ArrayUtils;
import com.zrqx.core.util.datatype.DateUtils;
import com.zrqx.core.util.excelutil.ExcelUtil;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.core.vo.sysuser.bg.content.ExcelSignLanguageVO;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageExcelListVO;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageListVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageORUserVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageOneVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageVo;
import com.zrqx.sysuser.bg.service.comment.CommentService;
import com.zrqx.sysuser.bg.service.content.ContentRelationService;
import com.zrqx.sysuser.bg.service.content.ContentService;
......@@ -137,7 +144,7 @@ public class SignLanguageController {
}
@ApiOperation(value = "分页查询", notes = "分页查询")
@GetMapping(value = SysUserRequestPath.PAGE)
public CallBack<PageInfo<SignLanguageVo>> page(LanguageORUserSelectForm form, PageParam pageParam) {
public CallBack<PageInfo<SignLanguageListVo>> page(LanguageORUserSelectForm form, PageParam pageParam) {
return CallBack.success(service.page(form,pageParam));
}
......@@ -152,7 +159,7 @@ public class SignLanguageController {
@ApiOperation(value = "用户信息列表", notes = "用户信息列表")
@GetMapping(value = SysUserRequestPath.LIST)
public CallBack<List<SignLanguageORUserVo>> list(LanguageORUserSelectForm form) {
public CallBack<List<SignLanguageORUserVo>> list(QueryUserTypeForm form) {
List<SignLanguageORUserVo> user=userRelationService.userByList(form);
return CallBack.success(user);
......@@ -213,6 +220,37 @@ public class SignLanguageController {
vo.setCommentNum(num);
return CallBack.success(vo);
}
@ApiOperation(value = "导出Excel")
@GetMapping(value = SysUserRequestPath.EXPORT)
public CallBack<List<String>> exportCard(LanguageExportForm form, HttpServletRequest request, HttpServletResponse response)
throws Exception {
List<SignLanguageExcelListVO> queryAllSignLanguageList = service.querySignLanguageList(form);
if (queryAllSignLanguageList == null || queryAllSignLanguageList.size() == 0) {
throw new BaseException("未查询到资源！");
}
for (SignLanguageExcelListVO vo : queryAllSignLanguageList) {
if(StringUtils.isNotBlank(vo.getStatus())){//状态 1待分发 2已分发 3审核中 4审核通过 5审核未通过
if(vo.getStatus().equals("1")){
vo.setStatus("待分发");
}
if(vo.getStatus().equals("2")){
vo.setStatus("已分发");
}
if(vo.getStatus().equals("3")){
vo.setStatus("审核中");
}
if(vo.getStatus().equals("4")){
vo.setStatus("审核通过");
}
if(vo.getStatus().equals("5")){
vo.setStatus("审核未通过");
}
}
}
ExcelUtil.getInstance().exportExcel(queryAllSignLanguageList, ExcelSignLanguageVO.class, "采集主题信息模板.xls", response,
request);
return CallBack.success();
}
@ApiOperation(value = "删除用户/撤回", notes = "删除用户/撤回 ")
@PostMapping(value = BaseRequestPath.DELETE_USER_OID)
public CallBack<Boolean> updateByUserId(@PathVariable String oid) {
......
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageMapper.java
浏览文件 @ ec80f074
......@@ -6,9 +6,12 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.zrqx.core.form.sysuser.bg.content.LanguageExportForm;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.sysuser.content.SignLanguage;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageExcelListVO;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageListVo;
@Mapper
......@@ -24,8 +27,11 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
+ "SELECT distinct s.id,s.title,s.founder,s.distributor,s.complete,s.status,"
+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
+ "DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime FROM sys_sign_language s "
+ "<if test='"+ NOTBLANK +"(form.title)'>"
+ " and s.title like concat('%',#{form.title},'%') "
+ "</if>"
+ "</script>")
List<SignLanguageVo> page();
List<SignLanguageListVo> page(@Param("form")LanguageORUserSelectForm form);
/*@Select("<script>"
+ "SELECT distinct s.id,s.title,s.founder,s.distributor,s.complete,sl.status,"
+ "DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,"
......@@ -45,6 +51,15 @@ public interface SignLanguageMapper extends BaseMapper<SignLanguage> {
+ " and re.userId = #{userId} "
+ "</if>"
+ "</script>")
List<SignLanguageVo> pageOrUserType(@Param("userId")String userId);
List<SignLanguageListVo> pageOrUserType(@Param("userId")String userId);
@Select("<script>"
+ "SELECT s.title,c.text,s.founder,s.distributor,DATE_FORMAT(s.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,DATE_FORMAT(s.completeTime,'%Y-%m-%d %H:%i:%s') completeTime,"
+ "s.`status` FROM sys_sign_language s LEFT JOIN sys_content_relation re on s.id=re.objectId LEFT JOIN sys_content c on c.id=re.contentId where 1=1"
+ "<if test='"+ NOTBLANK +"(form.title)'>"
+ " and (s.title like concat('%',#{form.title},'%') or c.text like concat('%',#{form.title},'%'))"
+ "</if>"
+ "</script>")
List<SignLanguageExcelListVO> exportBookList(@Param("form")LanguageExportForm form);
//SELECT distinct * FROM sys_sign_language s LEFT JOIN sys_content_relation re on s.id=re.objectId LEFT JOIN sys_content c on c.id=re.contentId where c.text like '%咖啡种类%' and s.title like '%12月20日任务演示%'
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageUserRelationMapper.java
浏览文件 @ ec80f074
......@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.form.sysuser.bg.content.QueryUserTypeForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageORUserVo;
......@@ -19,9 +20,12 @@ public interface SignLanguageUserRelationMapper extends BaseMapper<SignLanguageU
@Select("<script>"
+ "SELECT el.id,el.userId,el.userName,el.name,el.status,el.role,el.userType from sys_sign_language_user_relation el where 1=1 and (el.role!=1 or userType!=3)"
+ " and el.objectId = #{form.oid}"
+ "<if test='"+ NOTBLANK +"(form.dept)'>"
+ " and el.dept = #{form.dept} "
+ "</if>"
+ " ORDER BY el.role ,el.uploadTime asc"
+ "</script>")
List<SignLanguageORUserVo> userByList(@Param("form")LanguageORUserSelectForm form,@Param("userId")String userId);
List<SignLanguageORUserVo> userByList(@Param("form")QueryUserTypeForm form,@Param("userId")String userId);
/** 查询*/
@Select("<script>"
+ "SELECT el.id,el.userId,el.userName,el.name,el.status_1 as status,el.role from sys_sign_language_user_relation el where 1=1 "
......@@ -29,9 +33,12 @@ public interface SignLanguageUserRelationMapper extends BaseMapper<SignLanguageU
+ "<if test='"+ NOTBLANK +"(userId)'>"
+ " and (el.founderId = #{userId} or el.userId = #{userId} or el.role = 0 ) "
+ "</if>"
+ "<if test='"+ NOTBLANK +"(form.dept)'>"
+ " and el.dept = #{form.dept} "
+ "</if>"
+ " ORDER BY el.role ,el.uploadTime asc"
+ "</script>")
List<SignLanguageORUserVo> userByUserList(@Param("form")LanguageORUserSelectForm form,@Param("userId")String userId);
List<SignLanguageORUserVo> userByUserList(@Param("form")QueryUserTypeForm form,@Param("userId")String userId);
/** 查询*/
@Select("<script>"
+ "SELECT * from sys_sign_language_user_relation where objectId = #{id} and (role!='0' and role!='3') and userType!=3"
......
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageService.java
浏览文件 @ ec80f074
package com.zrqx.sysuser.bg.service.content;
import java.util.List;
import com.zrqx.core.form.sysuser.bg.content.LanguageExportForm;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.form.sysuser.bg.content.SaveUpdateUserForm;
import com.zrqx.core.model.sysuser.content.SignLanguage;
import com.zrqx.core.service.BaseService;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageExcelListVO;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageListVo;
public interface SignLanguageService extends BaseService<SignLanguage, String> {
/** 分页查询*/
PageInfo<SignLanguageVo> page(LanguageORUserSelectForm form,PageParam pageParam);
PageInfo<SignLanguageListVo> page(LanguageORUserSelectForm form,PageParam pageParam);
boolean saveOrUpdate(SaveUpdateUserForm form);
List<SignLanguageExcelListVO> querySignLanguageList(LanguageExportForm form);
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java
浏览文件 @ ec80f074
......@@ -13,6 +13,7 @@ import com.zrqx.core.enums.sysuser.SignStatusEnum;
import com.zrqx.core.enums.sysuser.UserStatusEnum;
import com.zrqx.core.enums.sysuser.UserTypeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.form.sysuser.bg.content.LanguageExportForm;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.form.sysuser.bg.content.SaveUpdateUserForm;
import com.zrqx.core.mapper.BaseMapper;
......@@ -26,11 +27,14 @@ import com.zrqx.core.util.bean.BeanUtils;
import com.zrqx.core.util.datatype.ArrayUtils;
import com.zrqx.core.util.page.PageInfo;
import com.zrqx.core.util.page.PageParam;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageVo;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageExcelListVO;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageListVo;
import com.zrqx.core.vo.sysuser.bg.dept.DeptVO;
import com.zrqx.sysuser.bg.mapper.content.ContentMapper;
import com.zrqx.sysuser.bg.mapper.content.SignLanguageMapper;
import com.zrqx.sysuser.bg.mapper.content.SignLanguageRelationMapper;
import com.zrqx.sysuser.bg.mapper.content.SignLanguageUserRelationMapper;
import com.zrqx.sysuser.bg.mapper.dept.DepartmentMapper;
import com.zrqx.sysuser.bg.mapper.user.UserMapper;
import com.zrqx.sysuser.commons.redis.Redis;
......@@ -53,14 +57,15 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
private ContentMapper contentMapper;
@Autowired
private UserMapper userMapper;
@Autowired
private DepartmentMapper departmentMapper;
@Override
public BaseMapper<SignLanguage> getMapper() {
return mapper;
}
@Override
public PageInfo<SignLanguageVo> page(LanguageORUserSelectForm form,PageParam pageParam) {
public PageInfo<SignLanguageListVo> page(LanguageORUserSelectForm form,PageParam pageParam) {
if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
pageParam.setOrderBy("s.uploadTime desc");
}
......@@ -68,10 +73,10 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
String userId = redis.getUser().getUserId();
Integer userType = redis.getUser().getUserType();
List<SignLanguageVo> list =null;
List<SignLanguageListVo> list =null;
//根据用户、用户类型查询
if(userType.equals(UserTypeEnum.TYPE_2.getCode()) || userType.equals(UserTypeEnum.TYPE_1.getCode())) {
list= mapper.page();
list= mapper.page(form);
}else if(userType.equals(UserTypeEnum.TYPE_3.getCode()) || userType.equals(UserTypeEnum.TYPE_4.getCode())){
list= mapper.pageOrUserType(userId);
// 判断待分发
......@@ -88,7 +93,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
});
}
if(ArrayUtils.isNotEmpty(list)) {
for (SignLanguageVo signLanguageVo : list) {
for (SignLanguageListVo signLanguageVo : list) {
List<SignLanguageUserRelation> userName= userRelationMapper.userList(signLanguageVo.getId());
StringBuilder sb = new StringBuilder();
userName.stream().forEach(li ->{
......@@ -115,7 +120,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
list.stream().forEach(li -> li.setStatus_zh(SignStatusEnum.getName(li.getStatus())));
this.regEx(list);
return new PageInfo<SignLanguageVo>(list);
return new PageInfo<SignLanguageListVo>(list);
}
@Override
......@@ -141,6 +146,14 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
userRelation.setRole(RoleStatusEnum.NOT_SET_UP.getCode());
userRelation.setFounderId(redis.getUser().getUserId());
userRelation.setUserType(userType);
//查询当前用户所属区域部门
Integer deptId = userMapper.getDeptIdByUserId(form.getUserId().get(i)).get(0);
if(deptId != null) {
DeptVO deptVO = departmentMapper.get(deptId);
if(deptVO != null) {
userRelation.setDept(deptVO.getDeptName());
}
}
userRelationMapper.insert(userRelation);
SignLanguageRelation relation = new SignLanguageRelation();
......@@ -167,7 +180,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
* @author ycw
* @date: 2019年4月18日 上午11:57:55
*/
private void regEx(List<SignLanguageVo> list){
private void regEx(List<SignLanguageListVo> list){
if(ArrayUtils.isNotEmpty(list)){
list.forEach(li -> {
if(StringUtils.isNotBlank(li.getContent())){
......@@ -204,7 +217,7 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
return null;
}
private Boolean isTrue(SignLanguageVo li, String id) {
private Boolean isTrue(SignLanguageListVo li, String id) {
SignLanguageUserRelation s = new SignLanguageUserRelation();
s.setObjectId(li.getId());
s.setUserId(id);
......@@ -214,4 +227,15 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
}
return false;
}
@Override
public List<SignLanguageExcelListVO> querySignLanguageList(LanguageExportForm form) {
String userId = redis.getUser().getUserId();
Integer userType = redis.getUser().getUserType();
List<SignLanguageExcelListVO> list = mapper.exportBookList(form);
return list;
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageUserRelationService.java
浏览文件 @ ec80f074
......@@ -2,7 +2,7 @@ package com.zrqx.sysuser.bg.service.content;
import java.util.List;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.form.sysuser.bg.content.QueryUserTypeForm;
import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
import com.zrqx.core.service.BaseService;
import com.zrqx.core.vo.sysuser.bg.content.SignLanguageORUserVo;
......@@ -10,5 +10,5 @@ import com.zrqx.core.vo.sysuser.bg.content.SignLanguageORUserVo;
public interface SignLanguageUserRelationService extends BaseService<SignLanguageUserRelation, String> {
List<SignLanguageORUserVo> userByList(LanguageORUserSelectForm form);
List<SignLanguageORUserVo> userByList(QueryUserTypeForm form);
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageUserRelationServiceImpl.java
浏览文件 @ ec80f074
......@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
import com.zrqx.core.enums.sysuser.SignStatusEnum;
import com.zrqx.core.enums.sysuser.UserTypeEnum;
import com.zrqx.core.form.sysuser.bg.content.LanguageORUserSelectForm;
import com.zrqx.core.form.sysuser.bg.content.QueryUserTypeForm;
import com.zrqx.core.mapper.BaseMapper;
import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
import com.zrqx.core.model.sysuser.content.SignLanguageUserRelation;
......@@ -33,7 +33,7 @@ public class SignLanguageUserRelationServiceImpl extends BaseServiceImpl<SignLan
return mapper;
}
@Override
public List<SignLanguageORUserVo> userByList(LanguageORUserSelectForm form) {
public List<SignLanguageORUserVo> userByList(QueryUserTypeForm form) {
String userId = redis.getUser().getUserId();
Integer userType = redis.getUser().getUserType();
List<SignLanguageORUserVo> list =null;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论