ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yjz
2024-01-12 17:54:31 +08:00
parent cb4ee1588d
commit a10a35acc3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java
+2 -2
View File
@@ -67,7 +67,7 @@ public class ProcessFbEntryChange implements Serializable {
/**来源（1国内、2海外） 翻译*/ /**来源（1国内、2海外） 翻译*/
@ApiModelProperty(value = "来源（1国内、2海外） 翻译") @ApiModelProperty(value = "来源（1国内、2海外） 翻译")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String sourceDictText; private java.lang.String source_dictText;
/**操作类型（1标准法规入库、2标准法规变更）*/ /**操作类型（1标准法规入库、2标准法规变更）*/
@Excel(name = "操作类型（1标准法规入库、2标准法规变更）", width = 15) @Excel(name = "操作类型（1标准法规入库、2标准法规变更）", width = 15)
@ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更）") @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更）")
@@ -75,7 +75,7 @@ public class ProcessFbEntryChange implements Serializable {
/**操作类型（1标准法规入库、2标准法规变更）*/ /**操作类型（1标准法规入库、2标准法规变更）*/
@ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更） 翻译") @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更） 翻译")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String operateTypeDictText; private java.lang.String operateType_dictText;
/**标准编号*/ /**标准编号*/
@Excel(name = "标准编号", width = 15) @Excel(name = "标准编号", width = 15)
@ApiModelProperty(value = "标准编号") @ApiModelProperty(value = "标准编号")
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+7 -7
View File
@@ -381,33 +381,33 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
String source = processFbEntryChange.getSource(); String source = processFbEntryChange.getSource();
JSONObject jsonObject = JSON.parseObject(businessJson); JSONObject jsonObject = JSON.parseObject(businessJson);
if ("1".equals(source)){ if ("1".equals(source)){
processFbEntryChange.setSourceDictText("国内"); processFbEntryChange.setSource_dictText("国内");
// 国内动力类型 // 国内动力类型
if (businessJson.contains("dynamic_type")){ if (businessJson.contains("dynamic_type")){
Object read = JSONPath.read(businessJson, "$.dynamic_type"); Object read = JSONPath.read(businessJson, "$.dynamic_type");
String text = dictService.queryDictText("POWER_TYPE_DOMESTIC", read.toString()); String text = dictService.queryDictText("POWER_TYPE_DOMESTIC", read.toString());
jsonObject.put("dynamic_typeDictText", text); jsonObject.put("dynamic_type_dictText", text);
} }
}else { }else {
processFbEntryChange.setSourceDictText("海外"); processFbEntryChange.setSource_dictText("海外");
// 海外动力类型 // 海外动力类型
if (businessJson.contains("dynamic_type")){ if (businessJson.contains("dynamic_type")){
Object read = JSONPath.read(businessJson, "$.dynamic_type"); Object read = JSONPath.read(businessJson, "$.dynamic_type");
String text = dictService.queryDictText("POWER_TYPE_DOMESTIC_OVERSEAS", read.toString()); String text = dictService.queryDictText("POWER_TYPE_DOMESTIC_OVERSEAS", read.toString());
jsonObject.put("dynamic_typeDictText", text); jsonObject.put("dynamic_type_dictText", text);
} }
} }
if ("1".equals(processFbEntryChange.getOperateType())){ if ("1".equals(processFbEntryChange.getOperateType())){
processFbEntryChange.setOperateTypeDictText("标准法规入库"); processFbEntryChange.setOperateType_dictText("标准法规入库");
}else { }else {
processFbEntryChange.setOperateTypeDictText("标准法规变更"); processFbEntryChange.setOperateType_dictText("标准法规变更");
} }
// 采标程度 // 采标程度
if (businessJson.contains("degree_of_bid_acquisition")){ if (businessJson.contains("degree_of_bid_acquisition")){
Object read = JSONPath.read(businessJson, "$.degree_of_bid_acquisition"); Object read = JSONPath.read(businessJson, "$.degree_of_bid_acquisition");
String text = dictService.queryDictText("degree_bid_acquisition", read.toString()); String text = dictService.queryDictText("degree_bid_acquisition", read.toString());
jsonObject.put("degree_of_bid_acquisitionDictText", text); jsonObject.put("degree_of_bid_acquisition_dictText", text);
} }
processFbEntryChange.setBusinessJson(jsonObject.toJSONString()); processFbEntryChange.setBusinessJson(jsonObject.toJSONString());
} }