From 3e663c083fc5bf3f9a92782864e3ba8a167c1cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 21 Jan 2026 11:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ServiceFlowMainController.java | 166 ------------------ .../controller/ServiceFlowSubController.java | 163 ----------------- .../config/flow/entity/ServiceFlowMain.java | 86 --------- .../config/flow/entity/ServiceFlowSub.java | 93 ---------- .../flow/mapper/ServiceFlowMainMapper.java | 14 -- .../flow/mapper/ServiceFlowSubMapper.java | 14 -- .../flow/mapper/xml/ServiceFlowMainMapper.xml | 5 - .../flow/mapper/xml/ServiceFlowSubMapper.xml | 5 - .../flow/service/IServiceFlowMainService.java | 14 -- .../flow/service/IServiceFlowSubService.java | 14 -- .../impl/ServiceFlowMainServiceImpl.java | 18 -- .../impl/ServiceFlowSubServiceImpl.java | 18 -- .../ConfigServiceDirectiveController.java | 5 - .../entity/ConfigServiceDirective.java | 18 +- .../xml/ConfigServiceDirectiveMapper.xml | 20 +-- 15 files changed, 12 insertions(+), 641 deletions(-) delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowMainController.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowSubController.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowMain.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowSub.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowMainMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowSubMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowMainMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowSubMapper.xml delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowMainService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowSubService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowMainServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowSubServiceImpl.java diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowMainController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowMainController.java deleted file mode 100644 index 40b22286..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowMainController.java +++ /dev/null @@ -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 { - @Autowired - private IServiceFlowMainService serviceFlowMainService; - - /** - * 分页列表查询 - * - * @param serviceFlowMain - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "服务指令-主流程-分页列表查询") - @ApiOperation(value = "服务指令-主流程-分页列表查询", notes = "服务指令-主流程-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ServiceFlowMain serviceFlowMain, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - // 自定义查询规则 - Map 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 queryWrapper = QueryGenerator.initQueryWrapper(serviceFlowMain, req.getParameterMap(), customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = serviceFlowMainService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param serviceFlowMain - * @return - */ - @AutoLog(value = "服务指令-主流程-添加") - @ApiOperation(value = "服务指令-主流程-添加", notes = "服务指令-主流程-添加") - @PostMapping(value = "/add") - public Result 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 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 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 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 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); - } - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowSubController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowSubController.java deleted file mode 100644 index 527d6021..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/controller/ServiceFlowSubController.java +++ /dev/null @@ -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 { - @Autowired - private IServiceFlowSubService serviceFlowSubService; - - /** - * 分页列表查询 - * - * @param serviceFlowSub - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "服务指令-子流程，用于指定节点-分页列表查询") - @ApiOperation(value = "服务指令-子流程，用于指定节点-分页列表查询", notes = "服务指令-子流程，用于指定节点-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ServiceFlowSub serviceFlowSub, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - // 自定义查询规则 - Map customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(serviceFlowSub, req.getParameterMap(), customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = serviceFlowSubService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param serviceFlowSub - * @return - */ - @AutoLog(value = "服务指令-子流程，用于指定节点-添加") - @ApiOperation(value = "服务指令-子流程，用于指定节点-添加", notes = "服务指令-子流程，用于指定节点-添加") - @PostMapping(value = "/add") - public Result 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 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 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 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 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); - } - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowMain.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowMain.java deleted file mode 100644 index fda2bfa0..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowMain.java +++ /dev/null @@ -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; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowSub.java deleted file mode 100644 index b761f772..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/entity/ServiceFlowSub.java +++ /dev/null @@ -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; -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowMainMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowMainMapper.java deleted file mode 100644 index 9dc33866..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowMainMapper.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.ServiceFlowMain; - -/** - * @Description: 服务指令-主流程 - * @Author: jeecg-boot - * @Date: 2025-12-08 - * @Version: V1.0 - */ -public interface ServiceFlowMainMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowSubMapper.java deleted file mode 100644 index d2e58f88..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/ServiceFlowSubMapper.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.ServiceFlowSub; - -/** - * @Description: 服务指令-子流程，用于指定节点 - * @Author: jeecg-boot - * @Date: 2025-12-08 - * @Version: V1.0 - */ -public interface ServiceFlowSubMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowMainMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowMainMapper.xml deleted file mode 100644 index 5083de82..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowMainMapper.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/ServiceFlowSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowSubMapper.xml deleted file mode 100644 index 055a1213..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/mapper/xml/ServiceFlowSubMapper.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/IServiceFlowMainService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowMainService.java deleted file mode 100644 index 6c1966ed..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowMainService.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.ServiceFlowMain; - -/** - * @Description: 服务指令-主流程 - * @Author: jeecg-boot - * @Date: 2025-12-08 - * @Version: V1.0 - */ -public interface IServiceFlowMainService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowSubService.java deleted file mode 100644 index af6dc94e..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/IServiceFlowSubService.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.ServiceFlowSub; - -/** - * @Description: 服务指令-子流程，用于指定节点 - * @Author: jeecg-boot - * @Date: 2025-12-08 - * @Version: V1.0 - */ -public interface IServiceFlowSubService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowMainServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowMainServiceImpl.java deleted file mode 100644 index a0cfb9af..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowMainServiceImpl.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.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 implements IServiceFlowMainService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowSubServiceImpl.java deleted file mode 100644 index 31e74dc5..00000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/flow/service/impl/ServiceFlowSubServiceImpl.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.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 implements IServiceFlowSubService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index 983330d0..f2a7db72 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -230,7 +230,6 @@ public class ConfigServiceDirectiveController extends JeecgController - @@ -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 @@ - @@ -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 m.iz_enabled = '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}