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

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

     /** ID */
     private Long id;
     /** 案件编号 */
-    @Excel(name = "案件编号")
+//    @Excel(name = "案件编号")
     private String caseNum;
     /** 案件标的 */
     @Excel(name = "案件标的")
     /** 开庭日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hearDate;
-    /** 申请人仲裁诉求 */
-    private String arbitratClaims;
+
     /** 借款开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "借款开始日期")
     /** 申请人主张违约金 */
     @Excel(name = "申请人主张违约金")
     private BigDecimal claimLiquidDamag;
+    /** 申请人仲裁诉求 */
+    @Excel(name = "申请人仲裁诉求")
+    private String arbitratClaims;
     /** 仲裁应缴费用 */
     private BigDecimal feePayable;
 
     }
 
     /** 身份类型 */
-    @Excel(name = "身份类型")
+//    @Excel(name = "身份类型")
     private int identityType;
+    /**
+     * 申请人主体信息
+     */
     /** 姓名 */
-    @Excel(name = "姓名")
+    @Excel(name = "申请人主体信息-申请人姓名",width = 26)
     private String name;
     /** 身份证号 */
-    @Excel(name = "身份证号")
+    @Excel(name = "申请人主体信息-身份证号",width = 26)
     private String identityNum;
-    /** 单位电话 */
-    @Excel(name = "单位电话")
-    private String workTelphone;
+
     /** 联系电话 */
-    @Excel(name = "联系电话")
+    @Excel(name = "申请人主体信息-联系电话",width = 26)
     private String contactTelphone;
     /** 联系地址 */
-    @Excel(name = "联系地址")
+    @Excel(name = "申请人主体信息-联系地址",width = 26)
     private String contactAddress;
+    /** 单位电话 */
+    @Excel(name = "申请人主体信息-单位电话",width = 26)
+    private String workTelphone;
     /** 单位地址 */
-    @Excel(name = "单位地址")
+    @Excel(name = "申请人主体信息-单位地址",width = 26)
     private String workAddress;
 
     /** 代理人姓名 */
-    @Excel(name = "代理人姓名")
+    @Excel(name = "申请人主体信息-代理人姓名",width = 26)
     private String nameAgent;
     /** 身份证号 */
-    @Excel(name = "代理人身份证号")
+    @Excel(name = "申请人主体信息-代理人身份证号",width = 26)
     private String identityNumAgent;
     /** 联系电话 */
-    @Excel(name = "代理人联系电话")
+    @Excel(name = "申请人主体信息-代理人联系电话",width = 26)
     private String contactTelphoneAgent;
+    /** 联系地址 */
+    @Excel(name = "申请人主体信息-代理人联系地址",width = 26)
+    private String contactAddressAgent;
+    /**
+     * 被申请人主体信息
+     */
+    /** 姓名 */
+    @Excel(name = "被申请人主体信息-申请人姓名",width = 26)
+    private String debtorName;
+    /** 身份证号 */
+    @Excel(name = "被申请人主体信息-身份证号",width = 26)
+    private String debtorIdentityNum;
+
+    /** 联系电话 */
+    @Excel(name = "被申请人主体信息-联系电话",width = 26)
+    private String debtorContactTelphone;
+    /** 联系地址 */
+    @Excel(name = "被申请人主体信息-联系地址",width = 26)
+    private String debtorContactAddress;
+    /** 单位电话 */
+    @Excel(name = "被申请人主体信息-单位电话",width = 26)
+    private String debtorWorkTelphone;
+    /** 单位地址 */
+    @Excel(name = "被申请人主体信息-单位地址",width = 26)
+    private String debtorWorkAddress;
+
+    /** 代理人姓名 */
+    @Excel(name = "被申请人主体信息-代理人姓名",width = 26)
+    private String debtorNameAgent;
+    /** 身份证号 */
+    @Excel(name = "被申请人主体信息-代理人身份证号",width = 26)
+    private String debtorIdentityNumAgent;
+    /** 联系电话 */
+    @Excel(name = "被申请人主体信息-代理人联系电话",width = 26)
+    private String debtorContactTelphoneAgent;
+    /** 联系地址 */
+    @Excel(name = "被申请人主体信息-代理人联系地址",width = 26)
+    private String debtorContactAddressAgent;
 
     public int getIdentityType() {
         return identityType;
         this.contactAddressAgent = contactAddressAgent;
     }
 
