Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java

+package com.ruoyi.web.controller.wisdomarbitrate.mscase;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord;
+import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+/**
+ * 案件列表控制层
+ * @Author wangqiong
+ * @Date 2024/01/8
+ * @Version V1.0
+ */
+@RestController
+@RequestMapping("/caseApplication")
+public class MsCaseApplicationController extends BaseController {
+    @Autowired
+    private MsCaseLogRecordService caseLogRecordService;
+
+    /**
+     * 查询案件日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('caseLog:list')")
+    @GetMapping("/list")
+    public AjaxResult list(MsCaseLogRecord caseLogRecord)
+    {
+        List<MsCaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
+        return AjaxResult.success(list);
+    }
+
+
+
+
+
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseLogRecordController.java

 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord;
 import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-
+/**
+ * 案件日志控制层
+ * @Author wangqiong
+ * @Date 2024/01/8
+ * @Version V1.0
+ */
 @RestController
 @RequestMapping("/caseLogRecord")
 public class MsCaseLogRecordController extends BaseController {

ruoyi-admin/src/main/resources/application-druid.yml

         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
+                url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
                 username: root
                 password: YMzc157#
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8001
+  port: 6001
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-common/src/main/java/com/ruoyi/common/handler/ResponseBodyAdviceHandler.java

 package com.ruoyi.common.handler;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 
 /**
 
     @Override
     public Object beforeBodyWrite(Object body, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest request, ServerHttpResponse serverHttpResponse) {
-         if (body instanceof String) {
-            ObjectMapper om = new ObjectMapper();
-            try {
-                return om.writeValueAsString(AjaxResult.success(body));
-            } catch (JsonProcessingException e) {
-                log.error("JsonProcessingException e:{}", e);
+
+        if (body instanceof AjaxResult) {
+            AjaxResult result = (AjaxResult) body;
+            if (ObjectUtil.isNotEmpty(result.get("data"))) {
+                //判断类型，然后转换字典
+                turnType(body);
+                return body;
+            }
+        } else if (body instanceof TableDataInfo) {
+            TableDataInfo pageRes = (TableDataInfo) body;
+            List list = pageRes.getRows();
+            if (CollectionUtil.isNotEmpty(list)) {
+                //判断类型，然后转换字典
+                turnType(body);
+                return body;
             }
         }
-        //判断类型，然后转换字典
-        turnType(body);
-        AjaxResult result = AjaxResult.success(body);
-        return result;
+            return body;
+
+
+
     }
 
     /**
     private void turnType(Object body) {
         if (body instanceof AjaxResult) {
             AjaxResult result = (AjaxResult) body;
-            if(result.isSuccess()){
+            if (result.isSuccess()) {
                 Object data = result.get("data");
-                if(data!=null){
-                    if(data instanceof List){
+                if (data != null) {
+                    if (data instanceof List) {
                         List list = (List) data;
                         convertList(list);
-                    }else if(data instanceof TableDataInfo){
+                    } else if (data instanceof TableDataInfo) {
                         TableDataInfo pageRes = (TableDataInfo) data;
                         List list = pageRes.getRows();
                         convertList(list);
-                    }else{
+                    } else {
                         loopTurn(data);
                     }
                 }
                     if (targetField != null) {
                         targetField.setAccessible(true);
                         String dictType = dictConvert.dictType();
-                        if(StrUtil.isEmpty(dictType)){
+                        if (StrUtil.isEmpty(dictType)) {
                             return;
                         }
                         //单个字典时直接设置值
                         if (!dictConvert.isMultiple()) {
 
-                            targetField.set(obj, ObjectUtil.isNotEmpty( DictUtils.getDictLabel(dictType,key)) ?  DictUtils.getDictLabel(dictType,key):null);
+                            targetField.set(obj, ObjectUtil.isNotEmpty(DictUtils.getDictLabel(dictType, key)) ? DictUtils.getDictLabel(dictType, key) : null);
                         } else {
                             //多个字典时，用逗号拼接值
                             List<String> textList = new ArrayList<>();
                             String[] ids = key.split(dictConvert.separator());
                             for (String id : ids) {
-                                if (ObjectUtil.isNotEmpty(DictUtils.getDictLabel(dictType,id))&&StrUtil.isNotEmpty(DictUtils.getDictLabel(dictType,id))) {
-                                    textList.add(DictUtils.getDictLabel(dictType,id));
+                                if (ObjectUtil.isNotEmpty(DictUtils.getDictLabel(dictType, id)) && StrUtil.isNotEmpty(DictUtils.getDictLabel(dictType, id))) {
+                                    textList.add(DictUtils.getDictLabel(dictType, id));
                                 }
                             }
                             targetField.set(obj, StrUtil.join(dictConvert.separator(), textList));
             }
         }
     }
+
     /**
      * 获取目标属性
      *

ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper">
 
-	<resultMap type="SysJobLog" id="SysJobLogResult">
+	<resultMap type="com.ruoyi.quartz.domain.SysJobLog" id="SysJobLogResult">
 		<id     property="jobLogId"       column="job_log_id"      />
 		<result property="jobName"        column="job_name"        />
 		<result property="jobGroup"       column="job_group"       />
 		from ms_sys_job_log
     </sql>
 	
-	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
+	<select id="selectJobLogList" parameterType="com.ruoyi.quartz.domain.SysJobLog" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
         truncate table ms_sys_job_log
     </update>
  	
- 	<insert id="insertJobLog" parameterType="SysJobLog">
+ 	<insert id="insertJobLog" parameterType="com.ruoyi.quartz.domain.SysJobLog">
  		insert into ms_sys_job_log(
  			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>

ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper">
 
-	<resultMap type="SysJob" id="SysJobResult">
+	<resultMap type="com.ruoyi.quartz.domain.SysJob" id="SysJobResult">
 		<id     property="jobId"          column="job_id"          />
 		<result property="jobName"        column="job_name"        />
 		<result property="jobGroup"       column="job_group"       />
 		from ms_sys_job
     </sql>
 	
-	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
+	<select id="selectJobList" parameterType="com.ruoyi.quartz.domain.SysJob" resultMap="SysJobResult">
 		<include refid="selectJobVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
         </foreach> 
  	</delete>
  	
- 	<update id="updateJob" parameterType="SysJob">
+ 	<update id="updateJob" parameterType="com.ruoyi.quartz.domain.SysJob">
  		update ms_sys_job
  		<set>
  			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
  		where job_id = #{jobId}
 	</update>
  	
- 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
+ 	<insert id="insertJob" parameterType="com.ruoyi.quartz.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
  		insert into ms_sys_job(
  			<if test="jobId != null and jobId != 0">job_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/miniprogress/IdentityAuthenticationMapper.java

 public interface IdentityAuthenticationMapper {
     int insertIdentityAuthentication(IdentityAuthentication identityAuthentication);
     IdentityAuthentication  selectIdentityAuthentication(IdentityAuthentication identityAuthentication);
+    Integer  selectCountIdentityAuthentication(IdentityAuthentication identityAuthentication);
 
 
     void updateIdentityAuthentication(IdentityAuthentication ientityAuthentication);

ruoyi-system/src/main/resources/generator/config.properties

 jdbc.user=root
 jdbc.password=YMzc157#
 #目标模块项目路径
-targetprojectpath=D:/ymPro/Mediation-Backend/ruoyi-system
+targetprojectpath=D:/ymPro/Mediation-Backend/ruoyi-system/src/main/resources/mapper/wisdomarbitrate
 #模块名称
 moduleName=mscase
 #表名
-tableName=ms_case_application
+tableName=ms_case_affiliate
 #主键
 premaryId=id

ruoyi-system/src/main/resources/generator/generatorConfig.xml

                         password="${jdbc.password}">
         </jdbcConnection>
         <!--实体-->
-        <javaModelGenerator targetPackage="com.ruoyi.system.domain.entity.${moduleName}"
+        <javaModelGenerator targetPackage="com.ruoyi.wisdomarbitrate.domain.entity.${moduleName}"
                             targetProject="src/main/java"/>
         <!--mapper.xml-->
-        <sqlMapGenerator targetPackage="com.ruoyi.system.mapper.${moduleName}"
+        <sqlMapGenerator targetPackage="mapper.wisdomarbitrate.${moduleName}"
                          targetProject="src/main/resources"/>
         <!--mapper接口-->
-        <javaClientGenerator targetPackage="com.ruoyi.system.mapper.${moduleName}"
+        <javaClientGenerator targetPackage="com.ruoyi.wisdomarbitrate.mapper.${moduleName}"
                              targetProject="src/main/java"
                              type="XMLMAPPER"/>
         <!--需要生成的数据库表-->

ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
     
-    <resultMap type="SysConfig" id="SysConfigResult">
+    <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />
         <result property="configName"    column="config_name"    />
         <result property="configKey"     column="config_key"     />
 		</where>
 	</sql>
     
-    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
+    <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <include refid="sqlwhereSearch"/>
     </select>
     
-    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
+    <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <where>
 			<if test="configName != null and configName != ''">
         where config_key = #{configKey} limit 1
     </select>
     
-    <insert id="insertConfig" parameterType="SysConfig">
+    <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
         insert into ms_sys_config (
 			<if test="configName != null and configName != '' ">config_name,</if>
 			<if test="configKey != null and configKey != '' ">config_key,</if>
 		)
     </insert>
 	 
-    <update id="updateConfig" parameterType="SysConfig">
+    <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
         update ms_sys_config 
         <set>
             <if test="configName != null and configName != ''">config_name = #{configName},</if>

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
-	<resultMap type="SysDept" id="SysDeptResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
 		<id     property="deptId"     column="dept_id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
         from ms_sys_dept d
     </sql>
     
-	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+	<select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
 		<if test="deptId != null and deptId != 0">
 		join ms_sys_user u on r.role_id=#{roleId} and r.user_id=u.user_id
 	</select>
 
-	<insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyColumn="dept_id" keyProperty="deptId">
+	<insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept" useGeneratedKeys="true" keyColumn="dept_id" keyProperty="deptId">
  		insert into ms_sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
 
 	</insert>
 
-    <update id="updateDept" parameterType="SysDept">
+    <update id="updateDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
  		update ms_sys_dept
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>

ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
 	
-	<resultMap type="SysDictData" id="SysDictDataResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
 		from ms_sys_dict_data
     </sql>
 
-	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
+	<select id="selectDictDataList" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
 	    <include refid="selectDictDataVo"/>
 		<where>
 		    <if test="dictType != null and dictType != ''">
 		order by dict_sort asc
 	</select>
 	
-	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
+	<select id="selectDictDataByType" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
         </foreach> 
  	</delete>
 	
-	<update id="updateDictData" parameterType="SysDictData">
+	<update id="updateDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
  		update ms_sys_dict_data
  		<set>
  			<if test="dictSort != null">dict_sort = #{dictSort},</if>
  		update ms_sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
 	</update>
  	
- 	<insert id="insertDictData" parameterType="SysDictData">
+ 	<insert id="insertDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
  		insert into ms_sys_dict_data(
  			<if test="dictSort != null">dict_sort,</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>

ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
 
-	<resultMap type="SysDictType" id="SysDictTypeResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysDictType" id="SysDictTypeResult">
 		<id     property="dictId"     column="dict_id"     />
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
 		from ms_sys_dict_type
     </sql>
 
-	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+	<select id="selectDictTypeList" parameterType="com.ruoyi.common.core.domain.entity.SysDictType" resultMap="SysDictTypeResult">
 	    <include refid="selectDictTypeVo"/>
 		<where>
 		    <if test="dictName != null and dictName != ''">
         </foreach> 
  	</delete>
 
- 	<update id="updateDictType" parameterType="SysDictType">
+ 	<update id="updateDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
  		update ms_sys_dict_type
  		<set>
  			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
  		where dict_id = #{dictId}
 	</update>
  	
- 	<insert id="insertDictType" parameterType="SysDictType">
+ 	<insert id="insertDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
  		insert into ms_sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>

ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
 
-	<resultMap type="SysLogininfor" id="SysLogininforResult">
+	<resultMap type="com.ruoyi.system.domain.SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />
 		<result property="userName"      column="user_name"         />
 		<result property="status"        column="status"            />
 		<result property="loginTime"     column="login_time"        />
 	</resultMap>
 
-	<insert id="insertLogininfor" parameterType="SysLogininfor">
+	<insert id="insertLogininfor" parameterType="com.ruoyi.system.domain.SysLogininfor">
 		insert into ms_sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
 		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
 	</insert>
 	
-	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
+	<select id="selectLogininforList" parameterType="com.ruoyi.system.domain.SysLogininfor" resultMap="SysLogininforResult">
 		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from ms_sys_logininfor
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
 
-	<resultMap type="SysMenu" id="SysMenuResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
 		<id     property="menuId"         column="menu_id"        />
 		<result property="menuName"       column="menu_name"      />
 		<result property="parentName"     column="parent_name"    />
 		from ms_sys_menu
     </sql>
     
-    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
+    <select id="selectMenuList" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		<where>
 			<if test="menuName != null and menuName != ''">
 		order by m.parent_id, m.order_num
 	</select>
 	
-	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+	<select id="selectMenuListByUserId" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from ms_sys_menu m
 		left join ms_ms_sys_role_menu rm on m.menu_id = rm.menu_id
 	    select count(1) from ms_sys_menu where parent_id = #{menuId}  
 	</select>
 	
-	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
+	<select id="checkMenuNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
 	</select>
 	
-	<update id="updateMenu" parameterType="SysMenu">
+	<update id="updateMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
 		update ms_sys_menu
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 		where menu_id = #{menuId}
 	</update>
 
-	<insert id="insertMenu" parameterType="SysMenu">
+	<insert id="insertMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
 		insert into ms_sys_menu(
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>

ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
     
-    <resultMap type="SysNotice" id="SysNoticeResult">
+    <resultMap type="com.ruoyi.system.domain.SysNotice" id="SysNoticeResult">
         <result property="noticeId"       column="notice_id"       />
         <result property="noticeTitle"    column="notice_title"    />
         <result property="noticeType"     column="notice_type"     />
         where notice_id = #{noticeId}
     </select>
     
-    <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
+    <select id="selectNoticeList" parameterType="com.ruoyi.system.domain.SysNotice" resultMap="SysNoticeResult">
         <include refid="selectNoticeVo"/>
         <where>
 			<if test="noticeTitle != null and noticeTitle != ''">
 		</where>
     </select>
     
-    <insert id="insertNotice" parameterType="SysNotice">
+    <insert id="insertNotice" parameterType="com.ruoyi.system.domain.SysNotice">
         insert into ms_sys_notice (
 			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
 			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
 		)
     </insert>
 	 
-    <update id="updateNotice" parameterType="SysNotice">
+    <update id="updateNotice" parameterType="com.ruoyi.system.domain.SysNotice">
         update ms_sys_notice 
         <set>
             <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>

ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
 
-	<resultMap type="SysOperLog" id="SysOperLogResult">
+	<resultMap type="com.ruoyi.system.domain.SysOperLog" id="SysOperLogResult">
 		<id     property="operId"         column="oper_id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
         from ms_sys_oper_log
     </sql>
     
-	<insert id="insertOperlog" parameterType="SysOperLog">
+	<insert id="insertOperlog" parameterType="com.ruoyi.system.domain.SysOperLog">
 		insert into ms_sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
 	</insert>
 	
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+	<select id="selectOperLogList" parameterType="com.ruoyi.system.domain.SysOperLog" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="title != null and title != ''">

ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
 
-	<resultMap type="SysPost" id="SysPostResult">
+	<resultMap type="com.ruoyi.system.domain.SysPost" id="SysPostResult">
 		<id     property="postId"        column="post_id"       />
 		<result property="postCode"      column="post_code"     />
 		<result property="postName"      column="post_name"     />
 		from ms_sys_post
     </sql>
 	
-	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
+	<select id="selectPostList" parameterType="com.ruoyi.system.domain.SysPost" resultMap="SysPostResult">
 	    <include refid="selectPostVo"/>
 		<where>
 			<if test="postCode != null and postCode != ''">
 		 where post_code=#{postCode} limit 1
 	</select>
 	
-	<update id="updatePost" parameterType="SysPost">
+	<update id="updatePost" parameterType="com.ruoyi.system.domain.SysPost">
  		update ms_sys_post
  		<set>
  			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
  		where post_id = #{postId}
 	</update>
  	
- 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+ 	<insert id="insertPost" parameterType="com.ruoyi.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
  		insert into ms_sys_post(
  			<if test="postId != null and postId != 0">post_id,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>

ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
 
-	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
+	<resultMap type="com.ruoyi.system.domain.SysRoleDept" id="SysRoleDeptResult">
 		<result property="roleId"     column="role_id"      />
 		<result property="deptId"     column="dept_id"      />
 	</resultMap>

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
 
-	<resultMap type="SysRole" id="SysRoleResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
 		<id     property="roleId"             column="role_id"               />
 		<result property="roleName"           column="role_name"             />
 		<result property="roleKey"            column="role_key"              />
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
             r.status, r.del_flag, r.create_time, r.remark 
         from ms_sys_role r
-	        left join ms_ms_sys_user_role ur on ur.role_id = r.role_id
+	        left join ms_sys_user_role ur on ur.role_id = r.role_id
 	        left join ms_sys_user u on u.user_id = ur.user_id
 	        left join ms_sys_dept d on u.dept_id = d.dept_id
     </sql>
     
-    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+    <select id="selectRoleList" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.del_flag = '0'
 		<if test="roleId != null and roleId != 0">
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
 		select r.role_id
         from ms_sys_role r
-	        left join ms_ms_sys_user_role ur on ur.role_id = r.role_id
+	        left join ms_sys_user_role ur on ur.role_id = r.role_id
 	        left join ms_sys_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
 	</select>
 		select role_id from ms_sys_role where role_name=#{roleName}
 	</select>
 
-	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+	<insert id="insertRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into ms_sys_role(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  		)
 	</insert>
 	
-	<update id="updateRole" parameterType="SysRole">
+	<update id="updateRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole">
  		update ms_sys_role
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>

ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
 
-	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
+	<resultMap type="com.ruoyi.system.domain.SysRoleMenu" id="SysRoleMenuResult">
 		<result property="roleId"     column="role_id"      />
 		<result property="menuId"     column="menu_id"      />
 	</resultMap>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-    <resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
         <id     property="userId"       column="user_id"      />
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="user_name"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
         <result property="specialty"       column="specialty"       />
-        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
+        <association property="dept"    javaType="com.ruoyi.common.core.domain.entity.SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
 	
-    <resultMap id="deptResult" type="SysDept">
+    <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
         <result property="deptName"  column="dept_name"   />
 
     </resultMap>
 	
-    <resultMap id="RoleResult" type="SysRole">
+    <resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
         <result property="roleKey"      column="role_key"       />
 		    left join ms_sys_role r on r.role_id = ur.role_id
     </sql>
     
-    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+    <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.specialty,u.id_card, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name,
 		 d.leader , r.role_id, r.role_name, d.dept_id
 		from ms_sys_user u
 		${params.dataScope}
 	</select>
 	
-	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+	<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.specialty,u.id_card, u.email, u.phonenumber, u.status, u.create_time
 	    from ms_sys_user u
 			 left join ms_sys_dept d on u.dept_id = d.dept_id
 		${params.dataScope}
 	</select>
 	
-	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+	<select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.specialty,u.id_card, u.email, u.phonenumber, u.status, u.create_time
 	    from ms_sys_user u
 			 left join ms_sys_dept d on u.dept_id = d.dept_id
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from ms_sys_user where email = #{email} and del_flag = '0' limit 1
-	</select>
-	<select id="selectUserListByAdRole" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name,u.specialty,u.id_card, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark from ms_sys_user u
-		 join ms_sys_user_role ur on ur.user_id =u.user_id
-		    join ms_sys_role r on ur.role_id = r.role_id and r.role_name='仲裁员'
-		where r.del_flag = '0' and r.status='0'
-		and u.del_flag = '0' and u.status='0'
-			<if test="arbitratorName != null and arbitratorName != ''">
-				AND u.nick_name like concat('%', #{arbitratorName}, '%')
-			</if>
-
-			<if test="idList != null and idList.size() > 0">
-				AND u.user_id in
-				<foreach item="id" collection="idList" open="(" separator="," close=")">
-					#{id}
-				</foreach>
-			</if>
-
-
 	</select>
 	<select id="selectUserListByIds" resultMap="SysUserResult">
 		select u.user_id,  u.nick_name, u.user_name,u.id_card,u.specialty, u.phonenumber, u.remark from ms_sys_user u
 	</select>
 
 
-    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+    <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser"useGeneratedKeys="true" keyProperty="userId">
  		insert into ms_sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
 		</foreach>;
 	</insert>
 
-    <update id="updateUser" parameterType="SysUser">
+    <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
  		update ms_sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
  		where user_id = #{userId}
 	</update>
 	
-	<update id="updateUserStatus" parameterType="SysUser">
- 		update ms_sys_user set status = #{status} where user_id = #{userId}
-	</update>
-	
-	<update id="updateUserAvatar" parameterType="SysUser">
+	<update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
  		update ms_sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
 	
-	<update id="resetUserPwd" parameterType="SysUser">
+	<update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
  		update ms_sys_user set password = #{password} where user_name = #{userName}
 	</update>
 	

ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
 
-	<resultMap type="SysUserPost" id="SysUserPostResult">
+	<resultMap type="com.ruoyi.system.domain.SysUserPost" id="SysUserPostResult">
 		<result property="userId"     column="user_id"      />
 		<result property="postId"     column="post_id"      />
 	</resultMap>

ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-	<resultMap type="SysUserRole" id="SysUserRoleResult">
+	<resultMap type="com.ruoyi.system.domain.SysUserRole" id="SysUserRoleResult">
 		<result property="userId"     column="user_id"      />
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
 		</foreach>
 	</insert>
 	
-	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+	<delete id="deleteUserRoleInfo" parameterType="com.ruoyi.system.domain.SysUserRole">
 		delete from ms_sys_user_role where user_id=#{userId} and role_id=#{roleId}
 	</delete>
 	

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casenumrule/CaseNumRuleMapper.xml

         <result column="dept_name_firchar" property="deptNameFirchar" />
     </resultMap>
 
-    <insert id="insertCaseNumRule" parameterType="CaseNumRule" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCaseNumRule" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule" useGeneratedKeys="true" keyProperty="id">
         insert into ms_case_num_rule(
         <if test="ruleType != null">rule_type,</if>
         <if test="prefixstr != null and prefixstr != '' ">prefixstr,</if>
         )
     </insert>
 
-    <update id="updateCaseNumRule" parameterType="CaseNumRule">
+    <update id="updateCaseNumRule" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule">
         update ms_case_num_rule
         <set>
             <if test="ruleType != null">rule_type = #{ruleType},</if>
             </if>
         </where>
     </update>
-    <delete id="deleteCaseNumRule" parameterType="CaseNumRule">
+    <delete id="deleteCaseNumRule" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule">
         delete from ms_case_num_rule where id = #{id}
     </delete>
 
-    <select id="selectCaseNumRules" parameterType="CaseNumRule" resultMap="BaseResultMap">
+    <select id="selectCaseNumRules" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule" resultMap="BaseResultMap">
         SELECT  id, rule_type ,prefixstr , date_format,dept_name,dept_name_firchar,current_num
         FROM  ms_case_num_rule
         <where>
         </where>
     </select>
 
-    <select id="selectCaseNumRule" parameterType="CaseNumRule" resultMap="BaseResultMap">
+    <select id="selectCaseNumRule" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.casenumrule.CaseNumRule" resultMap="BaseResultMap">
         SELECT  id, rule_type ,prefixstr , date_format,dept_name,dept_name_firchar,current_num
         FROM  ms_case_num_rule
         <where>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/DeptIdentifyMapper.xml

         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.dept.DeptIdentifyMapper">
-    <resultMap type="DeptIdentify" id="DeptIdentifyResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify" id="DeptIdentifyResult">
         <id     property="id"       column="id"      />
         <result property="identifyStatus"     column="identify_status"    />
         <result property="identifyDate"        column="identify_date"        />
     </resultMap>
 
 
-    <select id="selectDeptIdentify" parameterType="DeptIdentify" resultMap="DeptIdentifyResult">
+    <select id="selectDeptIdentify" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify" resultMap="DeptIdentifyResult">
         SELECT  id, identify_name ,identify_status , identify_date,is_use,org_id,auth_flow_id,
                 oper_name,oper_phone,identify_type,credit_code,legal_per_name,legal_per_phone
                ,identify_email,dept_id ,user_id
     </select>
 
 
-    <insert id="insertDeptIdentify" parameterType="DeptIdentify" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDeptIdentify" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify" useGeneratedKeys="true" keyProperty="id">
         insert into ms_dept_identify(
         <if test="identifyName != null and identifyName != ''">identify_name,</if>
         <if test="identifyStatus != null">identify_status,</if>
 
 
 
-    <update id="updateDeptIdentify" parameterType="DeptIdentify">
+    <update id="updateDeptIdentify" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify">
         update ms_dept_identify
         <set>
             <if test="identifyDate != null">identify_date = #{identifyDate},</if>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/SealManageMapper.xml

         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.dept.SealManageMapper">
-    <resultMap type="SealManage" id="SealManageResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage" id="SealManageResult">
         <id     property="id"       column="id"      />
         <result property="identifyId"     column="identify_id"    />
         <result property="sealName"        column="seal_name"        />
         <result property="isUse"     column="is_use"     />
     </resultMap>
 
-    <select id="selectSealList" parameterType="SealManage" resultMap="SealManageResult">
+    <select id="selectSealList" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage" resultMap="SealManageResult">
         SELECT  id, identify_id ,seal_name , seal_id,annex_id,seal_status,is_use
         FROM  ms_seal_manage
         <where>
     </select>
 
 
-    <insert id="insertSealManage" parameterType="SealManage" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSealManage" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage" useGeneratedKeys="true" keyProperty="id">
         insert into ms_seal_manage(
         <if test="identifyId != null">identify_id,</if>
         <if test="sealName != null and sealName != ''">seal_name,</if>
         )
     </insert>
 
-    <update id="updateSealManage" parameterType="SealManage">
+    <update id="updateSealManage" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage">
         update ms_seal_manage
         <set>
             <if test="identifyId != null">identify_id = #{identifyId},</if>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/miniprogress/IdentityAuthenticationMapper.xml

         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.miniprogress.IdentityAuthenticationMapper">
-    <resultMap type="IdentityAuthentication" id="IdentityAuthenticationResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication" id="IdentityAuthenticationResult">
         <id     property="id"       column="id"      />
         <result property="name"       column="name"      />
         <result property="identityNo"     column="identity_no"    />
 
     </resultMap>
 
-    <insert id="insertIdentityAuthentication" parameterType="IdentityAuthentication" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertIdentityAuthentication" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication" useGeneratedKeys="true" keyProperty="id">
         insert into ms_identi_authenti(
         <if test="userId != null">user_id,</if>
         <if test="idAddress != null and idAddress != ''">id_address,</if>
         where id = #{id}
     </update>
 
-    <select id="selectIdentityAuthentication" parameterType="IdentityAuthentication" resultMap="IdentityAuthenticationResult">
+    <select id="selectIdentityAuthentication" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication" resultMap="IdentityAuthenticationResult">
         SELECT  i.id ,i.name ,i.identity_no ,i.certification_time ,i.certification_status ,i.user_id ,i.user_name
         from ms_identi_authenti i
         <where>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateLogMapper.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.mscase.MsCaseAffiliateLogMapper">
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseAffiliateLogMapper">
   <resultMap id="BaseResultMap" type="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliateLog">
     <!--
       WARNING - @mbg.generated

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.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.mscase.MsCaseApplicationMapper">
+<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseApplicationMapper">
   <resultMap id="BaseResultMap" type="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication">
     <!--
       WARNING - @mbg.generated

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachLogMapper.xml

         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseAttachLogMapper">
-    <resultMap type="CaseAttach" id="CaseAttachResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach" id="CaseAttachResult">
         <id     property="annexId"       column="annex_id"      />
         <result property="caseAppliId"       column="case_appli_id"      />
         <result property="annexName"     column="annex_name"    />
         </where>
     </select>
 
-    <update id="updateCaseAttach" parameterType="CaseAttach">
+    <update id="updateCaseAttach" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach">
         update ms_case_attach_log
         set
             case_appli_log_id= #{caseAppliLogId}
         where annex_id = #{annexId}
     </update>
 
-    <update id="updateCaseAttachBycaseid" parameterType="CaseAttach" >
+    <update id="updateCaseAttachBycaseid" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach" >
         update ms_case_attach_log
         <set>
             <if test="annexName != null and annexName != ''">annex_name = #{annexName},</if>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachMapper.xml

         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseAttachMapper">
-    <resultMap type="CaseAttach" id="CaseAttachResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach" id="CaseAttachResult">
         <id     property="annexId"       column="annex_id"      />
         <result property="caseAppliId"       column="case_appli_id"      />
         <result property="annexName"     column="annex_name"    />
         </where>
     </select>
 
-    <update id="updateCaseAttach" parameterType="CaseAttach">
+    <update id="updateCaseAttach" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach">
         update ms_case_attach
         set
         case_appli_id= #{caseAppliId}
         where annex_id = #{annexId}
     </update>
 
-    <update id="updateCaseAttachBycaseid" parameterType="CaseAttach" >
+    <update id="updateCaseAttachBycaseid" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach" >
         update ms_case_attach
         <set>
             <if test="annexName != null and annexName != ''">annex_name = #{annexName},</if>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SendMailRecordMapper.xml

         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.sendrecord.SendMailRecordMapper">
 
-    <resultMap type="SendMailRecord" id="SendMailRecordResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord" id="SendMailRecordResult">
         <id     property="id"       column="id"      />
         <result property="mailName"       column="mail_name"      />
         <result property="mailContent"     column="mail_content"    />
 
     </resultMap>
 
-    <select id="selectSendMailRecord" parameterType="SendMailRecord" resultMap="SendMailRecordResult">
+    <select id="selectSendMailRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SendMailRecord" resultMap="SendMailRecordResult">
         SELECT s.id ,s.mail_name ,s.mail_content ,s.mail_address ,s.send_time ,s.case_id ,s.create_time ,s.create_by ,
         s.update_by ,s.update_time , s.send_status ,c.case_num
         from send_mail_record s left join ms_case_application c

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SmsRecordMapper.xml

         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper">
-    <resultMap type="SmsSendRecord" id="SmsSendRecordResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord" id="SmsSendRecordResult">
         <id     property="id"       column="id"      />
         <result property="caseId"       column="case_appli_id"      />
         <result property="caseNum"       column="case_num"      />
         <result property="updateBy"   column="update_by"  />
         <result property="sendStatus"   column="send_status"  />
     </resultMap>
-    <insert id="saveSmsSendRecord" parameterType="SmsSendRecord" useGeneratedKeys="true" keyProperty="id">
+    <insert id="saveSmsSendRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord" useGeneratedKeys="true" keyProperty="id">
 
         insert into sms_send_record(
         <if test="caseId != null ">case_appli_id,</if>
         </foreach>
     </insert>
 
-    <select id="getSmsSendRecord" parameterType="SmsSendRecord" resultMap="SmsSendRecordResult">
+    <select id="getSmsSendRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord" resultMap="SmsSendRecordResult">
 
         select id ,case_appli_id ,case_num ,phone ,send_time ,send_content,send_status
         from sms_send_record

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/FatchRuleMapper.xml

     <select id="listByTemplateId" resultMap="BaseResultMap">
         select f.id ,f.file_name ,f.start_content ,f.end_content ,
         f.`column` , ifnull(f.is_default,0) is_default ,f.`column_name`,ifnull(f.start_content_repeat_order,1) start_content_repeat_order,ifnull(f.end_content_repeat_order,1) end_content_repeat_order,ifnull(f.fatch_order,0) fatch_order
-         from ms_fatch_rule f join ms_template_fatch_rule tfr on f.id=tfr.ms_fatch_rule_id
+         from ms_fatch_rule f join ms_template_fatch_rule tfr on f.id=tfr.fatch_rule_id
         where tfr.template_id=#{templateId}
     </select>
 
-    <select id="selectFatchRuleList" parameterType="FatchRule" resultMap="BaseResultMap">
+    <select id="selectFatchRuleList" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule" resultMap="BaseResultMap">
         SELECT f.id ,f.file_name ,f.start_content ,f.end_content ,
         f.`column` ,f.is_default ,f.`column_name`,f.start_content_repeat_order,f.end_content_repeat_order,f.fatch_order
         FROM ms_template_fatch_rule tf
         left join ms_template_manage t on tf.template_id  = t.id
-        LEFT JOIN ms_fatch_rule f on tf.ms_fatch_rule_id  = f.id
+        LEFT JOIN ms_fatch_rule f on tf.fatch_rule_id  = f.id
         <where>
             <if test="templateId != null">
                 AND tf.template_id  = #{templateId}
         </where>
     </select>
 
-    <select id="selectColumnandComment"  parameterType="FatchRule"  resultMap="BaseResultMap">
+    <select id="selectColumnandComment"  parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule"  resultMap="BaseResultMap">
         select
             a.COLUMN_name as `column`,
             a.COLumn_comment as column_name
 
     </select>
 
-    <select id="selectColumnbycomment"  parameterType="FatchRule"  resultMap="BaseResultMap">
+    <select id="selectColumnbycomment"  parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule"  resultMap="BaseResultMap">
         select
               COLUMN_NAME
         from
     </select>
 
 
-    <select id="selectFatchRuleListIsDefault" parameterType="FatchRule" resultMap="BaseResultMap">
+    <select id="selectFatchRuleListIsDefault" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule" resultMap="BaseResultMap">
         SELECT f.id ,f.file_name ,f.start_content ,f.end_content ,
         f.`column` ,f.is_default ,f.`column_name`
         FROM ms_fatch_rule f
         </foreach>
     </delete>
 
-    <insert id="insertFatchRule" parameterType="FatchRule" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFatchRule" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule" useGeneratedKeys="true" keyProperty="id">
         insert into ms_fatch_rule(
         <if test="fileName != null and fileName != ''">file_name,</if>
         <if test="startContent != null and startContent != ''">start_content,</if>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateFatchRuleMapper.xml

         <result column="fatch_rule_id" property="fatchRuleId" />
     </resultMap>
 
-    <select id="selectTemplateFatchRulecount" parameterType="TemplateFatchRule"   resultType="Integer">
+    <select id="selectTemplateFatchRulecount" parameterType="com.ruoyi.wisdomarbitrate.domain.vo.template.TemplateFatchRule"   resultType="Integer">
         select count(1) from  ms_template_fatch_rule t
         <where>
             <if test="templateId != null">
         </where>
     </select>
 
-    <select id="selectTemplateFatchRuleList" parameterType="TemplateFatchRule" resultMap="BaseResultMap">
+    <select id="selectTemplateFatchRuleList" parameterType="com.ruoyi.wisdomarbitrate.domain.vo.template.TemplateFatchRule" resultMap="BaseResultMap">
         SELECT t.id ,t.template_id ,t.fatch_rule_id
         from ms_template_fatch_rule t
         <where>
 		delete from ms_template_fatch_rule where template_id=#{id}
 	</delete>
 
-    <insert id="insertTemplateFatchRule" parameterType="TemplateFatchRule" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTemplateFatchRule" parameterType="com.ruoyi.wisdomarbitrate.domain.vo.template.TemplateFatchRule" useGeneratedKeys="true" keyProperty="id">
         insert into ms_template_fatch_rule(
         <if test="templateId != null">template_id,</if>
         <if test="fatchRuleId != null">fatch_rule_id</if>

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/template/TemplateManageMapper.xml

         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.template.TemplateManageMapper">
-    <resultMap type="TemplateManage" id="TemplateManageResult">
+    <resultMap type="com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage" id="TemplateManageResult">
         <id     property="id"       column="id"      />
         <result property="identifyId"     column="identify_id"    />
         <result property="temName"        column="tem_name"        />
         <result property="fileName"     column="file_name"     />
     </resultMap>
 
-    <insert id="insertTemplateManage" parameterType="TemplateManage" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTemplateManage" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage" useGeneratedKeys="true" keyProperty="id">
         insert into ms_template_manage(
         <if test="identifyId != null">identify_id,</if>
         <if test="temName != null and temName != ''">tem_name,</if>
         )
     </insert>
 
-    <update id="updateTemplateManage" parameterType="TemplateManage">
+    <update id="updateTemplateManage" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage">
         update ms_template_manage
         <set>
             <if test="identifyId != null">identify_id = #{identifyId},</if>
         </where>
     </update>
 
-    <select id="selectTemplateList" parameterType="TemplateManage" resultMap="TemplateManageResult">
+    <select id="selectTemplateList" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage" resultMap="TemplateManageResult">
         SELECT  id, identify_id ,tem_name , tem_type,tem_format,tem_orig_path,tem_revis_path ,file_name
         FROM  ms_template_manage
         <where>