yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务派单规则表调整

This commit is contained in:
曹磊 2025-12-05 13:56:22 +08:00
parent 1d9e7e986a
commit 1aa034ebe3
13 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java
View File

@ -7,10 +7,10 @@ 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.config.sendorderpriority.entity.SendOrderRule;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleSubService;
import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
@ -168,11 +168,11 @@ public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrd
* @return
*/
private CareOrders employeeScreening(String directiveIds, String customerId, String employeeIds, Date startTime){
if (sendOrderRule.getPriorityCode().equals("1")) {
if (sendOrderRule.getRuleCode().equals("1")) {
//按优先级
return getByPriority(directiveIds, customerId, startTime, employeeIds);
}
if (sendOrderRule.getPriorityCode().equals("2")) {
if (sendOrderRule.getRuleCode().equals("2")) {
//专项按人头，可1v1，可NvN，全看长者配置专项护理员的设置
return getByHeadCount(directiveIds, customerId, startTime, employeeIds);
}
@ -193,7 +193,7 @@ public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrd
}
if(ruleSubList.size()>0){
for(SendOrderRuleSub ruleSub : ruleSubList){
switch (ruleSub.getPriorityCode()) {
switch (ruleSub.getRuleCode()) {
case 1:
//空闲积分
sortByIzFree(empList,ruleSub.getCoefficient());
@ -254,7 +254,7 @@ public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrd
if(ruleSubList.size()>0){
for(SendOrderRuleSub ruleSub : ruleSubList){
switch (ruleSub.getPriorityCode()) {
switch (ruleSub.getRuleCode()) {
case 1:
//空闲积分
sortByIzFree(empList,ruleSub.getCoefficient());

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java
View File

@ -8,10 +8,10 @@ import com.nu.modules.biz.invoicing.order.entity.InvoicingOrders;
import com.nu.modules.biz.invoicing.order.mapper.InvoicingOrdersMapper;
import com.nu.modules.biz.invoicing.order.service.IInvoicingOrdersService;
import com.nu.modules.care.api.IInvoicingOrdersApi;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRule;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleSubService;
import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.springframework.beans.BeanUtils;
@ -128,11 +128,11 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
* @return
*/
private InvoicingOrders employeeScreening(String directiveId, String customerId, Date startTime) {
if (sendOrderRule.getPriorityCode().equals("1")) {
if (sendOrderRule.getRuleCode().equals("1")) {
//按优先级
return getByPriority(directiveId, customerId, startTime);
}
if (sendOrderRule.getPriorityCode().equals("2")) {
if (sendOrderRule.getRuleCode().equals("2")) {
//按人头
return getByHeadCount(directiveId, customerId, startTime);
}
@ -149,7 +149,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
if (empList.size() > 0) {
if(ruleSubList.size()>0){
for(SendOrderRuleSub ruleSub : ruleSubList){
switch (ruleSub.getPriorityCode()) {
switch (ruleSub.getRuleCode()) {
case 1:
//空闲积分
sortByIzFree(empList,ruleSub.getCoefficient());
@ -210,7 +210,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
if(ruleSubList.size()>0){
for(SendOrderRuleSub ruleSub : ruleSubList){
switch (ruleSub.getPriorityCode()) {
switch (ruleSub.getRuleCode()) {
case 1:
//空闲积分
sortByIzFree(empList,ruleSub.getCoefficient());

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/controller/SendOrderRuleController.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/controller/SendOrderRuleController.java
View File

@ -1,10 +1,10 @@
package com.nu.modules.config.sendorderpriority.controller;
package com.nu.modules.config.sendorderrule.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRule;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/entity/SendOrderRule.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/entity/SendOrderRule.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.config.sendorderpriority.entity;
package com.nu.modules.config.sendorderrule.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@ -14,16 +14,16 @@ import java.io.Serializable;
import java.util.List;
/**
* @Description: 服务指令-派单优先级配置主表
* @Description: 服务指令-派单规则配置主表
* @Author: caolei
* @Date: 2025-12-1
* @Version: V1.0
*/
@Data
@TableName("nu_config_send_order_priority")
@TableName("nu_config_service_send_order_rule")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_config_send_order_priority对象", description="服务指令-派单优先级配置主表")
@ApiModel(value="nu_config_service_send_order_rule对象", description="服务指令-派单规则配置主表")
public class SendOrderRule implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@ -31,10 +31,10 @@ public class SendOrderRule implements Serializable {
private String id;
/**优先级编码值*/
private Integer priorityCode;
private Integer ruleCode;
/**优先级名称*/
private String priorityName;
private String ruleName;
/**是否启用 Y启用 N未启用*/
private String izEnabled;
@ -54,5 +54,5 @@ public class SendOrderRule implements Serializable {
/**是否删除 0未删除 1删除*/
private String delFlag;
private List<SendOrderRuleSub> sendOrderPrioritySubList;
private List<SendOrderRuleSub> sendOrderRuleSubList;
}

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/entity/SendOrderRuleSub.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/entity/SendOrderRuleSub.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.config.sendorderpriority.entity;
package com.nu.modules.config.sendorderrule.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@ -19,10 +19,10 @@ import java.io.Serializable;
* @Version: V1.0
*/
@Data
@TableName("nu_config_send_order_priority_sub")
@TableName("nu_config_service_send_order_rule_sub")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_config_send_order_priority_sub对象", description="服务指令-派单优先级配置子表")
@ApiModel(value="nu_config_service_send_order_rule_sub对象", description="服务指令-派单优先级配置子表")
public class SendOrderRuleSub implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@ -33,10 +33,10 @@ public class SendOrderRuleSub implements Serializable {
private String mainId;
/**优先级编码值*/
private Integer priorityCode;
private Integer ruleCode;
/**优先级名称*/
private String priorityName;
private String ruleName;
/**是否启用 Y启用 N未启用*/
private String izEnabled;

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/mapper/SendOrderRuleMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/mapper/SendOrderRuleMapper.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.config.sendorderpriority.mapper;
package com.nu.modules.config.sendorderrule.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
/**
* @Description: 派单优先级配置主表

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/mapper/SendOrderRuleSubMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/mapper/SendOrderRuleSubMapper.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.config.sendorderpriority.mapper;
package com.nu.modules.config.sendorderrule.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
/**
* @Description: 派单优先级配置子表

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/mapper/xml/SendOrderRuleMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/mapper/xml/SendOrderRuleMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.config.sendorderpriority.mapper.SendOrderRuleMapper">
<mapper namespace="com.nu.modules.config.sendorderrule.mapper.SendOrderRuleMapper">
</mapper>

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/mapper/xml/SendOrderRuleSubMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/mapper/xml/SendOrderRuleSubMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.config.sendorderpriority.mapper.SendOrderRuleSubMapper">
<mapper namespace="com.nu.modules.config.sendorderrule.mapper.SendOrderRuleSubMapper">
</mapper>

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/service/ISendOrderRuleService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/service/ISendOrderRuleService.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.config.sendorderpriority.service;
package com.nu.modules.config.sendorderrule.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
/**
* @Description: 服务指令-派单优先级配置主表

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/service/ISendOrderRuleSubService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/service/ISendOrderRuleSubService.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.config.sendorderpriority.service;
package com.nu.modules.config.sendorderrule.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
/**
* @Description: 服务指令-派单优先级配置子表

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/service/impl/SendOrderRuleServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/service/impl/SendOrderRuleServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.nu.modules.config.sendorderpriority.service.impl;
package com.nu.modules.config.sendorderrule.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRule;
import com.nu.modules.config.sendorderpriority.mapper.SendOrderRuleMapper;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.mapper.SendOrderRuleMapper;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
import org.springframework.stereotype.Service;
/**

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderpriority/service/impl/SendOrderRuleSubServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/sendorderrule/service/impl/SendOrderRuleSubServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.nu.modules.config.sendorderpriority.service.impl;
package com.nu.modules.config.sendorderrule.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.config.sendorderpriority.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderpriority.mapper.SendOrderRuleSubMapper;
import com.nu.modules.config.sendorderpriority.service.ISendOrderRuleSubService;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.mapper.SendOrderRuleSubMapper;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
import org.springframework.stereotype.Service;
/**