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

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

@@ -123,5 +123,15 @@ public class AdjudicationController extends BaseController {
 
         return adjudicationService.getArchivesDetail(id);
     }
+    /**
+     * 根据案件id获取邮箱
+     * @param id 案件id
+     * @return
+     */
+    @GetMapping("/emailByCaseId")
+    public AjaxResult emailByCaseId(@RequestParam("id") Long id){
+
+        return adjudicationService.emailByCaseId(id);
+    }
 
 }

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

@@ -84,7 +84,7 @@ public class CaseApplicationController extends BaseController {
     public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
 
         caseApplication.setUpdateBy(getUsername());
-        return toAjax(caseApplicationService.editCaseApplication(caseApplication));
+        return success(caseApplicationService.editCaseApplication(caseApplication));
     }
 
     /**

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

@@ -31,6 +31,10 @@ public class CaseAffiliate   extends BaseEntity {
      * 法定代表人
      */
     private String compLegalPerson;
+    /**
+     * 邮箱
+     */
+    private String email;
     /**
      * 法定代表人职位
      */
@@ -45,6 +49,14 @@ public class CaseAffiliate   extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date responBirth;
 
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
     public Date getResponBirth() {
         return responBirth;
     }

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

@@ -631,6 +631,10 @@ public class CaseApplication  extends BaseEntity {
     @Excel(name = "申请人主体信息-住所",width = 26)
     private String residenAffiliAppli;
 
+    /** 申请人邮箱 */
+    @Excel(name = "申请人主体信息-邮箱",width = 26)
+    private String email;
+
 
     /** 代理人姓名 */
     @Excel(name = "申请人主体信息-代理人姓名",width = 26)
@@ -739,6 +743,9 @@ public class CaseApplication  extends BaseEntity {
     /** 单位地址 */
     @Excel(name = "被申请人主体信息-单位地址",width = 26)
     private String debtorWorkAddress;
+    /** 邮箱 */
+    @Excel(name = "被申请人主体信息-邮箱",width = 26)
+    private String debtorEmail;
 
     /** 代理人姓名 */
     @Excel(name = "被申请人主体信息-代理人姓名",width = 26)
@@ -757,6 +764,22 @@ public class CaseApplication  extends BaseEntity {
      */
     private String applicationOrganId;
 
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getDebtorEmail() {
+        return debtorEmail;
+    }
+
+    public void setDebtorEmail(String debtorEmail) {
+        this.debtorEmail = debtorEmail;
+    }
+
     public String getApplicationOrganId() {
         return applicationOrganId;
     }

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

@@ -3,6 +3,7 @@ package com.ruoyi.wisdomarbitrate.mapper;
 import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +22,11 @@ public interface CaseAffiliateMapper {
     CaseAffiliate  selectCaseAffiliateByIdentityType(@Param("caseAppliId") Long caseAppliId, @Param("identityType")int identityType);
 
     int updataCaseAffiliate(CaseAffiliate caseAffiliate);
+
+    /**
+     * 根据案件查询邮箱
+     * @param id
+     * @return
+     */
+    List<CaseAffiliate> emailByCaseId(@Param("caseAppliId")Long id);
 }

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

@@ -25,4 +25,11 @@ public interface IAdjudicationService {
     AjaxResult getArchivesDetail(Long id);
 
     AjaxResult regenerationDocument(CaseApplication caseApplication);
+
+    /**
+     * 根据案件id查询邮箱
+     * @param id
+     * @return
+     */
+    AjaxResult emailByCaseId(Long id);
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.wisdomarbitrate.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.deepoove.poi.data.PictureRenderData;
@@ -7,6 +8,7 @@ import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
 import com.ruoyi.wisdomarbitrate.mapper.*;
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
 import com.ruoyi.common.utils.EmailOutUtil;
@@ -936,6 +938,24 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
         }
     }
 
+    @Override
+    public AjaxResult emailByCaseId(Long id) {
+        List<CaseAffiliate> list = caseAffiliateMapper.emailByCaseId(id);
+        BookSendVO bookSendVO = new BookSendVO();
+        if (CollectionUtil.isNotEmpty(list)) {
+            for (CaseAffiliate caseAffiliate : list) {
+                // 申请人邮箱
+                if (caseAffiliate.getIdentityType() == 1) {
+                    bookSendVO.setAppEmail(caseAffiliate.getEmail());
+                } else {
+                    // 被申请人邮箱
+                    bookSendVO.setResEmail(caseAffiliate.getEmail());
+                }
+            }
+        }
+        return AjaxResult.success(bookSendVO);
+    }
+
     public String getNewEquipmentNo() {
         Object awardNum = redisCache.getCacheObject("awardNum");
         if (awardNum == null) {

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

@@ -119,6 +119,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     // 手机号正则
     private static final Pattern TELEPHONE_REGX = Pattern.compile("^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$");
+   // 邮箱正则
+    private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$");
 
 
     /**
@@ -1414,6 +1416,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         } else if (caseApplication.getResponBirth().after(new Date())) {
             failureMsg.append("【被申请人主体信息-出生年月日】字段不合法,不能超过当前日期；");
         }
+        if (StrUtil.isEmpty(caseApplication.getDebtorEmail())) {
+            failureMsg.append("【被申请人主体信息-邮箱】字段不能为空；");
+        } else if(!EMAIL_PATTERN.matcher(caseApplication.getDebtorEmail()).matches()){
+
+            failureMsg.append("【被申请人主体信息-邮箱】字段不合法；");
+        }
     }
 
     /**
@@ -1514,6 +1522,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         } else if (caseApplication.getWorkAddress().length() > 50) {
             failureMsg.append("【申请人主体信息-单位地址】字段超出指定长度，最大长度为50；");
         }
+        if (StrUtil.isEmpty(caseApplication.getEmail())) {
+            failureMsg.append("【申请人主体信息-邮箱】字段不能为空；");
+        } else if(!EMAIL_PATTERN.matcher(caseApplication.getEmail()).matches()){
+
+            failureMsg.append("【申请人主体信息-邮箱】字段不合法；");
+        }
     }
 
     /**
@@ -2456,6 +2470,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
         caseAffiliate.setResidenAffili(caseApplication.getResidenAffiliAppli());
         caseAffiliate.setAppliAgentTitle(caseApplication.getAppliAgentTitle());
+        caseAffiliate.setEmail(caseApplication.getEmail());
         return caseAffiliate;
 
 
@@ -2520,6 +2535,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         debtorCaseAffiliate.setResponSex(caseApplication.getResponSex());
         debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth());
         debtorCaseAffiliate.setResidenAffili(caseApplication.getResidenAffiliRespon());
+        debtorCaseAffiliate.setEmail(caseApplication.getDebtorEmail());
 
         return debtorCaseAffiliate;
     }
@@ -2609,7 +2625,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
                     // 新增预约会议表
                     ReservedConference conference = new ReservedConference(reservedConferenceVO.getCaseId(), roomId,
-                            reservedConferenceVO.getScheduleStartTime(), reservedConferenceVO.getScheduleEndTime(), 1);
+                            reservedConferenceVO.getScheduleStartTime(), reservedConferenceVO.getScheduleEndTime(),1);
                     reservedConferenceMapper.insert(conference);
                     return AjaxResult.success("预约会议成功");
 
@@ -2637,7 +2653,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         String roomId = generateRoomId();
         // 新增预约会议表
         ReservedConference conference = new ReservedConference(caseId, roomId,
-                null, null, 0);
+                null, null,0);
         reservedConferenceMapper.insert(conference);
         return roomId;
     }
@@ -2651,7 +2667,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         // 查询最大房间号
         Integer maxRoomId = caseApplicationMapper.selectMaxRoomId();
 
-        if (null == maxRoomId || maxRoomId > 999999) {
+        if (null == maxRoomId || maxRoomId >999999) {
             return "000001";
         } else {
             return String.format("%06d", maxRoomId);
@@ -2699,7 +2715,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Override
     public AjaxResult deleteRoom(String roomId) {
 
-        return AjaxResult.success(reservedConferenceMapper.deleteByRoomId(roomId));
+        return AjaxResult.success( reservedConferenceMapper.deleteByRoomId(roomId));
     }
 }
 

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

@@ -61,6 +61,11 @@
             </if>
         </where>
     </select>
+    <select id="emailByCaseId" resultType="com.ruoyi.wisdomarbitrate.domain.CaseAffiliate">
+        select c.identity_type identityType,c.email
+        from case_affiliate c
+        where c.case_appli_id=#{caseAppliId}
+    </select>
 
 
     <insert id="batchCaseAffiliate">
@@ -68,13 +73,14 @@
         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
+        contact_address_agent,email ) 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})
+            #{item.contactAddressAgent},
+            #{item.email})
         </foreach>
     </insert>
 
@@ -100,6 +106,7 @@
         contact_address_agent = #{contactAddressAgent},
         send_email = #{sendEmail},
         residen_affili = #{residenAffili},
+        email= #{email},
         track_num = #{trackNum}
 
         where id = #{id}