合并 #96
+3
-4
@@ -19,7 +19,7 @@ import com.ruoyi.common.core.domain.entity.*;
|
||||
import com.ruoyi.common.core.domain.model.LoginUser;
|
||||
import com.ruoyi.common.exception.EsignDemoException;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.utils.WordUtil;
|
||||
import com.ruoyi.common.utils.*;
|
||||
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.system.mapper.SysUserMapper;
|
||||
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.system.mapper.SysDeptMapper;
|
||||
import com.ruoyi.wisdomarbitrate.domain.*;
|
||||
@@ -56,6 +53,7 @@ import java.util.*;
|
||||
import java.util.regex.Pattern;
|
||||
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.getUsername;
|
||||
|
||||
@@ -111,6 +109,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
||||
SysUser sysUser = sysUserMapper.selectUserById(userId);
|
||||
caseApplication.setIdCard(sysUser.getIdCard());
|
||||
caseApplication.setUserId(String.valueOf(userId));
|
||||
startPage();
|
||||
for (SysRole role : roles) {
|
||||
// 超级管理员和仲裁委(部门长)案件,可查看所有案件 √
|
||||
if(role.getRoleName().equals("超级管理员")
|
||||
|
||||
@@ -251,6 +251,9 @@
|
||||
</set>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<update id="updatePayType">
|
||||
update case_application set pay_type=#{payType} where id = #{caseId}
|
||||
</update>
|
||||
|
||||
<delete id="deletecaseApplication" parameterType="CaseApplication">
|
||||
delete from case_application where id = #{id}
|
||||
@@ -273,10 +276,10 @@
|
||||
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.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
|
||||
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>
|
||||
<if test="id != null ">
|
||||
AND c.id = #{id}
|
||||
@@ -305,7 +308,8 @@
|
||||
p.payment_status ,
|
||||
CASE p.payment_status when 1 then '已支付' when 0 then '未支付'
|
||||
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
|
||||
where c.case_status = 3 and p.payment_status = 1
|
||||
AND c.id = #{id}
|
||||
|
||||
Reference in New Issue
Block a user