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

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

@@ -37,7 +37,7 @@ public class WeChatUserController extends BaseController {
         if(StrUtil.isEmpty(userVO.getPhone())){
             return warn("手机号不能为空");
         }
-        return success(weChatUserService.sendCode(userVO));
+        return weChatUserService.sendCode(userVO);
     }
     /**
      * 小程序注册

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

@@ -85,6 +85,29 @@ public class CaseAffiliate   extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "联系地址")
     private String contactAddress;
+    /** 住所 */
+    @Excel(name = "住所")
+    private String residenAffili;
+    /** 申请人代理人职称 */
+    @Excel(name = "申请人代理人职称")
+    private String appliAgentTitle;
+
+    public String getResidenAffili() {
+        return residenAffili;
+    }
+
+    public void setResidenAffili(String residenAffili) {
+        this.residenAffili = residenAffili;
+    }
+
+    public String getAppliAgentTitle() {
+        return appliAgentTitle;
+    }
+
+    public void setAppliAgentTitle(String appliAgentTitle) {
+        this.appliAgentTitle = appliAgentTitle;
+    }
+
     /** 单位地址 */
     @Excel(name = "单位地址")
     private String workAddress;

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

@@ -80,7 +80,7 @@ public class CaseApplication  extends BaseEntity {
     @Excel(name = "申请人主张违约金")
     private BigDecimal claimLiquidDamag;
     /** 申请人仲裁请求及事实和理由 */
-    @Excel(name = "申请人仲裁请求及事实和理由")
+    @Excel(name = "申请人仲裁请求及事实和理由",width = 36)
     private String arbitratClaims;
     /** 仲裁应缴费用 */
     private BigDecimal feePayable;
@@ -121,7 +121,7 @@ public class CaseApplication  extends BaseEntity {
     private Integer openCourtHear;
 
     /** 申请人请求仲裁庭裁决 */
-    @Excel(name = "申请人请求仲裁庭裁决")
+    @Excel(name = "申请人请求仲裁庭裁决",width = 36)
     private String requestRule;
     /** 是否仲裁反请求 */
     private Integer adjudicaCounter;
@@ -562,6 +562,9 @@ public class CaseApplication  extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "申请人主体信息-联系地址",width = 26)
     private String contactAddress;
+    /** 申请人住所 */
+    @Excel(name = "申请人主体信息-住所",width = 26)
+    private String residenAffiliAppli;
     /** 单位电话 */
     @Excel(name = "申请人主体信息-单位电话",width = 26)
     private String workTelphone;
@@ -575,13 +578,41 @@ public class CaseApplication  extends BaseEntity {
     /** 身份证号 */
     @Excel(name = "申请人主体信息-代理人身份证号",width = 26)
     private String identityNumAgent;
+
     /** 联系电话 */
     @Excel(name = "申请人主体信息-代理人联系电话",width = 26)
     private String contactTelphoneAgent;
     /** 联系地址 */
     @Excel(name = "申请人主体信息-代理人联系地址",width = 26)
     private String contactAddressAgent;
-    /**
+    /** 申请人代理人职称 */
+    @Excel(name = "申请人主体信息-代理人职称",width = 26)
+    private String appliAgentTitle;
+
+    public String getResidenAffiliAppli() {
+        return residenAffiliAppli;
+    }
+
+    public void setResidenAffiliAppli(String residenAffiliAppli) {
+        this.residenAffiliAppli = residenAffiliAppli;
+    }
+
+    public String getAppliAgentTitle() {
+        return appliAgentTitle;
+    }
+
+    public void setAppliAgentTitle(String appliAgentTitle) {
+        this.appliAgentTitle = appliAgentTitle;
+    }
+
+    public String getResidenAffiliRespon() {
+        return residenAffiliRespon;
+    }
+
+    public void setResidenAffiliRespon(String residenAffiliRespon) {
+        this.residenAffiliRespon = residenAffiliRespon;
+    }
+/**
      * 被申请人主体信息
      */
     /** 姓名 */
@@ -635,6 +666,9 @@ public class CaseApplication  extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "被申请人主体信息-联系地址",width = 26)
     private String debtorContactAddress;
+    /** 被申请人住所 */
+    @Excel(name = "被申请人主体信息-住所",width = 26)
+    private String residenAffiliRespon;
     /** 单位电话 */
     @Excel(name = "被申请人主体信息-单位电话",width = 26)
     private String debtorWorkTelphone;

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java

@@ -11,7 +11,7 @@ import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO;
 public interface WeChatUserService {
 
 
-    String sendCode(WeChatUserVO userVO);
+    AjaxResult sendCode(WeChatUserVO userVO);
 
 
     AjaxResult registerUser(IdentityAuthentication ientityAuthentication);

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

@@ -420,7 +420,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 }
                 if (insertUserRow > 0) {
                     caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId()));
