From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage

---
 src/main/java/com/highdatas/mdm/mapper/TableInfoMapper.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/highdatas/mdm/mapper/TableInfoMapper.java b/src/main/java/com/highdatas/mdm/mapper/TableInfoMapper.java
index af3986b..7cfa399 100644
--- a/src/main/java/com/highdatas/mdm/mapper/TableInfoMapper.java
+++ b/src/main/java/com/highdatas/mdm/mapper/TableInfoMapper.java
@@ -18,11 +18,17 @@
 
     String selectTableByName(@Param("tableName")String tableName);
 
+    List<Map<String,Object>> selectIdxByTableName(@Param("tableName")String tableName);
+
+    void insertOneSelect(@Param("tableName")String tableName, @Param("fields")String fields, @Param("selectFields")String selectFields, @Param("selectSql")String selectSql);
+
     List<TableSchemaResult> getTableField(@Param("tableName")String tableName);
 
     List<TableSchemaResult> getTableFieldFromDb(@Param("tableName")String tableName, @Param("dbName")String dbName);
 
     List<Map<String,Object>> selectByPage(@Param("tableName") String tableName, @Param("fields") String fields, @Param("where") String where, @Param("limit") String limit);
+
+    List<Map<String,Object>> selectDistinct(@Param("tableName") String tableName, @Param("fields") String fields, @Param("where") String where);
 
     List<Map<String,Object>> selectByPageByVersion(@Param("tableName") String tableName,@Param("tableTempName") String tableTempName, @Param("fields") String fields, @Param("tempFields") String tempFields,@Param("Hfields") String Hfields, @Param("A1fields") String A1fields, @Param("A2fields") String A2fields, @Param("tempHFields") String tempHFields, @Param("fromOrderNo") Integer fromOrderNo, @Param("toOrderNo") Integer toOrderNo, @Param("maintainId") String maintainId, @Param("where") String where, @Param("limit") String limit);
 
@@ -41,6 +47,8 @@
 
     void update(@Param("tableName") String tableName, @Param("updateSegment") String updateSegment, @Param("where") String where);
 
+    void updateJoin(@Param("tableName") String tableName, @Param("joinTableSegment") String joinTableSegment, @Param("updateSegment") String updateSegment, @Param("where") String where);
+
     void delete(@Param("tableName") String tableName, @Param("where") String where);
 
     void deleteTempByMaintainId(@Param("tableTempName") String tableTempName, @Param("maintainId") String maintainId);
@@ -50,9 +58,11 @@
     void tempCreate2std(@Param("tableName") String tableName,@Param("tempFields") String tempFields, @Param("tableTempName") String tableTempName, @Param("maintainId") String maintainId);
     List<Map<String,Object>> tempByOperate(@Param("operate") String operate, @Param("fields") String fields, @Param("tableTempName") String tableTempName, @Param("maintainId") String maintainId);
 
-    Long tempDeal(@Param("tableTempName") String tableTempName, @Param("maintainId") String maintainId);
+    Integer tempDeal(@Param("tableTempName") String tableTempName, @Param("maintainId") String maintainId);
 
-    Integer insertMatintainDetailFromTemp(@Param("maintainId")String maintainId, @Param("tableTempName")String tableTempName);
+    Integer insertMatintainDetailFromTemp(@Param("maintainId")String maintainId, @Param("tableTempName")String tableTempName, @Param("operate") String operate);
+
+    Integer insertMatintainDetailFromStandrad(@Param("maintainId")String maintainId, @Param("tableTempName")String tableTempName);
 
     Integer updateStdId(@Param("tableTempName")String tableTempName);
 
@@ -60,5 +70,17 @@
 
     Integer deleteRecordByMaintainId(@Param("tableTempName")String tableTempName, @Param("stdId") String stdId, @Param("maintainId")String maintainId);
 
+    Integer insertRecordFromStandrad(@Param("tableName")String tableName, @Param("recordTableName")String recordTableName, @Param("tempFieldList")String tempFieldList);
+
+    Map<String,String> selectActMemberShip(@Param("userId")String userId, @Param("roleId")String roleId);
+
+    List<Map<String,Object>> selectActMemberShipByRole(@Param("roleId")String roleId);
+
+    List<Map<String,Object>> selectActMemberShipByUser(@Param("userId")String userId);
+
+    List<Map<String, Object>> getOneTempFieldDataByMaintainExtent(@Param("tableName")String tableName, @Param("tempTableName")String tempTableName,@Param("field")String field, @Param("fromOrderNo")Integer fromOrderNo, @Param("toOrderNo")Integer toOrderNo);
+    List<Map<String, Object>> getTempDataByMaintainExtent(@Param("tableName")String tableName, @Param("tempTableName")String tempTableName,@Param("fromOrderNo")Integer fromOrderNo, @Param("toOrderNo")Integer toOrderNo);
+
+    void createIdx(@Param("tableName")String recordTableName, @Param("idxName")String idxName, @Param("fields") String fields);
 }
 

--
Gitblit v1.8.0