收款相关

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

@@ -158,17 +158,17 @@
     <!-- 查询应收账款明细 -->
     <select id="getReceivableAccountItem" resultMap="BaseResultMapResponse">
         SELECT t.item_id,
-               t.item_id                                         as "accItemId",
+               t.item_id               as "accItemId",
                t.acc_item_type,
                t.object_id,
-               tmc.cus_code                                      as "cusCode",
-               tmc.cus_name                                      as "cusName",
-               tmc.cus_phone                                     as "cusPhone",
-               tmc.address_full                                  as "addressFull",
+               tmc.cus_code            as "cusCode",
+               tmc.cus_name            as "cusName",
+               tmc.cus_phone           as "cusPhone",
+               tmc.address_full        as "addressFull",
                t.org_id,
-               tmo.org_name                                      as "orgName",
+               tmo.org_name            as "orgName",
                t.staff_id,
-               tms.staff_name                                    as "staffName",
+               tms.staff_name          as "staffName",
                t.biznis_type,
                t.biznis_id,
                t.biznis_no,
@@ -181,7 +181,8 @@
                t.amt_should,
                t.amt_handle,
                t.amt_waive,
-               t.amt_residue                                     as "amtReceivableHandle",
+               t.amt_residue           as "amtNotHandle",
+               t.amt_residue           as "amtReceivableHandle",
                t.amt_residue,
                t.remarks,
                t.make_staff,
@@ -232,6 +233,7 @@
                t.amt_handle,
                t.amt_waive,
                t.amt_residue,
+               t.amt_residue           as "amtNotHandle",
                t.amt_residue           as "amtPayableHandle",
                t.remarks,
                t.make_staff,
@@ -339,7 +341,7 @@
 
     <!-- 查询收款总额 -->
     <select id="getSumAmtRec" resultType="java.util.Map">
-        SELECT sum(tmai.amt_rec) as "sumAmtRec"
+        SELECT COALESCE(sum(tmai.amt_rec), 0) as "sumAmtRec"
         FROM dkic_b.t_mac_account_item as tmai
         where tmai.flg_valid
           and tmai.object_id = #{id}::uuid

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

@@ -62,6 +62,9 @@
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
+            <if test="objectId != null and objectId != ''">
+                AND object_id = #{objectId}::uuid
+            </if>
             <if test="objectType != null and objectType != ''">
                 AND object_type = #{objectType}
             </if>

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

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, remarks, biznis_type, biznis_id, biznis_no, flg_lock, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, remarks, biznis_type, biznis_id, biznis_no, flg_lock, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->

src/main/java/com/dk/mdm/mapper/mst/MoneyAccountItemMapper.xml

@@ -182,7 +182,7 @@
 
     <!-- 查询收款总额 -->
     <select id="getSumAmtInflow" resultType="java.util.Map">
-        SELECT sum(tmmai.amt_inflow) as "sumAmtInflow"
+        SELECT COALESCE(sum(tmmai.amt_inflow), 0) as "sumAmtInflow"
         FROM dkic_b.t_mst_money_account_item as tmmai
         where tmmai.flg_valid
           and tmmai.mac_id = #{id}::uuid

src/main/java/com/dk/mdm/model/pojo/mac/RecPay.java

