dongke 2 年 前
コミット
ed9ebf1902

+ 9 - 1
src/main/java/com/dk/mdm/controller/mac/OtherPayableController.java

@@ -79,7 +79,15 @@ public class OtherPayableController{
     public ResponseResultVO<?> getOtherPayableForUpdate(@PathVariable String id) {
         return otherPayableService.getOtherPayableForUpdate(id);
     }
-
+    /**
+     * @desc : 通过ID查询
+     * @author : 王英杰
+     * @date : 2023/1/9 10:41
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return otherPayableService.getOtherPayableForUpdate(id);
+    }
     /**
      * @desc : 作废
      * @author : 付斌

+ 9 - 0
src/main/java/com/dk/mdm/controller/mac/OtherReceivableController.java

@@ -79,6 +79,15 @@ public class OtherReceivableController{
     public ResponseResultVO<?> getOtherReceivableForUpdate(@PathVariable String id) {
         return otherReceivableService.getOtherReceivableForUpdate(id);
     }
+    /**
+     * @desc : 通过ID查询
+     * @author : 王英杰
+     * @date : 2023/1/9 10:41
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return otherReceivableService.getOtherReceivableForUpdate(id);
+    }
 
     /**
      * @desc : 作废

+ 1 - 0
src/main/java/com/dk/mdm/mapper/mac/OtherReceivableMapper.xml

@@ -175,6 +175,7 @@
                t.object_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "objectTypeName",
                t.object_id,
+               tmc.cus_id         as "cusId",
                tmc.cus_code         as "cusCode",
                tmc.cus_name         as "cusName",
                tmc.cus_phone        as "cusPhone",

+ 1 - 1
src/main/java/com/dk/mdm/mapper/mst/MoneyAccountMapper.xml

@@ -140,7 +140,7 @@
         FROM
         dkic_b.t_mst_dictionary_data tmdd
         WHERE
-        tmdd.dict_code = '账户类别' UNION ALL
+        tmdd.dict_code = '基础资料-账户' UNION ALL
         SELECT
         t.mac_id AS "macId",
         t.mac_Type as "macType",

+ 7 - 0
src/main/java/com/dk/mdm/model/response/mac/OtherReceivableResponse.java

@@ -48,6 +48,13 @@ public class OtherReceivableResponse extends PageInfo<OtherReceivableResponse> i
     @ApiModelProperty(value = "其它收入单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String receivableId;
+    /**
+     * 客户ID
+     */
+    @Excel(name = "客户ID")
+    @ApiModelProperty(value = "客户ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String cusId;
 
 
     /**