anderx 1 год назад
Родитель
Сommit
4b072b623e

Разница между файлами не показана из-за своего большого размера
+ 588 - 750
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml


+ 237 - 2
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -5,8 +5,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * t_order_mid
- * @author 
+ * 订单中间表
+ * @TableName t_order_mid
  */
 public class TOrderMid implements Serializable {
     /**
@@ -189,293 +189,528 @@ public class TOrderMid implements Serializable {
      */
     private Integer stopProject;
 
+    /**
+     * 会员 0否 1是
+     */
+    private Integer bidType;
+
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
     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;
+    }
 }

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -961,6 +961,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		addOrderChangeLog("变更完成。", 4, nb.getOrderNo(), nb.getId(),date);
 		pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), order, TokenManager.getAdminId(),0);
 		orderNewService.pushOrderPublicReleaseCount(nb.getOrderNo(),null);
+		//修改投标标识
+		tOrderMidMapper.updateBidTypeByOrderNo(nb.getOrderNo());
 		return 1;
 	}
 

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

@@ -613,7 +613,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//计算公出统计
 			pushOrderPublicReleaseCount(t.getOrderNo(),null);
 			//如果有投标,标记成投标订单
-			pushOrderBidType(t.getOrderNo());
+			tOrderMidMapper.updateBidTypeByOrderNo(t.getOrderNo());
 		}
 		//驳回重新发起,需要刷新当天和今天
 		boolean newOrderFlag=false;
@@ -647,9 +647,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return 1;
 	}
 
-	private void pushOrderBidType(String orderNo) {
-		tOrderMidMapper.updateBidTypeByOrderNo(orderNo);
-	}
+
 
 	public void pushOrderPublicReleaseCount(String orderNo,Integer prId) {
 			List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(orderNo);