Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.wisdomarbitrate;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -8,6 +9,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.WxAppletNotifyUtils;
 import com.ruoyi.wisdomarbitrate.domain.*;
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
@@ -37,6 +39,9 @@ public class CaseApplicationController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
     @GetMapping("/list")
     public TableDataInfo list(CaseApplication caseApplication) {
+        if(StrUtil.isEmpty(caseApplication.getSelectCaseStatus())){
+          caseApplication.setSelectCaseStatus("0");
+        }
         startPage();
         List<CaseApplication> list = caseApplicationService.selectCaseApplicationListByRole(caseApplication);
 //        List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);

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

@@ -55,6 +55,7 @@ public class WeChatUserController extends BaseController {
         ){
             return warn("参数校验失败");
         }
+        logger.info("调用小程序注册==="+ientityAuthentication.toString());
         return weChatUserService.registerUser(ientityAuthentication);
     }
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -9,6 +9,10 @@ import java.util.List;
 
 public class CaseApplication  extends BaseEntity {
     private static final long serialVersionUID = 1L;
+    /**
+     * 查询案件时区分是否待办案件，0待办案件，1已办案件
+     */
+    private String selectCaseStatus;
 
     /** ID */
     private Long id;
@@ -26,6 +30,14 @@ public class CaseApplication  extends BaseEntity {
     /** 仲裁方式 */
     private Integer arbitratMethod;
 
+    public String getSelectCaseStatus() {
+        return selectCaseStatus;
+    }
+
+    public void setSelectCaseStatus(String selectCaseStatus) {
+        this.selectCaseStatus = selectCaseStatus;
+    }
+
     public Integer getArbitratMethod() {
         return arbitratMethod;
     }
@@ -355,6 +367,10 @@ public class CaseApplication  extends BaseEntity {
      * 用户id
      */
     private String userId;
+    /**
+     * 登录用户用户名
+     */
+    private String loginUserName;
     private List<Long> deptIds;
     /**
      * 部门长状态
@@ -365,6 +381,14 @@ public class CaseApplication  extends BaseEntity {
      */
     private Integer financeStatus;
 
+    public String getLoginUserName() {
+        return loginUserName;
+    }
+
+    public void setLoginUserName(String loginUserName) {
+        this.loginUserName = loginUserName;
+    }
+
     public Integer getFinanceStatus() {
         return financeStatus;
     }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java

@@ -97,4 +97,11 @@ public interface CaseApplicationMapper {
      * @return
      */
     Long selectCaseIdByRoomId(@Param("roomId")String roomId);
+
+    /**
+     * 查询已办案件
+     * @param caseApplication
+     * @return
+     */
+    List<CaseApplication> selectHandledCase(CaseApplication caseApplication);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -112,50 +112,56 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         Long userId = user.getUserId();
         // 查询登录人身份证号
         SysUser sysUser = sysUserMapper.selectUserById(userId);
-        List<SysRole> roles = sysUser.getRoles();
+        // 已办案件
-        // 没有角色不能查看案件列表
+        if(caseApplication.getSelectCaseStatus().equals("1")){
-        if(CollectionUtil.isEmpty(roles)){
+            caseApplication.setLoginUserName(sysUser.getUserName());
-            throw new ServiceException("该用户没有角色权限");
+            return caseApplicationMapper.selectHandledCase(caseApplication);
-        }
+        }else { // 待办案件
-        startPage();
+            List<SysRole> roles = sysUser.getRoles();
-        for (SysRole role : roles) {
+            // 没有角色不能查看案件列表
-            // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √
+            if (CollectionUtil.isEmpty(roles)) {
-            if(role.getRoleName().equals("超级管理员")
+                throw new ServiceException("该用户没有角色权限");
-            ){
-                return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
             }
-            if(role.getRoleName().equals("仲裁委")
+            startPage();
-                    ||role.getRoleName().equals("部门长")){
+            for (SysRole role : roles) {
-                List<Integer> caseStatusList=new ArrayList<>();
+                // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √
-                caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
+                if (role.getRoleName().equals("超级管理员")
-                caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
+                ) {
-                caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
+                    return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
-                caseApplication.setDeptHeadStatus(caseStatusList);
+                }
+                if (role.getRoleName().equals("仲裁委")
+                        || role.getRoleName().equals("部门长")) {
+                    List<Integer> caseStatusList = new ArrayList<>();
+                    caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
+                    caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
+                    caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
+                    caseApplication.setDeptHeadStatus(caseStatusList);
+                }
+                if (role.getRoleName().equals("仲裁员")) {
+                    caseApplication.setUserId(String.valueOf(userId));
+                }
+                if (role.getRoleName().equals("财务")) {
+                    caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
+                }
+                if (role.getRoleName().equals("法律顾问")) {
+                    // 查询角色有关的用户部门
+                    List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
+                    caseApplication.setDeptIds(deptIds);
+                }
+                if (StrUtil.isEmpty(caseApplication.getNameId()) && role.getRoleName().equals("申请人")) {
+                    // 查询角色有关的用户部门
+                    caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
+                }
+                if (role.getRoleName().equals("被申请人")) {
+                    //
+                    caseApplication.setIdCard(String.valueOf(sysUser.getIdCard()));
+                }
             }
-            if(role.getRoleName().equals("仲裁员")){
-                caseApplication.setUserId(String.valueOf(userId));
-            }
-            if(role.getRoleName().equals("财务")){
-                caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
-            }
-            if(role.getRoleName().equals("法律顾问")){
-                // 查询角色有关的用户部门
-                List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
-                caseApplication.setDeptIds(deptIds);
-            }
-            if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
-                // 查询角色有关的用户部门
-                caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
-            }
-            if(role.getRoleName().equals("被申请人")){
-                //
-                caseApplication.setIdCard(String.valueOf(sysUser.getIdCard()));
-            }
-        }
 
 
-        // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件
+            // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件
-        return caseApplicationMapper.selectCaseApplicationList(caseApplication);
+            return caseApplicationMapper.selectCaseApplicationList(caseApplication);
+        }
 
     }
     @Override

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java

@@ -215,7 +215,6 @@ public class VideoServiceImpl implements VideoService {
     @Transactional
     public  String downloadImage(String fileId,String fileUrl,String roomId) throws IOException {
         String staticAndMksDir = null;
-        log.info("fileUrl========");
         if (fileUrl != null) {
             //下载时文件名称
             String fileName = fileUrl.substring(fileUrl.lastIndexOf("/"));
@@ -224,7 +223,6 @@ public class VideoServiceImpl implements VideoService {
                 String absPath = getAbsoluteFile(RuoYiConfig.getVideoUploadPath(), fileName).getAbsolutePath();
                 staticAndMksDir = Paths.get(absPath).toFile().toString();
                 HttpUtil.downloadFile(fileUrl, staticAndMksDir );
-            log.info("selectCaseIdByRoomId========");
             Long caseId= caseApplicationMapper.selectCaseIdByRoomId(roomId);
             String annexName = getPathFileName(RuoYiConfig.getVideoUploadPath(), fileName);
             // 存入数据库
@@ -233,7 +231,6 @@ public class VideoServiceImpl implements VideoService {
                     .annexPath(RuoYiConfig.getVideoUploadPath())
                     .annexType(9)
                     .build();
-            log.info("视频保存========");
              caseAttachMapper.save(caseAttach);
             return annexName;
         }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java

@@ -130,7 +130,6 @@ public class WeChatUserServiceImpl implements WeChatUserService {
 
         // 根据身份证查询系统用户表中是否存在该用户，存在则同步已认证的信息，不存在则新增
         SysUser sysUser=sysUserMapper.selectUserByIdCard(ientityAuthentication.getIdentityNo());
-
         if(sysUser!=null){
             sysUser.setIdCard(ientityAuthentication.getIdentityNo());
             sysUser.setNickName(ientityAuthentication.getName());
@@ -147,7 +146,7 @@ public class WeChatUserServiceImpl implements WeChatUserService {
             sysUser.setUserName(ientityAuthentication.getUserName());
             sysUser.setPhonenumber(ientityAuthentication.getPhone());
             sysUser.setEmail(ientityAuthentication.getEmail());
-            sysUser.setCreateBy(ientityAuthentication.getPhone());
+            sysUser.setCreateBy(ientityAuthentication.getUserName());
             sysUser.setPassword(SecurityUtils.encryptPassword(ientityAuthentication.getPassWord()));
             int row = sysUserMapper.insertUser(sysUser);
             if(row<1) {

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -46,7 +46,51 @@
         <result property="adjudicaCounter"   column="adjudica_counter"  />
         <result property="lockStatus"   column="lock_status"  />
     </resultMap>
+    <select id="selectHandledCase"  resultMap="CaseApplicationResult">
+        select DISTINCT(c.id) id,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
+        CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
+        ELSE '无审理方式'
+        END arbitratMethodName,
+        c.case_status ,
+        CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
+        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
+        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
+        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
+        when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
+        when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
+        when 31 then '待修改开庭时间'
+        ELSE '无案件状态'
+        END caseStatusName,
+        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.lock_status,
+        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
+        from case_log_record r
+        join case_application c on r.case_appli_id=c.id
+        LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
+        <where>
             
+            <if test="lockStatus != null">
+                AND c.lock_status = #{lockStatus}
+            </if>
+            <if test="caseNum != null and caseNum != ''">
+                AND c.case_num = #{caseNum}
+            </if>
+            <if test="nameId != null and nameId != ''">
+                AND ca.application_organ_id=#{nameId}  AND ca.identity_type=1
+            </if>
+            <if test="loginUserName != null and loginUserName != ''">
+                AND r.create_by=#{loginUserName}  AND ca.identity_type=1
+            </if>
+            <if test="caseStatusList != null and caseStatusList.size() > 0">
+                and r.case_node in
+                <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
+                    #{caseStatus}
+                </foreach>
+            </if>
+        </where>
+        order by c.create_time desc,c.case_num desc
+    </select>
     <select id="selectCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
         select t1.* from(
         select DISTINCT(t.id),t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method,
@@ -568,4 +612,5 @@
     </select>
 
 
+
 </mapper>