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

服务指令-去掉周期类型

This commit is contained in:
曹磊 2026-01-21 11:13:56 +08:00
parent c6e553467d
commit 3e663c083f
15 changed files with 12 additions and 641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowMainController.java
View File

@ -1,166 +0,0 @@
package com.nu.modules.config.flow.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.flow.entity.ServiceFlowMain;
import com.nu.modules.config.flow.service.IServiceFlowMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* @Description: 服务指令-主流程
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
@Api(tags = "服务指令-主流程")
@RestController
@RequestMapping("/services/flow/main")
@Slf4j
public class ServiceFlowMainController extends JeecgController<ServiceFlowMain, IServiceFlowMainService> {
@Autowired
private IServiceFlowMainService serviceFlowMainService;
/**
* 分页列表查询
*
* @param serviceFlowMain
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "服务指令-主流程-分页列表查询")
@ApiOperation(value = "服务指令-主流程-分页列表查询", notes = "服务指令-主流程-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ServiceFlowMain>> queryPageList(ServiceFlowMain serviceFlowMain,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<ServiceFlowMain> queryWrapper = QueryGenerator.initQueryWrapper(serviceFlowMain, req.getParameterMap(), customeRuleMap);
Page<ServiceFlowMain> page = new Page<ServiceFlowMain>(pageNo, pageSize);
IPage<ServiceFlowMain> pageList = serviceFlowMainService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param serviceFlowMain
* @return
*/
@AutoLog(value = "服务指令-主流程-添加")
@ApiOperation(value = "服务指令-主流程-添加", notes = "服务指令-主流程-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ServiceFlowMain serviceFlowMain) {
serviceFlowMainService.save(serviceFlowMain);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param serviceFlowMain
* @return
*/
@AutoLog(value = "服务指令-主流程-编辑")
@ApiOperation(value = "服务指令-主流程-编辑", notes = "服务指令-主流程-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ServiceFlowMain serviceFlowMain) {
serviceFlowMainService.updateById(serviceFlowMain);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "服务指令-主流程-通过id删除")
@ApiOperation(value = "服务指令-主流程-通过id删除", notes = "服务指令-主流程-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
serviceFlowMainService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "服务指令-主流程-批量删除")
@ApiOperation(value = "服务指令-主流程-批量删除", notes = "服务指令-主流程-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.serviceFlowMainService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "服务指令-主流程-通过id查询")
@ApiOperation(value = "服务指令-主流程-通过id查询", notes = "服务指令-主流程-通过id查询")
@GetMapping(value = "/queryById")
public Result<ServiceFlowMain> queryById(@RequestParam(name = "id", required = true) String id) {
ServiceFlowMain serviceFlowMain = serviceFlowMainService.getById(id);
if (serviceFlowMain == null) {
return Result.error("未找到对应数据");
}
return Result.OK(serviceFlowMain);
}
/**
* 导出excel
*
* @param request
* @param serviceFlowMain
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ServiceFlowMain serviceFlowMain) {
return super.exportXls(request, serviceFlowMain, ServiceFlowMain.class, "服务指令-主流程");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ServiceFlowMain.class);
}
}

163
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowSubController.java
View File

@ -1,163 +0,0 @@
package com.nu.modules.config.flow.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.flow.entity.ServiceFlowSub;
import com.nu.modules.config.flow.service.IServiceFlowSubService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* @Description: 服务指令-子流程，用于指定节点
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
@Api(tags = "服务指令-子流程，用于指定节点")
@RestController
@RequestMapping("/services/flow/sub")
@Slf4j
public class ServiceFlowSubController extends JeecgController<ServiceFlowSub, IServiceFlowSubService> {
@Autowired
private IServiceFlowSubService serviceFlowSubService;
/**
* 分页列表查询
*
* @param serviceFlowSub
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "服务指令-子流程，用于指定节点-分页列表查询")
@ApiOperation(value = "服务指令-子流程，用于指定节点-分页列表查询", notes = "服务指令-子流程，用于指定节点-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ServiceFlowSub>> queryPageList(ServiceFlowSub serviceFlowSub,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<ServiceFlowSub> queryWrapper = QueryGenerator.initQueryWrapper(serviceFlowSub, req.getParameterMap(), customeRuleMap);
Page<ServiceFlowSub> page = new Page<ServiceFlowSub>(pageNo, pageSize);
IPage<ServiceFlowSub> pageList = serviceFlowSubService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param serviceFlowSub
* @return
*/
@AutoLog(value = "服务指令-子流程，用于指定节点-添加")
@ApiOperation(value = "服务指令-子流程，用于指定节点-添加", notes = "服务指令-子流程，用于指定节点-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ServiceFlowSub serviceFlowSub) {
serviceFlowSubService.save(serviceFlowSub);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param serviceFlowSub
* @return
*/
@AutoLog(value = "服务指令-子流程，用于指定节点-编辑")
@ApiOperation(value = "服务指令-子流程，用于指定节点-编辑", notes = "服务指令-子流程，用于指定节点-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ServiceFlowSub serviceFlowSub) {
serviceFlowSubService.updateById(serviceFlowSub);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "服务指令-子流程，用于指定节点-通过id删除")
@ApiOperation(value = "服务指令-子流程，用于指定节点-通过id删除", notes = "服务指令-子流程，用于指定节点-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
serviceFlowSubService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "服务指令-子流程，用于指定节点-批量删除")
@ApiOperation(value = "服务指令-子流程，用于指定节点-批量删除", notes = "服务指令-子流程，用于指定节点-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.serviceFlowSubService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "服务指令-子流程，用于指定节点-通过id查询")
@ApiOperation(value = "服务指令-子流程，用于指定节点-通过id查询", notes = "服务指令-子流程，用于指定节点-通过id查询")
@GetMapping(value = "/queryById")
public Result<ServiceFlowSub> queryById(@RequestParam(name = "id", required = true) String id) {
ServiceFlowSub serviceFlowSub = serviceFlowSubService.getById(id);
if (serviceFlowSub == null) {
return Result.error("未找到对应数据");
}
return Result.OK(serviceFlowSub);
}
/**
* 导出excel
*
* @param request
* @param serviceFlowSub
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ServiceFlowSub serviceFlowSub) {
return super.exportXls(request, serviceFlowSub, ServiceFlowSub.class, "服务指令-子流程，用于指定节点");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ServiceFlowSub.class);
}
}

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

@ -1,86 +0,0 @@
package com.nu.modules.config.flow.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 服务指令-主流程
* @Author: jeecg-boot
* @Date: 2025-12-08
* @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 ServiceFlowMain implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**节点名称*/
@Excel(name = "节点名称", width = 15)
@ApiModelProperty(value = "节点名称")
private java.lang.String flowName;
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15, dicCode = "iz_enabled")
@Dict(dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
/**createBy*/
@ApiModelProperty(value = "createBy")
private java.lang.String createBy;
/**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateBy*/
@ApiModelProperty(value = "updateBy")
private java.lang.String updateBy;
/**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic
private java.lang.String delFlag;
/**分类标签 nu_config_service_instruction_tag.id*/
@Excel(name = "分类标签 nu_config_service_instruction_tag.id", width = 15, dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name", dicCode = "id")
@Dict(dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name", dicCode = "id")
@ApiModelProperty(value = "分类标签 nu_config_service_instruction_tag.id")
private java.lang.String instructionTagId;
/**服务类别id nu_config_service_category.id*/
@Excel(name = "服务类别id nu_config_service_category.id", width = 15, dictTable = "nu_config_service_category", dicText = "category_name", dicCode = "id")
@Dict(dictTable = "nu_config_service_category", dicText = "category_name", dicCode = "id")
@ApiModelProperty(value = "服务类别id nu_config_service_category.id")
private java.lang.String categoryId;
/**服务类型id nu_config_service_type.id*/
@Excel(name = "服务类型id nu_config_service_type.id", width = 15, dictTable = "nu_config_service_type", dicText = "type_name", dicCode = "id")
@Dict(dictTable = "nu_config_service_type", dicText = "type_name", dicCode = "id")
@ApiModelProperty(value = "服务类型id nu_config_service_type.id")
private java.lang.String typeId;
}

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

@ -1,93 +0,0 @@
package com.nu.modules.config.flow.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 服务指令-子流程，用于指定节点
* @Author: jeecg-boot
* @Date: 2025-12-08
* @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 ServiceFlowSub implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**名称*/
@Excel(name = "名称", width = 15)
@ApiModelProperty(value = "名称")
private java.lang.String name;
/**主表ID*/
@Excel(name = "主表ID", width = 15, dictTable = "nu_config_service_flow_main", dicText = "flow_name", dicCode = "id")
@Dict(dictTable = "nu_config_service_flow_main", dicText = "flow_name", dicCode = "id")
@ApiModelProperty(value = "主表ID")
private java.lang.String mainId;
/**服务指令ID*/
@Excel(name = "服务指令ID", width = 15, dictTable = "nu_config_service_directive", dicText = "directive_name", dicCode = "id")
@Dict(dictTable = "nu_config_service_directive", dicText = "directive_name", dicCode = "id")
@ApiModelProperty(value = "服务指令ID")
private java.lang.String directiveId;
/**下一流程节点ID*/
@Excel(name = "下一流程节点ID", width = 15, dictTable = "nu_config_service_flow_sub", dicText = "name", dicCode = "id")
@Dict(dictTable = "nu_config_service_flow_sub", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "下一流程节点ID")
private java.lang.String subId;
/**流程编码，用于按钮点击时的入参，用来获取具体的指令*/
@Excel(name = "流程编码，用于按钮点击时的入参，用来获取具体的指令", width = 15)
@ApiModelProperty(value = "流程编码，用于按钮点击时的入参，用来获取具体的指令")
private java.lang.String flowCode;
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15, dicCode = "iz_enabled")
@Dict(dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled;
/**createBy*/
@ApiModelProperty(value = "createBy")
private java.lang.String createBy;
/**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateBy*/
@ApiModelProperty(value = "updateBy")
private java.lang.String updateBy;
/**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic
private java.lang.String delFlag;
/**PAD路径*/
@ApiModelProperty(value = "PAD路径")
private java.lang.String padPath;
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowMainMapper.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.ServiceFlowMain;
/**
* @Description: 服务指令-主流程
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
public interface ServiceFlowMainMapper extends BaseMapper<ServiceFlowMain> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowSubMapper.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.ServiceFlowSub;
/**
* @Description: 服务指令-子流程，用于指定节点
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
public interface ServiceFlowSubMapper extends BaseMapper<ServiceFlowSub> {
}

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowMainMapper.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.ServiceFlowMainMapper">
</mapper>

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowSubMapper.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.ServiceFlowSubMapper">
</mapper>

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowMainService.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.ServiceFlowMain;
/**
* @Description: 服务指令-主流程
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
public interface IServiceFlowMainService extends IService<ServiceFlowMain> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowSubService.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.ServiceFlowSub;
/**
* @Description: 服务指令-子流程，用于指定节点
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
public interface IServiceFlowSubService extends IService<ServiceFlowSub> {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowMainServiceImpl.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.ServiceFlowMain;
import com.nu.modules.config.flow.mapper.ServiceFlowMainMapper;
import com.nu.modules.config.flow.service.IServiceFlowMainService;
import org.springframework.stereotype.Service;
/**
* @Description: 服务指令-主流程
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
@Service
public class ServiceFlowMainServiceImpl extends ServiceImpl<ServiceFlowMainMapper, ServiceFlowMain> implements IServiceFlowMainService {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowSubServiceImpl.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.ServiceFlowSub;
import com.nu.modules.config.flow.mapper.ServiceFlowSubMapper;
import com.nu.modules.config.flow.service.IServiceFlowSubService;
import org.springframework.stereotype.Service;
/**
* @Description: 服务指令-子流程，用于指定节点
* @Author: jeecg-boot
* @Date: 2025-12-08
* @Version: V1.0
*/
@Service
public class ServiceFlowSubServiceImpl extends ServiceImpl<ServiceFlowSubMapper, ServiceFlowSub> implements IServiceFlowSubService {
}

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
View File

@ -230,7 +230,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
qw.eq("category_id", configServiceDirective.getCategoryId());
qw.eq("type_id", configServiceDirective.getTypeId());
qw.eq("directive_name", configServiceDirective.getDirectiveName());
qw.eq("cycle_type", configServiceDirective.getCycleType());
ConfigServiceDirective one = configServiceDirectiveService.getOne(qw);
if (one != null) {
return Result.error("服务指令已存在！");
@ -320,7 +319,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setCycleType(configServiceDirective.getCycleType());//指令类型
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
info.setTimeoutDuration(configServiceDirective.getTimeoutDuration());//超时时长
@ -453,7 +451,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(his.getDirectiveName());//服务指令名称
info.setTollPrice(his.getTollPrice());//收费价格
info.setComPrice(his.getComPrice());//提成价格
info.setCycleType(his.getCycleType());//指令类型
info.setServiceContent(his.getServiceContent());//服务说明
info.setServiceDuration(his.getServiceDuration());//服务时长
info.setSysOrgCode(his.getSysOrgCode());//所属部门
@ -481,7 +478,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setCycleType(configServiceDirective.getCycleType());//指令类型
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
info.setServiceDuration(configServiceDirective.getServiceDuration());//服务时长
info.setSysOrgCode(his.getSysOrgCode());//所属部门
@ -506,7 +502,6 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
|| !Objects.equals(his.getDirectiveName(), configServiceDirective.getDirectiveName())
|| !Objects.equals(his.getTollPrice(), configServiceDirective.getTollPrice())
|| !Objects.equals(his.getComPrice(), configServiceDirective.getComPrice())
|| !Objects.equals(his.getCycleType(), configServiceDirective.getCycleType())
|| !Objects.equals(his.getServiceContent(), configServiceDirective.getServiceContent())
|| !Objects.equals(his.getServiceDuration(), configServiceDirective.getServiceDuration())
|| !Objects.equals(his.getMp3File(), configServiceDirective.getMp3File())

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java
View File

@ -96,13 +96,6 @@ public class ConfigServiceDirective implements Serializable {
@ApiModelProperty(value = "收费频次")
@Dict(dicCode = "billing_frequency")
private java.lang.String chargingFrequency;
/**
* 指令类型 1日常护理 2周期护理 3即时护理
*/
@Excel(name = "指令类型", width = 15)
@ApiModelProperty(value = "指令类型")
@Dict(dicCode = "period_type")
private java.lang.String cycleType;
/**
* 排序
*/
@ -335,8 +328,15 @@ public class ConfigServiceDirective implements Serializable {
private boolean targetExist;//目标平台是否存在该指令
@TableField(exist = false)
private String cycleTypeShow;
@TableField(exist = false)
private String cycleTypeValue;
// @TableField(exist = false)
// private String cycleTypeValue;
@TableField(exist = false)
private String syncCode;
// /**
// * 指令类型 1日常护理 2周期护理 3即时护理
// */
// @Excel(name = "指令类型", width = 15)
// @ApiModelProperty(value = "指令类型")
// @Dict(dicCode = "period_type")
// private java.lang.String cycleType;
}

20
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
View File

@ -15,7 +15,6 @@
<result property="izReimbursement" column="iz_reimbursement"/>
<result property="izPreferential" column="iz_preferential"/>
<result property="chargingFrequency" column="charging_frequency"/>
<result property="cycleType" column="cycle_type"/>
<result property="sort" column="sort"/>
<result property="serviceContent" column="service_content"/>
<result property="serviceDuration" column="service_duration"/>
@ -65,7 +64,6 @@
c.iz_reimbursement,
c.iz_preferential,
c.charging_frequency,
c.cycle_type,
c.sort,
c.service_content,
c.service_duration,
@ -179,7 +177,6 @@
<result column="directive_name" property="directiveName"/>
<result column="category_id" property="categoryId"/>
<result column="type_id" property="typeId"/>
<result column="cycle_type" property="cycleType"/>
<!-- 一级、二级、三级 ID 可根据需要添加 -->
<collection property="bodyTagList" ofType="com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag"
select="getBodyTagsByDirective" column="id"/>
@ -195,8 +192,7 @@
type_id,
directive_name,
sort,
iz_enabled,
cycle_type
iz_enabled
FROM nu_config_service_directive
WHERE del_flag = '0'
ORDER BY sort ASC
@ -249,16 +245,11 @@
i.instruction_name as instructionName,
c.category_name as categoryName,
t.type_name as typeName,
m.directive_name,
dic.dit as cycleTypeName
m.directive_name
from nu_config_service_directive m
left join nu_config_service_instruction_tag i on m.instruction_tag_id = i.id
left join nu_config_service_category c on m.category_id = c.id
left join nu_config_service_type t on m.type_id = t.id
left join (select di.item_value as diva, di.item_text as dit
from sys_dict d
left join sys_dict_item di on d.id = di.dict_id where d.dict_code = 'period_type') dic
on m.cycle_type = dic.diva
<where>
m.iz_enabled = '0'
<if test="existIds != null and existIds.length > 0">
@ -276,16 +267,11 @@
m.*,
i.instruction_name as instructionName,
c.category_name as categoryName,
t.type_name as typeName,
dic.dit as cycleTypeName
t.type_name as typeName
from nu_config_service_directive m
left join nu_config_service_instruction_tag i on m.instruction_tag_id = i.id
left join nu_config_service_category c on m.category_id = c.id
left join nu_config_service_type t on m.type_id = t.id
left join (select di.item_value as diva, di.item_text as dit
from sys_dict d
left join sys_dict_item di on d.id = di.dict_id where d.dict_code = 'period_type') dic
on m.cycle_type = dic.diva
where m.id = #{id}
</select>
</mapper>