Browse Source

财务列表新增相关字段

anderx 3 years ago
parent
commit
a0ac26501c

+ 12 - 10
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -736,16 +736,18 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
- select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,
-	a.cost_amount costAmount,a.payment_amount paymentAmount,o.process_status as processStatus, o.settlement_amount as actuallyTotalAmount,
-	o.contract_no as contractNo, o.approval, o.back_status backStatus,a.salesman_name as sellerName, o.salesman_id as sellerId,
-	o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount, o.first_amount as signFirstPayment,
-	o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime, too.company_name as outsourceName,
-	0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,a.invoice_amount invoiceAmount ,
-    o.order_status orderStatus,a.project_type projectType,o.sales_type salesType,o.other ,o.delete_sign deleteSign,
-    date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.order_receivables orderReceivables,a.order_arrears orderArrears
-	from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
-	left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2,4,5)
+    select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,
+      a.cost_amount costAmount,a.payment_amount paymentAmount,o.process_status as processStatus, o.settlement_amount as actuallyTotalAmount,
+      o.contract_no as contractNo, o.approval, o.back_status backStatus,a.salesman_name as sellerName, o.salesman_id as sellerId,
+      o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount, o.first_amount as signFirstPayment,
+      o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime, too.company_name as outsourceName,
+      0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,a.invoice_amount invoiceAmount ,a.order_arrears orderArrears,
+      o.order_status orderStatus,a.project_type projectType,o.sales_type salesType,o.other ,o.delete_sign deleteSign, a.order_receivables orderReceivables,
+      date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.patent_cost patentCost,a.patent_cost_actual patentCostActual ,
+      a.soft_cost softCost ,a.soft_cost_actual softCostActual ,a.audit_cost auditCost ,a.audit_cost_actual auditCostActual ,a.other_cost otherCost ,
+      a.other_cost_actual otherCostActual , a.expect_profit expectProfit ,a.actual_profit  actualProfit
+    from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
+    left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2,4,5)
     and outsource=   #{o.outsource,jdbcType=INTEGER}
     <if test="o.processStatus == 3">
       and o.process_status = #{o.processStatus,jdbcType=INTEGER}

+ 59 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -41,6 +41,65 @@ public class OrderListBo {
 	private BigDecimal  costAmount;
 	@Excel(name = "已付成本(万元)" ,scale = 6)
 	private BigDecimal paymentAmount;
+	/**
+	 * 专利成本
+	 */
+	@Excel(name = "专利成本(万元)" ,scale = 6)
+	private BigDecimal patentCost;
+
+	/**
+	 * 专利成本实付
+	 */
+	@Excel(name = "专利成本实付(万元)" ,scale = 6)
+	private BigDecimal patentCostActual;
+
+	/**
+	 * 软著成本
+	 */
+	@Excel(name = "软著成本(万元)" ,scale = 6)
+	private BigDecimal softCost;
+
+	/**
+	 * 软著成本实付
+	 */
+	@Excel(name = "软著成本实付(万元)" ,scale = 6)
+	private BigDecimal softCostActual;
+
+	/**
+	 * 审计成本
+	 */
+	@Excel(name = "审计成本(万元)" ,scale = 6)
+	private BigDecimal auditCost;
+
+	/**
+	 * 审计成本实付
+	 */
+	@Excel(name = "审计成本实付(万元)" ,scale = 6)
+	private BigDecimal auditCostActual;
+
+	/**
+	 * 其他成本
+	 */
+	@Excel(name = "其他成本(万元)" ,scale = 6)
+	private BigDecimal otherCost;
+
+	/**
+	 * 其他成本实付
+	 */
+	@Excel(name = "其他成本实付(万元)" ,scale = 6)
+	private BigDecimal otherCostActual;
+
+	/**
+	 * 预计毛利
+	 */
+	@Excel(name = "预计毛利(万元)" ,scale = 6)
+	private BigDecimal expectProfit;
+
+	/**
+	 * 实际毛利
+	 */
+	@Excel(name = "实际毛利(万元)" ,scale = 6)
+	private BigDecimal actualProfit;
 	@Excel(name = "最近收款(万元)",scale = 6)
 	private BigDecimal finalReceivables;
 	@Excel(name = "最近收款时间")