diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowMain.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowMain.java deleted file mode 100644 index c901ce9..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowMain.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.nu.modules.config.flow.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 服务指令-流程配置主表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -@Data -@TableName("nu_config_service_flow_main") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_service_flow_main对象", description="服务指令-流程配置主表") -public class FlowMain implements Serializable { - private static final long serialVersionUID = 1L; - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /**流程名称*/ - private String flowName; - - /**是否启用 Y启用 N未启用*/ - private String izEnabled; - - /**创建人*/ - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; - /**更新人*/ - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; - /**是否删除 0未删除 1删除*/ - private String delFlag; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowPoint.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowPoint.java deleted file mode 100644 index 8b26ca3..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowPoint.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.nu.modules.config.flow.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - -/** - * @Description: 服务指令-流程配置节点表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -@Data -@TableName("nu_config_service_flow_point") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_service_flow_point对象", description="服务指令-流程配置节点表") -public class FlowPoint implements Serializable { - private static final long serialVersionUID = 1L; - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - /**流程名称*/ - private String pointName; - /**流程名称*/ - private String directiveId; - /**流程名称*/ - private String appPath; - /**是否启用 Y启用 N未启用*/ - private String izEnabled; - /**创建人*/ - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; - /**更新人*/ - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; - /**是否删除 0未删除 1删除*/ - private String delFlag; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowSub.java deleted file mode 100644 index ff43fd7..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowSub.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.nu.modules.config.flow.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 服务指令-流程配置子表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -@Data -@TableName("nu_config_service_flow_sub") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_service_flow_sub对象", description="服务指令-流程配置子表") -public class FlowSub implements Serializable { - private static final long serialVersionUID = 1L; - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - private String id; - /**流程名称*/ - private String mainId; - /**流程名称*/ - private String pointId; - /**流程名称*/ - private String nextPointId; - /**流程名称*/ - private String flowCode; - /**是否启用 Y启用 N未启用*/ - private String izEnabled; - /**创建人*/ - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; - /**更新人*/ - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; - /**是否删除 0未删除 1删除*/ - private String delFlag; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowMainMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowMainMapper.java deleted file mode 100644 index f1de87f..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowMainMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.config.flow.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.flow.entity.FlowMain; - -/** - * @Description: 服务指令-流程配置主表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -public interface FlowMainMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowPointMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowPointMapper.java deleted file mode 100644 index 321b6e8..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowPointMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.config.flow.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.flow.entity.FlowPoint; - -/** - * @Description: 服务指令-流程配置节点表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -public interface FlowPointMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowSubMapper.java deleted file mode 100644 index df81e6d..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowSubMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.config.flow.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.config.flow.entity.FlowSub; - -/** - * @Description: 服务指令-流程配置子表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -public interface FlowSubMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowMainMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowMainMapper.xml deleted file mode 100644 index 0e15176..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowMainMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowPointMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowPointMapper.xml deleted file mode 100644 index 6ba18a3..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowPointMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowSubMapper.xml deleted file mode 100644 index 09d4687..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowSubMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowMainService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowMainService.java deleted file mode 100644 index 1d9b1df..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowMainService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.config.flow.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.config.flow.entity.FlowMain; - -/** - * @Description: 服务指令-流程配置主表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -public interface IFlowMainService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowPointService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowPointService.java deleted file mode 100644 index 8522d90..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowPointService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.config.flow.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.config.flow.entity.FlowPoint; - -/** - * @Description: 服务指令-流程配置节点表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -public interface IFlowPointService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowSubService.java deleted file mode 100644 index 5ed0e17..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowSubService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.config.flow.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.config.flow.entity.FlowSub; - -/** - * @Description: 服务指令-流程配置子表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -public interface IFlowSubService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowMainServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowMainServiceImpl.java deleted file mode 100644 index 8cdec6b..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowMainServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.config.flow.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.config.flow.entity.FlowMain; -import com.nu.modules.config.flow.mapper.FlowMainMapper; -import com.nu.modules.config.flow.service.IFlowMainService; -import org.springframework.stereotype.Service; - -/** - * @Description: 服务指令-流程配置主表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -@Service -public class FlowMainServiceImpl extends ServiceImpl implements IFlowMainService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowPointServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowPointServiceImpl.java deleted file mode 100644 index c000c83..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowPointServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.config.flow.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.config.flow.entity.FlowPoint; -import com.nu.modules.config.flow.mapper.FlowPointMapper; -import com.nu.modules.config.flow.service.IFlowPointService; -import org.springframework.stereotype.Service; - -/** - * @Description: 服务指令-流程配置节点表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -@Service -public class FlowPointServiceImpl extends ServiceImpl implements IFlowPointService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowSubServiceImpl.java deleted file mode 100644 index 173d7b9..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowSubServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.config.flow.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.config.flow.entity.FlowSub; -import com.nu.modules.config.flow.mapper.FlowSubMapper; -import com.nu.modules.config.flow.service.IFlowSubService; -import org.springframework.stereotype.Service; - -/** - * @Description: 服务指令-流程配置子表 - * @Author: caolei - * @Date: 2025-12-5 - * @Version: V1.0 - */ -@Service -public class FlowSubServiceImpl extends ServiceImpl implements IFlowSubService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 4847e3b..eb27aae 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -414,12 +414,12 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl typeList = typeMap.get(cat.getId()); if (typeList != null) { typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort)); -// for (ConfigServiceType tp : typeList) { -// typUsing = "Y".equals(tp.getIzEnabled()); -// if ("enabled".equals(filterIzEnabled) && !typUsing) { -// continue; -// } -// TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,""); + for (ConfigServiceType tp : typeList) { + typUsing = "Y".equals(tp.getIzEnabled()); + if ("enabled".equals(filterIzEnabled) && !typUsing) { + continue; + } + TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,""); // List dirList = directiveMap.get(tp.getId()); // if (dirList != null) { // dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort)); @@ -435,8 +435,8 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl