diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 865721ad..63dfa9c2 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -916,7 +916,7 @@ where id = #{id} </select> <!-- 根据表名称查询所有的字段,返回小写个是--> - <select id="queryMdMFields" resultType="String" parameterType="java.util.HashMap" > + <select id="queryMdMFields" databaseId="oracle" resultType="String" parameterType="java.util.HashMap" > SELECT LOWER(COLUMN_NAME) as fileds FROM @@ -925,6 +925,13 @@ where id = #{id} TABLE_NAME = #{tableName} </select> + + <!-- 根据表名称查询所有的字段,返回小写个是--> + <select id="queryMdMFields" databaseId="mysql" resultType="String" parameterType="java.util.HashMap" > + SELECT LOWER(COLUMN_NAME) + FROM information_schema.columns + WHERE table_name = #{tableName} + </select> <!-- 分页查询列表 采用like格式 --> <select id="queryMdmST" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.util.HashMap"> select diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml index 4d1dd334..c1f5d334 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml @@ -81,11 +81,16 @@ </select> <!--根据mdm_module的id和mdm_module_db的id查询单据规则--> - <select id="queryComparisonById" resultMap="get-ComparisonEntity-result"> - <!-- select group_concat(db_value SEPARATOR '') as documentRule from mdm_table_code_rule--> - select replace(WM_CONCAT(db_value),',','') as documentRule from mdm_table_code_rule -where mdm_id=#{mId} and sts='Y' -</select> + <select id="queryComparisonById" databaseId="oracle" resultMap="get-ComparisonEntity-result"> + select replace(WM_CONCAT(db_value),',','') as documentRule from mdm_table_code_rule + where mdm_id=#{mId} and sts='Y' + </select> + + <!--根据mdm_module的id和mdm_module_db的id查询单据规则--> + <select id="queryComparisonById" databaseId="mysql" resultMap="get-ComparisonEntity-result"> + select group_concat(db_value SEPARATOR '') as documentRule from mdm_table_code_rule + where mdm_id=#{mId} and sts='Y' + </select> <!--生成单据规则--> <select id="queryComparisonRule" resultMap="get-ComparisonEntity-result" diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java index 781ab693..8da2155c 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java @@ -326,6 +326,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String> } else { jsonObjectList.put(comparisonDetailsEntity.getDbName(), new ArrayList<>()); } + jsonObjectList.remove(null); list.add(jsonObjectList); //保存操作日志 controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),tableName+"_option_log","1"); @@ -460,6 +461,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String> }else{ jsonObjectList.put(comparisonDetailsEntity.getDbName(),new ArrayList<>()); } + jsonObjectList.remove(null); jsonObjects.add(jsonObjectList); //保存操作日志 controlsLogDaoimpl.saveControlsLog(comparisonEntity.getId(),jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口更新",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log","1");