-                    // 发送短信 todo
+                    // 发送短信 1955400 普通短信 导入后通知申请人认证注册 尊敬的{1},您的申请的仲裁案件已导入，复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作，请忽略本短信 已生效
+                    SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
+                    request.setTemplateId("1955400");
+                    request.setPhone(agentUser.getPhonenumber());
+                    request.setTemplateParamSet(new String[]{agentUser.getNickName()});
+                    SmsUtils.sendSms(request);
                 }
             } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) {
                return "申请机构与申请代理人不匹配";
@@ -1541,6 +1546,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost());
         caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson());
 
+        caseAffiliate.setResidenAffili(caseApplication.getResidenAffiliAppli());
+        caseAffiliate.setAppliAgentTitle(caseApplication.getAppliAgentTitle());
         return caseAffiliate;
 
 
@@ -1603,6 +1610,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
         debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
         debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
+        debtorCaseAffiliate.setResidenAffili(caseApplication.getResidenAffiliRespon());
 
         return debtorCaseAffiliate;
     }

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

@@ -53,7 +53,7 @@ public class WeChatUserServiceImpl implements WeChatUserService {
     private IdentityAuthenticationMapper identityAuthenticationMapper;
 
     @Override
-    public String sendCode(WeChatUserVO userVO) {
+    public AjaxResult sendCode(WeChatUserVO userVO) {
 
         Random random = new Random();
         String code = "";
@@ -69,9 +69,10 @@ public class WeChatUserServiceImpl implements WeChatUserService {
         Boolean flag = SmsUtils.sendSms(request);
         if(flag){
             setCodeCache(userVO.getPhone(),code);
-            return "短信发送成功";
+            return AjaxResult.success("短信发送成功");
+        }else {
+            return AjaxResult.warn("短信发送失败");
         }
-        return "短信发送失败";
     }
     /**
      * 设置验证码缓存

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

@@ -27,12 +27,16 @@
         <result property="responSex"    column="respon_sex"   />
         <result property="responBirth"    column="respon_birth"   />
 
+        <result property="residenAffili"    column="residen_affili"   />
+        <result property="appliAgentTitle"    column="appli_agent_title"   />
+
     </resultMap>
 
     <select id="selectCaseAffiliate" parameterType="CaseAffiliate" 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.comp_legal_person,c.comp_legalper_post,c.respon_sex,c.respon_birth,
+        c.residen_affili,c.appli_agent_title,
         c.track_num,c.application_organ_id,c.application_organ_name
         from case_affiliate c
         <where>
@@ -61,11 +65,13 @@
         insert into case_affiliate(case_appli_id, identity_type,application_organ_id,application_organ_name,name,identity_num,contact_telphone,
         contact_address,work_address,work_telphone ,name_agent,identity_num_agent,contact_telphone_agent,
         comp_legal_person,comp_legalper_post,respon_sex ,respon_birth,
+        residen_affili,appli_agent_title,
         contact_address_agent ) values
         <foreach item="item" index="index" collection="list" separator=",">
             (#{item.caseAppliId},#{item.identityType},#{item.applicationOrganId},#{item.applicationOrganName},#{item.name},#{item.identityNum},#{item.contactTelphone},
             #{item.contactAddress},#{item.workAddress},#{item.workTelphone},  #{item.nameAgent},#{item.identityNumAgent},#{item.contactTelphoneAgent},
             #{item.compLegalPerson},#{item.compLegalperPost},#{item.responSex},  #{item.responBirth},
+            #{item.residenAffili},#{item.appliAgentTitle},
             #{item.contactAddressAgent})
         </foreach>
     </insert>

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

@@ -30,6 +30,11 @@
         <result property="updateTime"   column="update_time"  />
         <result property="arbitratMethodName"   column="arbitratMethodName"  />
 
+        <result property="isAbsence"   column="is_absence"  />
+        <result property="responCrossOpin"   column="respon_cross_opin"  />
+        <result property="applicaCrossOpin"   column="applica_cross_opin"  />
+        <result property="responDefenOpini"   column="respon_defen_opini"  />
+
         <result property="arbitratorId"   column="arbitrator_id"  />
         <result property="arbitratorName"   column="arbitrator_name"  />
         <result property="paymentStatus"   column="payment_status"  />
@@ -568,6 +573,7 @@
         c.hear_date ,c.arbitrat_claims ,
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.request_rule,c.adjudica_counter,c.proper_preser,
+        c.is_absence ,c.respon_cross_opin ,c.applica_cross_opin ,c.respon_defen_opini ,
         c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName
         from case_application c
         LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id and ca.identity_type=1