Merge pull request 'feature: 增加业务字典，根据value反差label接口。' (#16) from feature/queryDictionaryByValueOrKye into test

Reviewed-on: #16

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<IPage<OcrDictionary>> 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);
+    }
+
 }

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<Map<String, Object>> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName);
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if(StringUtils.isBlank(tenantId)){
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+        Page<Map<String, Object>> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName,tenantId);
         return ResultVoUtil.success(result);
 
     }

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<OcrTaskPackage> {
 
-    Page<Map<String,Object>> getPackageList(Page<Map<String, Object>> page, @Param("packageName") String packageName);
+    Page<Map<String,Object>> getPackageList(Page<Map<String, Object>> page, @Param("packageName") String packageName,
+                                            @Param("tenantId") String tenantId);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java

@@ -34,5 +34,5 @@ public interface IOcrTaskPackageService extends IService<OcrTaskPackage> {
      * @param packageName
      * @return
      */
-    Page<Map<String, Object>> getPackageList(Integer pageNo, Integer pageSize, String packageName);
+    Page<Map<String, Object>> getPackageList(Integer pageNo, Integer pageSize, String packageName,String tenantId);
 }

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<OcrDictionary> {
      * @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);
 }

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 BaseServiceImpl<OcrDictionaryDao,
         }
         return null;
     }
+
+    @Override
+    public String queryLabelByValue(String field, String value, String tenantId) {
+        if(!StringUtils.isNotBlank(value)){
+            return null;
+        }
+        OcrDictionaryGroup dictionaryGroup = this.queryGroupByField(field);
+        if(dictionaryGroup==null){
+            return null;
+        }
+        String[] values = value.split(",");
+        if(values!=null && values.length>0){
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("group_id",dictionaryGroup.getId());
+            queryWrapper.eq("tenant_id",tenantId);
+            queryWrapper.in("value",values);
+            List<OcrDictionary> dictionaries = baseMapper.selectList(queryWrapper);
+            List<String> result = new ArrayList<>();
+            if(dictionaries!=null && dictionaries.size()>0){
+                for (OcrDictionary dictionary: dictionaries) {
+                    result.add(dictionary.getLable());
+                }
+                return String.join(",",result);
+            }
+        }
+        return null;
+    }
+
+
 }

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<OcrTaskPackageMapper,
     private OcrFieldService fieldService;
     @Resource
     private UserService userService;
+    @Resource
+    private OcrDictionaryService ocrDictionaryService;
 
     @Override
     public ResultVo saveTaskPackage(OcrTaskPackageDto ocrTaskPackage) {
@@ -65,9 +68,9 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
     }
 
     @Override
-    public Page<Map<String, Object>> getPackageList(Integer pageNo, Integer pageSize, String packageName) {
+    public Page<Map<String, Object>> getPackageList(Integer pageNo, Integer pageSize, String packageName,String tenantId) {
         Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
-        Page<Map<String, Object>> result = taskPackageMapper.getPackageList(page, packageName);
+        Page<Map<String, Object>> result = taskPackageMapper.getPackageList(page, packageName,tenantId);
         if (CollectionUtils.isNotEmpty(result.getRecords())) {
             List<OcrField> list = fieldService.list(new LambdaQueryWrapper<OcrField>().eq(OcrField::getReviewType, 1));
             List<Map<String, Object>> records = result.getRecords();
@@ -83,7 +86,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
                             map.put(field, "");
                         }
                     }
-                    disMapData(map);
+                    disMapData(map,tenantId);
                     map.putAll(record);
                     record.putAll(map);
                 }
@@ -92,12 +95,12 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
         return result;
     }
 
-    private void disMapData(Map map) {
+    private void disMapData(Map map,String tenantId) {
-        Object field1 = map.get("field1");
+        Object field1 = map.get("upuserid");
         if (ObjectUtils.isNotEmpty(field1)) {
-            User user = userService.getById(field1.toString());
+            String result = ocrDictionaryService.queryLabelByValue("person",field1.toString(),tenantId);
-            if (ObjectUtils.isNotEmpty(user)) {
+            if (!StringUtils.isEmpty(result)) {
-                map.put("field1", user.getUsername());
+                map.put("upuserid", result);
             }
         }
     }

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml

@@ -9,8 +9,9 @@
                  LEFT JOIN ocr_check_duplicate t2 ON t1.check_duplicate_id = t2.id
         left join s_user_t t3 on t1.create_by = t3.ID
         <where>
+            t1.tenant_id = #{tenantId}
             <if test="packageName != null and packageName != ''">
-                t1.name like concat('%', #{packageName}, '%')
+                and t1.name like concat('%', #{packageName}, '%')
             </if>
         </where>
     </select>