Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/SpecialService/SpecialServiceController.java

@@ -0,0 +1,85 @@
+package com.ruoyi.web.controller.SpecialService;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.sooka.jnb.highServer.service.IJnbHighServerService;
+import com.sooka.jnb.highServer.vo.JnbHighServerVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 特色服务Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@RestController
+@RequestMapping("/special/service")
+public class SpecialServiceController extends BaseController {
+
+    @Autowired
+    private IJnbHighServerService jnbHighServerService;
+
+//    /**
+//     * 查询特色服务列表
+//     */
+//    @GetMapping("/list")
+//    public TableDataInfo list(JnbHighServerVO jnbHighServerVO) {
+//        startPage();
+//        List<JnbHighServerVO> list = jnbHighServerService.selectJnbHighServerList(jnbHighServerVO);
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出特色服务列表
+//     */
+//    @Log(title = "特色服务", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, JnbHighServerVO jnbHighServerVO) {
+//        List<JnbHighServerVO> list = jnbHighServerService.selectJnbHighServerList(jnbHighServerVO);
+//        ExcelUtil<JnbHighServerVO> util = new ExcelUtil<JnbHighServerVO>(JnbHighServerVO.class);
+//        util.exportExcel(response, list, "特色服务数据");
+//    }
+//
+//    /**
+//     * 获取特色服务详细信息
+//     */
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id) {
+//        return success(jnbHighServerService.selectJnbHighServerById(id));
+//    }
+//
+//    /**
+//     * 新增特色服务
+//     */
+//    @Log(title = "特色服务", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody JnbHighServerVO jnbHighServerVO) {
+//        return toAjax(jnbHighServerService.insertJnbHighServer(jnbHighServerVO));
+//    }
+//
+//    /**
+//     * 修改特色服务
+//     */
+//    @Log(title = "特色服务", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody JnbHighServerVO jnbHighServerVO) {
+//        return toAjax(jnbHighServerService.updateJnbHighServer(jnbHighServerVO));
+//    }
+//
+//    /**
+//     * 删除特色服务
+//     */
+//    @Log(title = "特色服务", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids) {
+//        return toAjax(jnbHighServerService.deleteJnbHighServerByIds(ids));
+//    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/department/configurationController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.controller.department;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.department.service.DepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 部门配置Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@RestController
+@RequestMapping("/system/department")
+public class configurationController extends BaseController
+{
+    @Autowired
+    private DepartmentService departmentService;
+
+    /**
+     * 查询部门配置列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(Department department)
+    {
+        startPage();
+        List<Department> list = departmentService.selectSysDeptVo(department);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取部门配置详细信息
+     */
+    @GetMapping(value = "/lists/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(departmentService.selectSysDeptById(id));
+    }
+
+    /**
+     * 新增部门配置
+     */
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody Department department)
+    {
+        return toAjax(departmentService.insertSysDept(department));
+    }
+
+    /**
+     * 修改部门配置
+     */
+    @PutMapping("update")
+    public AjaxResult edit(@RequestBody Department department)
+    {
+        return toAjax(departmentService.updateSysDept(department));
+    }
+
+    /**
+     * 删除部门配置
+     */
+    @DeleteMapping("/delete/{id}")
+    public AjaxResult remove(@PathVariable Long id)
+    {
+        return toAjax(departmentService.deleteSysDeptByDeptId(id));
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/handleAffairs/GridTypeController.java

@@ -26,7 +26,6 @@ public class GridTypeController extends BaseController {
     /**
      * 查询网格类型配置列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:gridType:list')")
     @GetMapping("/list")
     public TableDataInfo list(GridType GridType)
     {
@@ -38,7 +37,6 @@ public class GridTypeController extends BaseController {
     /**
      * 获取网格类型配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:gridType:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -48,7 +46,6 @@ public class GridTypeController extends BaseController {
     /**
      * 新增网格类型配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:gridType:add')")
     @Log(title = "网格类型配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody GridType GridType)
@@ -59,7 +56,6 @@ public class GridTypeController extends BaseController {
     /**
      * 修改网格类型配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:gridType:edit')")
     @Log(title = "网格类型配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody GridType GridType)
@@ -70,7 +66,6 @@ public class GridTypeController extends BaseController {
     /**
      * 删除网格类型配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:gridType:remove')")
     @Log(title = "网格类型配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -81,7 +76,6 @@ public class GridTypeController extends BaseController {
     /**
      * 导出网格类型配置列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:gridType:export')")
     @Log(title = "网格类型配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, GridType GridType)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/handleAffairs/TopicTypeController.java

@@ -34,7 +34,6 @@ public class TopicTypeController extends BaseController {
     /**
      * 查询主题类型配置列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:topicType:list')")
     @GetMapping("/list")
     public TableDataInfo list(TopicType topicType)
     {
@@ -46,7 +45,6 @@ public class TopicTypeController extends BaseController {
     /**
      * 导出主题类型配置列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:topicType:export')")
     @Log(title = "主题类型配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TopicType topicType)
@@ -59,7 +57,6 @@ public class TopicTypeController extends BaseController {
     /**
      * 获取主题类型配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:topicType:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -69,7 +66,6 @@ public class TopicTypeController extends BaseController {
     /**
      * 新增主题类型配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:topicType:add')")
     @Log(title = "主题类型配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody TopicType topicType)
@@ -80,7 +76,6 @@ public class TopicTypeController extends BaseController {
     /**
      * 修改主题类型配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:topicType:edit')")
     @Log(title = "主题类型配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody TopicType topicType)
@@ -91,7 +86,6 @@ public class TopicTypeController extends BaseController {
     /**
      * 删除主题类型配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:topicType:remove')")
     @Log(title = "主题类型配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/matter/matterConllter.java

@@ -0,0 +1,84 @@
+package com.ruoyi.web.controller.matter;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+import com.sooka.jnb.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+/**
+ * 事项Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@RestController
+@RequestMapping("/system/matter")
+public class matterConllter extends BaseController {
+
+    @Autowired
+    private MatterService matterService;
+
+        /**
+         * 查询事项列表
+         */
+        @GetMapping("/list")
+        public TableDataInfo list(Matter matter)
+        {
+            startPage();
+            List<Matter> list = matterService.selectSysMatterVo(matter);
+            return getDataTable(list);
+        }
+
+        /**
+         * 获取事项详细信息
+         */
+        @GetMapping(value = "/lists/{id}")
+        public AjaxResult getInfo(@PathVariable("id") Integer id)
+        {
+            return success(matterService.selectSysMatterById(id));
+        }
+
+        /**
+         * 新增事项
+         */
+        @PostMapping("add")
+        public AjaxResult add(@RequestBody Matter matter)
+        {
+            return toAjax(matterService.insertSysMatter(matter));
+        }
+
+        /**
+         * 修改事项
+         */
+        @PutMapping("update")
+        public AjaxResult edit(@RequestBody Matter matter)
+        {
+            return toAjax(matterService.updateSysMatter(matter));
+        }
+
+        /**
+         * 审核事项
+         */
+        @PutMapping("examine")
+        public AjaxResult examine(@RequestBody Matter matter)
+        {
+            return toAjax(matterService.examine(matter));
+        }
+
+        /**
+         * 删除事项
+         */
+        @DeleteMapping("/delete/{id}")
+        public AjaxResult remove(@PathVariable Long id)
+        {
+            return toAjax(matterService.deleteSysMatterByDeptId(id));
+        }
+
+
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/domin/Department.java

@@ -0,0 +1,17 @@
+package com.sooka.jnb.department.domin;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class Department extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    //部门id
+    private Integer id;
+    //部门名称
+    private  String  name;
+    //是否首页展示
+    private  String  shows;
+    //办理对象
+    private  String  application;
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/mapper/DepartmentMapper.java

@@ -0,0 +1,40 @@
+package com.sooka.jnb.department.mapper;
+
+import com.sooka.jnb.department.domin.Department;
+
+import java.util.List;
+
+/**
+ * 部门Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+public interface DepartmentMapper
+{
+
+    /**
+     * 查询部门配置列表
+     */
+    List<Department> selectSysDeptVo(Department department);
+
+    /**
+     * 获取部门配置详细信息
+     */
+    Department selectSysDeptById(Integer id);
+
+    /**
+     * 新增部门配置
+     */
+    int insertSysDept(Department department);
+
+    /**
+     * 修改部门配置
+     */
+    int updateSysDept(Department department);
+
+    /**
+     * 删除部门配置
+     */
+    int deleteSysDeptByDeptId(Long id);
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/service/DepartmentService.java

@@ -0,0 +1,35 @@
+package com.sooka.jnb.department.service;
+
+import com.sooka.jnb.department.domin.Department;
+
+import java.util.List;
+
+public interface DepartmentService
+{
+
+
+    /**
+     * 查询部门配置列表
+     */
+     List<Department> selectSysDeptVo(Department department);
+
+    /**
+     * 获取部门配置详细信息
+     */
+    Department selectSysDeptById(Integer id);
+
+    /**
+     * 新增部门配置
+     */
+     int insertSysDept(Department department);
+
+    /**
+     * 修改部门配置
+     */
+     int updateSysDept(Department department);
+
+    /**
+     * 删除部门配置
+     */
+     int deleteSysDeptByDeptId(Long id);
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/service/impl/departmentServicempl.java

@@ -0,0 +1,64 @@
+package com.sooka.jnb.department.service.impl;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.department.service.DepartmentService;
+import org.springframework.stereotype.Service;
+import com.sooka.jnb.department.mapper.DepartmentMapper;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class departmentServicempl implements DepartmentService
+{
+    @Resource
+    private DepartmentMapper departmentMapper;
+
+
+
+    /**
+     * 查询部门配置列表
+     */
+    @Override
+    public List<Department> selectSysDeptVo(Department department)
+    {
+        return departmentMapper.selectSysDeptVo(department);
+    }
+
+    /**
+     * 获取部门配置详细信息
+     */
+    @Override
+    public  Department selectSysDeptById(Integer id)
+    {
+        return departmentMapper.selectSysDeptById(id);
+    }
+
+    /**
+     * 新增部门配置
+     */
+    @Override
+    public int insertSysDept(Department department)
+    {
+
+        return departmentMapper.insertSysDept(department);
+    }
+
+    /**
+     * 修改部门配置
+     */
+    @Override
+    public int updateSysDept(Department department)
+    {
+        return departmentMapper.updateSysDept(department);
+    }
+
+    /**
+     * 删除部门配置
+     */
+    @Override
+    public int deleteSysDeptByDeptId(Long id)
+    {
+        return departmentMapper.deleteSysDeptByDeptId(id);
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/matter/domin/Matter.java

@@ -0,0 +1,29 @@
+package com.sooka.jnb.matter.domin;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+@Data
+public class Matter extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+        //事项列表id
+        private Integer id;
+        //事项标题
+        private  String  title;
+        //主题类型
+        private  String  type;
+        //所属部门
+        private  String  department;
+        //是否常办
+        private Integer operation;
+        //地址
+        private  String  address;
+        //电话
+        private  String  phone;
+        //图片
+        private  String  picture;
+         //审核状态
+        private  String examine;
+    }
+
+

sooka-jnb/src/main/java/com/sooka/jnb/matter/mapper/MatterMapper.java

@@ -0,0 +1,46 @@
+package com.sooka.jnb.matter.mapper;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+
+import java.util.List;
+/**
+ * 部门Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+public interface MatterMapper {
+
+        /**
+         * 获取事项详细信息
+         */
+        Matter selectSysMatterById(Integer id);
+
+        /**
+         * 查询事项列表
+         */
+        List<Matter> selectSysMatterVo(Matter matter);
+
+        /**
+         * 新增事项
+         */
+        int insertSysMatter(Matter matter);
+
+        /**
+         * 修改事项
+         */
+        int updateSysMatter(Matter matter);
+
+        /**
+         * 审核事项
+         */
+        int examine(Matter matter);
+
+        /**
+         * 删除事项
+         */
+        int deleteSysMatterByDeptId(Long id);
+}
+
+

sooka-jnb/src/main/java/com/sooka/jnb/matter/service/MatterService.java

@@ -0,0 +1,40 @@
+package com.sooka.jnb.matter.service;
+
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+
+import java.util.List;
+
+public interface MatterService
+{
+    /**
+     * 获取事项详细信息
+     */
+    Matter selectSysMatterById(Integer id);
+
+    /**
+     * 查询事项列表
+     */
+     List<Matter> selectSysMatterVo(Matter matter);
+
+    /**
+     * 新增事项
+     */
+    int insertSysMatter(Matter matter);
+
+    /**
+     * 修改事项
+     */
+     int updateSysMatter(Matter matter);
+
+    /**
+     * 审核事项
+     */
+    public int examine(Matter matter);
+
+    /**
+     * 删除事项
+     */
+    int deleteSysMatterByDeptId(Long id);
+}

sooka-jnb/src/main/java/com/sooka/jnb/matter/service/impl/MatterServicempl.java

@@ -0,0 +1,74 @@
+package com.sooka.jnb.matter.service.impl;
+
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+import com.sooka.jnb.matter.mapper.MatterMapper;
+import com.sooka.jnb.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class MatterServicempl implements MatterService
+{
+    @Resource
+    private MatterMapper matterMapper;
+
+    /**
+     * 获取事项详细信息
+     */
+    @Override
+    public Matter selectSysMatterById(Integer id)
+    {
+        return matterMapper.selectSysMatterById(id);
+    }
+
+    /**
+     * 查询事项列表
+     */
+    @Override
+    public List<Matter> selectSysMatterVo(Matter matter)
+    {
+        return matterMapper.selectSysMatterVo(matter);
+    }
+
+    /**
+     * 新增事项
+     */
+    @Override
+    public int insertSysMatter(Matter matter)
+    {
+
+        return matterMapper.insertSysMatter(matter);
+    }
+
+    /**
+     * 修改事项
+     */
+    @Override
+    public int updateSysMatter(Matter matter)
+    {
+        return matterMapper.updateSysMatter(matter);
+    }
+
+    /**
+     * 审核事项
+     */
+    @Override
+    public int examine(Matter matter)
+    {
+        return matterMapper.examine(matter);
+    }
+
+    /**
+     * 删除事项
+     */
+    @Override
+    public int deleteSysMatterByDeptId(Long id)
+    {
+        return matterMapper.deleteSysMatterByDeptId(id);
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/my/domain/ScoreOperate.java

@@ -54,6 +54,11 @@ public class ScoreOperate extends BaseEntity {
      */
     private String phone;
 
+    /**
+     * 微信名称
+     */
+    private String wechatName;
+
 
     public ScoreOperate() {
     }

sooka-jnb/src/main/java/com/sooka/jnb/my/service/impl/ScoreServiceImpl.java

@@ -33,8 +33,8 @@ public class ScoreServiceImpl implements IScoreService {
             score.setCreateTime(new Date());
         }
         score.setScoreOperate(ADD + score.getScoreNum());
-        scoreMapper.insertScoreOperate(score);
-        return scoreMapper.initScore(score);
+        scoreMapper.initScore(score);
+        return scoreMapper.insertScoreOperate(score);
     }
 
     @Override

sooka-jnb/src/main/java/com/sooka/jnb/wenba/service/impl/wenbaServiceImpl.java

@@ -1,12 +1,12 @@
-package com.sooka.jnb.wenba.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.entity.WxUser;
-import com.sooka.jnb.wenba.mapper.wenbaMapper;
-import com.sooka.jnb.wenba.service.wenbaService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class wenbaServiceImpl extends ServiceImpl<wenbaMapper, WxUser> implements wenbaService {
-
-}
+//package com.sooka.jnb.wenba.service.impl;
+//
+//
+//import com.ruoyi.common.core.domain.entity.WxUser;
+//
+//import com.sooka.jnb.department.service.departmentService;
+//import org.springframework.stereotype.Service;
+//
+//@Service
+//public class wenbaServiceImpl extends departmentService {
+//
+//}

sooka-jnb/src/main/resources/mapper/department/DepartmentMapper.xml

@@ -0,0 +1,50 @@
+<?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.sooka.jnb.department.mapper.DepartmentMapper">
+
+    <resultMap type="com.sooka.jnb.department.domin.Department" id="DepartmentResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="shows"    column="shows"    />
+        <result property="application"    column="application"    />
+    </resultMap>
+
+    <select id="selectSysDeptVo"  resultMap="DepartmentResult">
+        select  id,name, shows, application from jnb_department_configuration
+        <where>
+            <if test="name != null and name !=''">
+                AND name LIKE '%' #{name} '%'
+            </if>
+            <if test="application != null and application !=''">
+                AND application LIKE '%' #{application} '%'
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSysDeptById"  resultMap="DepartmentResult">
+       select  id, name, shows, application from jnb_department_configuration
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysDept">
+        INSERT INTO
+        jnb_department_configuration (name, shows, application)
+        VALUE (#{name},#{shows},#{application})
+    </insert>
+
+    <update id="updateSysDept" parameterType="SysDept">
+        update jnb_department_configuration
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="shows != null">shows = #{shows},</if>
+            <if test="application != null">application = #{application},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysDeptByDeptId" parameterType="Long">
+        delete from jnb_department_configuration where id = #{id}
+    </delete>
+</mapper>

sooka-jnb/src/main/resources/mapper/matter/matterMapper.xml

@@ -0,0 +1,68 @@
+<?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.sooka.jnb.matter.mapper.MatterMapper">
+
+    <resultMap type="com.sooka.jnb.matter.domin.Matter" id="MatterResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="type"    column="type"    />
+        <result property="department"    column="department"    />
+        <result property="operation"    column="operation"    />
+        <result property="address"    column="address"    />
+        <result property="phone"    column="phone"    />
+        <result property="picture"    column="picture"    />
+        <result property="examine"    column="examine"    />
+    </resultMap>
+
+
+    <select id="selectSysMatterVo"  resultMap="MatterResult">
+        select  id,title, type, department,operation,address,phone,picture,examine from jnb_list_of_matters
+        <where>
+            <if test="title != null and title !=''">
+                AND title LIKE '%' #{title} '%'
+            </if>
+            <if test="examine != null and examine !=''">
+                AND examine LIKE '%' #{examine} '%'
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSysMatterById"  resultMap="MatterResult">
+       select  id ,title, type, department,operation,address,phone,picture,examine from jnb_list_of_matters
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysMatter">
+       INSERT INTO
+           jnb_list_of_matters (title, type, department,operation,address,phone,picture )
+        VALUE (#{title},#{type},#{department},#{operation},#{address},#{phone},#{picture} )
+    </insert>
+
+    <update id="updateSysMatter" parameterType="SysDept">
+        update jnb_list_of_matters
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="department != null">department = #{department},</if>
+            <if test="operation != null">operation = #{operation},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="picture != null">picture = #{picture},</if>
+            <if test="phone != null">phone = #{phone},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="examine" parameterType="SysDept">
+        update jnb_list_of_matters
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="examine != null">examine = #{examine}</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysMatterByDeptId" parameterType="Long">
+        delete from jnb_list_of_matters where id = #{id}
+    </delete>
+</mapper>

sooka-jnb/src/main/resources/mapper/my/ScoreMapper.xml

@@ -9,6 +9,7 @@
         <id property="id" column="id"/>
         <result property="userId" column="user_id"/>
         <result property="name" column="name"/>
+        <result property="wechatName" column="wechat_name"/>
         <result property="phone" column="phone"/>
         <result property="scoreOperate" column="score_operate"/>
         <result property="scoreNum" column="score_num"/>
@@ -53,6 +54,7 @@
     <select id="getScoreList" parameterType="string" resultMap="scoreOperateResult">
         select jso.id, jso.user_id,
                jwu.name,
+               jwu.wechat_name,
                jso.score_operate,
                jso.score_num,
                jso.create_time,