Browse Source

科德系统财务总监财务派单查看导出修改

anderx 3 years ago
parent
commit
06b273ceba
2 changed files with 18 additions and 19 deletions
  1. 1 3
      kede-server.iml
  2. 17 16
      src/main/java/com/goafanti/order/bo/OrderListBo.java

+ 1 - 3
kede-server.iml

@@ -20,9 +20,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />

+ 17 - 16
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -32,6 +32,10 @@ public class OrderListBo {
 	private BigDecimal invoiceAmount;
 	@Excel(name = "已收金额(万元)",scale = 6)
 	private BigDecimal actuallyTotalAmount;
+	@Excel(name = "应收款(万元)",scale = 6)
+	private BigDecimal orderReceivables;
+	@Excel(name = "欠款(万元)",scale = 6)
+	private BigDecimal  orderArrears;
 	@Excel(name = "总成本(万元)",scale = 6)
 	private BigDecimal  costAmount;
 	@Excel(name = "已付成本(万元)" ,scale = 6)
@@ -50,14 +54,14 @@ public class OrderListBo {
 	private Integer orderType;
 	/** 业务品类 **/
 	private String projectType;
-	
+
 	/** 合同首付金额 **/
 	private BigDecimal signFirstPayment;
-	
+
 	/** 订单状态 **/
 	private Integer orderStatus;
-	
-	
+
+
 	/** 订单渠道 **/
 	private Integer orderChannel;
 	/** 营销员 **/
@@ -82,12 +86,12 @@ public class OrderListBo {
 	private Integer changeStatus;
 	/** 可操作状态 **/
 	private OperatorActive active;
-	
+
 	/** 搜索开始时间 **/
 	private String startTime;
 	/** 搜索结束时间 **/
 	private String endTime;
-	
+
 	/** 收款公司id **/
 	private String companyId;
 	/** 收款公司名称 **/
@@ -98,26 +102,23 @@ public class OrderListBo {
 	private Integer outsource;
 	/** 外包名称*/
 	private String outsourceName;
-	
-	
+
+
 
 	/** 结束最后收款 时间*/
 	private String endFinalReceivablesTime;
 	/** 开始最后收款 时间*/
-	private String startFinalReceivablesTime;	
+	private String startFinalReceivablesTime;
 	/** 外包金额*/
 	private BigDecimal outsourceAmount;
 	/** 筛选金额*/
 	private Integer amountStatus;
 	/** 驳回位置*/
 	private Integer backStatus;
-	/**应收款 */
-	private BigDecimal orderReceivables;
-	/**欠款 */
-	private BigDecimal  orderArrears;
-	
-	
-	
+
+
+
+
 	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
 	}