@@ -219,81 +219,6 @@ public class RecPay extends PageInfo<RecPay> implements Serializable {
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/pojo/mac/RecPayItem.java

@@ -42,7 +42,7 @@ public class RecPayItem extends PageInfo<RecPayItem> implements Serializable {
     /**
      * 明细ID
      */
-//    @TableId(value = "item_id", type = IdType.AUTO)
+    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;

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

@@ -153,17 +153,6 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDate accDate;
 
-    @ApiModelProperty(value = "制单时间开始")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDate makeTimeStart;
-
-    @ApiModelProperty(value = "制单时间结束")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDate makeTimeEnd;
-
-
     /**
      * 备注
      */
@@ -249,6 +238,28 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    @ApiModelProperty(value = "客户电话")
+    private String cusPhone;
+
+    @ApiModelProperty(value = "客户名称")
+    private String cusName;
+
+    @ApiModelProperty(value = "部门List")
+    private List<String> orgIdList;
+
+    @ApiModelProperty(value = "业务员List")
+    private List<String> staffIdList;
+
+    @ApiModelProperty(value = "制单时间开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate makeTimeStart;
+
+    @ApiModelProperty(value = "制单时间结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate makeTimeEnd;
+
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -243,6 +243,13 @@ public class AccountItemResponse extends PageInfo<AccountItemResponse> implement
     @ApiModelProperty(value = "本次核销金额")
     private BigDecimal amtReceivableHandle;
 
+    @ApiModelProperty(value = "单据类型")
+    private String biznisTypeName;
+
+    @ApiModelProperty(value = "未核销金额")
+    private BigDecimal amtNotHandle;
+
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -221,13 +221,6 @@ public class RecPayResponse extends PageInfo<RecPayResponse> implements Serializ
     private Integer cpId;
 
 
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
     @ApiModelProperty(value = "收付款类型")
     private String rpTypeName;
 

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

@@ -82,6 +82,9 @@ public class RecPayService extends BaseService<RecPay> {
     private MoneyAccountItemMapper moneyAccountItemMapper;
 
     @Autowired
+    private RecPayHandleItemService recPayHandleItemService;
+
+    @Autowired
     private RecPayHandleItemMapper recPayHandleItemMapper;
 
     @Autowired
@@ -163,7 +166,7 @@ public class RecPayService extends BaseService<RecPay> {
 
                 // 更新收款单上的账款明细Id
                 RecPayItem recPayItemUpdate = new RecPayItem();
-                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
+                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setItemId(recPayItem.getItemId());
                 recPayItemService.updateByUuid(recPayItemUpdate);
 
                 // 插入资金流水
@@ -235,7 +238,7 @@ public class RecPayService extends BaseService<RecPay> {
 
                 // 更新收款单上的账款明细Id
                 RecPayItem recPayItemUpdate = new RecPayItem();
-                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
+                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setItemId(recPayItem.getItemId());
                 recPayItemService.updateByUuid(recPayItemUpdate);
 
                 // 插入资金流水
@@ -312,7 +315,7 @@ public class RecPayService extends BaseService<RecPay> {
 
             // 更新收款单上的账款明细Id
             RecPayItem recPayItemUpdate = new RecPayItem();
-            recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
+            recPayItemUpdate.setAccItemId(accountItem.getItemId()).setItemId(recPayItem.getItemId());
             recPayItemService.updateByUuid(recPayItemUpdate);
 
             // 插入资金流水
@@ -393,7 +396,7 @@ public class RecPayService extends BaseService<RecPay> {
 
                 // 更新收款单上的账款明细Id
                 RecPayItem recPayItemUpdate = new RecPayItem();
-                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
+                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setItemId(recPayItem.getItemId());
                 recPayItemService.updateByUuid(recPayItemUpdate);
 
                 // 插入资金流水
@@ -505,6 +508,11 @@ public class RecPayService extends BaseService<RecPay> {
                     .setItemId(recPayHandleItemForUpdate.getAccItemId());
             accountItemUpdate.setAmtResidue(accountItemForUpdate.getAmtShould().subtract(accountItemUpdate.getAmtHandle()).subtract(accountItemUpdate.getAmtWaive()));
             accountItemService.updateByUuid(accountItemUpdate);
+
+            // 将核销明细有效标识置为false
+            RecPayHandleItem recPayHandleItemUpdate = new RecPayHandleItem();
+            recPayHandleItemUpdate.setFlgValid(false).setItemId(recPayHandleItemForUpdate.getItemId());
+            recPayHandleItemService.updateByUuid(recPayHandleItemUpdate);
         }
 
         // 把总帐上的钱加回来