-    /** 联系地址 */
-    @Excel(name = "代理人联系地址")
-    private String contactAddressAgent;
 
+    public String getDebtorName() {
+        return debtorName;
+    }
+
+    public void setDebtorName(String debtorName) {
+        this.debtorName = debtorName;
+    }
 
+    public String getDebtorIdentityNum() {
+        return debtorIdentityNum;
+    }
 
+    public void setDebtorIdentityNum(String debtorIdentityNum) {
+        this.debtorIdentityNum = debtorIdentityNum;
+    }
+
+    public String getDebtorContactTelphone() {
+        return debtorContactTelphone;
+    }
+
+    public void setDebtorContactTelphone(String debtorContactTelphone) {
+        this.debtorContactTelphone = debtorContactTelphone;
+    }
+
+    public String getDebtorContactAddress() {
+        return debtorContactAddress;
+    }
+
+    public void setDebtorContactAddress(String debtorContactAddress) {
+        this.debtorContactAddress = debtorContactAddress;
+    }
+
+    public String getDebtorWorkTelphone() {
+        return debtorWorkTelphone;
+    }
+
+    public void setDebtorWorkTelphone(String debtorWorkTelphone) {
+        this.debtorWorkTelphone = debtorWorkTelphone;
+    }
+
+    public String getDebtorWorkAddress() {
+        return debtorWorkAddress;
+    }
+
+    public void setDebtorWorkAddress(String debtorWorkAddress) {
+        this.debtorWorkAddress = debtorWorkAddress;
+    }
+
+    public String getDebtorNameAgent() {
+        return debtorNameAgent;
+    }
+
+    public void setDebtorNameAgent(String debtorNameAgent) {
+        this.debtorNameAgent = debtorNameAgent;
+    }
+
+    public String getDebtorIdentityNumAgent() {
+        return debtorIdentityNumAgent;
+    }
+
+    public void setDebtorIdentityNumAgent(String debtorIdentityNumAgent) {
+        this.debtorIdentityNumAgent = debtorIdentityNumAgent;
+    }
+
+    public String getDebtorContactTelphoneAgent() {
+        return debtorContactTelphoneAgent;
+    }
+
+    public void setDebtorContactTelphoneAgent(String debtorContactTelphoneAgent) {
+        this.debtorContactTelphoneAgent = debtorContactTelphoneAgent;
+    }
+
+    public String getDebtorContactAddressAgent() {
+        return debtorContactAddressAgent;
+    }
+
+    public void setDebtorContactAddressAgent(String debtorContactAddressAgent) {
+        this.debtorContactAddressAgent = debtorContactAddressAgent;
+    }
 
     public Long getId() {
         return id;

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseLogVO.java

+package com.ruoyi.wisdomarbitrate.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description 案件操作日志实体
+ * @Author wangqiong
+ * @Date 2023/10/09 15:18
+ * @Version V1.0
+ **/
+@Data
+public class CaseLogVO {
+    /**日志id*/
+    private String logId;
+    /**操作人id*/
+    private String operatorId;
+    /**操作人名称*/
+    private String operatorName;
+    /**操作人ip*/
+    private String ip;
+    /**操作时间*/
+    private Date operateTime;
+    /**操作明细*/
+    private String operateDetail;
+    /**操作类型*/
+    private String operateType;
+}

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

 
 import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
     CaseApplication selectCaseApplication(CaseApplication caseApplication);
 
     CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
+
+    /**
+     * 查询最大编号
+     * @param caseNum
+     * @param length
+     * @return
+     */
+    Integer selectCaseNumLike(@Param("caseNum") String caseNum, @Param("length") int length);
 }

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

 package com.ruoyi.wisdomarbitrate.service.impl;
 
