From ce5dce2d7f6eefbbe863d99e8adfa5d4ed5e229a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 13:10:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 2 +-
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 4 ++--
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java | 2 +-
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java | 2 +-
Source/UBCS-WEB/src/views/docking/task.vue | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index dcdfb1b..9f31ce4 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -84,7 +84,7 @@
import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
export default {
- name: "FormTemplateDialog",
+ name: "FormTemplateDialog",
components: { ResembleQuery, FormTemplate },
props: {
visible: {
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 57b670f..61e3788 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -97,7 +97,7 @@
sortable:true,
// width: 150,
formatter: function (row, column) {
- if (row.sendType === 'Released') {
+ if (row.sendType === 'Enabled') {
return '鍙戝竷';
} else if (row.sendType === 'TakeBack') {
return '鍥炴敹';
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 176cb9b..9ca5fc5 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -102,12 +102,12 @@
width: 150
},
{
- label: '鏁版嵁鎯呭喌',
+ label: '鎺ㄩ�佺被鍨�',
prop: 'sendType',
sortable:true,
width: 100,
formatter: function (row, column) {
- if (row.sendType === 'Released') {
+ if (row.sendType === 'Enabled') {
return '鍙戝竷';
} else if (row.sendType === 'TakeBack') {
return '鍥炴敹';
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 6ef500b..7786a94 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -103,7 +103,7 @@
codeclassify0.tenant_id = #{tenantId}
</if>
</where>
- order by id asc
+ order by lastmodifytime asc
</select>
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
@@ -304,7 +304,7 @@
<if test="tenantId != null and tenantId != ''">
and codeclassify0.tenant_id = #{tenantId}
</if>
- order by id asc
+ order by lastmodifytime desc
</select>
<select id="selectClassifyByKeyAndReseRel" resultMap="plCodeClassifyResultMap">
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java
index e19a148..fe85517 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java
@@ -17,7 +17,7 @@
* @param columnName 鍒楀悕绉�
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
- @Update("alter table ${tableName} DROP COLUMN ${columnName}")
+ @Update("alter table ${tableName} DROP COLUMN \"${columnName}\"")
@Override
int dropTableColumn(@Param("tableName")String tableName, @Param("columnName")String columnName);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java
index 94a78d2..296c988 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java
@@ -152,6 +152,6 @@
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
public int dropTableColumn(String tableName,String columnName){
- return mapper.dropTableColumn(tableName,columnName);
+ return mapper.dropTableColumn(tableName,columnName.toUpperCase());
}
}
--
Gitblit v1.9.3