guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

高级筛选新增类型，自定义筛选新增类型

Browse Source
pull/1/head
DELL 2 years ago
parent 0367629dea
commit 54ac08208e
7 changed files with 2797 additions and 25973 deletions
Show Stats Download Patch File Download Diff File

12483
develop/logs/ocr/log_error.log
View File

File diff suppressed because it is too large Load Diff

16102
develop/logs/ocr/log_info.log
View File

File diff suppressed because it is too large Load Diff

10
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java
Unescape View File

@ -19,10 +19,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
import com.alibaba.fastjson.JSONObject;
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 io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -71,6 +68,7 @@ public class OcrUsersearchController extends BaseController{
@GetMapping(value = "/list")
public ResultVo<IPage<OcrUsersearch>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="type") @ApiParam(value = "类型(首页为0，终审为1)", required = true) Integer type,
HttpServletRequest request) {
//获取当前登录人
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@ -93,6 +91,7 @@ public class OcrUsersearchController extends BaseController{
queryWrapper.eq("USERID",userToken.getUserid());
queryWrapper.eq("TENANTID",tenantId);
queryWrapper.eq("TYPE",type);
queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
IPage<OcrUsersearch> pageList = ocrUsersearchService.selectSearchListPage(paramterPage, queryWrapper);
@ -133,7 +132,8 @@ public class OcrUsersearchController extends BaseController{
ocrUsersearch.setCreatetime(System.currentTimeMillis());
ocrUsersearch.setCreateby(userToken.getLoginname());
ocrUsersearch.setTenantid(Long.parseLong(tenantId));
ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid()));
ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid(),ocrUsersearch.getType()));
ocrUsersearch.setType(ocrUsersearch.getType());
if(null != ocrUsersearch.getId()){
this.ocrUsersearchService.removeByIds(ocrUsersearch.getId().toString());
}

169
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrUsersearch.java
Unescape View File

@ -26,8 +26,7 @@ import java.util.Map;
import java.util.AbstractMap.SimpleEntry;
import java.util.stream.Stream;
import java.util.stream.Collectors;
@Data
@Builder
@ -35,84 +34,90 @@ import java.util.stream.Collectors;
@AllArgsConstructor
@Schema(name = "个人过滤条件", title = "个人过滤条件")
@TableName(value = "ocr_usersearch")
public class OcrUsersearch implements BaseDto,java.io.Serializable {
private static final long serialVersionUID = 3214150960755020489L;
@Schema(description = "主键")
@TableId(value = "id",type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="ID")
private Long id;
@Schema(description = "创建人")
@TableField(value="CREATEBY")
private String createby;
@Schema(description = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value="UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value="UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID--通过公司代码做匹配")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="TENANTID")
private Long tenantid;
@Schema(description = "所属用户主键")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value="USERID")
private Long userid;
@Schema(description = "筛选名称")
@TableField(value="SEARCHNAME")
private String searchname;
@Schema(description = "排序字段")
@TableField(value="REORDER")
private Integer reorder;
@Schema(description = "是否置顶，默认为0，表示不置顶")
@TableField(value="IZTOP")
private Integer iztop;
@TableField(exist = false)
private List<OcrUsersearchchild> ocrUsersearchchildList;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String,String> query = Stream.of(
new SimpleEntry<>("ID","id"),
new SimpleEntry<>("CREATEBY","createby"),
new SimpleEntry<>("CREATETIME","createtime"),
new SimpleEntry<>("UPDATEBY","updateby"),
new SimpleEntry<>("UPDATETIME","updatetime"),
new SimpleEntry<>("TENANTID","tenantid"),
new SimpleEntry<>("USERID","userid"),
new SimpleEntry<>("SEARCHNAME","searchname"),
new SimpleEntry<>("REORDER","reorder"),
new SimpleEntry<>("IZTOP","iztop")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname){
String obj = null;
if(null != query && query.size() > 0){
obj = query.get(filedname);
}
return obj;
}
public class OcrUsersearch implements BaseDto, java.io.Serializable {
private static final long serialVersionUID = 3214150960755020489L;
@Schema(description = "主键")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value = "ID")
private Long id;
@Schema(description = "创建人")
@TableField(value = "CREATEBY")
private String createby;
@Schema(description = "创建时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value = "CREATETIME")
private Long createtime;
@Schema(description = "修改人")
@TableField(value = "UPDATEBY")
private String updateby;
@Schema(description = "修改时间")
@JsonSerialize(using = DateSerializer.class)
@TableField(value = "UPDATETIME")
private Long updatetime;
@Schema(description = "租户ID--通过公司代码做匹配")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value = "TENANTID")
private Long tenantid;
@Schema(description = "所属用户主键")
@JsonSerialize(using = ToStringSerializer.class)
@TableField(value = "USERID")
private Long userid;
@Schema(description = "筛选名称")
@TableField(value = "SEARCHNAME")
private String searchname;
@Schema(description = "排序字段")
@TableField(value = "REORDER")
private Integer reorder;
@Schema(description = "是否置顶，默认为0，表示不置顶")
@TableField(value = "IZTOP")
private Integer iztop;
@Schema(description = "类型，首页为0，终审为1")
@TableField(value = "TYPE")
private Integer type;
@TableField(exist = false)
private List<OcrUsersearchchild> ocrUsersearchchildList;
//保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false)
@JsonIgnore
private SearchQuery searchQueryrolesShowleave;
@TableField(exist = false)
@JsonIgnore
private final Map<String, String> query = Stream.of(
new SimpleEntry<>("ID", "id"),
new SimpleEntry<>("CREATEBY", "createby"),
new SimpleEntry<>("CREATETIME", "createtime"),
new SimpleEntry<>("UPDATEBY", "updateby"),
new SimpleEntry<>("UPDATETIME", "updatetime"),
new SimpleEntry<>("TENANTID", "tenantid"),
new SimpleEntry<>("USERID", "userid"),
new SimpleEntry<>("SEARCHNAME", "searchname"),
new SimpleEntry<>("REORDER", "reorder"),
new SimpleEntry<>("IZTOP", "iztop"),
new SimpleEntry<>("TYPE", "type")
)
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
@Override
public String getQueryFiled(String filedname) {
String obj = null;
if (null != query && query.size() > 0) {
obj = query.get(filedname);
}
return obj;
}
}

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUsersearchService.java
Unescape View File

@ -28,7 +28,7 @@ public interface OcrUsersearchService extends BaseService<OcrUsersearch> {
* @param userid
* @return
*/
public int getReorder(Long userid);
public int getReorder(Long userid,Integer type);
/**
* 根据id检索出对应的预设条件

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchServiceImpl.java
Unescape View File

@ -51,9 +51,10 @@ public class OcrUsersearchServiceImpl extends BaseServiceImpl<OcrUsersearchMybat
* @param userid
* @return
*/
public int getReorder(Long userid){
public int getReorder(Long userid,Integer type){
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("USERID",userid);
queryWrapper.eq("TYPE",type);
queryWrapper.orderByDesc("REORDER");
List<OcrUsersearch> list = this.ocrusersearchmybatisdao.selectList(queryWrapper);

1
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrUsersearchMapper.xml
Unescape View File

@ -12,6 +12,7 @@
<result column="SEARCHNAME" property="searchname" jdbcType="VARCHAR"/>
<result column="REORDER" property="reorder" jdbcType="INTEGER"/>
<result column="IZTOP" property="iztop" jdbcType="INTEGER"/>
<result column="TYPE" property="type" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
ID AS id,

Write Preview
Loading…
Cancel
Save