Browse Source

催款详情统计

anderx 1 year ago
parent
commit
d1648f744e

+ 78 - 9
src/main/java/com/goafanti/common/dao/TOrderMidMapper.java

@@ -3,23 +3,87 @@ package com.goafanti.common.dao;
 import com.goafanti.common.bo.ErrorDunListBo;
 import com.goafanti.common.model.TOrderMid;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 订单中间表(TOrderMid)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-03 16:06:29
+ */
 public interface TOrderMidMapper {
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(TOrderMid record);
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TOrderMid queryById(Integer id);
+
+
+    /**
+     * 查询指定行数据
+     *
+     * @param tOrderMid 查询条件
+     * @param pageable  分页对象
+     * @return 对象列表
+     */
+    List<TOrderMid> findTOrderMidList(TOrderMid tOrderMid, @Param("pageable") Pageable pageable);
+
+    /**
+     * 统计总行数
+     *
+     * @param tOrderMid 查询条件
+     * @return 总行数
+     */
+    int findTOrderMidCount(TOrderMid tOrderMid);
+
+    /**
+     * 新增数据
+     *
+     * @param tOrderMid 实例对象
+     * @return 影响行数
+     */
+    int insert(TOrderMid tOrderMid);
+
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TOrderMid> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TOrderMid> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TOrderMid> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<TOrderMid> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param tOrderMid 实例对象
+     * @return 影响行数
+     */
+    int update(TOrderMid tOrderMid);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
 
-    int insertSelective(TOrderMid record);
-
-    TOrderMid selectByPrimaryKey(Integer id);
-
-    int updateByPrimaryKeySelective(TOrderMid record);
-
-    int updateByPrimaryKey(TOrderMid record);
 
     TOrderMid selectByOrderNo(String orderNo);
 
@@ -55,4 +119,9 @@ public interface TOrderMidMapper {
     void updateStopProjectByOrderNo(String orderNo);
 
     void updateBidTypeByOrderNo(String orderNo);
+
+    void updateByPrimaryKeySelective(TOrderMid tm);
+
+    void insertSelective(TOrderMid tm);
 }
+

File diff suppressed because it is too large
+ 715 - 317
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml


+ 21 - 244
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -4,41 +4,39 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+
 /**
- * 订单中间表
- * @TableName t_order_mid
+ * 订单中间表(TOrderMid)实体类
+ *
+ * @author makejava
+ * @since 2024-09-03 16:00:38
  */
 public class TOrderMid implements Serializable {
+    private static final long serialVersionUID = 493922259638050696L;
     /**
      * id
      */
     private Integer id;
-
     /**
      * 订单编号
      */
     private String orderNo;
-
     /**
      * 营销员id
      */
     private String salesmanId;
-
     /**
      * 财务id
      */
     private String financeId;
-
     /**
      * 营销员名称
      */
     private String salesmanName;
-
     /**
      * 财务名称
      */
     private String financeName;
-
     /**
      * 最后一次收款
      */
@@ -58,12 +56,10 @@ public class TOrderMid implements Serializable {
      * 创建时间
      */
     private Date createTime;
-
     /**
      * 公司名称(冗余)
      */
     private String buyerName;
-
     /**
      * 应收款
      */
@@ -88,52 +84,42 @@ public class TOrderMid implements Serializable {
      * 部门名称
      */
     private String depName;
-
     /**
      * 省份名称
      */
     private String provinceName;
-
     /**
      * 法务 0否 1是
      */
     private Integer legalAffairs;
-
     /**
      * 催款启动日期
      */
     private Date dunStartTime;
-
     /**
      * 法务状态 0法务催收中 1延期法务 2已完成法务
      */
     private Integer legalAffairsType;
-
     /**
      * 催款日期
      */
     private Date operationTime;
-
     /**
      * 法务状态 0否 1已回款 2已诉讼 3已坏账处理
      */
     private Integer legalAffairsStatus;
-
     /**
      * 会员 0否 1是
      */
     private Integer projectType;
-
     /**
      * 服务类型
      */
     private String serviceType;
-
     /**
      * 服务项目
      */
     private String serviceProject;
-
     /**
      * 专利成本
      */
@@ -193,524 +179,315 @@ public class TOrderMid implements Serializable {
      * 会员 0否 1是
      */
     private Integer bidType;
-
-    private static final long serialVersionUID = 1L;
-
     /**
-     * id
+     * 催款节点说明
      */
+    private String dunNodeContent;
+
+
     public Integer getId() {
         return id;
     }
 
-    /**
-     * id
-     */
     public void setId(Integer id) {
         this.id = id;
     }
 
-    /**
-     * 订单编号
-     */
     public String getOrderNo() {
         return orderNo;
     }
 
-    /**
-     * 订单编号
-     */
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
 
-    /**
-     * 营销员id
-     */
     public String getSalesmanId() {
         return salesmanId;
     }
 
-    /**
-     * 营销员id
-     */
     public void setSalesmanId(String salesmanId) {
         this.salesmanId = salesmanId;
     }
 
-    /**
-     * 财务id
-     */
     public String getFinanceId() {
         return financeId;
     }
 
-    /**
-     * 财务id
-     */
     public void setFinanceId(String financeId) {
         this.financeId = financeId;
     }
 
-    /**
-     * 营销员名称
-     */
     public String getSalesmanName() {
         return salesmanName;
     }
 
-    /**
-     * 营销员名称
-     */
     public void setSalesmanName(String salesmanName) {
         this.salesmanName = salesmanName;
     }
 
-    /**
-     * 财务名称
-     */
     public String getFinanceName() {
         return financeName;
     }
 
-    /**
-     * 财务名称
-     */
     public void setFinanceName(String financeName) {
         this.financeName = financeName;
     }
 
-    /**
-     * 最后一次收款
-     */
     public BigDecimal getFinalReceivables() {
         return finalReceivables;
     }
 
-    /**
-     * 最后一次收款
-     */
     public void setFinalReceivables(BigDecimal finalReceivables) {
         this.finalReceivables = finalReceivables;
     }
 
-    /**
-     * 最后一次收款时间
-     */
     public Date getFinalReceivablesTime() {
         return finalReceivablesTime;
     }
 
-    /**
-     * 最后一次收款时间
-     */
     public void setFinalReceivablesTime(Date finalReceivablesTime) {
         this.finalReceivablesTime = finalReceivablesTime;
     }
 
-    /**
-     * 开票金额
-     */
     public BigDecimal getInvoiceAmount() {
         return invoiceAmount;
     }
 
-    /**
-     * 开票金额
-     */
     public void setInvoiceAmount(BigDecimal invoiceAmount) {
         this.invoiceAmount = invoiceAmount;
     }
 
-    /**
-     * 创建时间
-     */
     public Date getCreateTime() {
         return createTime;
     }
 
-    /**
-     * 创建时间
-     */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    /**
-     * 公司名称(冗余)
-     */
     public String getBuyerName() {
         return buyerName;
     }
 
-    /**
-     * 公司名称(冗余)
-     */
     public void setBuyerName(String buyerName) {
         this.buyerName = buyerName;
     }
 
-    /**
-     * 应收款
-     */
     public BigDecimal getOrderReceivables() {
         return orderReceivables;
     }
 
-    /**
-     * 应收款
-     */
     public void setOrderReceivables(BigDecimal orderReceivables) {
         this.orderReceivables = orderReceivables;
     }
 
-    /**
-     * 欠款
-     */
     public BigDecimal getOrderArrears() {
         return orderArrears;
     }
 
-    /**
-     * 欠款
-     */
     public void setOrderArrears(BigDecimal orderArrears) {
         this.orderArrears = orderArrears;
     }
 
-    /**
-     * 成本实付
-     */
     public BigDecimal getPaymentAmount() {
         return paymentAmount;
     }
 
-    /**
-     * 成本实付
-     */
     public void setPaymentAmount(BigDecimal paymentAmount) {
         this.paymentAmount = paymentAmount;
     }
 
-    /**
-     * 成本金额
-     */
     public BigDecimal getCostAmount() {
         return costAmount;
     }
 
-    /**
-     * 成本金额
-     */
     public void setCostAmount(BigDecimal costAmount) {
         this.costAmount = costAmount;
     }
 
-    /**
-     * 部门名称
-     */
     public String getDepName() {
         return depName;
     }
 
-    /**
-     * 部门名称
-     */
     public void setDepName(String depName) {
         this.depName = depName;
     }
 
-    /**
-     * 省份名称
-     */
     public String getProvinceName() {
         return provinceName;
     }
 
-    /**
-     * 省份名称
-     */
     public void setProvinceName(String provinceName) {
         this.provinceName = provinceName;
     }
 
-    /**
-     * 法务 0否 1是
-     */
     public Integer getLegalAffairs() {
         return legalAffairs;
     }
 
-    /**
-     * 法务 0否 1是
-     */
     public void setLegalAffairs(Integer legalAffairs) {
         this.legalAffairs = legalAffairs;
     }
 
-    /**
-     * 催款启动日期
-     */
     public Date getDunStartTime() {
         return dunStartTime;
     }
 
-    /**
-     * 催款启动日期
-     */
     public void setDunStartTime(Date dunStartTime) {
         this.dunStartTime = dunStartTime;
     }
 
-    /**
-     * 法务状态 0法务催收中 1延期法务 2已完成法务
-     */
     public Integer getLegalAffairsType() {
         return legalAffairsType;
     }
 
-    /**
-     * 法务状态 0法务催收中 1延期法务 2已完成法务
-     */
     public void setLegalAffairsType(Integer legalAffairsType) {
         this.legalAffairsType = legalAffairsType;
     }
 
-    /**
-     * 催款日期
-     */
     public Date getOperationTime() {
         return operationTime;
     }
 
-    /**
-     * 催款日期
-     */
     public void setOperationTime(Date operationTime) {
         this.operationTime = operationTime;
     }
 
-    /**
-     * 法务状态 0否 1已回款 2已诉讼 3已坏账处理
-     */
     public Integer getLegalAffairsStatus() {
         return legalAffairsStatus;
     }
 
-    /**
-     * 法务状态 0否 1已回款 2已诉讼 3已坏账处理
-     */
     public void setLegalAffairsStatus(Integer legalAffairsStatus) {
         this.legalAffairsStatus = legalAffairsStatus;
     }
 
-    /**
-     * 会员 0否 1是
-     */
     public Integer getProjectType() {
         return projectType;
     }
 
-    /**
-     * 会员 0否 1是
-     */
     public void setProjectType(Integer projectType) {
         this.projectType = projectType;
     }
 
-    /**
-     * 服务类型
-     */
     public String getServiceType() {
         return serviceType;
     }
 
-    /**
-     * 服务类型
-     */
     public void setServiceType(String serviceType) {
         this.serviceType = serviceType;
     }
 
-    /**
-     * 服务项目
-     */
     public String getServiceProject() {
         return serviceProject;
     }
 
-    /**
-     * 服务项目
-     */
     public void setServiceProject(String serviceProject) {
         this.serviceProject = serviceProject;
     }
 
-    /**
-     * 专利成本
-     */
     public BigDecimal getPatentCost() {
         return patentCost;
     }
 
-    /**
-     * 专利成本
-     */
     public void setPatentCost(BigDecimal patentCost) {
         this.patentCost = patentCost;
     }
 
-    /**
-     * 专利成本实付
-     */
     public BigDecimal getPatentCostActual() {
         return patentCostActual;
     }
 
-    /**
-     * 专利成本实付
-     */
     public void setPatentCostActual(BigDecimal patentCostActual) {
         this.patentCostActual = patentCostActual;
     }
 
-    /**
-     * 软著成本
-     */
     public BigDecimal getSoftCost() {
         return softCost;
     }
 
-    /**
-     * 软著成本
-     */
     public void setSoftCost(BigDecimal softCost) {
         this.softCost = softCost;
     }
 
-    /**
-     * 软著成本实付
-     */
     public BigDecimal getSoftCostActual() {
         return softCostActual;
     }
 
-    /**
-     * 软著成本实付
-     */
     public void setSoftCostActual(BigDecimal softCostActual) {
         this.softCostActual = softCostActual;
     }
 
-    /**
-     * 审计成本
-     */
     public BigDecimal getAuditCost() {
         return auditCost;
     }
 
-    /**
-     * 审计成本
-     */
     public void setAuditCost(BigDecimal auditCost) {
         this.auditCost = auditCost;
     }
 
-    /**
-     * 审计成本实付
-     */
     public BigDecimal getAuditCostActual() {
         return auditCostActual;
     }
 
-    /**
-     * 审计成本实付
-     */
     public void setAuditCostActual(BigDecimal auditCostActual) {
         this.auditCostActual = auditCostActual;
     }
 
-    /**
-     * 其他成本
-     */
     public BigDecimal getOtherCost() {
         return otherCost;
     }
 
-    /**
-     * 其他成本
-     */
     public void setOtherCost(BigDecimal otherCost) {
         this.otherCost = otherCost;
     }
 
-    /**
-     * 其他成本实付
-     */
     public BigDecimal getOtherCostActual() {
         return otherCostActual;
     }
 
-    /**
-     * 其他成本实付
-     */
     public void setOtherCostActual(BigDecimal otherCostActual) {
         this.otherCostActual = otherCostActual;
     }
 
-    /**
-     * 预计毛利
-     */
     public BigDecimal getExpectProfit() {
         return expectProfit;
     }
 
-    /**
-     * 预计毛利
-     */
     public void setExpectProfit(BigDecimal expectProfit) {
         this.expectProfit = expectProfit;
     }
 
-    /**
-     * 实际毛利
-     */
     public BigDecimal getActualProfit() {
         return actualProfit;
     }
 
-    /**
-     * 实际毛利
-     */
     public void setActualProfit(BigDecimal actualProfit) {
         this.actualProfit = actualProfit;
     }
 
-    /**
-     * 暂停项目  0无 1有
-     */
     public Integer getStopProject() {
         return stopProject;
     }
 
-    /**
-     * 暂停项目  0无 1有
-     */
     public void setStopProject(Integer stopProject) {
         this.stopProject = stopProject;
     }
 
-    /**
-     * 会员 0否 1是
-     */
     public Integer getBidType() {
         return bidType;
     }
 
-    /**
-     * 会员 0否 1是
-     */
     public void setBidType(Integer bidType) {
         this.bidType = bidType;
     }
-}
+
+    public String getDunNodeContent() {
+        return dunNodeContent;
+    }
+
+    public void setDunNodeContent(String dunNodeContent) {
+        this.dunNodeContent = dunNodeContent;
+    }
+
+}
+

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -2538,7 +2538,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if (StringUtils.isNotBlank(valueByCode)){
 				TOrderMid mid=new TOrderMid();
 				mid.setOrderNo(e.getOrderNo());
-
+				mid.setDunNodeContent(valueByCode.toString());
 				tOrderMidMapper.updateByOrderNo(mid);
 			}
 		}