+
 import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.ruoyi.common.core.domain.AjaxResult.error;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toCollection;
 
 @Service
 public class CaseApplicationServiceImpl implements ICaseApplicationService {
         BigDecimal feeRate = new BigDecimal(0.01);
         BigDecimal feePayable  = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2,BigDecimal.ROUND_HALF_UP);
         caseApplication.setFeePayable(feePayable);
+        // 获取自动编码
+        String caseNum = generateCaseNum();
+        caseApplication.setCaseNum(caseNum);
 
         int rows = caseApplicationMapper.insertCaseApplication(caseApplication);
         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
         return rows;
     }
 
+    /**
+     * 获取自动编码
+     * @return
+     */
+
+    private String generateCaseNum() {
+        // 自动编码格式 zc+yyyyMMdd+001
+        String currentDay = DateUtils.dateTime();
+        String caseNum = "zc"+ currentDay;
+        //查询出当天的案件编号的最大值
+            Integer maxCaseNum =  caseApplicationMapper.selectCaseNumLike(caseNum,caseNum.length());
+        if(null == maxCaseNum){
+            caseNum = caseNum + "001";
+        }else {
+            caseNum = caseNum + String.format("%03d", maxCaseNum);
+        }
+        return caseNum;
+
+    }
+
     @Override
     public int selectCaseApplicationCount(CaseApplication caseApplication) {
         return caseApplicationMapper.selectCaseApplicationCount(caseApplication);
     @Override
     @Transactional
     public int editCaseApplication(CaseApplication caseApplication) {
+        //根据仲裁费用计费规则计算应缴费用
+        //暂时设置计费比率为0.01
+        BigDecimal feeRate = new BigDecimal(0.01);
+        BigDecimal feePayable  = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2,BigDecimal.ROUND_HALF_UP);
+        caseApplication.setFeePayable(feePayable);
+
         int rows = caseApplicationMapper.updataCaseApplication(caseApplication);
         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
         if(caseAffiliates!=null&&caseAffiliates.size()>0){
             for (CaseAffiliate caseAffiliate : caseAffiliates){
+                caseAffiliate.setCaseAppliId(caseApplication.getId());
                 caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
             }
         }
+        List<CaseAttach> caseAttachList = caseApplication.getCaseAttachList();
+        if(caseAttachList!=null&&caseAttachList.size()>0){
+            for (CaseAttach caseAttach : caseAttachList){
+                caseAttach.setCaseAppliId(caseApplication.getId());
+                caseAttachMapper.updateCaseAttach(caseAttach);
+            }
+
+        }
 
         return rows;
     }
     @Override
     @Transactional
     public String importCaseApplication(List<CaseApplication> caseApplicationList,  String operName) {
-        StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
+        StringBuilder successMsg = new StringBuilder();
         int successNum = 0;
         int failureNum = 0;
         if(caseApplicationList!=null&&caseApplicationList.size()>0){
             List<CaseApplication> caseApplicationListinsert = new ArrayList<>();
             for (int i = 0; i < caseApplicationList.size(); i++){
                 CaseApplication caseApplication = caseApplicationList.get(i);
+                //根据仲裁费用计费规则计算应缴费用
+                //暂时设置计费比率为0.01
+                BigDecimal feeRate = new BigDecimal(0.01);
+                BigDecimal feePayable  = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2,BigDecimal.ROUND_HALF_UP);
+                caseApplication.setFeePayable(feePayable);
+
                 //赋值CaseApplication的案件关联人信息
                 List<CaseAffiliate> caseAffiliatesnew  = new ArrayList<>();
                 assignmentCaseAffiliates(caseApplication,caseAffiliatesnew);
 
-                int caseApplicationCount = selectCaseApplicationCount(caseApplication);
-                if(caseApplicationCount>0){
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、立案编号 " + caseApplication.getCaseNum() + " 已存在");
-                }else {
-                    caseApplicationListinsert.add(caseApplication);
-                }
+//                int caseApplicationCount = selectCaseApplicationCount(caseApplication);
+//                if(caseApplicationCount>0){
+//                    failureNum++;
+//                    failureMsg.append("<br/>" + failureNum + "、立案编号 " + caseApplication.getCaseNum() + " 已存在");
+//                }else {
+//                    caseApplicationListinsert.add(caseApplication);
+//                }
+                caseApplicationListinsert.add(caseApplication);
             }
+
             if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){
-                List<CaseApplication> caseApplicationListinsertDiffer = caseApplicationListinsert.stream().collect(
-                        collectingAndThen(
-                                toCollection(() -> new TreeSet<>(Comparator.comparing(CaseApplication::getCaseNum))),
-                                ArrayList::new));
+//                List<CaseApplication> caseApplicationListinsertDiffer = caseApplicationListinsert.stream().collect(
+//                        collectingAndThen(
+//                                toCollection(() -> new TreeSet<>(Comparator.comparing(CaseApplication::getCaseNum))),
+//                                ArrayList::new));
 
 
                 //对不重复的立案对象集合的立案对象重新组装对应的案件关联人信息
-                if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){
-                    List<CaseApplication> caseApplicationNewList = new ArrayList<>();
-                    for (int i = 0; i < caseApplicationListinsertDiffer.size(); i++){
-                        CaseApplication caseApplicationinsertDiffer = caseApplicationListinsertDiffer.get(i);
+//                if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){
+                    List<CaseApplication> caseApplicationNewList = null;
+                    for (int i = 0; i < caseApplicationListinsert.size(); i++){
+                        caseApplicationNewList = new ArrayList<>();
+                        CaseApplication caseApplicationinsertDiffer = caseApplicationListinsert.get(i);
+                        // 设置自动编码
+                        caseApplicationinsertDiffer.setCaseNum(generateCaseNum());
                         List<CaseAffiliate> caseAffiliatesnew =  new ArrayList<>();
                         CaseApplication caseApplicationNew = new CaseApplication();
                         copyCaseApplication(caseApplicationinsertDiffer,caseApplicationNew);
                             CaseApplication caseApplicationItera = caseApplicationNewList.get(k);
                             // 新增立案信息
                             caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
+
                             int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
                             List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
                             if(caseAffiliates!=null&&caseAffiliates.size()>0){
                             successMsg.append("<br/>" + successNum + "、立案编号 " + caseApplicationItera.getCaseNum() + " 导入成功");
                         }
 
-                    }
+//                    }
 
                 }
 
         }else {
             throw new ServiceException("导入立案申请数据不能为空！");
         }
