From 241cd06b19dcfc3dcd6739af36a1081c1c63c53d Mon Sep 17 00:00:00 2001 From: admin <149470858@qq.com> Date: Sun, 10 Mar 2024 23:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E3=80=81?= =?UTF-8?q?=E7=9C=81=E4=BB=BD=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoyao/createcode/read/XmlPrase.java | 4 +- .../from/controller/CategoryController.java | 32 +++++++ .../oa/from/service/CategoryService.java | 5 + .../service/impl/CategoryServiceImpl.java | 12 +++ .../ocr/controller/OcrPictureController.java | 11 +-- .../ocr/controller/OcrProvinceController.java | 73 +++++++++++++++ .../ocr/dataDao/OcrProvinceMybatisDao.java | 11 +++ .../xiaoyao/ocr/dataobject/OcrProvince.java | 91 +++++++++++++++++++ .../ocr/service/OcrProvinceService.java | 16 ++++ .../service/impl/OcrProvinceServiceImpl.java | 32 +++++++ .../xiaoyao/ocr/util/SearchConfigEnum.java | 8 +- .../resources/mapper/oa/OcrProvinceMapper.xml | 51 +++++++++++ runstart/doc/sql/update.sql | 23 +++++ 13 files changed, 354 insertions(+), 15 deletions(-) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml diff --git a/jyjz-common/jyjz-common-mybatisplus/src/main/java/cn/jyjz/xiaoyao/createcode/read/XmlPrase.java b/jyjz-common/jyjz-common-mybatisplus/src/main/java/cn/jyjz/xiaoyao/createcode/read/XmlPrase.java index aa9c9c05..b95e8b40 100644 --- a/jyjz-common/jyjz-common-mybatisplus/src/main/java/cn/jyjz/xiaoyao/createcode/read/XmlPrase.java +++ b/jyjz-common/jyjz-common-mybatisplus/src/main/java/cn/jyjz/xiaoyao/createcode/read/XmlPrase.java @@ -61,8 +61,8 @@ public class XmlPrase { //通过一个table对象，得到columns对象 Element columns = table_s.element("Columns"); List columnList = new ArrayList(); - - + + for (Iterator cols = columns.elementIterator("Column"); cols.hasNext(); ) { Element column = cols.next(); Column column2 = new Column(); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/controller/CategoryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/controller/CategoryController.java index 188e46c5..e3941fb2 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/controller/CategoryController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/controller/CategoryController.java @@ -1,6 +1,7 @@ package cn.jyjz.xiaoyao.oa.from.controller; import java.io.IOException; +import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,6 +13,12 @@ import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat; import cn.jyjz.xiaoyao.oa.from.dataobject.Category; import cn.jyjz.xiaoyao.oa.from.service.CategoryService; 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 org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +35,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +@Api(tags="ocr_项目管理") @RestController @RequestMapping("/backstage/oa/category") public class CategoryController extends BaseController{ @@ -58,7 +66,31 @@ public class CategoryController extends BaseController{ } return ResultVoUtil.success(page); } + /** + *方法描述：返回json字符串，接受参数，dto名称以及分页信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2023-04-19 14:41:09 + **/ + @ApiOperation(value="项目列表", notes="项目列表") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true) + }) + @GetMapping("/listall") + public ResultVo> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{ + + //租户主键，由前端页面传送 + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("tenantid",tenantId); + + List list = this.categoryService.getCategoryAll(queryWrapper); + return ResultVoUtil.success(list); + } /** *方法描述：保存添加数据 *创建人：mail.zhangyong@gmail.com diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/CategoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/CategoryService.java index 7d78de27..4e4a1baa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/CategoryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/CategoryService.java @@ -1,8 +1,11 @@ package cn.jyjz.xiaoyao.oa.from.service; import java.util.List; + +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.oa.from.dataobject.Category; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; /** * 业务层 @@ -18,4 +21,6 @@ public interface CategoryService extends BaseService { Category getCategoryNotNull(); List getCategoryList(String category); + + List getCategoryAll(QueryWrapper queryWrapper); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/CategoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/CategoryServiceImpl.java index 95cc2168..14f8f38e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/CategoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/CategoryServiceImpl.java @@ -1,9 +1,12 @@ package cn.jyjz.xiaoyao.oa.from.service.impl; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; import cn.jyjz.xiaoyao.oa.from.dataDao.CategoryMybatisDao; import cn.jyjz.xiaoyao.oa.from.dataobject.Category; import cn.jyjz.xiaoyao.oa.from.service.CategoryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; @@ -52,4 +55,13 @@ public class CategoryServiceImpl extends BaseServiceImpl categoryList = this.list(queryWrapper); return categoryList; } + + public List getCategoryAll(QueryWrapper queryWrapper){ + Long count = this.count(queryWrapper); + + Page page = new Page<>(0, count); + + IPage iPage = this.categorymybatisdao.selectPage(page,queryWrapper); + return iPage.getRecords(); + } } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 60a1346b..74a1ddca 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -25,6 +25,7 @@ import cn.jyjz.xiaoyao.ocr.util.DataUtil; import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum; 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; @@ -45,6 +46,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +@Api(tags="ocr_图片管理") @RestController @RequestMapping("/ocr/ocrPicture") public class OcrPictureController extends BaseController{ @@ -216,15 +218,6 @@ public class OcrPictureController extends BaseController{ } - - //提报人 - //任务计划 - //相似度 - //图片类型 - //年份 - //发布地区 - //SearchConfigEnum.fomarQueryWrapper(req,queryWrapper); - for(SearchConfigEnum config : SearchConfigEnum.values()){ //相似度不在搜索范围内 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java new file mode 100644 index 00000000..86739131 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java @@ -0,0 +1,73 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import java.io.IOException; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import cn.jyjz.xiaoyao.oa.from.dataobject.Category; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince; +import cn.jyjz.xiaoyao.ocr.service.OcrProvinceService; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +@Api(tags="ocr_省份管理") +@RestController +@RequestMapping("/backstage/ocrnewtest/ocrprovince") +public class OcrProvinceController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private OcrProvinceService ocrProvinceService; + + @Autowired + private UserTokenService userTokenService; + @Autowired + private UserService userService; + /** + *方法描述：返回json字符串，接受参数，dto名称以及分页信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-03-10 23:18:35 + **/ + @ApiOperation(value="省份列表", notes="省份列表") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true) + }) + @GetMapping("/listall") + public ResultVo> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{ + //租户主键，由前端页面传送 + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("tenantid",tenantId); + + List list = this.ocrProvinceService.getProvinceAll(queryWrapper); + + return ResultVoUtil.success(list); + } + + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java new file mode 100644 index 00000000..35e7a455 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java @@ -0,0 +1,11 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +/** +* 数据持久化 +*/ +@Mapper +public interface OcrProvinceMybatisDao extends BaseMapper { +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java new file mode 100644 index 00000000..ad9d3b00 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrProvince.java @@ -0,0 +1,91 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import java.util.Map; +import java.util.AbstractMap.SimpleEntry; +import java.util.stream.Stream; +import java.util.stream.Collectors; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "拜访省份/直辖市", title = "拜访省份/直辖市") +@TableName(value = "ocr_province") +public class OcrProvince implements BaseDto,java.io.Serializable { + + private static final long serialVersionUID = 5578479019938662516L; + @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 = "创建时间") + @TableField(value="CREATETIME") + private Long createtime; + + @Schema(description = "修改人") + @TableField(value="UPDATEBY") + private String updateby; + + @Schema(description = "修改时间") + @TableField(value="UPDATETIME") + private Long updatetime; + + @Schema(description = "租户ID") + @TableField(value="TENANTID") + private Long tenantid; + + @Schema(description = "省份名称") + @TableField(value="PRONAME") + private String proname; + + @Schema(description = "排序字段") + @TableField(value="REORDER") + private Integer reorder; + + + //保存当前登录用户的数据权限范围的搜索条件 + @TableField(exist = false) + private SearchQuery searchQueryrolesShowleave; + + @TableField(exist = false) + private final Map query = Stream.of( + new SimpleEntry<>("listdept","deptid"), + 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<>("PRONAME","proname"), + new SimpleEntry<>("REORDER","reorder") + ) + .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; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java new file mode 100644 index 00000000..4c1e3ba7 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrProvinceService.java @@ -0,0 +1,16 @@ +package cn.jyjz.xiaoyao.ocr.service; + +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; +import cn.jyjz.xiaoyao.oa.from.dataobject.Category; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +import java.util.List; + +/** +* 业务层 +*/ +public interface OcrProvinceService extends BaseService { + + public List getProvinceAll(QueryWrapper queryWrapper); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java new file mode 100644 index 00000000..9e1c223b --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrProvinceServiceImpl.java @@ -0,0 +1,32 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.oa.from.dataobject.Category; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrProvinceMybatisDao; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince; +import cn.jyjz.xiaoyao.ocr.service.OcrProvinceService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; +import lombok.extern.slf4j.Slf4j; +import java.util.List; +/** +* 业务层实现 +*/ +@Service +@Slf4j +public class OcrProvinceServiceImpl extends BaseServiceImpl implements OcrProvinceService { + @Autowired + private OcrProvinceMybatisDao ocrprovincemybatisdao; + + public List getProvinceAll(QueryWrapper queryWrapper){ + Long count = this.count(queryWrapper); + + Page page = new Page<>(0, count); + + IPage iPage = this.ocrprovincemybatisdao.selectPage(page,queryWrapper); + return iPage.getRecords(); + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java index d53b6c3b..92a5e473 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java @@ -13,9 +13,9 @@ public enum SearchConfigEnum { //所属项目 PROJECT("izproject","projectIdName"), //拜访客户类型 - FILED2("izfiled2","field2"), + FILED2("izcustomlevel","field2"), //拜访客户级别 - FILED6("izfield6","field6"), + FILED6("izcustomlevel","field6"), //拜访客户名称 FILED3("izfield3","field3"), //任务来源 @@ -29,7 +29,7 @@ public enum SearchConfigEnum { //产品名称 FIELD9("izproductname","field9"), //拜访项目类别 - FIELD17("izfield17","field17"), + FIELD17("izprojecttype","field17"), //所属项目、拜访客户类型、拜访客户级别、拜访客户名称、拜访项目类别、任务来源、任务状态、拜访省份/直辖市、、厂商、产品名称、 //提报人 @@ -46,7 +46,7 @@ public enum SearchConfigEnum { //图片类型 TYPESEARCH("izPicturetype","pictureclassid"), //发布地区、拜访城市 - AREASEARCH("izArea","releaseArea"), + AREASEARCH("izvisitcity","releaseArea"), THREEWEEKdd("izYeardddd","upTime"); private String id; diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml new file mode 100644 index 00000000..5b22f3fc --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrProvinceMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + ID AS id, + CREATEBY AS createby, + CREATETIME AS createtime, + UPDATEBY AS updateby, + UPDATETIME AS updatetime, + TENANTID AS tenantid, + PRONAME AS proname, + REORDER AS reorder + + + + + + and ID ${id.dataOp} ${id.likestar}#{id.value}${id.likeend} + and CREATEBY ${createby.dataOp} ${createby.likestar}#{createby.value}${createby.likeend} + and CREATETIME ${createtime.dataOp} ${createtime.likestar}#{createtime.value}${createtime.likeend} + and UPDATEBY ${updateby.dataOp} ${updateby.likestar}#{updateby.value}${updateby.likeend} + and UPDATETIME ${updatetime.dataOp} ${updatetime.likestar}#{updatetime.value}${updatetime.likeend} + and TENANTID ${tenantid.dataOp} ${tenantid.likestar}#{tenantid.value}${tenantid.likeend} + and PRONAME ${proname.dataOp} ${proname.likestar}#{proname.value}${proname.likeend} + and REORDER ${reorder.dataOp} ${reorder.likestar}#{reorder.value}${reorder.likeend} + and USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend} + + and DEPARTID in + + #{item} + + + + + + order by ${page.sortname} ${page.sortorder} + limit ${page.start}, ${page.Pagesize} + + + + diff --git a/runstart/doc/sql/update.sql b/runstart/doc/sql/update.sql index 2bc9bb0f..63ff3cce 100644 --- a/runstart/doc/sql/update.sql +++ b/runstart/doc/sql/update.sql @@ -155,3 +155,26 @@ INSERT INTO `ocrnew`.`s_distionary_t` (`ID`, `DISTIONARYTYPEID`, `DISTIONATYGROU INSERT INTO `ocrnew`.`s_distionary_t` (`ID`, `DISTIONARYTYPEID`, `DISTIONATYGROUPID`, `CODENO`, `NAME`, `CONTENT`, `ENABLED`, `SORTING`, `CREATEUSER`, `CREATEDATE`, `UPDATEUSER`, `UPDATETIME`, `WEIGHT`, `BACKUP`) VALUES (260402999231251188, 251195458853011929, 251196098891219545, '0', '其他', '其他', 1, 99, '1', 1709869115234, '1', NULL, NULL, NULL); +#2024-03-10 + +INSERT INTO S_BACKSTAGEOPENURL_T(ID,URL,REMARK) VALUES(1196092352600928292, '/backstage/ocrnewtest/ocrprovince/listall', '查询省份'); +INSERT INTO S_BACKSTAGEOPENURL_T(ID,URL,REMARK) VALUES(1196092352600928293, '/backstage/oa/category/listall', '查询项目'); + + +drop table if exists ocr_province; + +/*==============================================================*/ +/* Table: ocr_province */ +/*==============================================================*/ +create table ocr_province +( + ID bigint(20) not null comment '主键', + CREATEBY varchar(100) not null comment '创建人', + CREATETIME bigint(15) not null comment '创建时间', + UPDATEBY varchar(100) comment '修改人', + UPDATETIME bigint(15) comment '修改时间', + TENANTID bigint(20) comment '租户ID', + PRONAME varchar(255) comment '省份名称', + REORDER int comment '排序字段', + primary key (ID) +);