修改

pom.xml

@@ -183,6 +183,7 @@
                 <version>${ruoyi.version}</version>
                 <version>${ruoyi.version}</version>
             </dependency>
             </dependency>
 
 
+
         </dependencies>
         </dependencies>
     </dependencyManagement>
     </dependencyManagement>
 
 

ruoyi-admin/pom.xml

@@ -61,6 +61,8 @@
             <artifactId>ruoyi-generator</artifactId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
         </dependency>
 
 
+
+
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

ruoyi-admin/src/main/java/com/ruoyi/system/controller/DwxxController.java

+package com.ruoyi.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Dwxx;
+import com.ruoyi.system.service.IDwxxService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 单位信息Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@RestController
+@RequestMapping("/system/dwxx")
+public class DwxxController extends BaseController
+{
+    @Autowired
+    private IDwxxService dwxxService;
+
+    /**
+     * 查询单位信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dwxx:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Dwxx dwxx)
+    {
+//        startPage();
+        List<Dwxx> list = dwxxService.selectDwxxList(dwxx);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出单位信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dwxx:export')")
+    @Log(title = "单位信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Dwxx dwxx)
+    {
+        List<Dwxx> list = dwxxService.selectDwxxList(dwxx);
+        ExcelUtil<Dwxx> util = new ExcelUtil<Dwxx>(Dwxx.class);
+        util.exportExcel(response, list, "单位信息数据");
+    }
+
+    /**
+     * 获取单位信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dwxx:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dwxxService.selectDwxxById(id));
+    }
+
+    /**
+     * 新增单位信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dwxx:add')")
+    @Log(title = "单位信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Dwxx dwxx)
+    {
+        return toAjax(dwxxService.insertDwxx(dwxx));
+    }
+
+    /**
+     * 修改单位信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dwxx:edit')")
+    @Log(title = "单位信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Dwxx dwxx)
+    {
+        return toAjax(dwxxService.updateDwxx(dwxx));
+    }
+
+    /**
+     * 删除单位信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:dwxx:remove')")
+    @Log(title = "单位信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dwxxService.deleteDwxxByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/controller/HyddController.java

+package com.ruoyi.system.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Hydd;
+import com.ruoyi.system.service.IHyddService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 会议地点Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@RestController
+@RequestMapping("/system/hydd")
+public class HyddController extends BaseController
+{
+    @Autowired
+    private IHyddService hyddService;
+
+    /**
+     * 查询会议地点列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hydd:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Hydd hydd)
+    {
+//        startPage();
+        List<Hydd> list = hyddService.selectHyddList(hydd);
+
+        List<String> qyList = list.stream().map(Hydd::getQy).distinct().collect(Collectors.toList());
+        List<Hydd> relist=new ArrayList<>();
+        Long i=0L;
+        for(String qy:qyList){
+            Hydd dd=new Hydd();
+            dd.setDdmc(qy);
+            dd.setText(qy);
+            dd.setId(i++);
+            List<Hydd> collect = list.stream().filter(item -> item.getQy().equals(qy)).collect(Collectors.toList());
+            dd.setChildren(collect);
+            relist.add(dd);
+        }
+        return getDataTable(relist);
+    }
+
+
+
+    /**
+     * 导出会议地点列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hydd:export')")
+    @Log(title = "会议地点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Hydd hydd)
+    {
+        List<Hydd> list = hyddService.selectHyddList(hydd);
+        ExcelUtil<Hydd> util = new ExcelUtil<Hydd>(Hydd.class);
+        util.exportExcel(response, list, "会议地点数据");
+    }
+
+    /**
+     * 获取会议地点详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hydd:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(hyddService.selectHyddById(id));
+    }
+
+    /**
+     * 新增会议地点
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hydd:add')")
+    @Log(title = "会议地点", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Hydd hydd)
+    {
+        return toAjax(hyddService.insertHydd(hydd));
+    }
+
+    /**
+     * 修改会议地点
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hydd:edit')")
+    @Log(title = "会议地点", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Hydd hydd)
+    {
+        return toAjax(hyddService.updateHydd(hydd));
+    }
+
+    /**
+     * 删除会议地点
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hydd:remove')")
+    @Log(title = "会议地点", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(hyddService.deleteHyddByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/controller/HyjlController.java

+package com.ruoyi.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.mapper.HyjlMapper;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Hyjl;
+import com.ruoyi.system.service.IHyjlService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 会议记录Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@RestController
+@RequestMapping("/system/hyjl")
+public class HyjlController extends BaseController
+{
+    @Autowired
+    private IHyjlService hyjlService;
+
+    @Autowired
+    private HyjlMapper hyjlMapper;
+    /**
+     * 查询会议记录列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hyjl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Hyjl hyjl)
+    {
+        startPage();
+        List<Hyjl> list = hyjlService.selectHyjlList(hyjl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议记录列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hyjl:export')")
+    @Log(title = "会议记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Hyjl hyjl)
+    {
+        List<Hyjl> list = hyjlService.selectHyjlList(hyjl);
+        ExcelUtil<Hyjl> util = new ExcelUtil<Hyjl>(Hyjl.class);
+        util.exportExcel(response, list, "会议记录数据");
+    }
+
+    /**
+     * 获取会议记录详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hyjl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(hyjlService.selectHyjlById(id));
+    }
+
+    /**
+     * 新增会议记录
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hyjl:add')")
+    @Log(title = "会议记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Hyjl hyjl)
+    {
+        hyjl.setCjsj2(DateUtils.dateTimeNow("yyyy-MM-dd"));
+        Hyjl hl=hyjlMapper.selectHyjlOne(hyjl);
+        if(hl!=null){
+            return AjaxResult.error("已有参会记录，不允许重复提交");
+        }
+        return toAjax(hyjlService.insertHyjl(hyjl));
+    }
+
+    /**
+     * 修改会议记录
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hyjl:edit')")
+    @Log(title = "会议记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Hyjl hyjl)
+    {
+        return toAjax(hyjlService.updateHyjl(hyjl));
+    }
+
+    /**
+     * 删除会议记录
+     */
+    //@PreAuthorize("@ss.hasPermi('system:hyjl:remove')")
+    @Log(title = "会议记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(hyjlService.deleteHyjlByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/controller/RyxxController.java

+package com.ruoyi.system.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.Dwxx;
+import com.ruoyi.system.service.IDwxxService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Ryxx;
+import com.ruoyi.system.service.IRyxxService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 人员信息Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@RestController
+@RequestMapping("/system/ryxx")
+public class RyxxController extends BaseController
+{
+    @Autowired
+    private IRyxxService ryxxService;
+    @Autowired
+    private IDwxxService dwxxService;
+
+    /**
+     * 查询人员信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ryxx:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Ryxx ryxx)
+    {
+//        startPage();
+        List<Ryxx> list = ryxxService.selectRyxxList(ryxx);
+        List<Dwxx> dwxxList = dwxxService.selectDwxxList(new Dwxx());
+        List<Ryxx> relist = new ArrayList<>();
+        dwxxList.forEach(item->{
+            Ryxx ryxx1=new Ryxx();
+            ryxx1.setId(item.getId());
+            ryxx1.setText(item.getDwmc());
+            List<Ryxx> collect = list.stream().filter(ry -> ry.getDwid().toString().equals(item.getId().toString() )).collect(Collectors.toList());
+            ryxx1.setChildren(collect);
+            relist.add(ryxx1);
+        });
+
+        return getDataTable(relist);
+    }
+
+    /**
+     * 导出人员信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ryxx:export')")
+    @Log(title = "人员信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Ryxx ryxx)
+    {
+        List<Ryxx> list = ryxxService.selectRyxxList(ryxx);
+        ExcelUtil<Ryxx> util = new ExcelUtil<Ryxx>(Ryxx.class);
+        util.exportExcel(response, list, "人员信息数据");
+    }
+
+    /**
+     * 获取人员信息详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ryxx:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ryxxService.selectRyxxById(id));
+    }
+
+    /**
+     * 新增人员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ryxx:add')")
+    @Log(title = "人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Ryxx ryxx)
+    {
+        return toAjax(ryxxService.insertRyxx(ryxx));
+    }
+
+    /**
+     * 修改人员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ryxx:edit')")
+    @Log(title = "人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Ryxx ryxx)
+    {
+        return toAjax(ryxxService.updateRyxx(ryxx));
+    }
+
+    /**
+     * 删除人员信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:ryxx:remove')")
+    @Log(title = "人员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ryxxService.deleteRyxxByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/Dwxx.java

+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 单位信息对象 dwxx
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public class Dwxx extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String dwmc;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String bz;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDwmc(String dwmc) 
+    {
+        this.dwmc = dwmc;
+    }
+
+    public String getDwmc() 
+    {
+        return dwmc;
+    }
+    public void setBz(String bz) 
+    {
+        this.bz = bz;
+    }
+
+    public String getBz() 
+    {
+        return bz;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dwmc", getDwmc())
+            .append("bz", getBz())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/Hydd.java

+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.DataSource;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 会议地点对象 hydd
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Data
+public class Hydd extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 区域 */
+    @Excel(name = "区域")
+    private String qy;
+
+    /** 地点名称 */
+    @Excel(name = "地点名称")
+    private String ddmc;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String bz;
+
+    private String text;
+
+
+    private List<Hydd> children;
+
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/Hyjl.java

+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 会议记录对象 hyjl
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Data
+public class Hyjl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String dwid;
+    @Excel(name = "单位")
+    private String dwmc;
+
+    /** $column.columnComment */
+    @Excel(name = "参会人员")
+    private String ryxx;
+
+    /** $column.columnComment */
+    @Excel(name = "参会地点")
+    private String chdd;
+
+    /** $column.columnComment */
+    @Excel(name = "是否请假")
+    private String sfqj;
+
+    /** $column.columnComment */
+    @Excel(name = "请假原因")
+    private String qjyy;
+
+    /** $column.columnComment */
+//    @Excel(name = "", readConverterExp = "$column.readConverterExp()")
+    private String bz;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "参会时间",dateFormat="yyyy-MM-dd")
+    private Date cjsj;
+
+    private String cjsj2;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDwid(String dwid) 
+    {
+        this.dwid = dwid;
+    }
+
+    public String getDwid() 
+    {
+        return dwid;
+    }
+    public void setRyxx(String ryxx) 
+    {
+        this.ryxx = ryxx;
+    }
+
+    public String getRyxx() 
+    {
+        return ryxx;
+    }
+    public void setChdd(String chdd) 
+    {
+        this.chdd = chdd;
+    }
+
+    public String getChdd() 
+    {
+        return chdd;
+    }
+    public void setSfqj(String sfqj) 
+    {
+        this.sfqj = sfqj;
+    }
+
+    public String getSfqj() 
+    {
+        return sfqj;
+    }
+    public void setQjyy(String qjyy) 
+    {
+        this.qjyy = qjyy;
+    }
+
+    public String getQjyy() 
+    {
+        return qjyy;
+    }
+    public void setBz(String bz) 
+    {
+        this.bz = bz;
+    }
+
+    public String getBz() 
+    {
+        return bz;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dwid", getDwid())
+            .append("ryxx", getRyxx())
+            .append("chdd", getChdd())
+            .append("sfqj", getSfqj())
+            .append("qjyy", getQjyy())
+            .append("bz", getBz())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/Ryxx.java

+package com.ruoyi.system.domain;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 人员信息对象 ryxx
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Data
+public class Ryxx extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long dwid;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String dwmc;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 职务 */
+    @Excel(name = "职务")
+    private String zw;
+
+    /** 东营办 */
+    @Excel(name = "东营办")
+    private String dyb;
+
+    /** 新疆办 */
+    @Excel(name = "新疆办")
+    private String xjb;
+
+    /** 东营手机号 */
+    @Excel(name = "东营手机号")
+    private String dysjh;
+
+    /** 乌市手机号 */
+    @Excel(name = "乌市手机号")
+    private String wssjh;
+
+    /** 账号1 */
+    @Excel(name = "账号1")
+    private String zh1;
+
+    /** 账号2 */
+    @Excel(name = "账号2")
+    private String zh2;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String bz;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long px;
+
+    private List<Ryxx> children;
+
+    private String text;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDwid(Long dwid) 
+    {
+        this.dwid = dwid;
+    }
+
+    public Long getDwid() 
+    {
+        return dwid;
+    }
+    public void setDwmc(String dwmc) 
+    {
+        this.dwmc = dwmc;
+    }
+
+    public String getDwmc() 
+    {
+        return dwmc;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setZw(String zw) 
+    {
+        this.zw = zw;
+    }
+
+    public String getZw() 
+    {
+        return zw;
+    }
+    public void setDyb(String dyb) 
+    {
+        this.dyb = dyb;
+    }
+
+    public String getDyb() 
+    {
+        return dyb;
+    }
+    public void setXjb(String xjb) 
+    {
+        this.xjb = xjb;
+    }
+
+    public String getXjb() 
+    {
+        return xjb;
+    }
+    public void setDysjh(String dysjh) 
+    {
+        this.dysjh = dysjh;
+    }
+
+    public String getDysjh() 
+    {
+        return dysjh;
+    }
+    public void setWssjh(String wssjh) 
+    {
+        this.wssjh = wssjh;
+    }
+
+    public String getWssjh() 
+    {
+        return wssjh;
+    }
+    public void setZh1(String zh1) 
+    {
+        this.zh1 = zh1;
+    }
+
+    public String getZh1() 
+    {
+        return zh1;
+    }
+    public void setZh2(String zh2) 
+    {
+        this.zh2 = zh2;
+    }
+
+    public String getZh2() 
+    {
+        return zh2;
+    }
+    public void setBz(String bz) 
+    {
+        this.bz = bz;
+    }
+
+    public String getBz() 
+    {
+        return bz;
+    }
+    public void setPx(Long px) 
+    {
+        this.px = px;
+    }
+
+    public Long getPx() 
+    {
+        return px;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dwid", getDwid())
+            .append("dwmc", getDwmc())
+            .append("name", getName())
+            .append("zw", getZw())
+            .append("dyb", getDyb())
+            .append("xjb", getXjb())
+            .append("dysjh", getDysjh())
+            .append("wssjh", getWssjh())
+            .append("zh1", getZh1())
+            .append("zh2", getZh2())
+            .append("bz", getBz())
+            .append("px", getPx())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DwxxMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Dwxx;
+
+/**
+ * 单位信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface DwxxMapper 
+{
+    /**
+     * 查询单位信息
+     * 
+     * @param id 单位信息主键
+     * @return 单位信息
+     */
+    public Dwxx selectDwxxById(Long id);
+
+    /**
+     * 查询单位信息列表
+     * 
+     * @param dwxx 单位信息
+     * @return 单位信息集合
+     */
+    public List<Dwxx> selectDwxxList(Dwxx dwxx);
+
+    /**
+     * 新增单位信息
+     * 
+     * @param dwxx 单位信息
+     * @return 结果
+     */
+    public int insertDwxx(Dwxx dwxx);
+
+    /**
+     * 修改单位信息
+     * 
+     * @param dwxx 单位信息
+     * @return 结果
+     */
+    public int updateDwxx(Dwxx dwxx);
+
+    /**
+     * 删除单位信息
+     * 
+     * @param id 单位信息主键
+     * @return 结果
+     */
+    public int deleteDwxxById(Long id);
+
+    /**
+     * 批量删除单位信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDwxxByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/HyddMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Hydd;
+
+/**
+ * 会议地点Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface HyddMapper 
+{
+    /**
+     * 查询会议地点
+     * 
+     * @param id 会议地点主键
+     * @return 会议地点
+     */
+    public Hydd selectHyddById(Long id);
+
+    /**
+     * 查询会议地点列表
+     * 
+     * @param hydd 会议地点
+     * @return 会议地点集合
+     */
+    public List<Hydd> selectHyddList(Hydd hydd);
+
+    /**
+     * 新增会议地点
+     * 
+     * @param hydd 会议地点
+     * @return 结果
+     */
+    public int insertHydd(Hydd hydd);
+
+    /**
+     * 修改会议地点
+     * 
+     * @param hydd 会议地点
+     * @return 结果
+     */
+    public int updateHydd(Hydd hydd);
+
+    /**
+     * 删除会议地点
+     * 
+     * @param id 会议地点主键
+     * @return 结果
+     */
+    public int deleteHyddById(Long id);
+
+    /**
+     * 批量删除会议地点
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHyddByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/HyjlMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Hyjl;
+
+/**
+ * 会议记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface HyjlMapper 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    public Hyjl selectHyjlById(Long id);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param hyjl 会议记录
+     * @return 会议记录集合
+     */
+    public List<Hyjl> selectHyjlList(Hyjl hyjl);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param hyjl 会议记录
+     * @return 结果
+     */
+    public int insertHyjl(Hyjl hyjl);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param hyjl 会议记录
+     * @return 结果
+     */
+    public int updateHyjl(Hyjl hyjl);
+
+    /**
+     * 删除会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    public int deleteHyjlById(Long id);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteHyjlByIds(Long[] ids);
+
+    Hyjl selectHyjlOne(Hyjl hyjl);
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/RyxxMapper.java

+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Ryxx;
+
+/**
+ * 人员信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface RyxxMapper 
+{
+    /**
+     * 查询人员信息
+     * 
+     * @param id 人员信息主键
+     * @return 人员信息
+     */
+    public Ryxx selectRyxxById(Long id);
+
+    /**
+     * 查询人员信息列表
+     * 
+     * @param ryxx 人员信息
+     * @return 人员信息集合
+     */
+    public List<Ryxx> selectRyxxList(Ryxx ryxx);
+
+    /**
+     * 新增人员信息
+     * 
+     * @param ryxx 人员信息
+     * @return 结果
+     */
+    public int insertRyxx(Ryxx ryxx);
+
+    /**
+     * 修改人员信息
+     * 
+     * @param ryxx 人员信息
+     * @return 结果
+     */
+    public int updateRyxx(Ryxx ryxx);
+
+    /**
+     * 删除人员信息
+     * 
+     * @param id 人员信息主键
+     * @return 结果
+     */
+    public int deleteRyxxById(Long id);
+
+    /**
+     * 批量删除人员信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRyxxByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/IDwxxService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Dwxx;
+
+/**
+ * 单位信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface IDwxxService 
+{
+    /**
+     * 查询单位信息
+     * 
+     * @param id 单位信息主键
+     * @return 单位信息
+     */
+    public Dwxx selectDwxxById(Long id);
+
+    /**
+     * 查询单位信息列表
+     * 
+     * @param dwxx 单位信息
+     * @return 单位信息集合
+     */
+    public List<Dwxx> selectDwxxList(Dwxx dwxx);
+
+    /**
+     * 新增单位信息
+     * 
+     * @param dwxx 单位信息
+     * @return 结果
+     */
+    public int insertDwxx(Dwxx dwxx);
+
+    /**
+     * 修改单位信息
+     * 
+     * @param dwxx 单位信息
+     * @return 结果
+     */
+    public int updateDwxx(Dwxx dwxx);
+
+    /**
+     * 批量删除单位信息
+     * 
+     * @param ids 需要删除的单位信息主键集合
+     * @return 结果
+     */
+    public int deleteDwxxByIds(Long[] ids);
+
+    /**
+     * 删除单位信息信息
+     * 
+     * @param id 单位信息主键
+     * @return 结果
+     */
+    public int deleteDwxxById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/IHyddService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Hydd;
+
+/**
+ * 会议地点Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface IHyddService 
+{
+    /**
+     * 查询会议地点
+     * 
+     * @param id 会议地点主键
+     * @return 会议地点
+     */
+    public Hydd selectHyddById(Long id);
+
+    /**
+     * 查询会议地点列表
+     * 
+     * @param hydd 会议地点
+     * @return 会议地点集合
+     */
+    public List<Hydd> selectHyddList(Hydd hydd);
+
+    /**
+     * 新增会议地点
+     * 
+     * @param hydd 会议地点
+     * @return 结果
+     */
+    public int insertHydd(Hydd hydd);
+
+    /**
+     * 修改会议地点
+     * 
+     * @param hydd 会议地点
+     * @return 结果
+     */
+    public int updateHydd(Hydd hydd);
+
+    /**
+     * 批量删除会议地点
+     * 
+     * @param ids 需要删除的会议地点主键集合
+     * @return 结果
+     */
+    public int deleteHyddByIds(Long[] ids);
+
+    /**
+     * 删除会议地点信息
+     * 
+     * @param id 会议地点主键
+     * @return 结果
+     */
+    public int deleteHyddById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/IHyjlService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Hyjl;
+
+/**
+ * 会议记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface IHyjlService 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    public Hyjl selectHyjlById(Long id);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param hyjl 会议记录
+     * @return 会议记录集合
+     */
+    public List<Hyjl> selectHyjlList(Hyjl hyjl);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param hyjl 会议记录
+     * @return 结果
+     */
+    public int insertHyjl(Hyjl hyjl);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param hyjl 会议记录
+     * @return 结果
+     */
+    public int updateHyjl(Hyjl hyjl);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的会议记录主键集合
+     * @return 结果
+     */
+    public int deleteHyjlByIds(Long[] ids);
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    public int deleteHyjlById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/IRyxxService.java

+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Ryxx;
+
+/**
+ * 人员信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+public interface IRyxxService 
+{
+    /**
+     * 查询人员信息
+     * 
+     * @param id 人员信息主键
+     * @return 人员信息
+     */
+    public Ryxx selectRyxxById(Long id);
+
+    /**
+     * 查询人员信息列表
+     * 
+     * @param ryxx 人员信息
+     * @return 人员信息集合
+     */
+    public List<Ryxx> selectRyxxList(Ryxx ryxx);
+
+    /**
+     * 新增人员信息
+     * 
+     * @param ryxx 人员信息
+     * @return 结果
+     */
+    public int insertRyxx(Ryxx ryxx);
+
+    /**
+     * 修改人员信息
+     * 
+     * @param ryxx 人员信息
+     * @return 结果
+     */
+    public int updateRyxx(Ryxx ryxx);
+
+    /**
+     * 批量删除人员信息
+     * 
+     * @param ids 需要删除的人员信息主键集合
+     * @return 结果
+     */
+    public int deleteRyxxByIds(Long[] ids);
+
+    /**
+     * 删除人员信息信息
+     * 
+     * @param id 人员信息主键
+     * @return 结果
+     */
+    public int deleteRyxxById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DwxxServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DwxxMapper;
+import com.ruoyi.system.domain.Dwxx;
+import com.ruoyi.system.service.IDwxxService;
+
+/**
+ * 单位信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Service
+public class DwxxServiceImpl implements IDwxxService 
+{
+    @Autowired
+    private DwxxMapper dwxxMapper;
+
+    /**
+     * 查询单位信息
+     * 
+     * @param id 单位信息主键
+     * @return 单位信息
+     */
+    @Override
+    public Dwxx selectDwxxById(Long id)
+    {
+        return dwxxMapper.selectDwxxById(id);
+    }
+
+    /**
+     * 查询单位信息列表
+     * 
+     * @param dwxx 单位信息
+     * @return 单位信息
+     */
+    @Override
+    public List<Dwxx> selectDwxxList(Dwxx dwxx)
+    {
+        return dwxxMapper.selectDwxxList(dwxx);
+    }
+
+    /**
+     * 新增单位信息
+     * 
+     * @param dwxx 单位信息
+     * @return 结果
+     */
+    @Override
+    public int insertDwxx(Dwxx dwxx)
+    {
+        return dwxxMapper.insertDwxx(dwxx);
+    }
+
+    /**
+     * 修改单位信息
+     * 
+     * @param dwxx 单位信息
+     * @return 结果
+     */
+    @Override
+    public int updateDwxx(Dwxx dwxx)
+    {
+        return dwxxMapper.updateDwxx(dwxx);
+    }
+
+    /**
+     * 批量删除单位信息
+     * 
+     * @param ids 需要删除的单位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDwxxByIds(Long[] ids)
+    {
+        return dwxxMapper.deleteDwxxByIds(ids);
+    }
+
+    /**
+     * 删除单位信息信息
+     * 
+     * @param id 单位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDwxxById(Long id)
+    {
+        return dwxxMapper.deleteDwxxById(id);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/HyddServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.HyddMapper;
+import com.ruoyi.system.domain.Hydd;
+import com.ruoyi.system.service.IHyddService;
+
+/**
+ * 会议地点Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Service
+public class HyddServiceImpl implements IHyddService 
+{
+    @Autowired
+    private HyddMapper hyddMapper;
+
+    /**
+     * 查询会议地点
+     * 
+     * @param id 会议地点主键
+     * @return 会议地点
+     */
+    @Override
+    public Hydd selectHyddById(Long id)
+    {
+        return hyddMapper.selectHyddById(id);
+    }
+
+    /**
+     * 查询会议地点列表
+     * 
+     * @param hydd 会议地点
+     * @return 会议地点
+     */
+    @Override
+    public List<Hydd> selectHyddList(Hydd hydd)
+    {
+        return hyddMapper.selectHyddList(hydd);
+    }
+
+    /**
+     * 新增会议地点
+     * 
+     * @param hydd 会议地点
+     * @return 结果
+     */
+    @Override
+    public int insertHydd(Hydd hydd)
+    {
+        return hyddMapper.insertHydd(hydd);
+    }
+
+    /**
+     * 修改会议地点
+     * 
+     * @param hydd 会议地点
+     * @return 结果
+     */
+    @Override
+    public int updateHydd(Hydd hydd)
+    {
+        return hyddMapper.updateHydd(hydd);
+    }
+
+    /**
+     * 批量删除会议地点
+     * 
+     * @param ids 需要删除的会议地点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHyddByIds(Long[] ids)
+    {
+        return hyddMapper.deleteHyddByIds(ids);
+    }
+
+    /**
+     * 删除会议地点信息
+     * 
+     * @param id 会议地点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHyddById(Long id)
+    {
+        return hyddMapper.deleteHyddById(id);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/HyjlServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.HyjlMapper;
+import com.ruoyi.system.domain.Hyjl;
+import com.ruoyi.system.service.IHyjlService;
+
+/**
+ * 会议记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Service
+public class HyjlServiceImpl implements IHyjlService 
+{
+    @Autowired
+    private HyjlMapper hyjlMapper;
+
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    @Override
+    public Hyjl selectHyjlById(Long id)
+    {
+        return hyjlMapper.selectHyjlById(id);
+    }
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param hyjl 会议记录
+     * @return 会议记录
+     */
+    @Override
+    public List<Hyjl> selectHyjlList(Hyjl hyjl)
+    {
+        return hyjlMapper.selectHyjlList(hyjl);
+    }
+
+    /**
+     * 新增会议记录
+     * 
+     * @param hyjl 会议记录
+     * @return 结果
+     */
+    @Override
+    public int insertHyjl(Hyjl hyjl)
+    {
+
+        if(StringUtils.isNotEmpty(hyjl.getSfqj())){
+            if("true".equals(hyjl.getSfqj())){
+                hyjl.setSfqj("是");
+            }else {
+                hyjl.setSfqj("否");
+            }
+        }else {
+            hyjl.setSfqj("否");
+        }
+        return hyjlMapper.insertHyjl(hyjl);
+    }
+
+    /**
+     * 修改会议记录
+     * 
+     * @param hyjl 会议记录
+     * @return 结果
+     */
+    @Override
+    public int updateHyjl(Hyjl hyjl)
+    {
+        return hyjlMapper.updateHyjl(hyjl);
+    }
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHyjlByIds(Long[] ids)
+    {
+        return hyjlMapper.deleteHyjlByIds(ids);
+    }
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteHyjlById(Long id)
+    {
+        return hyjlMapper.deleteHyjlById(id);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/RyxxServiceImpl.java

+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RyxxMapper;
+import com.ruoyi.system.domain.Ryxx;
+import com.ruoyi.system.service.IRyxxService;
+
+/**
+ * 人员信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-30
+ */
+@Service
+public class RyxxServiceImpl implements IRyxxService 
+{
+    @Autowired
+    private RyxxMapper ryxxMapper;
+
+    /**
+     * 查询人员信息
+     * 
+     * @param id 人员信息主键
+     * @return 人员信息
+     */
+    @Override
+    public Ryxx selectRyxxById(Long id)
+    {
+        return ryxxMapper.selectRyxxById(id);
+    }
+
+    /**
+     * 查询人员信息列表
+     * 
+     * @param ryxx 人员信息
+     * @return 人员信息
+     */
+    @Override
+    public List<Ryxx> selectRyxxList(Ryxx ryxx)
+    {
+        return ryxxMapper.selectRyxxList(ryxx);
+    }
+
+    /**
+     * 新增人员信息
+     * 
+     * @param ryxx 人员信息
+     * @return 结果
+     */
+    @Override
+    public int insertRyxx(Ryxx ryxx)
+    {
+        return ryxxMapper.insertRyxx(ryxx);
+    }
+
+    /**
+     * 修改人员信息
+     * 
+     * @param ryxx 人员信息
+     * @return 结果
+     */
+    @Override
+    public int updateRyxx(Ryxx ryxx)
+    {
+        return ryxxMapper.updateRyxx(ryxx);
+    }
+
+    /**
+     * 批量删除人员信息
+     * 
+     * @param ids 需要删除的人员信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRyxxByIds(Long[] ids)
+    {
+        return ryxxMapper.deleteRyxxByIds(ids);
+    }
+
+    /**
+     * 删除人员信息信息
+     * 
+     * @param id 人员信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRyxxById(Long id)
+    {
+        return ryxxMapper.deleteRyxxById(id);
+    }
+}

ruoyi-admin/src/main/resources/mapper/system/DwxxMapper.xml

+<?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.ruoyi.system.mapper.DwxxMapper">
+    
+    <resultMap type="Dwxx" id="DwxxResult">
+        <result property="id"    column="id"    />
+        <result property="dwmc"    column="dwmc"    />
+        <result property="bz"    column="bz"    />
+    </resultMap>
+
+    <sql id="selectDwxxVo">
+        select id, dwmc, bz from dwxx
+    </sql>
+
+    <select id="selectDwxxList" parameterType="Dwxx" resultMap="DwxxResult">
+        <include refid="selectDwxxVo"/>
+        <where>  
+            <if test="dwmc != null  and dwmc != ''"> and dwmc = #{dwmc}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
+        </where>
+    </select>
+    
+    <select id="selectDwxxById" parameterType="Long" resultMap="DwxxResult">
+        <include refid="selectDwxxVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertDwxx" parameterType="Dwxx" useGeneratedKeys="true" keyProperty="id">
+        insert into dwxx
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dwmc != null">dwmc,</if>
+            <if test="bz != null">bz,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dwmc != null">#{dwmc},</if>
+            <if test="bz != null">#{bz},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDwxx" parameterType="Dwxx">
+        update dwxx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dwmc != null">dwmc = #{dwmc},</if>
+            <if test="bz != null">bz = #{bz},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDwxxById" parameterType="Long">
+        delete from dwxx where id = #{id}
+    </delete>
+
+    <delete id="deleteDwxxByIds" parameterType="String">
+        delete from dwxx where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

ruoyi-admin/src/main/resources/mapper/system/HyddMapper.xml

+<?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.ruoyi.system.mapper.HyddMapper">
+    
+    <resultMap type="Hydd" id="HyddResult">
+        <result property="id"    column="id"    />
+        <result property="qy"    column="qy"    />
+        <result property="ddmc"    column="ddmc"    />
+        <result property="bz"    column="bz"    />
+        <result property="text"    column="text"    />
+    </resultMap>
+
+    <sql id="selectHyddVo">
+        select id, qy, ddmc, bz,ddmc text from hydd
+    </sql>
+
+    <select id="selectHyddList" parameterType="Hydd" resultMap="HyddResult">
+        <include refid="selectHyddVo"/>
+        <where>  
+            <if test="qy != null  and qy != ''"> and qy = #{qy}</if>
+            <if test="ddmc != null  and ddmc != ''"> and ddmc = #{ddmc}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
+        </where>
+    </select>
+    
+    <select id="selectHyddById" parameterType="Long" resultMap="HyddResult">
+        <include refid="selectHyddVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertHydd" parameterType="Hydd" useGeneratedKeys="true" keyProperty="id">
+        insert into hydd
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="qy != null">qy,</if>
+            <if test="ddmc != null">ddmc,</if>
+            <if test="bz != null">bz,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="qy != null">#{qy},</if>
+            <if test="ddmc != null">#{ddmc},</if>
+            <if test="bz != null">#{bz},</if>
+         </trim>
+    </insert>
+
+    <update id="updateHydd" parameterType="Hydd">
+        update hydd
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="qy != null">qy = #{qy},</if>
+            <if test="ddmc != null">ddmc = #{ddmc},</if>
+            <if test="bz != null">bz = #{bz},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteHyddById" parameterType="Long">
+        delete from hydd where id = #{id}
+    </delete>
+
+    <delete id="deleteHyddByIds" parameterType="String">
+        delete from hydd where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

ruoyi-admin/src/main/resources/mapper/system/HyjlMapper.xml

+<?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.ruoyi.system.mapper.HyjlMapper">
+    
+    <resultMap type="Hyjl" id="HyjlResult">
+        <result property="id"    column="id"    />
+        <result property="dwid"    column="dwid"    />
+        <result property="ryxx"    column="ryxx"    />
+        <result property="chdd"    column="chdd"    />
+        <result property="sfqj"    column="sfqj"    />
+        <result property="qjyy"    column="qjyy"    />
+        <result property="bz"    column="bz"    />
+        <result property="dwmc"    column="dwmc"    />
+        <result property="cjsj"    column="cjsj"    />
+    </resultMap>
+
+    <sql id="selectHyjlVo">
+        select a.id, a.dwid,d.dwmc, ryxx, concat(qy,'/',chdd )chdd, sfqj, qjyy, a.bz,cjsj from hyjl a  left join dwxx d on a.dwid=d.id
+                                                                                                       left join hydd c on a.chdd=c.ddmc
+    </sql>
+
+    <select id="selectHyjlList" parameterType="Hyjl" resultMap="HyjlResult">
+        <include refid="selectHyjlVo"/>
+        <where>  
+            <if test="dwid != null  and dwid != ''"> and dwid = #{dwid}</if>
+            <if test="ryxx != null  and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
+            <if test="chdd != null  and chdd != ''"> and chdd like concat('%', #{chdd}, '%')</if>
+            <if test="sfqj != null  and sfqj != ''"> and sfqj = #{sfqj}</if>
+            <if test="qjyy != null  and qjyy != ''"> and qjyy = #{qjyy}</if>
+            <if test="cjsj2 != null  and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
+            <if test="bz != null  and bz != ''"> and a.bz = #{bz}</if>
+        </where>
+        order by  d.px
+
+    </select>
+    
+    <select id="selectHyjlById" parameterType="Long" resultMap="HyjlResult">
+        <include refid="selectHyjlVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectHyjlOne" resultType="com.ruoyi.system.domain.Hyjl">
+        select * from hyjl where dwid=#{dwid} and  ryxx=#{ryxx}  and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}
+    </select>
+
+    <insert id="insertHyjl" parameterType="Hyjl" useGeneratedKeys="true" keyProperty="id">
+        insert into hyjl
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dwid != null">dwid,</if>
+            <if test="ryxx != null">ryxx,</if>
+            <if test="chdd != null">chdd,</if>
+            <if test="sfqj != null">sfqj,</if>
+            <if test="qjyy != null">qjyy,</if>
+            <if test="bz != null">bz,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dwid != null">#{dwid},</if>
+            <if test="ryxx != null">#{ryxx},</if>
+            <if test="chdd != null">#{chdd},</if>
+            <if test="sfqj != null">#{sfqj},</if>
+            <if test="qjyy != null">#{qjyy},</if>
+            <if test="bz != null">#{bz},</if>
+         </trim>
+    </insert>
+
+    <update id="updateHyjl" parameterType="Hyjl">
+        update hyjl
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dwid != null">dwid = #{dwid},</if>
+            <if test="ryxx != null">ryxx = #{ryxx},</if>
+            <if test="chdd != null">chdd = #{chdd},</if>
+            <if test="sfqj != null">sfqj = #{sfqj},</if>
+            <if test="qjyy != null">qjyy = #{qjyy},</if>
+            <if test="bz != null">bz = #{bz},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteHyjlById" parameterType="Long">
+        delete from hyjl where id = #{id}
+    </delete>
+
+    <delete id="deleteHyjlByIds" parameterType="String">
+        delete from hyjl where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

ruoyi-admin/src/main/resources/mapper/system/RyxxMapper.xml

+<?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.ruoyi.system.mapper.RyxxMapper">
+    
+    <resultMap type="Ryxx" id="RyxxResult">
+        <result property="id"    column="id"    />
+        <result property="dwid"    column="dwid"    />
+        <result property="dwmc"    column="dwmc"    />
+        <result property="name"    column="name"    />
+        <result property="zw"    column="zw"    />
+        <result property="dyb"    column="dyb"    />
+        <result property="xjb"    column="xjb"    />
+        <result property="dysjh"    column="dysjh"    />
+        <result property="wssjh"    column="wssjh"    />
+        <result property="zh1"    column="zh1"    />
+        <result property="zh2"    column="zh2"    />
+        <result property="bz"    column="bz"    />
+        <result property="px"    column="px"    />
+        <result property="text"    column="text"    />
+    </resultMap>
+
+    <sql id="selectRyxxVo">
+        select id, dwid, dwmc, name, zw, dyb, xjb, dysjh, wssjh, zh1, zh2, bz, px,name text from ryxx
+    </sql>
+
+    <select id="selectRyxxList" parameterType="Ryxx" resultMap="RyxxResult">
+        <include refid="selectRyxxVo"/>
+        <where>  
+            <if test="dwid != null "> and dwid = #{dwid}</if>
+            <if test="dwmc != null  and dwmc != ''"> and dwmc = #{dwmc}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="zw != null  and zw != ''"> and zw = #{zw}</if>
+            <if test="dyb != null  and dyb != ''"> and dyb = #{dyb}</if>
+            <if test="xjb != null  and xjb != ''"> and xjb = #{xjb}</if>
+            <if test="dysjh != null  and dysjh != ''"> and dysjh = #{dysjh}</if>
+            <if test="wssjh != null  and wssjh != ''"> and wssjh = #{wssjh}</if>
+            <if test="zh1 != null  and zh1 != ''"> and zh1 = #{zh1}</if>
+            <if test="zh2 != null  and zh2 != ''"> and zh2 = #{zh2}</if>
+            <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
+            <if test="px != null "> and px = #{px}</if>
+        </where>
+    </select>
+    
+    <select id="selectRyxxById" parameterType="Long" resultMap="RyxxResult">
+        <include refid="selectRyxxVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertRyxx" parameterType="Ryxx" useGeneratedKeys="true" keyProperty="id">
+        insert into ryxx
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dwid != null">dwid,</if>
+            <if test="dwmc != null">dwmc,</if>
+            <if test="name != null">name,</if>
+            <if test="zw != null">zw,</if>
+            <if test="dyb != null">dyb,</if>
+            <if test="xjb != null">xjb,</if>
+            <if test="dysjh != null">dysjh,</if>
+            <if test="wssjh != null">wssjh,</if>
+            <if test="zh1 != null">zh1,</if>
+            <if test="zh2 != null">zh2,</if>
+            <if test="bz != null">bz,</if>
+            <if test="px != null">px,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dwid != null">#{dwid},</if>
+            <if test="dwmc != null">#{dwmc},</if>
+            <if test="name != null">#{name},</if>
+            <if test="zw != null">#{zw},</if>
+            <if test="dyb != null">#{dyb},</if>
+            <if test="xjb != null">#{xjb},</if>
+            <if test="dysjh != null">#{dysjh},</if>
+            <if test="wssjh != null">#{wssjh},</if>
+            <if test="zh1 != null">#{zh1},</if>
+            <if test="zh2 != null">#{zh2},</if>
+            <if test="bz != null">#{bz},</if>
+            <if test="px != null">#{px},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRyxx" parameterType="Ryxx">
+        update ryxx
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dwid != null">dwid = #{dwid},</if>
+            <if test="dwmc != null">dwmc = #{dwmc},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="zw != null">zw = #{zw},</if>
+            <if test="dyb != null">dyb = #{dyb},</if>
+            <if test="xjb != null">xjb = #{xjb},</if>
+            <if test="dysjh != null">dysjh = #{dysjh},</if>
+            <if test="wssjh != null">wssjh = #{wssjh},</if>
+            <if test="zh1 != null">zh1 = #{zh1},</if>
+            <if test="zh2 != null">zh2 = #{zh2},</if>
+            <if test="bz != null">bz = #{bz},</if>
+            <if test="px != null">px = #{px},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRyxxById" parameterType="Long">
+        delete from ryxx where id = #{id}
+    </delete>
+
+    <delete id="deleteRyxxByIds" parameterType="String">
+        delete from ryxx where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 		<!-- 指定 MyBatis 所用日志的具体实现 -->
 		<!-- 指定 MyBatis 所用日志的具体实现 -->
         <setting name="logImpl"                  value="SLF4J"  />
         <setting name="logImpl"                  value="SLF4J"  />
         <!-- 使用驼峰命名法转换字段 -->
         <!-- 使用驼峰命名法转换字段 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+		 <setting name="mapUnderscoreToCamelCase" value="true"/>
 	</settings>
 	</settings>
 	
 	
 </configuration>
 </configuration>

ruoyi-common/pom.xml

@@ -119,6 +119,12 @@
             <artifactId>javax.servlet-api</artifactId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>
\ No newline at end of file

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,6 +112,7 @@ public class SecurityConfig
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
                 requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/system/hydd/**", "/system/dwxx/**", "/system/hyjl/**","/system/ryxx/**").permitAll()
                     // 静态资源，可匿名访问
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()