+        // 编号存在不导入
+        if(StringUtils.isNotEmpty(failureMsg)){
+            return failureMsg.append(successMsg).toString();
+        }else {
 
-        return  successMsg.toString();
+            return successMsg.toString();
+        }
     }
 
     @Override
     @Override
     public CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication) {
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplicationConfirm(caseApplication);
+        CaseAffiliate caseAffiliate = new CaseAffiliate();
+        caseAffiliate.setCaseAppliId(caseApplication.getId());
+        List<CaseAffiliate> caseAffiliatListeselect = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
+        if(caseAffiliatListeselect!=null){
+            StringBuffer applicantName = new StringBuffer();
+            for (int i = 0; i < caseAffiliatListeselect.size(); i++){
+                CaseAffiliate caseAffiliateselect = caseAffiliatListeselect.get(i);
+                int identityType = caseAffiliateselect.getIdentityType();
+                if(identityType==1){
+                    applicantName.append(caseAffiliateselect.getName()).append(",");;
+                }
+            }
+            caseApplicationselect.setApplicantName(applicantName.toString());
 
+
+        }
         return caseApplicationselect;
     }
 
 
         //发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
-        request.setTemplateId("1931000");
+        request.setTemplateId("1947342");
 
         CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
         String caseNum = caseApplicationselect.getCaseNum();
                     Arbitrator arbitratorselect = arbitratorList.get(i);
                     //给仲裁员发送短信通知
                     request.setPhone(arbitratorselect.getTelephone());
