Sfoglia il codice sorgente

修复庭审笔录生成功能

gy b 2 anni fa
parent
commit
9282d639b9

+ 4
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java Vedi File

42
      * 用户账户
42
      * 用户账户
43
      */
43
      */
44
     private String userName;
44
     private String userName;
45
-
45
+    /**
46
+     * 印章状态(0未启用,1已启用)
47
+     */
48
+    private Integer sealStatus;
46
 
49
 
47
 }
50
 }

+ 17
- 16
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Vedi File

131
      * @param caseApplication
131
      * @param caseApplication
132
      * @return
132
      * @return
133
      */
133
      */
134
-//    @Override
134
+    @Override
135
     public List<CaseApplication> selectCaseApplicationListByRole(CaseApplication caseApplication) {
135
     public List<CaseApplication> selectCaseApplicationListByRole(CaseApplication caseApplication) {
136
         // 获取登录用户
136
         // 获取登录用户
137
         LoginUser loginUser = getLoginUser();
137
         LoginUser loginUser = getLoginUser();
1773
                                                 sealIds.add(sealId);
1773
                                                 sealIds.add(sealId);
1774
                                             }
1774
                                             }
1775
                                         }
1775
                                         }
1776
-                                        EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord,sealIds);
1776
+                                        EsignHttpResponse response3 = SignAward.createByFile(sealSignRecord, sealIds);
1777
                                         JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
1777
                                         JSONObject jsonObject3 = JSONObject.parseObject(response3.getBody());
1778
                                         if (jsonObject3.getIntValue("code") == 0) {
1778
                                         if (jsonObject3.getIntValue("code") == 0) {
1779
                                             //获取签署流程ID
1779
                                             //获取签署流程ID
1905
         String returnResult = "短信发送成功";
1905
         String returnResult = "短信发送成功";
1906
         //todo 需要申请模板,申请人,被申请人发送短信通知
1906
         //todo 需要申请模板,申请人,被申请人发送短信通知
1907
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
1907
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
1908
-        String startFormat="";
1909
-        String  endFormat="";
1908
+        String startFormat = "";
1909
+        String endFormat = "";
1910
         // 创建房间短信通知
1910
         // 创建房间短信通知
1911
         if (messageVO.getScheduleStartTime() == null) {
1911
         if (messageVO.getScheduleStartTime() == null) {
1912
             request.setTemplateId("1983692");
1912
             request.setTemplateId("1983692");
1913
         } else {
1913
         } else {
1914
             String format = "yyyy/MM/dd HH:mm:ss"; // 目标格式
1914
             String format = "yyyy/MM/dd HH:mm:ss"; // 目标格式
1915
-            Date startDate =messageVO.getScheduleStartTime();
1915
+            Date startDate = messageVO.getScheduleStartTime();
1916
             Date endDate = messageVO.getScheduleEndTime();
1916
             Date endDate = messageVO.getScheduleEndTime();
1917
             SimpleDateFormat sdf = new SimpleDateFormat(format);
1917
             SimpleDateFormat sdf = new SimpleDateFormat(format);
1918
             startFormat = sdf.format(startDate);
1918
             startFormat = sdf.format(startDate);
1925
             request.setPhone(caseAffiliate.getContactTelphone());
1925
             request.setPhone(caseAffiliate.getContactTelphone());
1926
             request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + caseAffiliate.getUserId()});
1926
             request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + caseAffiliate.getUserId()});
1927
             // 1952136 普通短信 尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。
1927
             // 1952136 普通短信 尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请在浏览器打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓,如非本人操作,请忽略本短信。
1928
-            String userId = (null==caseAffiliate.getUserId()?"" : caseAffiliate.getUserId());
1929
-            if(messageVO.getScheduleStartTime()==null) {
1928
+            String userId = (null == caseAffiliate.getUserId() ? "" : caseAffiliate.getUserId());
1929
+            if (messageVO.getScheduleStartTime() == null) {
1930
                 // 1983692	开庭审理创建会议通知  尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。
1930
                 // 1983692	开庭审理创建会议通知  尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。
1931
                 request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId});
1931
                 request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId});
1932
-            }else {
1932
+            } else {
1933
                 //  1983711 开庭审理预约会议短信通知  尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},会议时间为{4},请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。
1933
                 //  1983711 开庭审理预约会议短信通知  尊敬的{1}用户,您的{2}仲裁案件,开庭审理房间号为{3},会议时间为{4},请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。
1934
-                request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId,startFormat+"-"+endFormat});
1934
+                request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo() + userId, startFormat + "-" + endFormat});
1935
             }
1935
             }
1936
             Boolean aBoolean = SmsUtils.sendSms(request);
1936
             Boolean aBoolean = SmsUtils.sendSms(request);
1937
             //保存短信发送记录
1937
             //保存短信发送记录
1941
             smsSendRecord.setPhone(request.getPhone());
1941
             smsSendRecord.setPhone(request.getPhone());
1942
             smsSendRecord.setSendTime(new Date());
1942
             smsSendRecord.setSendTime(new Date());
