得到的

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysAreaViewMapper.xml

@@ -84,7 +84,7 @@
         <result column="CITY" property="city"/>
     </resultMap>
 
-    <select id="selectProvinceAndCity" parameterType="list" resultMap="ExtResultMap">
+    <select id="selectProvinceAndCity" parameterType="list" resultMap="ExtResultMap" databaseId="MySQL">
         SELECT P.`NAME` AS PROVINCE,
         A.`NAME` AS CITY,
         A.CITY_CODE,
@@ -100,4 +100,21 @@
         P.ID,
         A.ID
     </select>
+
+    <select id="selectProvinceAndCity" parameterType="list" resultMap="ExtResultMap" databaseId="Oracle">
+        SELECT P.NAME AS PROVINCE,
+        A.NAME AS CITY,
+        A.CITY_CODE,
+        A.ID
+        FROM SYS_AREA P
+        LEFT JOIN SYS_AREA A ON P.ID = A.PARENT_ID
+        WHERE P.NAME IN
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        AND A.NAME != '无'
+        ORDER BY
+        P.ID,
+        A.ID
+    </select>
 </mapper>

C09-base/pps-core-base/src/main/java/pps/core/base/service/ExcelService.java

@@ -289,7 +289,7 @@ public class ExcelService {
     public XFileResult exportPriceStrategy(XContext context, GetBasePriceStrategyViewInput input) {
         List<ExcelPriceStrategyTemplate> list;
         String strategyId = input.getId();
-        if (CharSequenceUtil.isNotBlank(strategyId)) {
+        if (CharSequenceUtil.isNotBlank(strategyId) && !CharSequenceUtil.equals("undefined", strategyId)) {
             BasePriceStrategyDetailView view = new BasePriceStrategyDetailView();
             view.setStrategyId(strategyId);
             String month = input.getMonth();

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyDetailViewMapper.xml

@@ -53,7 +53,7 @@
         ID=#{id}
     </select>
 
-    <insert id="batchInsertList" parameterType="list">
+    <insert id="batchInsertList" parameterType="list" databaseId="MySQL">
         INSERT INTO BASE_PRICE_STRATEGY_DETAIL (
         ID,
         CREATE_BY_ID,
@@ -91,6 +91,51 @@
         </foreach>
     </insert>
 
+    <insert id="batchInsertList" parameterType="list" databaseId="Oracle">
+        INSERT ALL
+        <foreach collection="list" item="item">
+            INTO BASE_PRICE_STRATEGY_DETAIL (
+            ID,
+            IS_DELETED,
+            CREATE_BY_ID,
+            CREATE_BY_NAME,
+            CREATE_TIME,
+            MODIFY_BY_ID,
+            MODIFY_BY_NAME,
+            MODIFY_TIME,
+            STRATEGY_ID,
+            STRATEGY_MONTH,
+            PERIOD_TYPE_KEY,
+            START_TIME,
+            END_TIME,
+            ELECTROVALENCE
+            <if test="item.internalSettlementPrice != null">
+                ,INTERNAL_SETTLEMENT_PRICE
+            </if>
+            )
+            VALUES
+            ( #{item.id},
+            1,
+            #{item.createById},
+            #{item.createByName},
+            #{item.createTime},
+            #{item.modifyById},
+            #{item.modifyByName},
+            #{item.modifyTime},
+            #{item.strategyId},
+            #{item.strategyMonth},
+            #{item.periodTypeKey},
+            #{item.startTime},
+            #{item.endTime},
+            #{item.electrovalence}
+            <if test="item.internalSettlementPrice != null">
+                , #{item.internalSettlementPrice}
+            </if>
+            )
+        </foreach>
+        SELECT * FROM DUAL
+    </insert>
+
     <select id="selectDetailList" parameterType="pps.core.base.entity.BasePriceStrategyDetailView"
             resultMap="BaseResultMap">
         SELECT D.STRATEGY_MONTH,

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePriceStrategyMonthViewMapper.xml

@@ -44,7 +44,7 @@
         ID=#{id}
     </select>
 
-    <insert id="batchInsertList" parameterType="list">
+    <insert id="batchInsertList" parameterType="list" databaseId="MySQL">
         INSERT INTO BASE_PRICE_STRATEGY_MONTH ( ID, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME, MODIFY_BY_ID,
         MODIFY_BY_NAME, MODIFY_TIME, STRATEGY_ID, STRATEGY_MONTH )
         VALUES
@@ -62,4 +62,26 @@
             )
         </foreach>
     </insert>
+
+    <insert id="batchInsertList" parameterType="list" databaseId="Oracle">
+        INSERT ALL
+        <foreach collection="list" item="item">
+            INTO BASE_PRICE_STRATEGY_MONTH ( ID, IS_DELETED, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME, MODIFY_BY_ID,
+            MODIFY_BY_NAME, MODIFY_TIME, STRATEGY_ID, STRATEGY_MONTH )
+            VALUES
+            (
+            #{item.id},
+            1,
+            #{item.createById},
+            #{item.createByName},
+            #{item.createTime},
+            #{item.modifyById},
+            #{item.modifyByName},
+            #{item.modifyTime},
+            #{item.strategyId},
+            #{item.strategyMonth}
+            )
+        </foreach>
+        SELECT * FROM DUAL
+    </insert>
 </mapper>
\ No newline at end of file