From 37884ae4a44321be145f0f1d9a59c1b55dbbce16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 26 Dec 2025 17:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E8=AF=B7?= =?UTF-8?q?=E9=A2=86=E6=B5=81=E7=A8=8B=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=92=8C=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qld/service/impl/QingLingServiceImpl.java | 1 + .../thd/service/impl/ThdServiceImpl.java | 2 +- .../service/impl/CareOrdersServiceImpl.java | 72 ++++++++++--------- .../service/impl/EmpOrdersServiceImpl.java | 72 ++++++++++--------- .../service/impl/QlOrdersServiceImpl.java | 10 +-- 5 files changed, 86 insertions(+), 71 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 3621ffd3..694831da 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -639,6 +639,7 @@ public class QingLingServiceImpl implements IQinglingApi { if ("3".equals(nowStatus)) { InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); p_.setFlowCode("ql_sq"); + p_.setIzRollback("Y"); p_.setBizId(dto.getQldNo()); Map j = invoicingQlOrdersApi.izCanGoOn(p_); if(!j.get("error_code").equals("0")){ diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index 0ec2d24f..2f89e287 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -572,7 +572,7 @@ public class ThdServiceImpl implements ITuiHuoApi { NuInvoicingThdMain main = thdMainMapper.selectOne(qw); //检测是否已入库 - if (main == null || !"2".equals(main.getStatus())) { + if (main == null || !"1".equals(main.getStatus())) { r_.put("error_code", "1"); r_.put("msg", "退货单未入库"); return r_; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java index cd0c5988..15adb593 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java @@ -8,7 +8,6 @@ import com.nu.modules.biz.care.order.entity.CareOrdersSub; import com.nu.modules.biz.care.order.mapper.CareOrdersMapper; import com.nu.modules.biz.care.order.service.ICareOrdersService; import com.nu.modules.biz.care.order.service.ICareOrdersSubService; -import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders; import com.nu.modules.config.sendorderrule.entity.SendOrderRule; import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub; import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService; @@ -254,6 +253,8 @@ public class CareOrdersServiceImpl extends ServiceImpl empList = getEmpPermissionAndOnline(directiveIds,employeeIds,startTime); if (empList.size() > 0) { + List newList = new ArrayList(); + newList.addAll(empList); for(int i=0;i getByOrderly(empList,elderId); - - if(ruleSubList.size()>0){ - for(SendOrderRuleSub ruleSub : ruleSubList){ - switch (ruleSub.getRuleCode()) { - case 1: - //空闲积分 - sortByIzFree(empList,ruleSub.getCoefficient()); - break; - case 2: - //单次积分 - sortByNumAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 3: - //收益积分 - sortByPriceAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 4: - //服务时长积分 - sortByDurationAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 5: - //最后接单时间积分 - sortByMaxTimeAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 6: - //超出上限积分 - sortByLimit(empList,ruleSub.getCoefficient()); - break; + if (empList.size() > 0) { + if (ruleSubList.size() > 0) { + for (SendOrderRuleSub ruleSub : ruleSubList) { + switch (ruleSub.getRuleCode()) { + case 1: + //空闲积分 + sortByIzFree(empList, ruleSub.getCoefficient()); + break; + case 2: + //单次积分 + sortByNumAndSetLevel(empList, ruleSub.getCoefficient()); + break; + case 3: + //收益积分 + sortByPriceAndSetLevel(empList, ruleSub.getCoefficient()); + break; + case 4: + //服务时长积分 + sortByDurationAndSetLevel(empList, ruleSub.getCoefficient()); + break; + case 5: + //最后接单时间积分 + sortByMaxTimeAndSetLevel(empList, ruleSub.getCoefficient()); + break; + case 6: + //超出上限积分 + sortByLimit(empList, ruleSub.getCoefficient()); + break; + } } + //获取员工信息 + sortEmpList(empList); + return empList.get(0); + } else { + //随机获取一个员工 + Random random = new Random(); + return empList.get(random.nextInt(empList.size())); } - //获取员工信息 - sortEmpList(empList); - return empList.get(0); }else{ //随机获取一个员工 Random random = new Random(); - return empList.get(random.nextInt(empList.size())); + return newList.get(random.nextInt(newList.size())); } } return null; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java index 24979c3c..6b701001 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java @@ -249,50 +249,56 @@ public class EmpOrdersServiceImpl extends ServiceImpl empList = getEmpPermissionAndOnline(directiveId,startTime); if (empList.size() > 0) { + List newList = new ArrayList(); + newList.addAll(empList); for(int i=0;i getByOrderly(empList,elderId); - - if(ruleSubList.size()>0){ - for(SendOrderRuleSub ruleSub : ruleSubList){ - switch (ruleSub.getRuleCode()) { - case 1: - //空闲积分 - sortByIzFree(empList,ruleSub.getCoefficient()); - break; - case 2: - //单次积分 - sortByNumAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 3: - //收益积分 - sortByPriceAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 4: - //服务时长积分 - sortByDurationAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 5: - //最后接单时间积分 - sortByMaxTimeAndSetLevel(empList,ruleSub.getCoefficient()); - break; - case 6: - //超出上限积分 - sortByLimit(empList,ruleSub.getCoefficient()); - break; + if (empList.size() > 0) { + if(ruleSubList.size()>0){ + for(SendOrderRuleSub ruleSub : ruleSubList){ + switch (ruleSub.getRuleCode()) { + case 1: + //空闲积分 + sortByIzFree(empList,ruleSub.getCoefficient()); + break; + case 2: + //单次积分 + sortByNumAndSetLevel(empList,ruleSub.getCoefficient()); + break; + case 3: + //收益积分 + sortByPriceAndSetLevel(empList,ruleSub.getCoefficient()); + break; + case 4: + //服务时长积分 + sortByDurationAndSetLevel(empList,ruleSub.getCoefficient()); + break; + case 5: + //最后接单时间积分 + sortByMaxTimeAndSetLevel(empList,ruleSub.getCoefficient()); + break; + case 6: + //超出上限积分 + sortByLimit(empList,ruleSub.getCoefficient()); + break; + } } + //获取员工信息 + sortEmpList(empList); + return empList.get(0); + }else{ + //随机获取一个员工 + Random random = new Random(); + return empList.get(random.nextInt(empList.size())); } - //获取员工信息 - sortEmpList(empList); - return empList.get(0); }else{ //随机获取一个员工 Random random = new Random(); - return empList.get(random.nextInt(empList.size())); + return newList.get(random.nextInt(newList.size())); } } return null; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java index a7719d14..69cec77b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java @@ -169,7 +169,11 @@ public class QlOrdersServiceImpl extends ServiceImpl