SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

功能优化

Browse Source
This commit is contained in:
18792927508
2024-04-18 09:32:37 +08:00
parent e5c8ebfb31
commit 6da9516d82
55 changed files with 1790 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/resources/com/ruoyi/system/mapper/log/MsRequestLogMapper.xml
+2 -1
View File
@@ -6,10 +6,11 @@
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="status" jdbcType="BIGINT" property="status" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="request_url" jdbcType="LONGVARCHAR" property="requestUrl" />
<result column="content" jdbcType="LONGVARCHAR" property="content" />
<result column="reason" jdbcType="LONGVARCHAR" property="reason" />
<result column="return_content" jdbcType="LONGVARCHAR" property="returnContent" />
</resultMap>
</mapper>
ruoyi-system/src/main/resources/com/ruoyi/system/mapper/sms/MsSmsSendHistoryRecordParamMapper.xml
+12
View File
@@ -0,0 +1,12 @@
<?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.sms.MsSmsSendHistoryRecordParamMapper">
<resultMap id="BaseResultMap" type="com.ruoyi.system.domain.entity.sms.MsSmsSendHistoryRecordParam">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="sms_record_history_id" jdbcType="BIGINT" property="smsRecordHistoryId" />
<result column="param_value" jdbcType="LONGVARCHAR" property="paramValue" />
</resultMap>
</mapper>
ruoyi-system/src/main/resources/com/ruoyi/system/mapper/sms/MsSmsSendRecordParamMapper.xml
+13
View File
@@ -0,0 +1,13 @@
<?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.sms.MsSmsSendRecordParamMapper">
<resultMap id="BaseResultMap" type="com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="sms_record_id" jdbcType="VARCHAR" property="smsRecordId" />
<result column="param" jdbcType="VARCHAR" property="param" />
<result column="param_value" jdbcType="LONGVARCHAR" property="paramValue" />
</resultMap>
</mapper>
ruoyi-system/src/main/resources/com/ruoyi/system/mapper/sms/MsSmsTemplateMapper.xml
+12
View File
@@ -0,0 +1,12 @@
<?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.sms.MsSmsTemplateMapper">
<resultMap id="BaseResultMap" type="com.ruoyi.system.domain.entity.sms.MsSmsTemplate">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="template_id" jdbcType="VARCHAR" property="templateId" />
<result column="name" jdbcType="VARCHAR" property="name" />
</resultMap>
</mapper>
ruoyi-system/src/main/resources/com/ruoyi/system/mapper/sms/MsSmsTemplateParamMapper.xml
+12
View File
@@ -0,0 +1,12 @@
<?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.sms.MsSmsTemplateParamMapper">
<resultMap id="BaseResultMap" type="com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="sms_template_id" jdbcType="VARCHAR" property="smsTemplateId" />
<result column="param" jdbcType="VARCHAR" property="param" />
</resultMap>
</mapper>
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+1 -1
View File
@@ -108,7 +108,7 @@
left join ms_sys_role_menu rm on m.menu_id = rm.menu_id
left join ms_sys_user_role ur on rm.role_id = ur.role_id
left join ms_sys_role r on r.role_id = ur.role_id
where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
where m.status = '0' and r.status = '0' and ur.user_id = #{userId} and m.perms is not null and m.perms!=''
</select>
<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+4 -1
View File
@@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="specialty" column="specialty" />
<result property="birth" column="birth" />
<result property="home" column="home" />
<result property="address" column="address" />
<!-- <collection property="dept" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult" />-->
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -52,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectUserVo">
select u.user_id, u.user_name, u.nick_name,u.specialty, u.id_card,u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card,u.id_type,u.nationality
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.birth,u.id_type,u.nationality,u.home,u.address
from ms_sys_user u
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml
+6 -6
View File
@@ -9,7 +9,7 @@
u.nickName name,
u.id_type idType,
r.role_name roleName,
GROUP_CONCAT( DISTINCT CASE WHEN c.organize_flag = 0 THEN u.nick_name ELSE d.dept_name END ) AS name,
GROUP_CONCAT( DISTINCT CASE WHEN a1.organize_flag = 0 THEN u.nick_name ELSE d.dept_name END ) AS name,
(select GROUP_CONCAT( DISTINCT u1.nick_name ) FROM
ms_case_affiliate a1
@@ -39,13 +39,13 @@
group by a.case_appli_id
</select>
<select id="selectByCaseId" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
u.email,
select c.id caseAppliId,r.role_id roleId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
u.email,u.user_name userName,
(case when a.user_id is null then d.dept_name else u.nick_name end) name,
(case when a.user_id is null then d.home else u.home end) home,
(case when a.user_id is null then d.address else u.address end) address,
(case when a.user_id is null then d.nationality else u.nationality end) nationality,
u.sex,u.id_type idType,u.birth,a.user_id userId,c.organize_flag organizeFlag,c.case_source caseSource,d.dept_name applicantOrgName
u.sex,u.id_type idType,u.birth,a.user_id userId,a.organize_flag organizeFlag,c.case_source caseSource,d.dept_name applicantOrgName
FROM
ms_case_application c
JOIN ms_case_affiliate a ON a.case_appli_id=#{id} and c.id = a.case_appli_id
@@ -54,7 +54,7 @@
LEFT JOIN ms_sys_role r ON r.role_id = ur.role_id
LEFT JOIN ms_sys_dept d ON d.dept_id = a.applicant_dept_id
where c.id = #{id}
GROUP BY a.id order by a.id asc
GROUP BY a.id,r.role_id order by a.id asc
</select>
<select id="selectUserRoleByCaseIds" resultType="com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate">
select c.id caseAppliId,a.id,a.role_type roleType,a.group_order groupOrder,a.operator_flag operatorFlag,d.code,d.comp_legal_person compLegalPerson,u.id_card idCard,u.phonenumber phone,
@@ -63,7 +63,7 @@
(case when a.user_id is null then d.home else u.home end) home,
(case when a.user_id is null then d.address else u.address end) address,
(case when a.user_id is null then d.nationality else u.nationality end) nationality,
u.sex,u.id_type idType,u.birth,r.role_name roleName,d.dept_name applicantOrgName,a.user_id userId,a.applicant_dept_id applicantDeptId,c.organize_flag organizeFlag,c.case_source caseSource
u.sex,u.id_type idType,u.birth,r.role_name roleName,d.dept_name applicantOrgName,a.user_id userId,a.applicant_dept_id applicantDeptId,a.organize_flag organizeFlag,c.case_source caseSource
FROM
ms_case_application c
JOIN ms_case_affiliate a ON c.id = a.case_appli_id
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml
+26 -2
View File
@@ -110,7 +110,7 @@
<select id="list" resultType="com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO">
select t.* from(
SELECT
c.id,c.organize_flag organizeFlag,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus,
c.id,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus,
c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum,
u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime,
c.mediation_method mediationMethod,
@@ -120,7 +120,7 @@
c.id
union
SELECT
c.id,c.organize_flag organizeFlag,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus,
c.id,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus,
c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum,
u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime,
c.mediation_method mediationMethod,
@@ -159,4 +159,28 @@
) t ORDER BY t.createTime desc,t.caseNum desc
</select>
<select id="countCasePerson" resultType="java.lang.Long">
select c.id from ms_case_application c where c.mediator_id
in
<foreach collection="userIds" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
union ALL
select a.id from ms_case_affiliate a where a.user_id
in
<foreach collection="userIds" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
union all
SELECT id from ms_dept_identify where user_id
in
<foreach collection="userIds" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</select>
<select id="selectCaseByDeptId" resultType="java.lang.Long">
select a.id from ms_case_affiliate a where a.applicant_dept_id=#{deptId}
union all
SELECT id from ms_dept_identify where dept_id=#{deptId}
</select>
</mapper>
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/sendrecord/SmsRecordMapper.xml
+45 -36
View File
@@ -5,28 +5,27 @@
<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper">
<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="phone" column="phone"/>
<result property="sendTime" column="send_time"/>
<result property="sendContent" column="send_content"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="sendStatus" column="send_status"/>
<result property="sid" column="sid"/>
<id property="id" column="id" />
<result property="caseId" column="case_appli_id" />
<result property="msSmsTemplateId" column="ms_sms_template_id" />
<result property="caseNum" column="case_num" />
<result property="phone" column="phone" />
<result property="sendTime" column="send_time" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="sendStatus" column="send_status" />
<result property="sid" column="sid" />
</resultMap>
<insert id="saveSmsSendRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord"
useGeneratedKeys="true" keyProperty="id">
<insert id="saveSmsSendRecord" parameterType="com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord" useGeneratedKeys="true" keyProperty="id">
insert into ms_sms_send_record(
<if test="caseId != null ">case_appli_id,</if>
<if test="caseNum != null ">case_num,</if>
<if test="phone != null and phone != ''">phone,</if>
<if test="sendTime != null ">send_time,</if>
<if test="sendContent != null ">send_content,</if>
<if test="msSmsTemplateId != null ">ms_sms_template_id,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="sendStatus != null ">send_status,</if>
sid,
@@ -37,7 +36,7 @@
<if test="caseNum != null ">#{caseNum},</if>
<if test="phone != null and phone != ''">#{phone},</if>
<if test="sendTime != null ">#{sendTime},</if>
<if test="sendContent != null ">#{sendContent},</if>
<if test="msSmsTemplateId != null ">#{msSmsTemplateId},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="sendStatus != null ">#{sendStatus},</if>
#{sid},
@@ -48,27 +47,27 @@
<insert id="batchSaveSmsSendRecord">
insert into ms_sms_send_record(
case_appli_id,
case_num,
phone,
send_time,
send_content,
create_by,
send_status,
case_appli_id,
case_num,
phone,
send_time,
ms_sms_template_id,
create_by,
send_status,
create_time,
sid,reason
)values
<foreach item="item" index="index" collection="list" separator=",">
(
#{item.caseId},
#{item.caseNum},
#{item.phone},
#{item.sendTime},
#{item.sendContent},
#{item.createBy},
#{item.sendStatus},
sysdate(),#{sid},#{reason}
)
(
#{item.caseId},
#{item.caseNum},
#{item.phone},
#{item.sendTime},
#{item.msSmsTemplateId},
#{item.createBy},
#{item.sendStatus},
sysdate(),#{sid},#{reason}
)
</foreach>
</insert>
@@ -97,10 +96,20 @@
reason=#{reason}
where sid = #{sid}
</update>
<update id="updateSendContent">
<update id="update">
update ms_sms_send_record
set send_content= #{sendContent},
update_time=#{updateTime}
<set>
<if test="caseId != null ">case_appli_id = #{caseId},</if>
<if test="caseNum != null and caseNum != '' ">case_num = #{caseNum},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
<if test="sendTime != null ">send_time = #{sendTime},</if>
<if test="msSmsTemplateId != null ">ms_sms_template_id = #{msSmsTemplateId},
</if>
<if test="sendStatus != null ">send_status = #{sendStatus},</if>
<if test="sid != null and sid != '' ">sid = #{sid},</if>
reason = #{reason}
</set>
where id = #{id}
</update>