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

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;

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

@@ -3,6 +3,7 @@ package com.ruoyi.wisdomarbitrate.domain.vo;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -13,7 +14,7 @@ import java.io.Serializable;
 @Data
 public class SendRoomNoMessageVO implements Serializable {
     private static final long serialVersionUID = 1L;
-    @NotEmpty(message = "案件id不能为空")
+    @NotNull(message = "案件id不能为空")
     private Long id;
     @NotEmpty(message = "房间号不能为空")
     private String roomNo;

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

@@ -8,12 +8,4 @@ import java.util.List;
 public interface ArbitratorMapper {
     List<Arbitrator> selectArbitratorList(Arbitrator arbitrator);
 
-    /**
-     * 根据案件id和身份类型查询案件关联人
-     * @param caseAppliId
-     * @param identityType
-     * @return
-     */
-    Arbitrator selectArbitratorById(@Param("caseAppliId") Long caseAppliId,@Param("identityType") Integer identityType);
-
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.wisdomarbitrate.mapper;
 
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ public interface CaseAffiliateMapper {
 
 
     List<CaseAffiliate>  selectCaseAffiliate(CaseAffiliate caseAffiliate);
+    CaseAffiliate  selectCaseAffiliateByIdentityType(@Param("caseAppliId") Long caseAppliId, @Param("identityType")int identityType);
 
     int updataCaseAffiliate(CaseAffiliate caseAffiliate);
 }

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

@@ -461,8 +461,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
      */
     @Override
     public String sendRoomNoMessage(SendRoomNoMessageVO messageVO) {
-        Arbitrator arbitrator = arbitratorMapper.selectArbitratorById(messageVO.getId(), 2);
-        if(null==arbitrator){
+        CaseAffiliate caseAffiliate = caseAffiliateMapper.selectCaseAffiliateByIdentityType(messageVO.getId(), 2);
+        if(null==caseAffiliate){
             return "被申请人不存在";
         }
         CaseApplication caseApplication = new CaseApplication();
@@ -473,9 +473,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
         request.setTemplateId("1948332");
         // 1948332 普通短信 开庭审理房间号通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请知晓，如非本人操作，请忽略本短信。
-        request.setPhone(arbitrator.getTelephone());
-        request.setTemplateParamSet(new String[]{arbitrator.getArbitratorName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
-
+        request.setPhone(caseAffiliate.getContactTelphone());
+        request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
+        SmsUtils.sendSms(request);
 
         return "短信发送成功";
     }

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

@@ -36,21 +36,5 @@
 
         </where>
     </select>
-    <select id="selectArbitratorById" resultMap="ArbitratorResult">
-        select a.id ,a.arbitrator_name ,a.title ,a.career ,a.professi_classifi ,
-        a.education ,a.area ,a.telephone ,a.current_case_num ,a.closed_case_num
-        from arbitrator a
-        <where>
-            <if test="caseAppliId != null and caseAppliId != ''">
-                AND ca.ase_appliId=#{caseAppliId}
-            </if>
-
-            <if test="identityType != null and identityType != ''">
-                a.identity_type=#{identityType}
-            </if>
-
-        </where>
-    </select>
-
 
 </mapper>

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

@@ -33,6 +33,20 @@
             </if>
         </where>
     </select>
+    <select id="selectCaseAffiliateByIdentityType"  resultMap="CaseAffiliateResult">
+        select c.id ,c.case_appli_id ,c.identity_type ,c.name ,c.identity_num ,c.contact_telphone ,c.contact_address ,
+        c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
+        c.track_num
+        from case_affiliate c
+        <where>
+            <if test="caseAppliId != null ">
+                AND c.case_appli_id = #{caseAppliId}
+            </if>
+            <if test="caseAppliId != null ">
+                AND c.identity_type = #{identityType}
+            </if>
+        </where>
+    </select>
 
 
     <insert id="batchCaseAffiliate">