添加排序字段

integrate-system/src/main/java/com/system/controller/KingDeeCommonConfigController.java

@@ -6,6 +6,8 @@ import com.system.transfer.response.RestResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -28,6 +30,7 @@ public class KingDeeCommonConfigController {
     }
 
     @ApiOperation("金蝶通用配置创建")
+    @Transactional
     @PostMapping("/kingdee/common/config/create")
     public RestResponse kingDeeCommonConfigCreate(@RequestBody KingDeeCommonConfigCreateInVo inVo) {
         return kingDeeCommonConfigService.kingDeeCommonConfigCreate(inVo);

integrate-system/src/main/java/com/system/dao/mapper/KingDeeCommonConfigMapper.xml

@@ -8,7 +8,7 @@
 
         SELECT
             id, doc_type, s_form_id, `name`, direction, operation, primary_key_field, entry_primary_key_field, mes_entry_name, entry_name,
-            fathers_form_id, father_entry_name, push_rule, is_in_transaction, is_auto_perform, plug_in_url, custom_sql, create_time
+            fathers_form_id, father_entry_name, push_rule, is_in_transaction, is_auto_perform, plug_in_url, custom_sql, create_time,pai_xu
         FROM tb_kingdee_common_config WHERE platform_product_relation_id = #{inVo.platformProductRelationId}
         <if test="inVo.operation != null">
             AND operation = #{inVo.operation}
@@ -16,6 +16,7 @@
         <if test="inVo.name != null and inVo.name != ''">
             AND `name` LIKE CONCAT("%", #{inVo.name}, "%")
         </if>
+        order by pai_xu asc
 
     </select>
 
@@ -25,7 +26,7 @@
 
         SELECT
             id, platform_product_relation_id, doc_type, s_form_id, `name`, direction, operation, primary_key_field, entry_primary_key_field,
-            mes_entry_name, entry_name, fathers_form_id, father_entry_name, push_rule, is_in_transaction, is_auto_perform, plug_in_url, custom_sql
+            mes_entry_name, entry_name, fathers_form_id, father_entry_name, push_rule, is_in_transaction, is_auto_perform, plug_in_url, custom_sql,pai_xu
         FROM tb_kingdee_common_config
         <where>
             <if test="operation != null and operation == 2">
@@ -38,6 +39,7 @@
                 platform_product_relation_id = #{platformProductRelationId} AND s_form_id = #{sFormId} AND operation = #{operation}
             </if>
         </where>
+        order by pai_xu asc
 
     </select>
 
@@ -55,10 +57,10 @@
 
         INSERT INTO tb_kingdee_common_config (
             doc_type, platform_product_relation_id, s_form_id, `name`, direction, operation, primary_key_field, entry_primary_key_field,
-            mes_entry_name, entry_name, fathers_form_id, father_entry_name, push_rule, is_in_transaction, is_auto_perform, plug_in_url, custom_sql
+            mes_entry_name, entry_name, fathers_form_id, father_entry_name, push_rule, is_in_transaction, is_auto_perform, plug_in_url, custom_sql,pai_xu
         ) VALUES (
             #{docType}, #{platformProductRelationId}, #{sFormId}, #{name}, #{direction}, #{operation}, #{primaryKeyField}, #{entryPrimaryKeyField},
-            #{mesEntryName}, #{entryName}, #{fathersFormId}, #{fatherEntryName}, #{pushRule}, #{isInTransaction}, #{isAutoPerform}, #{plugInUrl}, #{customSql}
+            #{mesEntryName}, #{entryName}, #{fathersFormId}, #{fatherEntryName}, #{pushRule}, #{isInTransaction}, #{isAutoPerform}, #{plugInUrl}, #{customSql},#{paiXu}
         )
 
     </insert>
@@ -71,7 +73,7 @@
             doc_type = #{docType}, s_form_id = #{sFormId}, `name` = #{name}, direction = #{direction}, operation = #{operation},
             primary_key_field = #{primaryKeyField}, entry_primary_key_field = #{entryPrimaryKeyField}, mes_entry_name = #{mesEntryName},
             entry_name = #{entryName}, fathers_form_id = #{fathersFormId}, father_entry_name = #{fatherEntryName}, push_rule = #{pushRule},
-            is_in_transaction = #{isInTransaction}, is_auto_perform = #{isAutoPerform},plug_in_url = #{plugInUrl}, custom_sql = #{customSql}
+            is_in_transaction = #{isInTransaction}, is_auto_perform = #{isAutoPerform},plug_in_url = #{plugInUrl}, custom_sql = #{customSql},pai_xu=#{paiXu}
         WHERE id = #{id} LIMIT 1
 
     </update>

integrate-system/src/main/java/com/system/transfer/kingdee/KingDeeCommonConfigCreateInVo.java

@@ -115,5 +115,10 @@ public class KingDeeCommonConfigCreateInVo {
      */
     private String customSql;
 
+    /**
+     * 排序
+     */
+    private Integer paiXu;
+
 
 }

integrate-system/src/main/java/com/system/transfer/kingdee/KingDeeCommonConfigListInVo.java

@@ -24,6 +24,11 @@ public class KingDeeCommonConfigListInVo {
      */
     private Integer operation;
 
+    /**
+     * 排序
+     */
+    private Integer paiXu;
+
 
     /**
      * 页码
@@ -37,6 +42,8 @@ public class KingDeeCommonConfigListInVo {
     private Integer pageSize;
 
 
+
+
     private static final Integer DEFAULT_PAGE_NO = 1;
     private static final Integer DEFAULT_PAGE_SIZE = 20;
 
@@ -91,5 +98,13 @@ public class KingDeeCommonConfigListInVo {
         this.pageSize = pageSize;
     }
 
+    public Integer getPaiXu() {
+        return paiXu;
+    }
+
+    public void setPaiXu(Integer paiXu) {
+        this.paiXu = paiXu;
+    }
+
 
 }

integrate-system/src/main/java/com/system/transfer/kingdee/KingDeeCommonConfigListOutVoRecords.java

@@ -123,6 +123,11 @@ public class KingDeeCommonConfigListOutVoRecords {
      */
     private String createTime;
 
+    /**
+     * 排序
+     */
+    private Integer paiXu;
+
 
     /**
      * 映射记录

integrate-system/src/main/java/com/system/transfer/kingdee/KingDeeCommonConfigOneInVo.java

@@ -36,4 +36,5 @@ public class KingDeeCommonConfigOneInVo {
     private Integer operation;
 
 
+
 }

integrate-system/src/main/java/com/system/transfer/kingdee/KingDeeCommonConfigUpdateInVo.java

@@ -109,5 +109,10 @@ public class KingDeeCommonConfigUpdateInVo {
      */
     private String customSql;
 
+    /**
+     * 排序
+     */
+    private Integer paiXu;
+
 
 }

integrate-system/src/main/java/com/system/utils/TableStructureUtil.java

@@ -285,7 +285,7 @@ public class TableStructureUtil {
         for (Object object : objectList) {
             Map<String, Object> temp = JsonUtil.toMap(JsonUtil.toString(object), String.class, Object.class);
 
-            response.put((String) temp.get("model"), data.get(String.valueOf(temp.get("dbFieldName"))));
+            response.put((String) temp.get("model"), data == null ? "null" : data.get(String.valueOf(temp.get("dbFieldName"))));
         }
 
         return response;

integrate-system/src/main/resources/application-test.yaml

@@ -48,8 +48,8 @@ spring:
 
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/db_integrate?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
-    username: inori
-    password: inori
+    username: root
+    password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 

integrate-system/src/main/resources/application.yaml

 spring:
   profiles:
-    active: docker
+    active: test