1943
             String content = "";
1943
             String content = "";
1944
-            if(messageVO.getScheduleStartTime()==null) {
1945
-                 content = "尊敬的" + caseAffiliate.getName() + "用户,您的" + caseApplicationselect.getCaseNum() + "仲裁案件,开庭审理房间号为" + messageVO.getRoomNo() + userId + ",请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。";
1946
-            }else {
1947
-                content = "尊敬的" + caseAffiliate.getName() + "用户,您的" + caseApplicationselect.getCaseNum() + "仲裁案件,开庭审理房间号为" + messageVO.getRoomNo() + userId +"会议时间为"+startFormat+"-"+endFormat+ ",请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。";
1944
+            if (messageVO.getScheduleStartTime() == null) {
1945
+                content = "尊敬的" + caseAffiliate.getName() + "用户,您的" + caseApplicationselect.getCaseNum() + "仲裁案件,开庭审理房间号为" + messageVO.getRoomNo() + userId + ",请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。";
1946
+            } else {
1947
+                content = "尊敬的" + caseAffiliate.getName() + "用户,您的" + caseApplicationselect.getCaseNum() + "仲裁案件,开庭审理房间号为" + messageVO.getRoomNo() + userId + "会议时间为" + startFormat + "-" + endFormat + ",请点击https://txroom.xayunmei.com/#/home, 请知晓,如非本人操作,请忽略本短信。";
1948
 
1948
 
1949
             }
1949
             }
1950
             smsSendRecord.setSendContent(content);
1950
             smsSendRecord.setSendContent(content);
2550
         bodyParams.put("scheduleStartTime", startTime);
2550
         bodyParams.put("scheduleStartTime", startTime);
2551
         bodyParams.put("scheduleEndTime", endTime);
2551
         bodyParams.put("scheduleEndTime", endTime);
2552
 
2552
 
2553
-        bodyParams.put("scheduleStartTime",startTime.getTime()/1000 );
2554
-        bodyParams.put("scheduleEndTime",endTime.getTime()/1000);
2553
+        bodyParams.put("scheduleStartTime", startTime.getTime() / 1000);
2554
+        bodyParams.put("scheduleEndTime", endTime.getTime() / 1000);
2555
         roomParams.put("roomType", 1);
2555
         roomParams.put("roomType", 1);
2556
         bodyParams.put("roomInfo", roomParams);
2556
         bodyParams.put("roomInfo", roomParams);
2557
         StringEntity postingString = new StringEntity(bodyParams.toString());
2557
         StringEntity postingString = new StringEntity(bodyParams.toString());
2600
     @Override
2600
     @Override
2601
     public void destroyRoomBack(String body, HttpServletRequest request) {
2601
     public void destroyRoomBack(String body, HttpServletRequest request) {
2602
         // todo 测试回调
2602
         // todo 测试回调
2603
-        reservedConferenceMapper.insert(new ReservedConference(999888L,body,null,null));
2603
+        reservedConferenceMapper.insert(new ReservedConference(999888L, body, null, null));
2604
         JSONObject jsonObject = (JSONObject) JSON.parse(body);
2604
         JSONObject jsonObject = (JSONObject) JSON.parse(body);
2605
         // 事件类型
2605
         // 事件类型
2606
         Integer eventType = jsonObject.getInteger("EventType");
2606
         Integer eventType = jsonObject.getInteger("EventType");
2617
 
2617
 
2618
     /**
2618
     /**
2619
      * 根据案件id查询已预约的会议
2619
      * 根据案件id查询已预约的会议
2620
+     *
2620
      * @param caseId
2621
      * @param caseId
2621
      * @return
2622
      * @return
2622
      */
2623
      */

+ 1
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Vedi File

118
         applicantName,
118
         applicantName,
119
         c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status
119
         c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status
120
         from case_application c
120
         from case_application c
121
-        LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id
121
+        LEFT JOIN (select * from case_affiliate where application_organ_id is not null ) ca ON ca.case_appli_id = c.id
122
         <where>
122
         <where>
123
             <if test="caseStatus != null">
123
             <if test="caseStatus != null">
124
                 AND c.case_status = #{caseStatus}
124
                 AND c.case_status = #{caseStatus}

+ 1
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml Vedi File

75
     </select>
75
     </select>
76
 
76
 
77
     <select id="selectDeptIdentifylistother" parameterType="DeptIdentify" resultMap="DeptIdentifyResult">
77
     <select id="selectDeptIdentifylistother" parameterType="DeptIdentify" resultMap="DeptIdentifyResult">
78
-        SELECT d.id ,d.dept_id ,d.user_id,d.identify_status ,d.is_use ,d.sealName ,d.sealId ,d.annexId
78
+        SELECT d.id ,d.dept_id ,d.user_id,d.identify_status ,d.is_use ,d.seal_name ,d.seal_id ,d.annex_id
79
         from dept_identify d
79
         from dept_identify d
80
         <where>
80
         <where>
81
             <if test="identifyStatus != null">
81
             <if test="identifyStatus != null">