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

1、删除指令流程刚创建的代码（之后重新生成） 

2、解决服务指令树没有服务类型bug
This commit is contained in:
1378012178@qq.com 2025-12-05 16:25:54 +08:00
parent 24e94500ff
commit fea4fc1815
16 changed files with 8 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowMain.java
View File

@ -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;
}

53
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowPoint.java
View File

@ -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;
}

57
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/FlowSub.java
View File

@ -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;
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowMainMapper.java
View File

@ -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<FlowMain> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowPointMapper.java
View File

@ -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<FlowPoint> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/FlowSubMapper.java
View File

@ -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<FlowSub> {
}

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowMainMapper.xml
View File

@ -1,5 +0,0 @@
<?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.flow.mapper.FlowMainMapper">
</mapper>

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowPointMapper.xml
View File

@ -1,5 +0,0 @@
<?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.flow.mapper.FlowPointMapper">
</mapper>

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/FlowSubMapper.xml
View File

@ -1,5 +0,0 @@
<?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.flow.mapper.FlowSubMapper">
</mapper>

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowMainService.java
View File

@ -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<FlowMain> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowPointService.java
View File

@ -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<FlowPoint> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IFlowSubService.java
View File

@ -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<FlowSub> {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowMainServiceImpl.java
View File

@ -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<FlowMainMapper, FlowMain> implements IFlowMainService {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowPointServiceImpl.java
View File

@ -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<FlowPointMapper, FlowPoint> implements IFlowPointService {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/FlowSubServiceImpl.java
View File

@ -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<FlowSubMapper, FlowSub> implements IFlowSubService {
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -414,12 +414,12 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
List<ConfigServiceType> 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<ConfigServiceDirective> dirList = directiveMap.get(tp.getId());
// if (dirList != null) {
// dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
@ -435,8 +435,8 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
//// dirNode.addChild(tagNode);
// }
// }
// catNode.addChild(typeNode);
// }
catNode.addChild(typeNode);
}
}
instNode.addChild(catNode);
}