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

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

@@ -439,5 +439,16 @@ public class CaseApplicationController extends BaseController {
         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-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java

@@ -114,4 +114,10 @@ public interface ICaseApplicationService {
 
     AjaxResult uploadCaseZipFile(MultipartFile file);
 
+    /**
+     * 根据附件id修改案件id
+     * @param caseAttach
+     * @return
+     */
+    AjaxResult updateCaseIdByAnnexId(CaseAttach caseAttach);
 }

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

@@ -184,7 +184,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                         || "部门长".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);
                 }
@@ -260,7 +260,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     || "部门长".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())) {
@@ -2127,14 +2127,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         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();
@@ -2143,20 +2140,15 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             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();
@@ -2164,13 +2156,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             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;
@@ -2955,6 +2941,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     }
 
+    /**
+     * 根据附件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/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -305,7 +305,7 @@
                 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=")">
@@ -676,13 +676,11 @@
 <!--                </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
@@ -708,37 +706,37 @@
         </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">
 
@@ -757,7 +755,7 @@
                 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=")">