lizhenhao 2 rokov pred
rodič
commit
1ff54c0fd6
14 zmenil súbory, kde vykonal 858 pridanie a 0 odobranie
  1. 92 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/controller/HelpController.java
  2. 134 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/controller/HelpTreeController.java
  3. 50 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/domain/Help.java
  4. 50 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/domain/HelpTree.java
  5. 25 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/HelpMapper.java
  6. 29 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/HelpTreeMapper.java
  7. 55 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/xml/HelpMapper.xml
  8. 80 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/xml/HelpTreeMapper.xml
  9. 103 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/HelpService.java
  10. 89 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/HelpTreeService.java
  11. 59 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/dto/HelpDTO.java
  12. 58 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/dto/HelpTreeDTO.java
  13. 17 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/mapstruct/HelpTreeWrapper.java
  14. 17 0
      jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/mapstruct/HelpWrapper.java

+ 92 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/controller/HelpController.java

@@ -0,0 +1,92 @@
+package com.jeeplus.test.help.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.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.test.help.domain.Help;
+import com.jeeplus.test.help.service.HelpService;
+import com.jeeplus.test.help.service.dto.HelpDTO;
+import io.swagger.annotations.Api;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@Api("帮助管理")
+@RestController
+@RequestMapping(value = "/help")
+public class HelpController {
+
+    @Resource
+    private HelpService helpService;
+
+    /**
+     * 查询帮助管理列表
+     * @param helpDTO
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @ApiLog("查询帮助管理列表")
+    @PreAuthorize("hasAuthority('help:list')")
+    @GetMapping("list")
+    public ResponseEntity<IPage<HelpDTO>> data(HelpDTO helpDTO, Page<HelpDTO> page) throws Exception {
+        IPage<HelpDTO> result = new Page<HelpDTO>();
+        result = helpService.findList (page,helpDTO);
+        return ResponseEntity.ok (result);
+    }
+
+    /**
+     * 查询帮助管理数据
+     * @param id
+     * @return
+     */
+    @ApiLog("查询帮助管理数据")
+    @PreAuthorize("hasAnyAuthority('help:view','help:add','help:edit')")
+    @GetMapping("queryById")
+    public ResponseEntity queryById(@RequestParam("id") String id) {
+        HelpDTO helpDTO = helpService.queryById ( id );
+        return ResponseEntity.ok (helpDTO);
+    }
+
+    /**
+     * 保存帮助
+     * @param helpDTO
+     * @return
+     */
+    @ApiLog(value = "修改/新增帮助", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('help:add','help:edit')")
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody HelpDTO helpDTO) throws Exception {
+        helpService.saveHelp(helpDTO);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除帮助
+     * @param ids
+     * @return
+     */
+    @ApiLog(value = "删除帮助", type = LogTypeEnum.SAVE)
+    @PreAuthorize ("hasAuthority('help:del')")
+    @DeleteMapping("delete")
+    public ResponseEntity delete(String ids) {
+        return helpService.deleteByIds(ids);
+    }
+
+    /**
+     * 帮助管理状态 启用/停用
+     * @return
+     */
+    @ApiLog(value = "帮助管理状态启用/停用", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('help:add','help:edit')")
+    @PostMapping("updateStatus")
+    public ResponseEntity updateStatus(@RequestBody HelpDTO helpDTO) {
+        return helpService.updateStatus(helpDTO);
+    }
+}

+ 134 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/controller/HelpTreeController.java

@@ -0,0 +1,134 @@
+package com.jeeplus.test.help.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.help.domain.HelpTree;
+import com.jeeplus.test.help.service.HelpTreeService;
+import com.jeeplus.test.help.service.dto.HelpTreeDTO;
+import io.swagger.annotations.Api;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Api("帮助管理树形")
+@RestController
+@RequestMapping(value = "/help_tree")
+public class HelpTreeController {
+
+    @Resource
+    private HelpTreeService helpTreeService;
+
+    /**
+     * 查询帮助管理树形列表
+     * @param helpTreeDTO
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @ApiLog("查询帮助管理树形列表")
+    @PreAuthorize("hasAuthority('help:list')")
+    @GetMapping("list")
+    public ResponseEntity<IPage<HelpTreeDTO>> data(HelpTreeDTO helpTreeDTO, Page<HelpTreeDTO> page) throws Exception {
+        page.setSize(-1);
+        IPage<HelpTreeDTO> result = new Page<HelpTreeDTO>();
+        if(ObjectUtil.isNotEmpty(helpTreeDTO)){
+            if(StringUtils.isNotBlank(helpTreeDTO.getName())){
+                //根据type模糊查询
+                List<HelpTree> helpTreeList = helpTreeService.list(new QueryWrapper<HelpTree>().lambda()
+                        .like(StringUtils.isNotBlank(helpTreeDTO.getName()), HelpTree::getName, helpTreeDTO.getName())
+                );
+                List<String> idList = new ArrayList<>();
+                helpTreeList.stream().forEach(item->{
+                    if (StringUtils.isNotBlank(item.getParentIds())){
+                        String[] split = item.getParentIds().split(",");
+                        for (String s : split) {
+                            idList.add(s);
+                        }
+                    }
+                    List<HelpTree> list = helpTreeService.list(new QueryWrapper<HelpTree>().lambda().like(HelpTree::getParentIds, "," + item.getId() + ","));
+                    idList.addAll(list.stream().map(HelpTree::getId).collect(Collectors.toList()));
+                    idList.add(item.getId());
+                });
+                List<String> ids = idList.stream().distinct().filter(item->{
+                    if (!"0".equals(item)){
+                        return true;
+                    }
+                    return false;
+                }).collect(Collectors.toList());
+                if(CollectionUtil.isNotEmpty(ids)){
+                    QueryWrapper<HelpTree> wrapper = new QueryWrapper<HelpTree>()
+                            .in("ht.id",idList);
+                    result = helpTreeService.findList (page,wrapper);
+                }
+            }else{
+                result = helpTreeService.findList (page,new QueryWrapper<HelpTree>());
+            }
+        }
+        return ResponseEntity.ok (result);
+    }
+
+
+    /**
+     * 查询帮助管理树形数据
+     * @param id
+     * @return
+     */
+    @ApiLog("查询帮助管理树形数据")
+    @PreAuthorize("hasAnyAuthority('help:view','help:add','help:edit')")
+    @GetMapping("queryById")
+    public ResponseEntity queryById(@RequestParam("id") String id) {
+        HelpTreeDTO helpTreeDTO = helpTreeService.queryById ( id );
+        return ResponseEntity.ok (helpTreeDTO);
+    }
+
+    /**
+     * 查询全部一级数据
+     * @return
+     */
+    @ApiLog("查询全部一级数据")
+    @GetMapping("getList")
+    public ResponseEntity<List<HelpTreeDTO>> getList() {
+        List<HelpTreeDTO> list = helpTreeService.getList();
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 保存帮助管理树形
+     * @param helpTreeDTO
+     * @return
+     */
+    @ApiLog(value = "修改/新增帮助管理树形", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('help:add','help:edit')")
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody HelpTreeDTO helpTreeDTO) {
+        helpTreeService.saveType(helpTreeDTO);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除帮助管理树形
+     * @param ids
+     * @return
+     */
+    @ApiLog(value = "删除帮助管理树形", type = LogTypeEnum.SAVE)
+    @PreAuthorize ("hasAuthority('help:del')")
+    @DeleteMapping("delete")
+    public ResponseEntity delete(String ids) {
+        return helpTreeService.deleteByIds(ids);
+    }
+
+
+}

+ 50 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/domain/Help.java

@@ -0,0 +1,50 @@
+package com.jeeplus.test.help.domain;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 帮助管理
+ * @TableName help
+ */
+@TableName(value ="help")
+@Data
+public class Help extends BaseEntity implements Serializable {
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 编号
+     */
+    private String number;
+
+    /**
+     * 关联表id
+     */
+    private String treeId;
+
+    /**
+     * 功能
+     */
+    private String features;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 是否启用  0关闭  1启用
+     */
+    private String useFlag;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

+ 50 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/domain/HelpTree.java

@@ -0,0 +1,50 @@
+package com.jeeplus.test.help.domain;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 帮助管理-树形
+ * @TableName help_tree
+ */
+@TableName(value ="help_tree")
+@Data
+public class HelpTree extends BaseEntity implements Serializable {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 父id
+     */
+    private String parentId;
+
+    /**
+     * 等级
+     */
+    private Integer level;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 父ids
+     */
+    private String parentIds;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

+ 25 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/HelpMapper.java

@@ -0,0 +1,25 @@
+package com.jeeplus.test.help.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.test.cw.projectBusinessType.domain.CwProjectBusinessType;
+import com.jeeplus.test.cw.projectBusinessType.service.dto.CwProjectBusinessTypeDTO;
+import com.jeeplus.test.help.domain.Help;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.help.service.dto.HelpDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface HelpMapper extends BaseMapper<Help> {
+
+    IPage<HelpDTO> findList(Page<HelpDTO> page, @Param(Constants.WRAPPER) QueryWrapper<Help> queryWrapper);
+
+    HelpDTO queryById(@Param("id") String id);
+}
+
+
+
+

+ 29 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/HelpTreeMapper.java

@@ -0,0 +1,29 @@
+package com.jeeplus.test.help.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.test.cw.projectBusinessType.domain.CwProjectBusinessType;
+import com.jeeplus.test.cw.projectBusinessType.service.dto.CwProjectBusinessTypeDTO;
+import com.jeeplus.test.help.domain.HelpTree;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.help.service.dto.HelpTreeDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface HelpTreeMapper extends BaseMapper<HelpTree> {
+
+    IPage<HelpTreeDTO> findList(Page<HelpTreeDTO> page, @Param(Constants.WRAPPER) QueryWrapper<HelpTree> queryWrapper);
+
+    HelpTreeDTO queryById(@Param("id") String id);
+
+    List<HelpTreeDTO> getList();
+}
+
+
+
+

+ 55 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/xml/HelpMapper.xml

@@ -0,0 +1,55 @@
+<?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.jeeplus.test.help.mapper.HelpMapper">
+
+    <resultMap id="BaseResultMap" type="com.jeeplus.test.help.service.dto.HelpDTO">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="createBy.id" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
+            <result property="updateBy.id" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
+            <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
+            <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+            <result property="number" column="number" jdbcType="VARCHAR"/>
+            <result property="treeId" column="tree_id" jdbcType="VARCHAR"/>
+            <result property="features" column="features" jdbcType="VARCHAR"/>
+            <result property="description" column="description" jdbcType="VARCHAR"/>
+            <result property="useFlag" column="use_flag" jdbcType="VARCHAR"/>
+            <result property="treeName" column="tree_name" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        h.id,
+        h.create_by,
+        h.create_date,
+        h.update_by,
+        h.update_date,
+        h.del_flag,
+        h.remarks,
+        h.number,
+        h.tree_id,
+        h.features,
+        h.description,
+        h.use_flag
+    </sql>
+
+    <select id="findList" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List"></include>,
+            ht.name as tree_name
+        from help h
+        left join help_tree ht on ht.id = h.tree_id and ht.del_flag = '0'
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="queryById" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List"></include>,
+            ht.name as tree_name
+        from help h
+        left join help_tree ht on ht.id = h.tree_id and ht.del_flag = '0'
+        where h.del_flag = '0' and h.id = #{id}
+    </select>
+</mapper>

+ 80 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/mapper/xml/HelpTreeMapper.xml

@@ -0,0 +1,80 @@
+<?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.jeeplus.test.help.mapper.HelpTreeMapper">
+
+    <resultMap id="BaseResultMap" type="com.jeeplus.test.help.service.dto.HelpTreeDTO">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="createBy.id" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
+            <result property="updateBy.id" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
+            <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
+            <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
+            <result property="level" column="level" jdbcType="INTEGER"/>
+            <result property="sort" column="sort" jdbcType="INTEGER"/>
+            <result property="parentIds" column="parent_ids" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ht.id,
+        ht.create_by,
+        ht.create_date,
+        ht.update_by,
+        ht.update_date,
+        ht.del_flag,
+        ht.remarks,
+        ht.name,
+        ht.parent_id,
+        ht.level,
+        ht.sort,
+        ht.parent_ids
+    </sql>
+
+    <select id="findList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"></include>
+        from help_tree ht
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="queryById" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"></include>
+        from help_tree ht
+        where ht.del_flag = '0' and ht.id = #{id}
+    </select>
+
+    <select id="getList" resultMap="map">
+        select
+        <include refid="Base_Column_List"></include>
+        from help_tree ht
+        where ht.del_flag = '0' and ht.parent_id = '0'
+    </select>
+
+    <resultMap id="map" type="com.jeeplus.test.help.service.dto.HelpTreeDTO">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="createBy.id" column="create_by" jdbcType="VARCHAR"/>
+        <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
+        <result property="updateBy.id" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
+        <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
+        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
+        <result property="level" column="level" jdbcType="INTEGER"/>
+        <result property="sort" column="sort" jdbcType="INTEGER"/>
+        <result property="parentIds" column="parent_ids" jdbcType="VARCHAR"/>
+        <collection property="childrenList" column="id" select="getChildList" ofType="com.jeeplus.test.help.service.dto.HelpTreeDTO"/>
+    </resultMap>
+
+    <select id="getChildList" resultMap="map">
+        select
+        <include refid="Base_Column_List"></include>
+        from help_tree ht
+        where ht.del_flag = '0' and ht.parent_id = ${id}
+    </select>
+</mapper>

+ 103 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/HelpService.java

@@ -0,0 +1,103 @@
+package com.jeeplus.test.help.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.google.common.collect.Lists;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceDTO;
+import com.jeeplus.test.help.domain.Help;
+import com.jeeplus.test.help.mapper.HelpMapper;
+import com.jeeplus.test.help.mapper.HelpTreeMapper;
+import com.jeeplus.test.help.service.dto.HelpDTO;
+import com.jeeplus.test.help.service.mapstruct.HelpWrapper;
+import com.jeeplus.test.mould.service.SerialnumTplService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class HelpService extends ServiceImpl<HelpMapper, Help> {
+
+    @Resource
+    private HelpMapper helpMapper;
+
+    @Resource
+    private SerialnumTplService serialnumTplService;
+
+    @Resource
+    private HelpTreeMapper helpTreeMapper;
+
+    public IPage<HelpDTO> findList(Page<HelpDTO> page, HelpDTO helpDTO){
+        QueryWrapper<Help> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("h.del_flag","0");
+        if (ObjectUtil.isNotEmpty(helpDTO)) {
+            if (StringUtils.isNotBlank(helpDTO.getDescription())) {
+                queryWrapper.like("h.description",helpDTO.getDescription());
+            }
+            if (StringUtils.isNotBlank(helpDTO.getFeatures())) {
+                queryWrapper.like("h.features",helpDTO.getFeatures());
+            }
+            if (StringUtils.isNotBlank(helpDTO.getNumber())) {
+                queryWrapper.like("h.number",helpDTO.getNumber());
+            }
+            if (StringUtils.isNotBlank(helpDTO.getTreeId())) {
+                queryWrapper.eq("h.tree_id",helpDTO.getTreeId());
+            }
+        }
+        queryWrapper.orderByDesc("h.create_date");
+        return helpMapper.findList(page,queryWrapper);
+    }
+
+    public HelpDTO queryById(String id) {
+
+        HelpDTO helpDTO = helpMapper.queryById(id);
+
+        return helpDTO;
+    }
+
+    public ResponseEntity saveHelp(HelpDTO helpDTO) throws Exception{
+        if (ObjectUtil.isNotEmpty(helpDTO) && StringUtils.isBlank(helpDTO.getId())) {
+            String serialNum = serialnumTplService.genSerialNum(UserUtils.getCurrentUserDTO().getCompanyDTO().getId(), HelpDTO.BIZ_CODE);
+            helpDTO.setNumber(serialNum);
+        }
+        Help help = HelpWrapper.INSTANCE.toEntity(helpDTO);
+        this.saveOrUpdate(help);
+        return ResponseEntity.ok("保存成功");
+    }
+
+    public ResponseEntity deleteByIds(String ids) {
+        String idArray[] =ids.split(",");
+        this.removeByIds (Lists.newArrayList (idArray));
+        return ResponseEntity.ok ("删除成功");
+    }
+
+    // 帮助管理状态启用/停用
+    public ResponseEntity updateStatus (HelpDTO helpDTO) {
+        if (ObjectUtil.isNotEmpty(helpDTO) && StringUtils.isNotBlank(helpDTO.getId())) {
+            // 查询此数据的状态
+            Help help = getById(helpDTO.getId());
+            if (ObjectUtil.isNotEmpty(help) && StringUtils.isNotBlank(help.getUseFlag())) {
+                if ("1".equals(help.getUseFlag())) { // 当前状态为启用
+                    help.setUseFlag("0"); // 设置为停用
+                    updateById(help);
+                    return ResponseEntity.ok("修改成功,”"+help.getNumber()+"“调整为停用");
+                } else if ("0".equals(help.getUseFlag())) { // 当前状态为停用
+                    help.setUseFlag("1"); // 设置为启用
+                    updateById(help);
+                    return ResponseEntity.ok("修改成功,”"+help.getNumber()+"“调整为启用");
+                }
+            }
+        }
+        return ResponseEntity.badRequest().body("修改失败");
+    }
+
+
+}

+ 89 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/HelpTreeService.java

@@ -0,0 +1,89 @@
+package com.jeeplus.test.help.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.google.common.collect.Lists;
+import com.jeeplus.sys.utils.StringUtils;
+import com.jeeplus.test.cw.projectBusinessType.domain.CwProjectBusinessType;
+import com.jeeplus.test.cw.projectBusinessType.service.dto.CwProjectBusinessTypeDTO;
+import com.jeeplus.test.cw.projectBusinessType.service.mapstruct.CwProjectBusinessTypeWrapper;
+import com.jeeplus.test.help.domain.Help;
+import com.jeeplus.test.help.domain.HelpTree;
+import com.jeeplus.test.help.mapper.HelpMapper;
+import com.jeeplus.test.help.mapper.HelpTreeMapper;
+import com.jeeplus.test.help.service.dto.HelpTreeDTO;
+import com.jeeplus.test.help.service.mapstruct.HelpTreeWrapper;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class HelpTreeService extends ServiceImpl<HelpTreeMapper, HelpTree> {
+
+    @Resource
+    private HelpTreeMapper helpTreeMapper;
+
+    @Resource
+    private HelpMapper helpMapper;
+
+    public IPage<HelpTreeDTO> findList(Page<HelpTreeDTO> page, QueryWrapper<HelpTree> queryWrapper){
+        queryWrapper.eq("ht.del_flag","0").orderByAsc("ht.sort");
+        return helpTreeMapper.findList(page,queryWrapper);
+    }
+
+    public HelpTreeDTO queryById(String id) {
+
+        HelpTreeDTO helpTreeDTO = helpTreeMapper.queryById(id);
+
+        return helpTreeDTO;
+    }
+
+    public List<HelpTreeDTO> getList() {
+        List<HelpTreeDTO> list = helpTreeMapper.getList();
+        return list;
+    }
+
+    public ResponseEntity saveType(HelpTreeDTO helpTreeDTO) {
+        HelpTree helpTree = HelpTreeWrapper.INSTANCE.toEntity(helpTreeDTO);
+        if (ObjectUtil.isNotEmpty(helpTreeDTO)) {
+            if (StringUtils.isBlank(helpTreeDTO.getId())) {
+                if (StringUtils.isNotBlank(helpTreeDTO.getParentId())){
+                    if ("0".equals(helpTreeDTO.getParentId())){
+                        helpTree.setLevel(1);
+                        helpTree.setParentIds("0,");
+                    }else{
+                        HelpTree byId = this.getById(helpTreeDTO.getParentId());
+                        HelpTreeDTO pbt = HelpTreeWrapper.INSTANCE.toDTO(byId);
+                        if(ObjectUtil.isNotEmpty(pbt)){
+                            helpTree.setLevel(pbt.getLevel()+1);
+                            helpTree.setParentIds(pbt.getParentIds()+pbt.getId()+",");
+                        }
+                    }
+                }
+            }
+        }
+        this.saveOrUpdate(helpTree);
+        return ResponseEntity.ok("保存成功");
+    }
+
+    public ResponseEntity deleteByIds(String ids) {
+        String idArray[] =ids.split(",");
+        if(CollectionUtil.isNotEmpty(Lists.newArrayList (idArray))){
+            List<String> list = this.list(new QueryWrapper<HelpTree>().lambda().in(HelpTree::getParentId, Lists.newArrayList(idArray))).stream().distinct().map(HelpTree::getId).collect(Collectors.toList());
+            this.removeByIds (list);
+        }
+        this.removeByIds (Lists.newArrayList (idArray));
+        return ResponseEntity.ok ("删除成功");
+    }
+
+
+}

+ 59 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/dto/HelpDTO.java

@@ -0,0 +1,59 @@
+package com.jeeplus.test.help.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 帮助管理
+ * @TableName help
+ */
+@TableName(value ="help")
+@Data
+public class HelpDTO extends BaseDTO implements Serializable {
+
+    //帮助编号(字典值)
+    public static final String BIZ_CODE = "30";
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 编号
+     */
+    private String number;
+
+    /**
+     * 关联项id
+     */
+    private String treeId;
+
+    /**
+     * 关联项名称
+     */
+    private String treeName;
+
+    /**
+     * 功能
+     */
+    private String features;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 是否启用  0关闭  1启用
+     */
+    private String useFlag;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

+ 58 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/dto/HelpTreeDTO.java

@@ -0,0 +1,58 @@
+package com.jeeplus.test.help.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.test.cw.workClientInfo.domain.CwManageLevelType;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 帮助管理-树形
+ * @TableName help_tree
+ */
+@TableName(value ="help_tree")
+@Data
+public class HelpTreeDTO extends BaseDTO implements Serializable {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 父id
+     */
+    private String parentId;
+
+    /**
+     * 等级
+     */
+    private Integer level;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 父ids
+     */
+    private String parentIds;
+
+    /**
+     * 子集合
+     */
+    private List<HelpTreeDTO> childrenList;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

+ 17 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/mapstruct/HelpTreeWrapper.java

@@ -0,0 +1,17 @@
+package com.jeeplus.test.help.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.help.domain.Help;
+import com.jeeplus.test.help.domain.HelpTree;
+import com.jeeplus.test.help.service.dto.HelpDTO;
+import com.jeeplus.test.help.service.dto.HelpTreeDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface HelpTreeWrapper extends EntityWrapper<HelpTreeDTO, HelpTree>{
+
+        HelpTreeWrapper INSTANCE = Mappers.getMapper(HelpTreeWrapper.class);
+
+}

+ 17 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/help/service/mapstruct/HelpWrapper.java

@@ -0,0 +1,17 @@
+package com.jeeplus.test.help.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.help.domain.Help;
+import com.jeeplus.test.help.service.dto.HelpDTO;
+import com.jeeplus.test.jobPosion.domain.JobPosition;
+import com.jeeplus.test.jobPosion.service.dto.JobPositionDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface HelpWrapper extends EntityWrapper<HelpDTO, Help>{
+
+        HelpWrapper INSTANCE = Mappers.getMapper(HelpWrapper.class);
+
+}