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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -103,6 +103,13 @@ public class CaseApplication  extends BaseEntity {
     /** 申请人主张违约金 */
     @Excel(name = "申请人主张违约金")
     private BigDecimal claimLiquidDamag;
+    /** 申请人请求仲裁庭裁决 */
+    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
+    private String requestRule;
+
+    /** 是否财产保全申请 */
+    @Excel(name = "是否财产保全申请",width = 26,combo= {"是","否"},readConverterExp = "0=否,1=是")
+    private Integer properPreser;
     /** 申请人仲裁请求及事实和理由 */
     @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
     private String arbitratClaims;
@@ -144,13 +151,10 @@ public class CaseApplication  extends BaseEntity {
     /** 是否需要开庭审理 */
     private Integer openCourtHear;
 
-    /** 申请人请求仲裁庭裁决 */
-    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
-    private String requestRule;
+
     /** 是否仲裁反请求 */
     private Integer adjudicaCounter;
-    /** 是否财产保全申请 */
-    private Integer properPreser;
+
     /** 被申请人是否缺席 */
     private Integer isAbsence;
     /** 是否管辖异议申请 */
@@ -594,14 +598,19 @@ public class CaseApplication  extends BaseEntity {
     /** 姓名 */
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
     private String name;
-
+    /** 身份证号 */
+    @Excel(name = "申请人主体信息-代码",width = 26)
+    private String identityNum;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人",width = 26)
+    private String compLegalPerson;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
+    private String compLegalperPost;
     /**
      * 申请人主体信息-申请人(机构)id
      */
     private String nameId;
-    /** 身份证号 */
-    @Excel(name = "申请人主体信息-代码",width = 26)
-    private String identityNum;
 
     /** 联系电话 */
     @Excel(name = "申请人主体信息-联系电话",width = 26)
@@ -609,19 +618,13 @@ public class CaseApplication  extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "申请人主体信息-联系地址",width = 26)
     private String contactAddress;
-
     /** 单位电话 */
     @Excel(name = "申请人主体信息-单位电话",width = 26)
     private String workTelphone;
     /** 单位地址 */
     @Excel(name = "申请人主体信息-单位地址",width = 26)
     private String workAddress;
-    /** 申请人主体信息-法定代表人 */
-    @Excel(name = "申请人主体信息-法定代表人",width = 26)
-    private String compLegalPerson;
-    /** 申请人主体信息-法定代表人 */
-    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
-    private String compLegalperPost;
+
     /** 申请人住所 */
     @Excel(name = "申请人主体信息-住所",width = 26)
     private String residenAffiliAppli;
@@ -677,7 +680,7 @@ public class CaseApplication  extends BaseEntity {
     @Excel(name = "被申请人主体信息-身份证号",width = 26)
     private String debtorIdentityNum;
     /** 被申请人主体信息-性别 */
-    @Excel(name = "被申请人主体信息-性别",width = 26)
+    @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,女=1")
     private String responSex;
 
     public Date getResponBirth() {

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

@@ -1824,33 +1824,47 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
      */
     @Override
     public String sendRoomNoMessage(SendRoomNoMessageVO messageVO) {
-        CaseAffiliate caseAffiliate = caseAffiliateMapper.selectCaseAffiliateByIdentityType(messageVO.getId(), 2);
-        if(null==caseAffiliate){
-            return "被申请人不存在";
+        CaseAffiliate caseAffiliateSelect=new CaseAffiliate();
+        caseAffiliateSelect.setCaseAppliId(messageVO.getId());
+        List<CaseAffiliate> caseAffiliates= caseAffiliateMapper.selectCaseAffiliate(caseAffiliateSelect);
+        if(CollectionUtil.isEmpty(caseAffiliates)){
+            return "申请人、被申请人不存在";
         }
         CaseApplication caseApplication = new CaseApplication();
         caseApplication.setId(messageVO.getId());
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
+        String returnResult="短信发送成功";
 
         //发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
         request.setTemplateId("1952136");
-        // 1948332 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
-        request.setPhone(caseAffiliate.getContactTelphone());
-        request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
-        if (SmsUtils.sendSms(request)){
-            //保存短信发送记录
-            SmsSendRecord smsSendRecord = new SmsSendRecord();
-            smsSendRecord.setCaseId(messageVO.getId());
-            smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
-            smsSendRecord.setPhone(request.getPhone());
-            smsSendRecord.setSendTime(new Date());
-            String content="尊敬的"+caseAffiliate.getName()+"用户，您的"+ caseApplicationselect.getCaseNum()+"仲裁案件，开庭审理房间号为"+ messageVO.getRoomNo()+"，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
-            smsSendRecord.setSendContent(content);
-            smsSendRecord.setCreateBy(getUsername());
-            smsRecordMapper.saveSmsSendRecord(smsSendRecord);
-        }
-        return "短信发送成功";
+        for (CaseAffiliate caseAffiliate : caseAffiliates) {
+            request.setPhone(caseAffiliate.getContactTelphone());
+            request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
+            // 1948332 普通短信 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。
+            if (SmsUtils.sendSms(request)){
+                //保存短信发送记录
+                SmsSendRecord smsSendRecord = new SmsSendRecord();
+                smsSendRecord.setCaseId(messageVO.getId());
+                smsSendRecord.setCaseNum(caseApplicationselect.getCaseNum());
+                smsSendRecord.setPhone(request.getPhone());
+                smsSendRecord.setSendTime(new Date());
+                String content="尊敬的"+caseAffiliate.getName()+"用户，您的"+ caseApplicationselect.getCaseNum()+"仲裁案件，开庭审理房间号为"+ messageVO.getRoomNo()+"，请在微信内打开https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 请知晓，如非本人操作，请忽略本短信。";
+                smsSendRecord.setSendContent(content);
+                String userName;
+                try {
+                    userName= getUsername();
+                } catch (Exception e) {
+                    userName="admin";
+                }
+                smsSendRecord.setCreateBy(userName);
+                smsRecordMapper.saveSmsSendRecord(smsSendRecord);
+            }else {
+                returnResult= "短信发送失败";
+            }
+        }
+        return returnResult;
+
     }
 
     @Override
@@ -1988,6 +2002,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             }
             String arbitratorName = caseApplication.getArbitratorName();
             datas.put("caseName", caseApplication.getCaseName());
+            datas.put("caseNum", caseApplication.getCaseNum());
             datas.put("arbitratorName", arbitratorName);
             Date hearDate = caseApplication.getHearDate();
             if (hearDate != null) {

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

@@ -150,6 +150,12 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                         }
                     }
                 }
+                //更改记录表里的支付状态和支付时间
+                CasePaymentRecord casePaymentRecord = new CasePaymentRecord();
+                casePaymentRecord.setPaymentStatus(1);
+                casePaymentRecord.setPaymentTime(new Date());
+                casePaymentRecord.setUpdateTime(new Date());
+                casePaymentRecordMapper.update(casePaymentRecord);
                 // 新增日志
                 CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CASE_CROSSEXAMI,"");
 

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

@@ -458,6 +458,7 @@
             <if test="caseDescribe != null  and caseDescribe != ''">case_describe = #{caseDescribe},</if>
             <if test="caseResult != null  and caseResult != ''">case_result = #{caseResult},</if>
             <if test="caseStatus != null">case_status = #{caseStatus},</if>
+            <if test="properPreser != null">proper_preser = #{properPreser},</if>
 
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>