diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java new file mode 100644 index 0000000..0e61ad3 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java @@ -0,0 +1,162 @@ +package com.nu.modules.directiveTag.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.directiveTag.entity.DirectiveTag; +import com.nu.modules.directiveTag.service.IDirectiveTagService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Api(tags="指令标签") +@RestController +@RequestMapping("/directiveTag/directiveTag") +@Slf4j +public class DirectiveTagController extends JeecgController { + @Autowired + private IDirectiveTagService directiveTagService; + + /** + * 分页列表查询 + * + * @param directiveTag + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "指令标签-分页列表查询") + @ApiOperation(value="指令标签-分页列表查询", notes="指令标签-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DirectiveTag directiveTag, + @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(directiveTag, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage pageList = directiveTagService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param directiveTag + * @return + */ + @AutoLog(value = "指令标签-添加") + @ApiOperation(value="指令标签-添加", notes="指令标签-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody DirectiveTag directiveTag) { + directiveTagService.save(directiveTag); + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param directiveTag + * @return + */ + @AutoLog(value = "指令标签-编辑") + @ApiOperation(value="指令标签-编辑", notes="指令标签-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DirectiveTag directiveTag) { + directiveTagService.updateById(directiveTag); + 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) { + directiveTagService.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.directiveTagService.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) { + DirectiveTag directiveTag = directiveTagService.getById(id); + if(directiveTag==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(directiveTag); + } + + /** + * 导出excel + * + * @param request + * @param directiveTag + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DirectiveTag directiveTag) { + return super.exportXls(request, directiveTag, DirectiveTag.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, DirectiveTag.class); + } + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java new file mode 100644 index 0000000..4f7e193 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java @@ -0,0 +1,78 @@ +package com.nu.modules.directiveTag.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: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +@TableName("config_directive_tag") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="config_directive_tag对象", description="指令标签") +public class DirectiveTag 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 tagName; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; + /**是否启用 0启用 1未启用*/ + @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") + @Dict(dicCode = "iz_enabled") + @ApiModelProperty(value = "是否启用") + private java.lang.String izEnabled; + /**是否删除 0未删除 1删除*/ + @Excel(name = "是否删除", width = 15) + @ApiModelProperty(value = "是否删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java new file mode 100644 index 0000000..3355bcf --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.directiveTag.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 指令标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface DirectiveTagMapper extends BaseMapper { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml new file mode 100644 index 0000000..a992d83 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java new file mode 100644 index 0000000..5578f80 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java @@ -0,0 +1,14 @@ +package com.nu.modules.directiveTag.service; + +import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 指令标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +public interface IDirectiveTagService extends IService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java new file mode 100644 index 0000000..dd48952 --- /dev/null +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.directiveTag.service.impl; + +import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directiveTag.mapper.DirectiveTagMapper; +import com.nu.modules.directiveTag.service.IDirectiveTagService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 指令标签 + * @Author: 张明远 + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Service +public class DirectiveTagServiceImpl extends ServiceImpl implements IDirectiveTagService { + +} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java index 0996d75..acea519 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java @@ -56,22 +56,7 @@ public class ConfigServiceDirectiveController extends JeecgController customeRuleMap = new HashMap<>(); - // 自定义多选的查询规则为:LIKE_WITH_OR - customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR); - customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); - Page page = new Page(pageNo, pageSize); - IPage pageList = configServiceDirectiveService.page(page, queryWrapper); - //处理单元格合并所需数据 - service.merge(pageList.getRecords()); + IPage pageList = service.pageList(configServiceDirective, pageNo, pageSize); return Result.OK(pageList); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java index 1e66f1e..7f8258d 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java @@ -1,22 +1,19 @@ package com.nu.modules.serviceDirective.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.*; -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 com.nu.modules.directiveTag.entity.DirectiveTag; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; /** * @Description: 服务指令 @@ -100,7 +97,7 @@ public class ConfigServiceDirective implements Serializable { @ApiModelProperty(value = "是否启用") @Dict(dicCode = "iz_enabled") private java.lang.String izEnabled; - /**是否删除 0未删除 1删除*/ + /**是否删除*/ @Excel(name = "是否删除", width = 15) @ApiModelProperty(value = "是否删除") @TableLogic @@ -140,4 +137,7 @@ public class ConfigServiceDirective implements Serializable { private Integer typeRowSpan; @TableField(exist = false) private Integer instructionRowSpan; + + //服务指令标签 + List tagList; } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java index cf137a4..4624c9d 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java @@ -2,6 +2,8 @@ package com.nu.modules.serviceDirective.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -9,9 +11,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 服务指令 * @Author: 张明远 - * @Date: 2025-03-13 + * @Date: 2025-03-13 * @Version: V1.0 */ public interface ConfigServiceDirectiveMapper extends BaseMapper { - + /** + * 自定义分页查询方法 + * + * @param page 分页参数 + * @param directive 主查询对象(包含搜索条件) + * @return 分页结果 + */ + IPage pageList( + @Param("page") Page page, + @Param("directive") ConfigServiceDirective directive + ); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 9efaec6..ba24d7e 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -2,4 +2,102 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java index 988aa1b..4fdf52a 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java @@ -1,9 +1,13 @@ package com.nu.modules.serviceDirective.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.system.query.QueryRuleEnum; +import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * @Description: 服务指令 @@ -14,4 +18,6 @@ import java.util.List; public interface IConfigServiceDirectiveService extends IService { void merge(List records); + + IPage pageList(ConfigServiceDirective configServiceDirective, Integer pageNo, Integer pageSize); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 47a6053..cc9956b 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -1,26 +1,63 @@ package com.nu.modules.serviceDirective.service.impl; +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper; import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 服务指令 * @Author: 张明远 - * @Date: 2025-03-13 + * @Date: 2025-03-13 * @Version: V1.0 */ @Service public class ConfigServiceDirectiveServiceImpl extends ServiceImpl implements IConfigServiceDirectiveService { + @Override + public IPage pageList(ConfigServiceDirective configServiceDirective, Integer pageNo, Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + IPage pageList = baseMapper.pageList(page, configServiceDirective); + //处理单元格合并所需数据 + merge(pageList.getRecords()); + return pageList; + } +// @Override +// public IPage pageList(ConfigServiceDirective configServiceDirective, Integer pageNo, Integer pageSize, HttpServletRequest req) { +// // 自定义查询规则 +// Map customeRuleMap = new HashMap<>(); +// // 自定义多选的查询规则为:LIKE_WITH_OR +// customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("typeId", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("instructionTagId", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR); +// customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR); +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); +// Page page = new Page<>(pageNo, pageSize); +// IPage pageList = page(page, queryWrapper); +// //处理单元格合并所需数据 +// merge(pageList.getRecords()); +// return pageList; +// } + /** * 主合并方法 + * * @param records 已排序的记录列表(需先按categoryId→typeId→instructionTagId排序) */ @Override @@ -42,11 +79,13 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl records, int start, int end) { processOuterGroup(records, start, end); // 处理一级categoryRowSpan @@ -67,9 +106,10 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl records, int start, int end) { processTypeRowSpan(records, start, end); // 设置二级typeRowSpan @@ -90,9 +130,10 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl records, int start, int end) { int count = end - start + 1;