qingzhangyin há 2 anos atrás
pai
commit
706e7e521a

+ 1 - 1
src/main/java/com/palmnest/model/repair/RepairConfig.java

@@ -23,7 +23,7 @@ public class RepairConfig implements Serializable {
 	private Long    id;
 	private Integer org_id;
 	private Integer max_bills;
-	private Integer repair_type;
+	private Integer repair_type; //1-抢单模式 2-派单模式
 	private Byte    ispersons;
 	private Byte    ispay;
 	private Date    create_time;

+ 10 - 1
src/main/java/com/palmnest/service/repair/impl/RepairBillServiceImpl.java

@@ -750,7 +750,16 @@ public class RepairBillServiceImpl implements RepairBillService {
 		dto.setInProgressTotal(inProgressTotal);//进行中
 		dto.setPendingTotal(pendingTotal);//挂单中
 		dto.setManageTotal(manageTotal);//管理
-		dto.setWaitCompleteTotal(inProgressTotal + pendingTotal);//待完成= 进行中(转单中和进行中)+挂单中 "当前登录账号的" 待完成维修工单,进行中、挂单中、转单中的工单数量
+		//待完成= 进行中(转单中和进行中)+挂单中 "当前登录账号的" 待完成维修工单,进行中、挂单中、转单中的工单数量
+
+		//1-抢单模式 2-派单模式
+		Integer waitCompleteTotal = inProgressTotal + pendingTotal; //默认派单模式
+		RepairConfig s_con = repairConfigManager.getByOrgId(orgId);
+		if(s_con.getRepair_type().equals(1)){
+			waitCompleteTotal =  waitCompleteTotal+isSingleTotal; //进行中+可抢单;
+		}
+		dto.setWaitCompleteTotal(waitCompleteTotal);
+
 		return dto;
 	}