Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

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

         return caseApplicationService.uploadCaseZipFile(file);
     }
 
-
+    /**
+     * 根据附件id修改案件id
+     * @param caseAttach
+     * @return
+     */
+    @PostMapping("/updateCaseIdByAnnexId")
+    public AjaxResult updateCaseIdByAnnexId(@RequestBody CaseAttach caseAttach)  {
+        if(caseAttach.getAnnexId()==null || caseAttach.getCaseAppliId()==null){
+            return error("参数校验失败");
+        }
+        return caseApplicationService.updateCaseIdByAnnexId(caseAttach);
+    }
 }

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

     /**
      * 查询当前用户案件列表
      *
-     * @param identityNum
+     * @param caseStatus
      * @return
      */
     @GetMapping("/all")
-    public TableDataInfo getCaseListAll(@RequestParam(required = false) String identityNum) {
-        startPage();
-        List<CaseEvidenceVO> list = caseEvidenceService.getCaseListAll(identityNum);
-        if (list != null) {
-            return getDataTable(list);
-        }
-        return getDataTable(new ArrayList<>());
+    public AjaxResult getCaseListAll(@RequestParam("caseStatus") Integer caseStatus) {
+
+       return success(caseEvidenceService.getCaseListAll(caseStatus));
+
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java

 package com.ruoyi.wisdomarbitrate.domain.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class CaseEvidenceVO {
     /**
      * 案件状态
      */
     private Integer caseStatus;
+    /**
+     * 房间号
+     */
+    private Long roomId;
+    /**
+     * 开庭时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduleStartTime;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java

 
     AjaxResult uploadCaseZipFile(MultipartFile file);
 
+    /**
+     * 根据附件id修改案件id
+     * @param caseAttach
+     * @return
+     */
+    AjaxResult updateCaseIdByAnnexId(CaseAttach caseAttach);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java

 
     AjaxResult uploadEvidence(MultipartFile file, Integer annexType, Long id,String userName,Long userId);
 
-    List<CaseEvidenceVO> getCaseListAll(String identityNum);
+    List<CaseEvidenceVO> getCaseListAll(Integer caseStatus);
 
     AjaxResult evidenceConfirmation(CaseApplication caseApplication);
 

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

                         || "部门长".equals(role.getRoleName())) {
                     List<Integer> caseStatusList = new ArrayList<>();
                     caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
-                    caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
+                  //  caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
                     caseApplication.setDeptHeadStatus(caseStatusList);
                     caseApplication.setIsOtherRole(1);
                 }
                     || "部门长".equals(role.getRoleName())) {
                 caseApplication.setIsOtherRole(1);
                 caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
-                caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
+             //   caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
                 caseApplication.setDeptHeadStatus(caseStatusList);
             }
             if ("仲裁员".equals(role.getRoleName())) {
                 caseApplication.setDeptIds(deptIds);
             }
             if ("申请人".equals(role.getRoleName())) {
-                //  caseApplication.setIsOtherRole(1);
+                  caseApplication.setIsOtherRole(1);
                 // 查询角色有关的用户部门
                 caseApplication.setApplicationOrganId(String.valueOf(sysUser.getDeptId()));
             }
         caseApplication.setId(messageVO.getId());
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
         String returnResult = "短信发送成功";
-        //todo 需要申请模板，申请人，被申请人发送短信通知
+        // 需要申请模板，申请人，被申请人发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
         String startFormat = "";
         String endFormat = "";
         // 创建房间短信通知
-        if (messageVO.getScheduleStartTime() == null) {
-            request.setTemplateId("1983692");
-        } else {
             String format = "yyyy/MM/dd HH:mm:ss"; // 目标格式
             Date startDate = messageVO.getScheduleStartTime();
             Date endDate = messageVO.getScheduleEndTime();
             endFormat = sdf.format(endDate);
             // 预约会议短信模板
             request.setTemplateId("1983711");
-        }
+
 
         for (CaseAffiliate caseAffiliate : caseAffiliates) {
             request.setPhone(caseAffiliate.getContactTelphone());
             request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + caseAffiliate.getUserId()});
