18792927508 пре 2 година
родитељ
комит
f0f65d0cf0

+ 1
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Прегледај датотеку

19
 import com.ruoyi.common.utils.poi.ExcelUtil;
19
 import com.ruoyi.common.utils.poi.ExcelUtil;
20
 import org.springframework.web.multipart.MultipartFile;
20
 import org.springframework.web.multipart.MultipartFile;
21
 
21
 
22
+import javax.annotation.security.PermitAll;
22
 import javax.servlet.http.HttpServletResponse;
23
 import javax.servlet.http.HttpServletResponse;
23
 import java.io.IOException;
24
 import java.io.IOException;
24
 import java.util.List;
25
 import java.util.List;

+ 2
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java Прегледај датотеку

3
 import lombok.Data;
3
 import lombok.Data;
4
 
4
 
5
 import javax.validation.constraints.NotEmpty;
5
 import javax.validation.constraints.NotEmpty;
6
+import javax.validation.constraints.NotNull;
6
 import java.io.Serializable;
7
 import java.io.Serializable;
7
 
8
 
8
 /**
9
 /**
13
 @Data
14
 @Data
14
 public class SendRoomNoMessageVO implements Serializable {
15
 public class SendRoomNoMessageVO implements Serializable {
15
     private static final long serialVersionUID = 1L;
16
     private static final long serialVersionUID = 1L;
16
-    @NotEmpty(message = "案件id不能为空")
17
+    @NotNull(message = "案件id不能为空")
17
     private Long id;
18
     private Long id;
18
     @NotEmpty(message = "房间号不能为空")
19
     @NotEmpty(message = "房间号不能为空")
19
     private String roomNo;
20
     private String roomNo;

+ 0
- 8
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ArbitratorMapper.java Прегледај датотеку

8
 public interface ArbitratorMapper {
8
 public interface ArbitratorMapper {
9
     List<Arbitrator> selectArbitratorList(Arbitrator arbitrator);
9
     List<Arbitrator> selectArbitratorList(Arbitrator arbitrator);
10
 
10
 
11
-    /**
12
-     * 根据案件id和身份类型查询案件关联人
13
-     * @param caseAppliId
14
-     * @param identityType
15
-     * @return
16
-     */
17
-    Arbitrator selectArbitratorById(@Param("caseAppliId") Long caseAppliId,@Param("identityType") Integer identityType);
18
-
19
 }
11
 }

+ 2
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java Прегледај датотеку

2
 
2
 
3
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
3
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
4
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
4
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
5
+import org.apache.ibatis.annotations.Param;
5
 
6
 
6
 import java.util.List;
7
 import java.util.List;
7
 
8
 
15
 
16
 
16
 
17
 
17
     List<CaseAffiliate>  selectCaseAffiliate(CaseAffiliate caseAffiliate);
18
     List<CaseAffiliate>  selectCaseAffiliate(CaseAffiliate caseAffiliate);
19
+    CaseAffiliate  selectCaseAffiliateByIdentityType(@Param("caseAppliId") Long caseAppliId, @Param("identityType")int identityType);
18
 
20
 
19
     int updataCaseAffiliate(CaseAffiliate caseAffiliate);
21
     int updataCaseAffiliate(CaseAffiliate caseAffiliate);
20
 }
22
 }

+ 5
- 5
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Прегледај датотеку

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

+ 0
- 16
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitratorMapper.xml Прегледај датотеку

36
 
36
 
37
         </where>
37
         </where>
38
     </select>
38
     </select>
39
-    <select id="selectArbitratorById" resultMap="ArbitratorResult">
40
-        select a.id ,a.arbitrator_name ,a.title ,a.career ,a.professi_classifi ,
41
-        a.education ,a.area ,a.telephone ,a.current_case_num ,a.closed_case_num
42
-        from arbitrator a
43
-        <where>
44
-            <if test="caseAppliId != null and caseAppliId != ''">
45
-                AND ca.ase_appliId=#{caseAppliId}
46
-            </if>
47
-
48
-            <if test="identityType != null and identityType != ''">
49
-                a.identity_type=#{identityType}
50
-            </if>
51
-
52
-        </where>
53
-    </select>
54
-
55
 
39
 
56
 </mapper>
40
 </mapper>

+ 14
- 0
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml Прегледај датотеку

33
             </if>
33
             </if>
34
         </where>
34
         </where>
35
     </select>
35
     </select>
36
+    <select id="selectCaseAffiliateByIdentityType"  resultMap="CaseAffiliateResult">
37
+        select c.id ,c.case_appli_id ,c.identity_type ,c.name ,c.identity_num ,c.contact_telphone ,c.contact_address ,
38
+        c.work_address ,c.work_telphone ,c.name_agent, c.identity_num_agent ,c.contact_telphone_agent ,c.contact_address_agent,
39
+        c.track_num
40
+        from case_affiliate c
41
+        <where>
42
+            <if test="caseAppliId != null ">
43
+                AND c.case_appli_id = #{caseAppliId}
44
+            </if>
45
+            <if test="caseAppliId != null ">
46
+                AND c.identity_type = #{identityType}
47
+            </if>
48
+        </where>
49
+    </select>
36
 
50
 
37
 
51
 
38
     <insert id="batchCaseAffiliate">
52
     <insert id="batchCaseAffiliate">