合并 #96

Merged
wangqiong123 merged 3 commits from wq into dev 2023-10-15 10:55:03 +00:00
2 changed files with 10 additions and 7 deletions
Showing only changes of commit c91bbf834a - Show all commits
@@ -19,7 +19,7 @@ import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.EsignDemoException; import com.ruoyi.common.exception.EsignDemoException;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.WordUtil; import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.file.SaaSAPIFileUtils; import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
@@ -29,9 +29,6 @@ import com.ruoyi.common.exception.EsignDemoException;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils; import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SmsUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.wisdomarbitrate.domain.*; import com.ruoyi.wisdomarbitrate.domain.*;
@@ -56,6 +53,7 @@ import java.util.*;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.ruoyi.common.utils.PageUtils.startPage;
import static com.ruoyi.common.utils.SecurityUtils.getLoginUser; import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
import static com.ruoyi.common.utils.SecurityUtils.getUsername; import static com.ruoyi.common.utils.SecurityUtils.getUsername;
@@ -111,6 +109,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
SysUser sysUser = sysUserMapper.selectUserById(userId); SysUser sysUser = sysUserMapper.selectUserById(userId);
caseApplication.setIdCard(sysUser.getIdCard()); caseApplication.setIdCard(sysUser.getIdCard());
caseApplication.setUserId(String.valueOf(userId)); caseApplication.setUserId(String.valueOf(userId));
startPage();
for (SysRole role : roles) { for (SysRole role : roles) {
// 超级管理员和仲裁委(部门长)案件,可查看所有案件 √ // 超级管理员和仲裁委(部门长)案件,可查看所有案件 √
if(role.getRoleName().equals("超级管理员") if(role.getRoleName().equals("超级管理员")
@@ -251,6 +251,9 @@
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
<update id="updatePayType">
update case_application set pay_type=#{payType} where id = #{caseId}
</update>
<delete id="deletecaseApplication" parameterType="CaseApplication"> <delete id="deletecaseApplication" parameterType="CaseApplication">
delete from case_application where id = #{id} delete from case_application where id = #{id}
@@ -273,10 +276,10 @@
c.hear_date ,c.arbitrat_claims , c.hear_date ,c.arbitrat_claims ,
c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time , c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,d.dept_name as applicantName c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
from case_application c from case_application c
LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1 LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1
LEFT JOIN sys_dept d ON ca.NAME = d.dept_id and ca.name=d.dept_id
<where> <where>
<if test="id != null "> <if test="id != null ">
AND c.id = #{id} AND c.id = #{id}
@@ -305,7 +308,8 @@
p.payment_status , p.payment_status ,
CASE p.payment_status when 1 then '已支付' when 0 then '未支付' CASE p.payment_status when 1 then '已支付' when 0 then '未支付'
ELSE '无支付状态' ELSE '无支付状态'
END paymentStatusName END paymentStatusName,c.pay_type,
CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
from case_application c left join case_payment_record p on c.id = p.case_id from case_application c left join case_payment_record p on c.id = p.case_id
where c.case_status = 3 and p.payment_status = 1 where c.case_status = 3 and p.payment_status = 1
AND c.id = #{id} AND c.id = #{id}