pg数据库字段类型修改

db/uasp.postgresql.sql

@@ -94,7 +94,7 @@ SET default_with_oids = false;
   create table tmp_sa_i18nproperties
    (	tmp_id varchar(32 ) not null,
 	batch_number varchar(64 ),
-	status varchar(64 ),
+	status integer,
 	message varchar(512 ),
 	code varchar(128 ),
 	value1 varchar(512 ),
@@ -4696,7 +4696,7 @@ CREATE TABLE public.sa_opbizmanagementtype (
     node_kind_id numeric,
     remark character varying(256),
     full_name character varying(2048),
-    status numeric
+    status integer
 );
 
 
@@ -5901,14 +5901,14 @@ CREATE TABLE public.sa_oporg (
     person_id character varying(32),
     node_kind_id character varying(6),
     description character varying(512),
-    status numeric,
-    sequence numeric,
-    version numeric,
+    status integer,
+    sequence character varying(32),,
+    version character varying(32),,
     org_code character varying(360),
     dept_code character varying(360),
     position_code character varying(360),
     person_member_code character varying(360),
-    is_center numeric,
+    is_center character varying(32),,
     center_code character varying(64),
     org_id character varying(32),
     dept_id character varying(32),
@@ -5922,7 +5922,7 @@ CREATE TABLE public.sa_oporg (
     center_name character varying(128),
     full_sequence character varying(256),
     full_org_kind_id character varying(128),
-    is_virtual numeric,
+    is_virtual character varying(32),,
     dept_level character varying(64),
     tenant_id character varying(32)
 );
@@ -6388,7 +6388,7 @@ CREATE TABLE public.sa_oporgtype (
     code character varying(128),
     name character varying(256),
     org_kind_id character varying(5),
-    status numeric,
+    status integer,
     sequence numeric,
     version numeric
 );

huigou-uasp/src/main/resources/config/content/easysearch/easy-search-bpm.xml

@@ -2,8 +2,9 @@
 <easy-search-mappings>
 	<easy-search name="approvalBizElement" desc="选择业务审批要素" >
 		<sql>
-		  select id, code, name, kind_id, data_source_config, sequence from wf_approvalelement where kind_id = 2 order by sequence
+		  select id, code, name, kind_id, data_source_config, sequence from wf_approvalelement where kind_id = 2
 		</sql>
+		<orderby>sequence desc</orderby>
 		<field name="id" code="id" type='hidden'/>
 		<field name="kindId" code="kindId" type='hidden'/>
 		<field name="编码" code="code" width="160"/>
@@ -22,8 +23,8 @@
                and d.proc_id = :procKey
                and d.code = :procUnitId
          )
-         order by sequence
 		</sql>
+		<orderby>sequence desc</orderby>
 		<field name="id" code="id" type='hidden'/>
 		<field name="编码" code="code" width="160"/>
 		<field name="名称" code="name"  width="200"/>

huigou-uasp/src/main/resources/config/content/easysearch/easy-search-sys.xml

@@ -83,8 +83,9 @@
 			select s.id, s.code, s.name, s.table_name, s.folder_id
 			  from SA_ExcelImportTemplate s
 			 where s.status = 1
-			 order by s.id asc
+			 <!--order by s.id asc-->
 		</sql>
+		<orderby>id asc</orderby>
 		<field name="id" code="id" type='hidden' />
 		<field name="编码" code="code" width="100" />
 		<field name="名称" code="name" width="180" />

huigou-uasp/src/main/resources/config/content/treeview/tree-view-sys.xml

@@ -24,7 +24,7 @@
 			<hiddenCol>ORG_KIND_ID,FULL_ID,FULL_NAME,ORG_ID,ORG_NAME,CENTER_ID,CENTER_NAME,DEPT_ID,DEPT_NAME,POSITION_ID,POSITION_NAME,PERSON_ID
 			</hiddenCol>
 			<root>parent_id = :orgRoot or id = :orgRoot</root>
-			<orderby>FULL_SEQUENCE</orderby>
+			<!--<orderby>FULL_SEQUENCE</orderby>-->
 			<condition column="org_kind_id" name="orgKindId" symbol="in"/>
 			<condition column="status" name="status" symbol="in"/>
 			<condition column="is_virtual" name="isVirtual" symbol="in"/>
@@ -41,10 +41,10 @@
 			<hiddenCol>CODE,ORG_KIND_ID,FULL_ID,FULL_NAME,ORG_ID,ORG_NAME,CENTER_ID,CENTER_NAME,DEPT_ID,DEPT_NAME,POSITION_ID,POSITION_NAME,PERSON_ID
 			</hiddenCol>
 			<root>parent_id =:orgRoot or id = :orgRoot</root>
-			<orderby>FULL_SEQUENCE</orderby>
+			<!--<orderby>FULL_SEQUENCE</orderby>-->
 			<condition column="org_kind_id" name="orgKindId" symbol="in"/>
-			<condition column="status" name="status" symbol="in"/>
-			<condition column="is_virtual" name="isVirtual" symbol="in"/>
+			<condition column="status" name="status" type="java.lang.Integer" symbol="in"/>
+			<condition column="is_virtual" name="isVirtual" type="java.lang.Integer" symbol="in"/>
 		</dataModel>
 	</tree>
 	<!-- 功能菜单 -->

huigou-uasp/src/main/resources/config/uasp/query/bmp/configuration.xml

@@ -106,7 +106,7 @@
 			select t.* from tmp_sa_i18nproperties t where t.batch_number=?
 		</sql>
 		<sql name="deleteTempData">
-			delete from tmp_sa_i18nproperties t where t.batch_number=?
+			delete from tmp_sa_i18nproperties  where batch_number=?
 		</sql>
 		<sql name="updataByCode">
 			update sa_i18nproperties

huigou-xt/pom.xml

@@ -454,6 +454,12 @@
                     <artifactId>postgresql</artifactId>
                     <version>42.2.9</version>
                 </dependency>
+                <dependency>
+                    <groupId>com.microsoft.sqlserver</groupId>
+                    <artifactId>mssql-jdbc</artifactId>
+                    <version>7.4.1.jre8</version>
+                </dependency>
+
             </dependencies>
             <build>
                 <finalName>huigou-xt</finalName>

huigou-xt/src/main/resources/config/spring/spring-jpa.xml

@@ -35,7 +35,8 @@
 				<prop key="hibernate.format_sql">true</prop>
 				<prop key="hibernate.dialect">${system.hibernate.dialect}</prop>
 				<prop key="hibernate.enable_lazy_load_no_trans">true</prop>
-				<prop key="hibernate.globally_quoted_identifiers">true</prop>
+				<!--postgresql数据库globally_quoted_identifiers的值为false，其他是true-->
+				<prop key="hibernate.globally_quoted_identifiers">false</prop>
 			</props>
 		</property>
 	</bean>