-            // 1952136 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
             String userId = (null == caseAffiliate.getUserId() ? "" : caseAffiliate.getUserId());
-            if (messageVO.getScheduleStartTime() == null) {
-                // 1983692	开庭审理创建会议通知  尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。
-                request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId});
-            } else {
-                //  1983711 开庭审理预约会议短信通知  尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。
-                request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId, startFormat + "-" + endFormat});
-            }
+            //  1983711 开庭审理预约会议短信通知  尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，会议时间为{4}，请点击https://txroom.xayunmei.com/#/home， 请知晓，如非本人操作，请忽略本短信。
+            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() , startFormat + "-" + endFormat});
+
             Boolean aBoolean = SmsUtils.sendSms(request);
             //保存短信发送记录
             SmsSendRecord smsSendRecord = new SmsSendRecord();
             smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
             smsSendRecord.setPhone(request.getPhone());
             smsSendRecord.setSendTime(new Date());
-            String content = "";
-            if (messageVO.getScheduleStartTime() == null) {
-                content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。";
-            } else {
-                content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo() + userId + "会议时间为" + startFormat + "-" + endFormat + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。";
-
-            }
+            String   content = "尊敬的" + caseAffiliate.getName() + "用户，您的" + caseApplicationselect.getCaseNum() + "仲裁案件，开庭审理房间号为" + messageVO.getRoomNo()  + "会议时间为" + startFormat + "-" + endFormat + "，请点击https://txroom.xayunmei.com/#/home, 请知晓，如非本人操作，请忽略本短信。";
             smsSendRecord.setSendContent(content);
 
             String userName;
         return null;
     }
 
+    /**
+     * 根据附件id修改案件id
+     * @param caseAttach
+     * @return
+     */
+    @Override
+    public AjaxResult updateCaseIdByAnnexId(CaseAttach caseAttach) {
+        caseAttachMapper.updateCaseAttach(caseAttach);
+        return success();
+    }
+
     public static List<String> findAndConvertPDF(File directory) {
         List<String> pdfPaths = new ArrayList<>();
         if (directory.isFile()) {

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

     IdentityAuthenticationMapper identityAuthenticationMapper;
 
     @Override
-    public List<CaseEvidenceVO> getCaseListAll(String identityNum) {
+    public List<CaseEvidenceVO> getCaseListAll(Integer caseStatus) {
         // 是否为超级管理员
         int adMinFlag=0;
-        if (StringUtils.isBlank(identityNum)) {
+        String identityNum = "";
             IdentityAuthentication authentication = new IdentityAuthentication();
             LoginUser loginUser = SecurityUtils.getLoginUser();
             // 查询该用户的角色
                   identityNum = authentication1.getIdentityNo();
               }
           }
-        }
-        List<Integer> caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI);
+
+        List<Integer> caseStatusList = Arrays.asList(caseStatus);
         return getCaseEvidenceVOList(identityNum, caseStatusList, 2);
     }
 
 
     private List<CaseEvidenceVO> getCaseEvidenceVOList(String identityNum, List<Integer> caseStatusList, Integer identityType) {
         List<CaseEvidenceVO> caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList, identityType);
+       // todo 返回房间号和开庭时间
         if (caseListByRespondent != null && caseListByRespondent.size() > 0) {
             for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) {
                 //根据案件id查询姓名

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

                 WHERE case_appli_id = c.id
                  )
                 WHERE
-                ca.identity_type=1 and c.case_status in (1,5,11,15,16,17,31)
+                ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31)
                 <if test="caseStatusList != null and caseStatusList.size() > 0">
                     and c.case_status in
                     <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
 <!--                </foreach> )-->
 <!--            </if>-->
             <!--申请人-->
