Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/mac/RecPayHandleItemMapper.java

@@ -2,13 +2,22 @@ package com.dk.mdm.mapper.mac;
 
 import com.dk.mdm.model.pojo.mac.RecPayHandleItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mac.RecPayHandleItemQuery;
+import com.dk.mdm.model.response.mac.RecPayHandleItemResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  账务冲抵明细 Mapper
 */
 @Repository
 public interface RecPayHandleItemMapper extends BaseMapper<RecPayHandleItem>{
-	
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-03-19 16:13
+     */
+    List<RecPayHandleItemResponse> selectByCond(RecPayHandleItemQuery recPayHandleItemQuery);
 }
 

src/main/java/com/dk/mdm/mapper/mac/RecPayHandleItemMapper.xml

@@ -38,35 +38,30 @@
 
     <!-- 通用条件列 -->
     <sql id="Condition">
-        <where>
-            <if test="rpId != null and rpId != ''">
-                AND rp_id = #{rpId}
-            </if>
-            <if test="accItemId != null and accItemId != ''">
-                AND acc_item_id = #{accItemId}
-            </if>
-            <if test="amtReceivableHandle != null">
-                AND amt_receivable_handle = #{amtReceivableHandle}
-            </if>
-            <if test="amtPayableHandle != null">
-                AND amt_payable_handle = #{amtPayableHandle}
-            </if>
-            <if test="amtWaive != null">
-                AND amt_waive = #{amtWaive}
-            </if>
-            <if test="accDate != null">
-                AND acc_date = #{accDate}
-            </if>
-            <if test="remarks != null and remarks != ''">
-                AND remarks = #{remarks}
-            </if>
-            <if test="flgValid != null">
-                AND flg_valid = #{flgValid}
-            </if>
-            <if test="cpId != null">
-                AND cp_id = #{cpId}
-            </if>
-        </where>
+        <if test="rpId != null and rpId != ''">
+            AND t.rp_id = #{rpId}::uuid
+        </if>
+        <if test="accItemId != null and accItemId != ''">
+            AND t.acc_item_id = #{accItemId}
+        </if>
+        <if test="amtReceivableHandle != null">
+            AND t.amt_receivable_handle = #{amtReceivableHandle}
+        </if>
+        <if test="amtPayableHandle != null">
+            AND t.amt_payable_handle = #{amtPayableHandle}
+        </if>
+        <if test="amtWaive != null">
+            AND t.amt_waive = #{amtWaive}
+        </if>
+        <if test="accDate != null">
+            AND t.acc_date = #{accDate}
+        </if>
+        <if test="remarks != null and remarks != ''">
+            AND t.remarks = #{remarks}
+        </if>
+        <if test="cpId != null">
+            AND t.cp_id = #{cpId}
+        </if>
     </sql>
 
     <sql id="idsForeach">
@@ -79,9 +74,21 @@
 
     <!-- 查询表t_mac_rec_pay_handle_item，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_handle_item
+        SELECT t.item_id,
+               t.rp_id,
+               t.acc_item_id,
+               t.amt_receivable_handle,
+               t.amt_payable_handle,
+               t.amt_waive,
+               t.acc_date,
+               t.remarks,
+               t.flg_valid,
+               t.cp_id,
+               tmai.biznis_no  as "biznisNo",
+               tmai.amt_should as "amtShould"
+        FROM dkic_b.t_mac_rec_pay_handle_item as t
+                 left join dkic_b.t_mac_account_item tmai on tmai.item_id = t.acc_item_id
+        where t.flg_valid
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -92,7 +99,8 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mac_rec_pay_handle_item
+        FROM dkic_b.t_mac_rec_pay_handle_item as t
+        where t.flg_valid
         <include refid="Condition"/>
     </select>
 
@@ -100,7 +108,7 @@
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_handle_item
+        FROM dkic_b.t_mac_rec_pay_handle_item
         WHERE item_id = #{itemId}::uuid
     </select>
 
@@ -108,7 +116,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_handle_item
+        FROM dkic_b.t_mac_rec_pay_handle_item
         WHERE item_id = #{id}::uuid
         for update
     </select>
@@ -117,13 +125,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_handle_item
+        FROM dkic_b.t_mac_rec_pay_handle_item
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mac_rec_pay_handle_item
+        insert into dkic_b.t_mac_rec_pay_handle_item
         (
         <trim suffixOverrides=",">
             rp_id,

src/main/java/com/dk/mdm/model/response/mac/RecPayHandleItemResponse.java

@@ -22,7 +22,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
- *  账务冲抵明细
+ * 账务冲抵明细
  */
 @Data
 @AllArgsConstructor
@@ -31,7 +31,7 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @ExportTitle("账务冲抵明细")
 @TableName(value = "t_mac_rec_pay_handle_item", autoResultMap = true)
-@ApiModel(value="实体类：账务冲抵明细", description="表名：t_mac_rec_pay_handle_item")
+@ApiModel(value = "实体类：账务冲抵明细", description = "表名：t_mac_rec_pay_handle_item")
 public class RecPayHandleItemResponse extends PageInfo<RecPayHandleItemResponse> implements Serializable {
 
     /*
@@ -123,6 +123,12 @@ public class RecPayHandleItemResponse extends PageInfo<RecPayHandleItemResponse>
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    @ApiModelProperty(value = "来源单号")
+    private String biznisNo;
+
+    @ApiModelProperty(value = "应收金额")
+    private BigDecimal amtShould;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/mac/RecPayService.java

@@ -19,8 +19,10 @@ import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mst.MoneyAccount;
 import com.dk.mdm.model.pojo.mst.MoneyAccountItem;
+import com.dk.mdm.model.query.mac.RecPayHandleItemQuery;
 import com.dk.mdm.model.query.mac.RecPayItemQuery;
 import com.dk.mdm.model.query.mac.RecPayQuery;
+import com.dk.mdm.model.response.mac.RecPayHandleItemResponse;
 import com.dk.mdm.model.response.mac.RecPayItemResponse;
 import com.dk.mdm.model.response.mac.RecPayResponse;
 import com.dk.mdm.model.vo.mac.RecPayHandleItemVO;
@@ -117,6 +119,10 @@ public class RecPayService extends BaseService<RecPay> {
         List<RecPayItemResponse> recPayItem = recPayItemMapper.selectByCond(new RecPayItemQuery().setRpId(id));
         result.put("recPayItem", recPayItem);
 
+        // 收款明细
+        List<RecPayHandleItemResponse> recPayHandleItem = recPayHandleItemMapper.selectByCond(new RecPayHandleItemQuery().setRpId(id));
+        result.put("recPayHandleItem", recPayHandleItem);
+
         // 附件
         return ResponseResultUtil.success(result);
     }