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

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -211,13 +211,16 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public int insertDept(SysDept dept)
     {
-        SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
-            throw new ServiceException("部门停用，不允许新增");
+        Long parentId = dept.getParentId();
+        if(parentId!=null){
+            SysDept info = deptMapper.selectDeptById(dept.getParentId());
+            // 如果父节点不为正常状态,则不允许新增子节点
+            if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+            {
+                throw new ServiceException("部门停用，不允许新增");
+            }
+            dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }
 

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

@@ -609,6 +609,7 @@ public class CaseApplication  extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "申请人主体信息-联系地址",width = 26)
     private String contactAddress;
+
     /** 单位电话 */
     @Excel(name = "申请人主体信息-单位电话",width = 26)
     private String workTelphone;

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

@@ -2100,8 +2100,26 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {
 //        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
+
         caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
-        int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
+        int rows = 0;
+        //同意组庭
+        if(isAgreePendTral!=null&&isAgreePendTral==1){
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        }else {
+            List<Arbitrator> arbitrators = caseApplication.getArbitrators();
+            // 仲裁员信息
+            if(arbitrators!=null&&arbitrators.size()>0){
+                List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
+                List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList());
+                String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(","));
+                String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(","));
+                caseApplication.setArbitratorId(idstr);
+                caseApplication.setArbitratorName(arbitratorNamestr);
+                rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+            }
+        }
 
         //发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java

@@ -77,7 +77,7 @@ public class FixSelectFlowDetailUtils {
                     caseApplication.setId(sealSignRecord.getCaseAppliId());
 
                     CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
-                    if(caseApplicationselect.getCaseStatus().intValue()==CaseApplicationConstants.SIGN_ARBITRATION){
+                    if((caseApplicationselect.getCaseStatus()!=null)&&(caseApplicationselect.getCaseStatus().intValue()==CaseApplicationConstants.SIGN_ARBITRATION)){
                         caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
                         caseApplicationMapper.submitCaseApplication(caseApplication);
 
@@ -85,8 +85,6 @@ public class FixSelectFlowDetailUtils {
                         sealSignRecord.setSignFlowStatus(2);
                         sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
                     }
-
-
                 }
                 if((psnsignStatus.intValue()==2)&&(orgsignStatus.intValue()==2)){
                     //更新立案申请状态为待送达
@@ -94,7 +92,7 @@ public class FixSelectFlowDetailUtils {
                     caseApplication.setId(sealSignRecord.getCaseAppliId());
 
                     CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
-                    if(caseApplicationselect.getCaseStatus().intValue()==CaseApplicationConstants.ARBITRATED_SEAL){
+                    if((caseApplicationselect.getCaseStatus()!=null)&&(caseApplicationselect.getCaseStatus().intValue()==CaseApplicationConstants.ARBITRATED_SEAL)){
                         caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
                         //下载审核完成的裁决书，
                         String signFlowId = sealSignRecord.getSignFlowid();
@@ -115,6 +113,7 @@ public class FixSelectFlowDetailUtils {
 
                         }
                     }
+
                 }
             }
 

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="deptName"   column="dept_name"   />
+		<result property="deptType"   column="dept_type"   />
 		<result property="orderNum"   column="order_num"   />
 		<result property="leader"     column="leader"      />
 		<result property="phone"      column="phone"       />
@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.dept_type,d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
         from sys_dept d
     </sql>
     
@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
     
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+		select d.dept_id, d.parent_id, d.ancestors, d.dept_name,d.dept_type, d.order_num, d.leader, d.phone, d.email, d.status,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}

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

@@ -97,6 +97,7 @@
         contact_telphone_agent = #{contactTelphoneAgent},
         contact_address_agent = #{contactAddressAgent},
         send_email = #{sendEmail},
+        residen_affili = #{residenAffili},
         track_num = #{trackNum}
 
         where id = #{id}