-<!--            <if test="applicationOrganId != null and applicationOrganId != ''">-->
-<!--                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1-->
-<!--                &lt;!&ndash;暂时改为可以查询到生成裁决书之前所有的案件状态&ndash;&gt;-->
-<!--                and (t.case_status &lt;= 10 or t.case_status=31))-->
-<!--            &lt;!&ndash; and t.case_status in (0,2,17))&ndash;&gt;-->
+            <if test="applicationOrganId != null and applicationOrganId != ''">
+                or ( t.application_organ_id = #{applicationOrganId} AND t.identity_type=1
+                 and t.case_status in (0,2,17))
 
-<!--         </if>-->
+         </if>
          <!--部门长-->
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
                 or (t.identity_type=1 and t.case_status in
         </where>
             union
         </if>
-            <if test="applicationOrganId != null and applicationOrganId != ''">
-                <!--申请人案件-->
+<!--            <if test="applicationOrganId != null and applicationOrganId != ''">-->
+<!--                &lt;!&ndash;申请人案件&ndash;&gt;-->
 
-                select l.case_appli_id id ,
-                c.case_status,ca.application_organ_id,
-                c.arbitrator_id,ca.identity_num , ca.identity_type
-                from case_application c
-                JOIN case_application_log l ON c.id = l.case_appli_id
-                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1 and c.version=l.version
-                <where>
-                    (c.case_status &lt;= 10 or c.case_status=31) AND ca.identity_type=1
+<!--                select l.case_appli_id id ,-->
+<!--                c.case_status,ca.application_organ_id,-->
+<!--                c.arbitrator_id,ca.identity_num , ca.identity_type-->
+<!--                from case_application c-->
+<!--                JOIN case_application_log l ON c.id = l.case_appli_id-->
+<!--                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1 and c.version=l.version-->
+<!--                <where>-->
+<!--                    (c.case_status &lt;= 10 or c.case_status=31) AND ca.identity_type=1-->
 
-                    <if test="applicationOrganId != null and applicationOrganId != ''">
-                        AND ca.application_organ_id = #{applicationOrganId}
-                    </if>
-                    <if test="caseStatus != null">
-                        AND c.case_status = #{caseStatus}
-                    </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}
-                    </if>
+<!--                    <if test="applicationOrganId != null and applicationOrganId != ''">-->
+<!--                        AND ca.application_organ_id = #{applicationOrganId}-->
+<!--                    </if>-->
+<!--                    <if test="caseStatus != null">-->
+<!--                        AND c.case_status = #{caseStatus}-->
+<!--                    </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}-->
+<!--                    </if>-->
 
-                    <if test="lockStatus != null">
-                        AND c.lock_status = #{lockStatus}
-                    </if>
-                </where>
-                union
-            </if>
+<!--                    <if test="lockStatus != null">-->
+<!--                        AND c.lock_status = #{lockStatus}-->
+<!--                    </if>-->
+<!--                </where>-->
+<!--                union-->
+<!--            </if>-->
             <!--秘书案件-->
             <if test="deptIds != null and deptIds.size() > 0">
 
                 WHERE case_appli_id = c.id
                )
                 WHERE
-                ca.identity_type=1 and c.case_status in (1,5,11,15,16,17,31)
+                ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31)
                 <if test="deptIds != null and deptIds.size() > 0">
                     and ca.application_organ_id in
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">

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

         <id     property="id"       column="id"      />
         <result property="caseNum"       column="case_num"      />
         <result property="caseStatus"     column="case_status"    />
+        <result property="roomId"     column="room_id"    />
+        <result property="scheduleStartTime"     column="schedule_start_time"    />
     </resultMap>
     <select id="getCaseListByRespondent" resultType="CaseEvidenceVO" resultMap="CaseEvidenceVOResult">
-        select DISTINCT(c.id) id, c.case_num,c.case_status
-        from case_application as c  ,case_affiliate as d
+        select DISTINCT(c.id) id, c.case_num,c.case_status,rc.room_id,rc.schedule_start_time
+        from case_application as c  join case_affiliate as d on c.id = d.case_appli_id
+        left join reserved_conference rc on rc.case_id=c.id
         where c.id = d.case_appli_id
         <if test="identityNum != null and identityNum != ''">
             and d.identity_num = #{identityNum}