fix(标准法规入库/变更流程): 翻译问题

laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java

@@ -1,15 +1,15 @@
 package com.jero.modules.system.service;
 
-import java.util.List;
-import java.util.Map;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.DictQuery;
 import com.jero.modules.system.entity.SysDict;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.model.TreeSelectModel;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 字典表 服务类
@@ -227,4 +227,6 @@ public interface ISysDictService extends IService<SysDict> {
 	void deleteById(String id);
 
 	void deleteByIds(List<String> idList);
+
+	String queryDictText(String code, String keys);
 }

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -5,19 +5,16 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.vo.Result;
 import com.jero.common.api.vo.ResultCommon;
-import com.jero.common.constant.enums.LanguageEnum;
-import com.jero.common.constant.enums.YesOrNoEnum;
-import com.jero.common.exception.JeroBootException;
-import com.jero.common.system.vo.DictModelMany;
-import com.jero.common.util.MessageUtils;
-import com.jero.common.util.SqlInjectionUtil;
-import lombok.extern.slf4j.Slf4j;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.LanguageEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.DictModel;
+import com.jero.common.system.vo.DictModelMany;
 import com.jero.common.system.vo.DictQuery;
+import com.jero.common.util.MessageUtils;
+import com.jero.common.util.SqlInjectionUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDict;
 import com.jero.modules.system.entity.SysDictItem;
@@ -25,6 +22,7 @@ import com.jero.modules.system.mapper.SysDictItemMapper;
 import com.jero.modules.system.mapper.SysDictMapper;
 import com.jero.modules.system.model.TreeSelectModel;
 import com.jero.modules.system.service.ISysDictService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -231,10 +229,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     @Transactional
     public Integer saveMain(SysDict sysDict, List<SysDictItem> sysDictItemList) {
 		int insert=0;
-    	try{
+		try{
 			sysDict.setIsTagDict(0);
 			sysDict.setIsReadOnly(0);
-			 insert = sysDictMapper.insert(sysDict);
+			insert = sysDictMapper.insert(sysDict);
 			if (sysDictItemList != null) {
 				for (SysDictItem entity : sysDictItemList) {
 					entity.setDictId(sysDict.getId());
@@ -517,4 +515,22 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		}
 		this.removeByIds(idList);
 	}
+
+	@Override
+	public String queryDictText(String code, String keys) {
+		SysDict sysDict = getOne(new LambdaQueryWrapper<SysDict>().eq(SysDict::getDictCode, code));
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(
+				new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, sysDict.getId()));
+		String[] keyArr = keys.split(",");
+		List<String> itemValueList = new ArrayList<>();
+		for (String key : keyArr) {
+			Optional<SysDictItem> optionalSysDictItem = sysDictItemList.stream().filter(v -> key.equals(v.getItemValue())).findFirst();
+			if (optionalSysDictItem.isPresent()){
+				itemValueList.add(optionalSysDictItem.get().getItemText());
+			}else {
+				itemValueList.add(key);
+			}
+		}
+		return String.join(",", itemValueList);
+	}
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java

@@ -1,6 +1,8 @@
 package com.jero.modules.activiti.process.fb.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONPath;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.dto.message.SendMessageDTO;
@@ -29,6 +31,7 @@ import com.jero.modules.laws.common.service.ILawsCommonService;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.tag.entity.LawsTag;
 import com.jero.modules.tag.enums.TableNameEnum;
@@ -74,6 +77,9 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     @Resource
     private ISysUserService sysUserService;
 
+    @Resource
+    private ISysDictService dictService;
+
     /**
      * @Author: liao
      * @Date: 2023/11/2 15:43
@@ -371,19 +377,40 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     }
 
     private void toDict(ProcessFbEntryChange processFbEntryChange) {
+        String businessJson = processFbEntryChange.getBusinessJson();
         String source = processFbEntryChange.getSource();
+        JSONObject jsonObject = JSON.parseObject(businessJson);
         if ("1".equals(source)){
             processFbEntryChange.setSourceDictText("国内");
+            // 国内动力类型
+            if (businessJson.contains("dynamic_type")){
+                Object read = JSONPath.read(businessJson, "$.dynamic_type");
+                String text = dictService.queryDictText("POWER_TYPE_DOMESTIC", read.toString());
+                jsonObject.put("dynamic_typeDictText", text);
+
+            }
         }else {
             processFbEntryChange.setSourceDictText("海外");
+            // 海外动力类型
+            if (businessJson.contains("dynamic_type")){
+                Object read = JSONPath.read(businessJson, "$.dynamic_type");
+                String text = dictService.queryDictText("POWER_TYPE_DOMESTIC_OVERSEAS", read.toString());
+                jsonObject.put("dynamic_typeDictText", text);
+            }
         }
         if ("1".equals(processFbEntryChange.getOperateType())){
             processFbEntryChange.setOperateTypeDictText("标准法规入库");
         }else {
             processFbEntryChange.setOperateTypeDictText("标准法规变更");
         }
+        // 采标程度
+        if (businessJson.contains("degree_of_bid_acquisition")){
+            Object read = JSONPath.read(businessJson, "$.degree_of_bid_acquisition");
+            String text = dictService.queryDictText("degree_bid_acquisition", read.toString());
+            jsonObject.put("degree_of_bid_acquisitionDictText", text);
+        }
+        processFbEntryChange.setBusinessJson(jsonObject.toJSONString());
     }
-
     @Override
     public void changeToDraft(ProcessAll processAll) {
         // 删除业务表数据