diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java index 7337cfc9..cb85fc1d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java @@ -59,4 +59,26 @@ public class OcrDictionaryController { } return new ResultVo<>(ResultVo.ERROR,"根据field查询不到字典组!"); } + + + /** + *根据字典value获取对应lable值 + * + *创建人:mail.zhangyong@gmail.com + *创建时间:2024-01-14 10:27:02 + **/ + @GetMapping("/getLabelByValue") + @ResponseBody + public ResultVo> getLabelByValue(HttpServletResponse response, + HttpServletRequest request, + @RequestParam(name="field", defaultValue="upName",required = true) String field, + @RequestParam(name="value", defaultValue="",required = true) String value) { + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + String result= ocrDictionaryService.queryLabelByValue(field,value,tenantId); + return new ResultVo<>(ResultVo.ERROR,result); + } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java index 6b40d5d8..35fe3bda 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java @@ -110,7 +110,11 @@ public class OcrTaskPackageController extends BaseController { @RequestParam(name = "pageNo") Integer pageNo, @RequestParam(name = "pageSize") Integer pageSize, HttpServletRequest req) { - Page> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName); + String tenantId = req.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + Page> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName,tenantId); return ResultVoUtil.success(result); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java index 3fccfb7a..d66ed3d3 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java @@ -20,5 +20,6 @@ import java.util.Map; @Mapper public interface OcrTaskPackageMapper extends BaseMapper { - Page> getPackageList(Page> page, @Param("packageName") String packageName); + Page> getPackageList(Page> page, @Param("packageName") String packageName, + @Param("tenantId") String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java index 161eaa9a..63c2209f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java @@ -34,5 +34,5 @@ public interface IOcrTaskPackageService extends IService { * @param packageName * @return */ - Page> getPackageList(Integer pageNo, Integer pageSize, String packageName); + Page> getPackageList(Integer pageNo, Integer pageSize, String packageName,String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java index 7599c434..6563b7f5 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrDictionaryService.java @@ -2,7 +2,6 @@ package cn.jyjz.xiaoyao.ocr.service; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary; import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; -import liquibase.pro.packaged.L; /** * 业务向 数据字典 操作接口 @@ -27,4 +26,14 @@ public interface OcrDictionaryService extends BaseService { * @return */ OcrDictionaryGroup queryGroupByField(String field); + + /** + * 根据value 获取字典lable + * + * @param field + * @param value 支持两种格式: 1.单value(xxx) ,2.多value(xxx,xxx) + * @param tenantId + * @return + */ + String queryLabelByValue(String field, String value, String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java index fc94d3f8..67aa0245 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrDictionaryServiceImpl.java @@ -1,5 +1,7 @@ package cn.jyjz.xiaoyao.ocr.service.impl; +import cn.hutool.core.util.ArrayUtil; +import cn.jyjz.xiaoyao.common.base.util.StringUtils; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import cn.jyjz.xiaoyao.ocr.dataDao.OcrDictionaryDao; import cn.jyjz.xiaoyao.ocr.dataDao.OcrDictionaryGroupDao; @@ -8,9 +10,12 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup; import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.List; /** @@ -47,4 +52,33 @@ public class OcrDictionaryServiceImpl extends BaseServiceImpl0){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("group_id",dictionaryGroup.getId()); + queryWrapper.eq("tenant_id",tenantId); + queryWrapper.in("value",values); + List dictionaries = baseMapper.selectList(queryWrapper); + List result = new ArrayList<>(); + if(dictionaries!=null && dictionaries.size()>0){ + for (OcrDictionary dictionary: dictionaries) { + result.add(dictionary.getLable()); + } + return String.join(",",result); + } + } + return null; + } + + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java index ec02f131..2f453723 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -47,6 +48,8 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl> getPackageList(Integer pageNo, Integer pageSize, String packageName) { + public Page> getPackageList(Integer pageNo, Integer pageSize, String packageName,String tenantId) { Page> page = new Page<>(pageNo, pageSize); - Page> result = taskPackageMapper.getPackageList(page, packageName); + Page> result = taskPackageMapper.getPackageList(page, packageName,tenantId); if (CollectionUtils.isNotEmpty(result.getRecords())) { List list = fieldService.list(new LambdaQueryWrapper().eq(OcrField::getReviewType, 1)); List> records = result.getRecords(); @@ -83,7 +86,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl + t1.tenant_id = #{tenantId} - t1.name like concat('%', #{packageName}, '%') + and t1.name like concat('%', #{packageName}, '%') - \ No newline at end of file +