anderx лет назад: 4
Родитель
Сommit
bc96fc52b0

+ 6 - 4
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -387,10 +387,12 @@
     where aid = #{aid,jdbcType=INTEGER}
   </select>
   <select id="selectReceivablesList" parameterType="java.lang.String" resultType="com.goafanti.order.bo.ReceivablesListBo">
-  	select a.id,a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,b.total_amount totalAmount,d.name depName,a.status ,b.settlement_amount settlementAmount,
-	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks
-	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
-	left join admin e on b.salesman_id=e.id 
+  	 select a.id,a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,
+    b.total_amount totalAmount,d.name depName,a.status ,b.settlement_amount settlementAmount,
+	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks,c.username
+	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
+	left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id 
 	where 1=1
 	<if test="aid != null">
 	and  a.aid= #{aid}

+ 7 - 0
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -8,6 +8,7 @@ public class ReceivablesListBo {
 	private String contractNo;
 	private String corporateName;
 	private String nickname;
+	private String username;
 	private BigDecimal totalAmount;
 	private BigDecimal settlementAmount;
 	private String depName;
@@ -108,6 +109,12 @@ public class ReceivablesListBo {
 	public void setInptStatus(Integer inptStatus) {
 		this.inptStatus = inptStatus;
 	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
 	
 	
 

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

@@ -301,7 +301,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				r.setInptStatus(1);
 			}else if(r.getTotalAmount()==null) {
 				r.setInptStatus(2);
-			}else if(!r.getCorporateName().equals(r.getNickname())) {
+			}else if(!r.getCorporateName().equals(r.getUsername())) {
 				r.setInptStatus(3);
 			}else {
 				r.setInptStatus(0);