首付款 denglu

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

@@ -149,6 +149,12 @@
         <if test="supName != null and supName != ''">
             AND tmp.sup_name LIKE concat('%',my_ex.likequery(#{supName}),'%')
         </if>
+        <if test="staffName != null and staffName != ''">
+            AND tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
+        </if>
+        <if test="orgName != null and orgName != ''">
+            AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
     </sql>
 
     <sql id="idsForeach">

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -249,6 +249,12 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @ApiModelProperty(value = "供应商名称")
     private String supName;
 
+    @ApiModelProperty(value = "部门名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -116,6 +116,28 @@ public class ReceiptService extends BaseService<RecPay> {
      * @date : 2024-02-28 13:25
      */
     @Pagination
+    public ResponseResultVO selectById(String id) {
+        Map<String, Object> result = new HashMap<>();
+        RecPayResponse recPayResponse = recPayMapper.selectById(id);
+        result.put("data", recPayResponse);
+        // 收款明细
+        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);
+    }
+
+    /**
+     * @desc : 查询收款明细
+     * @author : 付斌
+     * @date : 2024-02-28 13:25
+     */
+    @Pagination
     public ResponseResultVO<Map<String, Object>> selectRpInfoById(String id) {
         Map<String, Object> result = new HashMap<>();
         // 收款明细