-                    // 1931000 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
+                    // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
                     String name = arbitratorselect.getArbitratorName();
                     request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
                     SmsUtils.sendSms(request);
                 int identityType = caseAffiliateselect.getIdentityType();
                 //给申请人、被申请人发送短信通知
                 request.setPhone(caseAffiliateselect.getContactTelphone());
-                // 1931000 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
+                // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
                 String name = caseAffiliateselect.getName();
                 request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
                 SmsUtils.sendSms(request);
 
     private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew) {
         CaseAffiliate caseAffiliate = new CaseAffiliate();
+
 //        BeanUtils.copyBeanProp(caseApplication,caseAffiliate);
         BeanUtils.copyBeanProp(caseAffiliate,caseApplication);
+        caseAffiliate.setIdentityType(1);
         caseAffiliatesnew.add(caseAffiliate);
+
+        // 组装被申请人信息
+        caseAffiliatesnew.add( buildDebtorInfo(caseApplication));
         caseApplication.setCaseAffiliates(caseAffiliatesnew);
     }
 
+    /**
+     * 组装被申请人信息
+     * @param caseApplication
+     * @return
+     */
+
+    private CaseAffiliate buildDebtorInfo(CaseApplication caseApplication) {
+        // 被申请人信息
+        CaseAffiliate debtorCaseAffiliate = new CaseAffiliate();
+        debtorCaseAffiliate.setCaseAppliId(caseApplication.getId());
+        debtorCaseAffiliate.setIdentityType(2);
+        debtorCaseAffiliate.setName(caseApplication.getDebtorName());
+        debtorCaseAffiliate.setIdentityNum(caseApplication.getDebtorIdentityNum());
+        debtorCaseAffiliate.setContactTelphone(caseApplication.getDebtorContactTelphone());
+        debtorCaseAffiliate.setContactAddress(caseApplication.getDebtorContactAddress());
+        debtorCaseAffiliate.setWorkTelphone(caseApplication.getDebtorWorkTelphone());
+        debtorCaseAffiliate.setWorkAddress(caseApplication.getDebtorWorkAddress());
+        debtorCaseAffiliate.setNameAgent(caseApplication.getDebtorNameAgent());
+        debtorCaseAffiliate.setIdentityNumAgent(caseApplication.getDebtorIdentityNumAgent());
+        debtorCaseAffiliate.setContactTelphoneAgent(caseApplication.getDebtorContactTelphoneAgent());
+        debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent());
+        return debtorCaseAffiliate;
+    }
+
     private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
         caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
         caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
         caseApplicationNew.setClaimInterestOwed(caseApplicationinsertDiffer.getClaimInterestOwed());
         caseApplicationNew.setClaimPrinciOwed(caseApplicationinsertDiffer.getClaimPrinciOwed());
         caseApplicationNew.setClaimLiquidDamag(caseApplicationinsertDiffer.getClaimLiquidDamag());
+        caseApplicationNew.setFeePayable(caseApplicationinsertDiffer.getFeePayable());
     }
 
 

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

 
 //                reqest.setInfoType("1");
 //                reqest.setInfoType("13");
-                reqest.setInfoType("2");
+//                reqest.setInfoType("2");
 
                 //获得身份认证结果
                 GetEidResultResponse respIdenAuth = clientIdenAuth.GetEidResult(reqest);

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

     <update id="updataCaseAffiliate" parameterType="CaseAffiliate">
         update case_affiliate
         set
+        case_appli_id=#{caseAppliId},
         identity_type= #{identityType},
         name = #{name},
         identity_num = #{identityNum},

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

                 </foreach>
             </if>
         </where>
-        order by c.create_time desc
+        order by c.create_time desc,c.case_num desc
     </select>
 
     <select id="selectCaseApplicationCount" parameterType="CaseApplication" resultType="int">
             AND c.id = #{id}
 
     </select>
-
-
-
+    <select id="selectCaseNumLike" resultType="java.lang.Integer">
+        select max(substring(case_num, #{length}+1,12)+1) as maxCaseNum
+        from case_application where case_num like CONCAT(#{caseNum},'%') ;
+    </select>
 
 
 </mapper>