diff --git a/jyjz-system/jyjz-system-oa/pom.xml b/jyjz-system/jyjz-system-oa/pom.xml index 1b31da9..d0e040c 100644 --- a/jyjz-system/jyjz-system-oa/pom.xml +++ b/jyjz-system/jyjz-system-oa/pom.xml @@ -61,6 +61,13 @@ flowable-ui-modeler-logic + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + org.flowable flowable-rest diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java index 6aef3ef..1cc4afa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java @@ -8,9 +8,11 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Candidateuser; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead; import cn.jyjz.xiaoyao.ocr.service.IOcrMsgService; +import cn.jyjz.xiaoyao.ocr.util.PageRequest; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -52,32 +54,29 @@ public class OcrMsgReadController { /** * 分页查询 - * @param map - * @param map start 起始页 - * @param map limit 每页显示多少条 默认10 条 * @return */ @ApiOperation(value = "系统消息分页", notes = "系统消息分页") - @RequestMapping(value = "/systempage", method = RequestMethod.GET) - public ResponseEntity systempage(HttpServletRequest request,@RequestBody Map map) { + @RequestMapping(value = "/systemPage", method = RequestMethod.GET) + public ResponseEntity systemPage(HttpServletRequest request, + @RequestParam(value = "pageNo", required = false, defaultValue = "1") int pageNo, + @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize, + @RequestParam(value = "msgCategory", required = false) String msgCategory) { - IPage iPage = new Page<>(Integer.valueOf(map.get("pageNo")),Integer.valueOf(map.get("pageSize"))); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("id","titile","sender","bus_json","send_time").eq("msg_category",map.get("msgCategory")).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids) UNION ALL select id,titile,bus_json,send_time from ocr_msg where receive_user_type='2' "); -// .select("id","titile","sender","bus_json","send_time").eq("send_status","2"); -// if(!StringUtils.isEmpty(map.get("productsId"))) { -// } - //执行查询方法 + //条件查询 + PageRequest pageQuery=new PageRequest(); + pageQuery.setPageNum(pageNo); + pageQuery.setPageSize(pageSize); - IPage page = this.iocrmsgservice.page(iPage,wrapper); + PageInfo>> findPage = iocrmsgservice.selectPage(pageQuery,userToken.getUserid(),msgCategory); - - return new ResponseEntity(page,HttpStatus.OK); + //执行查询方法 + return new ResponseEntity(findPage, HttpStatus.OK); } @@ -94,7 +93,7 @@ public class OcrMsgReadController { public ResponseEntity msgOne(@RequestParam(value = "id", required = false)String id) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("titile","msg_content","sender","msg_category","send_time"); + wrapper.select("titile","msg_content as msgContent","sender","msg_category as msgCategory","send_time as sendTime"); wrapper.eq("id", id); //执行查询方法 OcrMsg one = iocrmsgservice.getOne(wrapper); @@ -114,7 +113,7 @@ public class OcrMsgReadController { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); QueryWrapper wrapperlist = new QueryWrapper<>(); - wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUsername()+"',receive_user_ids)"); + wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply("FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)"); QueryWrapper wrapperone = new QueryWrapper<>(); @@ -122,9 +121,9 @@ public class OcrMsgReadController { List list = iocrmsgservice.list(wrapperlist); for (OcrMsg msg:list){ - wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUsername()); + wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUserid()); OcrMsgRead one = ocrMsgReadService.getOne(wrapperone); - if(null!=one) { + if(null==one) { OcrMsgRead ocrmsgread=new OcrMsgRead(); ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis()))); ocrmsgread.setMsgId(msg.getId()); @@ -135,7 +134,7 @@ public class OcrMsgReadController { } } //此处需要手工处理 返回需要将修改后的数据返回 - return new ResponseEntity(HttpStatus.OK); + return new ResponseEntity("true",HttpStatus.OK); } @ApiOperation(value = "消除未读单个", notes = "消除未读单个") @@ -157,7 +156,7 @@ public class OcrMsgReadController { boolean save = ocrMsgReadService.save(ocrmsgread); //此处需要手工处理 返回需要将修改后的数据返回 - return new ResponseEntity(save,HttpStatus.CREATED); + return new ResponseEntity(save,HttpStatus.OK); } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java index 2ec1928..3256093 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java @@ -9,8 +9,11 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.redis.cache.ICacheManager; import cn.jyjz.xiaoyao.common.redis.cache.constants.CacheConstants; import cn.jyjz.xiaoyao.framework.security.service.SmsLoginService; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSUserT; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture; import cn.jyjz.xiaoyao.ocr.service.OcrISUserTService; +import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.ApiOperation; @@ -54,6 +57,9 @@ public class OcrSUserTController { @Resource ICacheManager iCacheManager; + @Autowired + OcrTaskchildPictureService ocrtaskchildpictureservice; + /** 忘记密码 */ @ApiOperation(value = "重置密码", notes = "重置密码") @@ -100,7 +106,7 @@ public class OcrSUserTController { } @ApiOperation(value = "忘记密码", notes = "忘记密码") - @RequestMapping(value = "/selectSUser", method = RequestMethod.GET) + @RequestMapping(value = "/selectSUser", method = RequestMethod.POST) public ResponseEntity selectSUser(@RequestBody Map map) { if(null!=map.get("loginname")){ @@ -161,4 +167,5 @@ public class OcrSUserTController { } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java new file mode 100644 index 0000000..cd49eb1 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java @@ -0,0 +1,94 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +import cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; + +import java.util.List; + +/** + * ocr控制器 + * + * @author 你的肉 + * @Date 2024-03-15 19:53:30 + */ +@CrossOrigin +@RestController +@RequestMapping("/ocr/history") +public class OcrSearchHistoryController { + + + @Autowired + private IOcrSearchHistoryService ocrSearchHistoryService; + + @Autowired + private UserTokenService userTokenService; + + /** + * 搜索查询 + * @param request + * @return + */ + @RequestMapping(value = "/searchList", method = RequestMethod.GET) + public ResponseEntity searchList(HttpServletRequest request, + @RequestParam(value = "search", required = false) String search) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + //执行查询方法 + List selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getUsername()); + + OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); + ocrsearchhistory.setHistoryname(search); + ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid())); + ocrsearchhistory.setCreatedate(System.currentTimeMillis()); + ocrSearchHistoryService.save(ocrsearchhistory); + + return new ResponseEntity(selectsearch, HttpStatus.OK); + } + + + /** + * 通过 删除历史记录 + * @param request + * @return + */ + @RequestMapping(value = "/searchdelete", method = RequestMethod.DELETE) + public ResponseEntity searchdelete(HttpServletRequest request) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("userid",userToken.getUserid()); + //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据 + ocrSearchHistoryService.remove(wrapper); + return new ResponseEntity("true",HttpStatus.OK); + } + + /** + * 历史搜索 + * + * @param request + * @return + */ + @RequestMapping(value = "/historySearch", method = RequestMethod.GET) + public ResponseEntity historySearch(HttpServletRequest request) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("historyname","createdate").eq("userid",userToken.getUserid()).orderByDesc("createdate").last("limit 8"); + List list = ocrSearchHistoryService.list(wrapper); + + return new ResponseEntity>(list, HttpStatus.OK); + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java index eeea916..5f4cce4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java @@ -4,6 +4,10 @@ package cn.jyjz.xiaoyao.ocr.dataDao; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** *

@@ -15,5 +19,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface OcrMsgMapper extends BaseMapper { - + List>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java new file mode 100644 index 0000000..ce145ec --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java @@ -0,0 +1,23 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import liquibase.pro.packaged.S; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 综合搜索历史表 Mapper 接口 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +@Mapper +public interface OcrSearchHistoryMapper extends BaseMapper { + List selectsearch(@Param("search")String search,@Param("assignee") String assignee); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java new file mode 100644 index 0000000..03c2f37 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrSearchHistory.java @@ -0,0 +1,90 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; + +import java.io.Serializable; + +/** + *

+ * 综合搜索历史表 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +@TableName("ocr_search_history") +public class OcrSearchHistory extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 历史主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + /** + * 搜索历史名称 + */ + private String historyname; + + public Long getUserid() { + return userid; + } + + public void setUserid(Long userid) { + this.userid = userid; + } + + /** + * 创建时间 + */ + private Long userid; + /** + * 创建时间 + */ + private Long createdate; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + + public String getHistoryname() { + return historyname; + } + + public void setHistoryname(String historyname) { + this.historyname = historyname; + } + + public Long getCreatedate() { + return createdate; + } + + public void setCreatedate(Long createdate) { + this.createdate = createdate; + } + + @Override + public Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "OcrSearchHistory{" + + "id=" + id + + ", historyname=" + historyname + + ", userid=" + userid + + ", createdate=" + createdate + + "}"; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java index e82d72c..b090426 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrMsgService.java @@ -3,6 +3,11 @@ package cn.jyjz.xiaoyao.ocr.service; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; +import cn.jyjz.xiaoyao.ocr.util.PageRequest; + +import java.util.List; +import java.util.Map; /** *

@@ -14,4 +19,13 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IOcrMsgService extends IService { + /** + * 分页查询接口 + * 这里统一封装了分页请求和结果，避免直接引入具体框架的分页对象, 如MyBatis或JPA的分页对象 + * 从而避免因为替换ORM框架而导致服务层、控制层的分页接口也需要变动的情况，替换ORM框架也不会 + * 影响服务层以上的分页接口，起到了解耦的作用 + * @param pageRequest 自定义，统一分页查询请求 + * @return PageResult 自定义，统一分页查询结果 + */ + PageInfo>> selectPage(PageRequest pageRequest,String userid, String msgCategory); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java new file mode 100644 index 0000000..57ccaf3 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java @@ -0,0 +1,20 @@ +package cn.jyjz.xiaoyao.ocr.service; + + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 综合搜索历史表 服务类 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +public interface IOcrSearchHistoryService extends IService { + List selectsearch(String search,String assignee); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java index 68286ec..626b7e5 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrMsgServiceImpl.java @@ -4,8 +4,16 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrMsgMapper; import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg; import cn.jyjz.xiaoyao.ocr.service.IOcrMsgService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.jyjz.xiaoyao.ocr.util.PageRequest; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + /** *

* 服务实现类 @@ -17,4 +25,17 @@ import org.springframework.stereotype.Service; @Service public class OcrMsgServiceImpl extends ServiceImpl implements IOcrMsgService { + @Resource + OcrMsgMapper ocrmsgmapper; + + + @Override + public PageInfo>> selectPage(PageRequest pageRequest,String userid, String msgCategory) { + int pageNum = pageRequest.getPageNum(); + int pageSize = pageRequest.getPageSize(); + PageHelper.startPage(pageNum, pageSize); + List>> selectPage = ocrmsgmapper.selectPage(userid,msgCategory); + return new PageInfo>>(selectPage); + } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java new file mode 100644 index 0000000..82ee3c3 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -0,0 +1,31 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; +import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + +/** + *

+ * 综合搜索历史表 服务实现类 + *

+ * + * @author 你的肉123 + * @since 2024-03-15 + */ +@Service +public class OcrSearchHistoryServiceImpl extends ServiceImpl implements IOcrSearchHistoryService { + + @Resource + OcrSearchHistoryMapper ocrsearchhistorymapper; + + @Override + public List selectsearch(String search, String assignee) { + return ocrsearchhistorymapper.selectsearch(search,assignee); + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java new file mode 100644 index 0000000..ff42ebf --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/PageRequest.java @@ -0,0 +1,27 @@ +package cn.jyjz.xiaoyao.ocr.util; +/** + * 分页请求 + */ +public class PageRequest { + /** + * 当前页码 + */ + private int pageNum; + /** + * 每页数量 + */ + private int pageSize; + + public int getPageNum() { + return pageNum; + } + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + public int getPageSize() { + return pageSize; + } + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } +} \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml index 4b7dacc..b89f887 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml @@ -28,4 +28,69 @@ id, titile, msg_content AS msgContent, sender, msg_category AS msgCategory, receive_user_type AS receiveUserType, bus_json AS busJson, create_time AS createTime, create_by AS createBy, update_time AS updateTime, update_by AS updateBy, receive_user_ids AS receiveUserIds, open_type AS openType, open_page AS openPage, send_status AS sendStatus, send_time AS sendTime, cancel_time AS cancelTime + + diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml new file mode 100644 index 0000000..8f5925d --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + id, historyname, userid, createdate + + + + + +