Browse Source

修复问题

2507040827 3 weeks ago
parent
commit
5917319df7

+ 1 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/dto/TagResultDto.java

@@ -28,7 +28,7 @@ public class TagResultDto {
     private Boolean passr;
 
     /**
-     * 标签编
+     * 标签编
      */
     private String tag_code;
 

+ 5 - 1
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/entity/AitagTagInfoVersionEntity.java

@@ -111,5 +111,9 @@ public class AitagTagInfoVersionEntity {
     private String reviser;
 
 
-
+    /**
+     * 主版本id
+     **/
+    @ApiModelProperty(value = "主版本id")
+    private String primaryVersionId;
 }

+ 1 - 0
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagTagInfoServiceImpl.java

@@ -193,6 +193,7 @@ public class AitagTagInfoServiceImpl extends ServiceImpl<AitagTagInfoDao, AitagT
             checkTagCodeDuplicate(newTagCode);
         }
         AitagTagInfoVersionEntity aitagTagInfoVersionEntity = JSON.parseObject(JSON.toJSONString(oldTagInfo), AitagTagInfoVersionEntity.class);
+        aitagTagInfoVersionEntity.setPrimaryVersionId(aitagTagInfoEntity.getId());
         aitagTagInfoVersionEntity.setId(StringUtils.getUUID());
         this.aitagTagInfoVersionDao.insert(aitagTagInfoVersionEntity);
         aitagTagInfoEntity.setRevisionTime(DateUtils.getCurrDateTimeStr());

+ 1 - 1
server/yusp-tagging-core/src/main/resources/mapper/AitagTagInfoMapper.xml

@@ -68,7 +68,7 @@
         FROM aitag_tag_info ti
                  LEFT JOIN (SELECT *
                             FROM aitag_tag_info_version
-                            WHERE is_delete = '0')  tiv ON ti.tag_code = tiv.tag_code
+                            WHERE is_delete = '0')  tiv ON ti.id = tiv.primary_version_id
         where ti.id= #{id}
         order by version_revision_time desc
     </select>

+ 2 - 2
server/yusp-tagging-core/src/main/resources/messages/yusp_input_msg.properties

@@ -107,10 +107,10 @@ E006=\u6821\u9A8C\u5931\u8D25\uFF1A\u6807\u7B7E [{0}] \u7684\u7236\u6807\u7B7E [
 E007=\u68C0\u6D4B\u5230\u6807\u7B7E\u5C42\u7EA7\u73AF\u8DEF:{0}
 E008=\u8C03\u7528AI\u6253\u6807\u63A5\u53E3\u5931\u8D25
 E009=\u83B7\u53D6\u7528\u6237\u767B\u9646\u4FE1\u606F\u4E3A\u7A7A
-E010=\u6807\u7B7E\u7F16\u7801\u91CD\u590D\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165
+E010=\u6807\u7B7E\u7F16\u53F7\u91CD\u590D\uFF0C\u8BF7\u91CD\u65B0\u8F93\u5165
 E011=\u6807\u7B7E\u5B58\u5728\u4E0B\u7EA7\u6807\u7B7E\uFF0C\u65E0\u6CD5\u5220\u9664
 E012=\u6807\u7B7E\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
-E013=\u6807\u7B7E\u4EE3\u7801\u4E0D\u80FD\u4E3A\u7A7A
+E013=\u6807\u7B7E\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
 E014=\u6807\u7B7E\u7F16\u53F7\u4E0D\u6B63\u786E
 E015=\u6A21\u677F\u683C\u5F0F\u4E0D\u6B63\u786E
 E016=\u6570\u636E\u884C\u6570\u8D85\u8FC7\u9650\u5236