zhoux 1 год назад
Родитель
Сommit
3b7286e661

+ 8 - 8
src/main/java/com/dk/mdm/mapper/mst/PrintLayoutMapper.xml

@@ -69,7 +69,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         SELECT
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
-        FROM t_mst_print_layout
+        FROM dkic_b.t_mst_print_layout
         <include refid="Condition"/>
         <include refid="Condition"/>
         order by display_no
         order by display_no
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -81,7 +81,7 @@
     <select id="countByCond" resultType="Long">
     <select id="countByCond" resultType="Long">
         SELECT
         SELECT
         count(1)
         count(1)
-        FROM t_mst_print_layout
+        FROM dkic_b.t_mst_print_layout
         <include refid="Condition"/>
         <include refid="Condition"/>
     </select>
     </select>
 
 
@@ -89,16 +89,16 @@
     <select id="selectById" resultMap="BaseResultMap">
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         SELECT
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
-        FROM t_mst_print_layout
-        WHERE layout_id = #{layoutId}::uuid
+        FROM dkic_b.t_mst_print_layout
+        WHERE layout_id = #{id}::uuid
     </select>
     </select>
 
 
     <!-- 根据主键锁定表t_mst_print_layout的一行数据 -->
     <!-- 根据主键锁定表t_mst_print_layout的一行数据 -->
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         SELECT
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
-        FROM t_mst_print_layout
-        WHERE layout_id = #{layoutId}
+        FROM dkic_b.t_mst_print_layout
+        WHERE layout_id = #{id}
         for update
         for update
     </select>
     </select>
 
 
@@ -106,13 +106,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         SELECT
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
-        FROM t_mst_print_layout
+        FROM dkic_b.t_mst_print_layout
         <include refid="idsForeach"/>
         <include refid="idsForeach"/>
         for update
         for update
     </select>
     </select>
 
 
     <insert id="insertBatch">
     <insert id="insertBatch">
-        insert into t_mst_print_layout
+        insert into dkic_b.t_mst_print_layout
         (
         (
         <trim suffixOverrides=",">
         <trim suffixOverrides=",">
             layout_name,
             layout_name,

+ 1 - 0
src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -95,6 +95,7 @@ public class PurchaseService extends BaseService<Purchase> {
      */
      */
     @Pagination
     @Pagination
     public ResponseResultVO<PageList<PurchaseResponse>> selectByCondItem(PurchaseQuery purchaseQuery) {
     public ResponseResultVO<PageList<PurchaseResponse>> selectByCondItem(PurchaseQuery purchaseQuery) {
+        // todo xml 明细修改json
          List<PurchaseResponse> purchaseOrders = purchaseMapper.selectByCond(purchaseQuery); // 总单数据
          List<PurchaseResponse> purchaseOrders = purchaseMapper.selectByCond(purchaseQuery); // 总单数据
         for (PurchaseResponse order : purchaseOrders) {
         for (PurchaseResponse order : purchaseOrders) {
             PurchaseItemQuery purchaseItemQuery = new PurchaseItemQuery ();
             PurchaseItemQuery purchaseItemQuery = new PurchaseItemQuery ();

+ 1 - 1
src/main/resources/dev/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
   datasource:
     driver-class-name: org.postgresql.Driver
     driver-class-name: org.postgresql.Driver
     url: jdbc:postgresql://dkdev.dkiboss.com:15000/dkic_dev_b1
     url: jdbc:postgresql://dkdev.dkiboss.com:15000/dkic_dev_b1
-    username: dkic_b
+    username: dkic_sp
     password: dk
     password: dk
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
     druid: