Forráskód Böngészése

Merge branch 'test' of jishutao/kede-server into prod

anderx 5 éve%!(EXTRA string=óta)
szülő
commit
d03731e1a9

+ 6 - 0
src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml

@@ -520,6 +520,9 @@
 		<if test="lvl==1">
 		and c.finance_id in (select id from admin where superior_id= #{aid} )
 		</if>
+		<if test="lvl==3">
+		and b.task_receiver= #{aid}
+		</if>
 		<if test="contractNo !=null">
 		and c.contract_no like concat('%', #{contractNo},'%')
 		</if>
@@ -564,6 +567,9 @@
 		<if test="lvl==1">
 		and c.finance_id in (select id from admin where superior_id= #{aid} )
 		</if>
+		<if test="lvl==3">
+		and b.task_receiver= #{aid}
+		</if>
 		<if test="contractNo !=null">
 		and c.contract_no like concat('%', #{contractNo},'%')
 		</if>

+ 32 - 30
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 
+import java.math.BigDecimal;
+
 /**
  * 订单列表
  * @author Administrator
@@ -17,11 +19,11 @@ public class OrderListBo {
 	/** 签单时间 **/
 	private String signTime;
 	/** 合同首付金额 **/
-	private String signFirstPayment;
+	private BigDecimal signFirstPayment;
 	/** 合同订单金额 **/
-	private String signTotalAmount;
+	private BigDecimal signTotalAmount;
 	/** 实际付款金额 **/
-	private String actuallyTotalAmount;
+	private BigDecimal actuallyTotalAmount;
 	/** 买方姓名 **/
 	private String buyerName;
 	/** 卖方姓名 **/
@@ -77,34 +79,34 @@ public class OrderListBo {
 	/** 外包名称*/
 	private String outsourceName;
 	/** 最后收款 */
-	private String finalReceivables;
+	private BigDecimal finalReceivables;
 	/** 最后收款 时间*/
 	private String finalReceivablesTime;
 	/** 开票金额 */
-	private String invoiceAmount;
+	private BigDecimal invoiceAmount;
 	/** 结束最后收款 时间*/
 	private String endFinalReceivablesTime;
 	/** 开始最后收款 时间*/
 	private String startFinalReceivablesTime;	
 	/** 外包金额*/
-	private String outsourceAmount;
+	private BigDecimal outsourceAmount;
 	/** 筛选金额*/
 	private Integer amountStatus;
 	/** 驳回位置*/
 	private Integer backStatus;
 	/**应收款 */
-	private String orderReceivables;
+	private BigDecimal orderReceivables;
 	/**欠款 */
-	private String  orderArrears;
+	private BigDecimal  orderArrears;
 	/**总成本*/
-	private String  costAmount;
+	private BigDecimal  costAmount;
 	/**已付成本*/
-	private String paymentAmount;
+	private BigDecimal paymentAmount;
 	
-	public String getFinalReceivables() {
+	public BigDecimal getFinalReceivables() {
 		return finalReceivables;
 	}
-	public void setFinalReceivables(String finalReceivables) {
+	public void setFinalReceivables(BigDecimal finalReceivables) {
 		this.finalReceivables = finalReceivables;
 	}
 	public String getFinalReceivablesTime() {
@@ -113,10 +115,10 @@ public class OrderListBo {
 	public void setFinalReceivablesTime(String finalReceivablesTime) {
 		this.finalReceivablesTime = finalReceivablesTime;
 	}
-	public String getInvoiceAmount() {
+	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
 	}
-	public void setInvoiceAmount(String invoiceAmount) {
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
 	}
 	public String getOrderNo() {
@@ -149,22 +151,22 @@ public class OrderListBo {
 	public void setSignTime(String signTime) {
 		this.signTime = signTime;
 	}
-	public String getSignFirstPayment() {
+	public BigDecimal getSignFirstPayment() {
 		return signFirstPayment;
 	}
-	public void setSignFirstPayment(String signFirstPayment) {
+	public void setSignFirstPayment(BigDecimal signFirstPayment) {
 		this.signFirstPayment = signFirstPayment;
 	}
-	public String getSignTotalAmount() {
+	public BigDecimal getSignTotalAmount() {
 		return signTotalAmount;
 	}
-	public void setSignTotalAmount(String signTotalAmount) {
+	public void setSignTotalAmount(BigDecimal signTotalAmount) {
 		this.signTotalAmount = signTotalAmount;
 	}
-	public String getActuallyTotalAmount() {
+	public BigDecimal getActuallyTotalAmount() {
 		return actuallyTotalAmount;
 	}
-	public void setActuallyTotalAmount(String actuallyTotalAmount) {
+	public void setActuallyTotalAmount(BigDecimal actuallyTotalAmount) {
 		this.actuallyTotalAmount = actuallyTotalAmount;
 	}
 	public String getBuyerName() {
@@ -344,10 +346,10 @@ public class OrderListBo {
 	public void setStartFinalReceivablesTime(String startFinalReceivablesTime) {
 		this.startFinalReceivablesTime = startFinalReceivablesTime;
 	}
-	public String getOutsourceAmount() {
+	public BigDecimal getOutsourceAmount() {
 		return outsourceAmount;
 	}
-	public void setOutsourceAmount(String outsourceAmount) {
+	public void setOutsourceAmount(BigDecimal outsourceAmount) {
 		this.outsourceAmount = outsourceAmount;
 	}
 	public Integer getAmountStatus() {
@@ -362,28 +364,28 @@ public class OrderListBo {
 	public void setBackStatus(Integer backStatus) {
 		this.backStatus = backStatus;
 	}
-	public String getOrderReceivables() {
+	public BigDecimal getOrderReceivables() {
 		return orderReceivables;
 	}
-	public void setOrderReceivables(String orderReceivables) {
+	public void setOrderReceivables(BigDecimal orderReceivables) {
 		this.orderReceivables = orderReceivables;
 	}
-	public String getOrderArrears() {
+	public BigDecimal getOrderArrears() {
 		return orderArrears;
 	}
-	public void setOrderArrears(String orderArrears) {
+	public void setOrderArrears(BigDecimal orderArrears) {
 		this.orderArrears = orderArrears;
 	}
-	public String getCostAmount() {
+	public BigDecimal getCostAmount() {
 		return costAmount;
 	}
-	public void setCostAmount(String costAmount) {
+	public void setCostAmount(BigDecimal costAmount) {
 		this.costAmount = costAmount;
 	}
-	public String getPaymentAmount() {
+	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
 	}
-	public void setPaymentAmount(String paymentAmount) {
+	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
 	}
 }

+ 8 - 5
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -501,7 +501,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		    	try {
 		    		//设计表头
 		    		String[] comment = {"订单编号", "合同编号","客户名称","订单部门","订单负责人","签单日期","下单日期", 
-							"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","最近收款时间","结算状态","订单流程","是否特批"};
+							"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","总成本(万元)","已付成本(万元)",
+							"最近收款(万元)","最近收款时间","结算状态","订单流程","是否特批"};
 		    		String fileName = "收款结算列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
 		    		XSSFWorkbook wb =exportTemplateInfoS(comment,"收款结算",list,0);
 		    		//根据列表编写文档
@@ -714,10 +715,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					case "订单负责人": o = ob.getSellerName(); break;
 					case "签单日期": o = ob.getSignTime(); break;
 					case "下单日期": o = ob.getCreateTime(); break;
-					case "签单金额(万元)":o=ob.getSignTotalAmount();break;
-					case "已开票金额(万元)":o=ob.getInvoiceAmount();break;
-					case "已收金额(万元)":o=ob.getActuallyTotalAmount();break;
-					case "最近收款(万元)":o=ob.getFinalReceivables();break;
+					case "签单金额(万元)":o=ob.getSignTotalAmount().toString();break;
+					case "已开票金额(万元)":o=ob.getInvoiceAmount().toString();break;
+					case "已收金额(万元)":o=ob.getActuallyTotalAmount().toString();break;
+					case "总成本(万元)":o=ob.getCostAmount().toString();break;
+					case "已付成本(万元)":o=ob.getPaymentAmount().toString();break;
+					case "最近收款(万元)":o=ob.getFinalReceivables().toString();break;
 					case "最近收款时间":o=ob.getFinalReceivablesTime();break;
 					case "结算状态":o=LiquidationNewState.getValueByCode(ob.getLiquidationStatus());break;
 					case "订单流程":o=ProcessStatus.getValueByCode(ob.getProcessStatus());break;

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2133 - 2133
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java


+ 8 - 8
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -57,10 +57,10 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
 			return res;
 		}
-		if(thirdPartyCompanyService.addCompanyChekeNumber(t)) {
-			res.getError().add(buildError("第三方数量总和必须小于项目数量。","第三方数量总和必须小于项目数量。"));
-			return res;
-		}
+//		if(thirdPartyCompanyService.addCompanyChekeNumber(t)) {
+//			res.getError().add(buildError("第三方数量总和必须小于项目数量。","第三方数量总和必须小于项目数量。"));
+//			return res;
+//		}
 		//0 系统 1软著 2专利
 		if (calculation==1) {
 			thirdPartyCompanyService.calculationUnitPrice(t);
@@ -99,10 +99,10 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
             		ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField())));
             return res;
         }
-		if(thirdPartyCompanyService.addCompanyChekeNumber(t)) {
-			res.getError().add(buildError("第三方数量总和必须小于项目数量。","第三方数量总和必须小于项目数量。"));
-			return res;
-		}
+//		if(thirdPartyCompanyService.addCompanyChekeNumber(t)) {
+//			res.getError().add(buildError("第三方数量总和必须小于项目数量。","第三方数量总和必须小于项目数量。"));
+//			return res;
+//		}
 		if (null==t.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;

+ 2 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -573,6 +573,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
 				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
 			map.put("lvl", 2);
+		}else  if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)) {
+			map.put("lvl", 3);
 		}else  {
 			map.put("lvl", 0);
 		}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -69,7 +69,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.49
+static.host=//static.jishutao.com/1.1.50
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.49
+static.host=//static.jishutao.com/1.1.50
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload