add shaoyin task

src/main/java/cn/cslg/pas/service/business/AdminProceedService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,11 +66,12 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addDto.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //行政诉讼书 4
-        reportAffairDTO.setAffairType(4);
         //发生时间是口审时间
         reportAffairDTO.setOccurredTime(addDto.getProceedingTime());
         //备注
@@ -139,6 +141,9 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 根据id查出行政记录
         AdminProceed al = this.getById(id);
         if (al == null) {
@@ -178,11 +183,12 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addJudgmentDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //行政诉讼判决书 5
-        reportAffairDTO.setAffairType(5);
         //发生时间是口审时间
         reportAffairDTO.setOccurredTime(addJudgmentDTO.getJudgmentTime());
         //备注
@@ -235,6 +241,9 @@ public class AdminProceedService extends ServiceImpl<AdminProceedMapper, AdminPr
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateJudgmentDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1.拿到报告事务id，获取法院判别书，并更新
         List<CourtOrder> courtOrders = courtOrderService.list(new LambdaQueryWrapper<CourtOrder>()
                 .eq(CourtOrder::getReportAffairId, reportAffairId)

src/main/java/cn/cslg/pas/service/business/InvalidDecisionFileService.java

@@ -63,11 +63,12 @@ public class InvalidDecisionFileService extends ServiceImpl<InvalidDecisionFileM
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addInvalidDecisionFileDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //无效决定书 3
-        reportAffairDTO.setAffairType(3);
         //发生时间是口审时间
         reportAffairDTO.setOccurredTime(addInvalidDecisionFileDTO.getInvalidDecisionTime());
         //备注
@@ -167,6 +168,9 @@ public class InvalidDecisionFileService extends ServiceImpl<InvalidDecisionFileM
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateInvalidDecisionFileDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 根据id查出无效决定书
         InvalidDecisionFile invalidDecisionFile = this.getById(id);
         if (invalidDecisionFile == null) {

src/main/java/cn/cslg/pas/service/business/InvalidRequestFileService.java

@@ -16,6 +16,7 @@ import cn.cslg.pas.service.report.SendReportMailService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,11 +60,12 @@ public class InvalidRequestFileService extends ServiceImpl<InvalidRequestFileMap
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addInvalidRequestFileDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //无效请求书 1
-        reportAffairDTO.setAffairType(1);
         //发生时间是无效请求日
         reportAffairDTO.setOccurredTime(addInvalidRequestFileDTO.getInvalidRequestDate());
         //备注
@@ -126,6 +128,9 @@ public class InvalidRequestFileService extends ServiceImpl<InvalidRequestFileMap
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateInvalidRequestFileDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 根据id查出无效请求书
         InvalidRequestFile invalidRequestFile = this.getById(id);
         if (invalidRequestFile == null) {

src/main/java/cn/cslg/pas/service/business/OralTrailService.java

@@ -18,6 +18,7 @@ import cn.cslg.pas.service.report.SendReportMailService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,11 +58,12 @@ public class OralTrailService extends ServiceImpl<OralTrailMapper, OralTrail> {
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addOralTrailDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //口审记录 0
-        reportAffairDTO.setAffairType(0);
         //发生时间是口审时间
         reportAffairDTO.setOccurredTime(addOralTrailDTO.getOralTrailTime());
         //备注
@@ -129,6 +131,9 @@ public class OralTrailService extends ServiceImpl<OralTrailMapper, OralTrail> {
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateOralTrailDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 根据id查出口审记录
         OralTrail oralTrail = this.getById(id);
         if (oralTrail == null) {

src/main/java/cn/cslg/pas/service/business/OtherDocumentsService.java

@@ -15,6 +15,7 @@ import cn.cslg.pas.service.report.SendReportMailService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,11 +58,12 @@ public class OtherDocumentsService extends ServiceImpl<OtherDocumentsMapper, Oth
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addOtherDocumentsDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //其他文档 8
-        reportAffairDTO.setAffairType(8);
         //发生时间是文档时间
         reportAffairDTO.setOccurredTime(addOtherDocumentsDTO.getDocumentTime());
         //备注
@@ -116,6 +118,9 @@ public class OtherDocumentsService extends ServiceImpl<OtherDocumentsMapper, Oth
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateOtherDocumentsDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 根据id查出其他文档
         OtherDocuments otherDocuments = this.getById(id);
         if (otherDocuments == null) {

src/main/java/cn/cslg/pas/service/business/ReportAffairService.java

@@ -414,11 +414,12 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addStateOpinionDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //陈述意见书 2
-        reportAffairDTO.setAffairType(2);
         //发生时间是无效请求日
         reportAffairDTO.setOccurredTime(addStateOpinionDTO.getStateReplyTime());
         //备注
@@ -464,6 +465,9 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateStateOpinionDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //2. 拿到报告事务id，获取报告事务
         ReportAffair reportAffair = this.getById(reportAffairId);
         reportAffair.setProjectId(projectId);
@@ -530,11 +534,12 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addClaimHistoryDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //权要修改历史 6
-        reportAffairDTO.setAffairType(6);
         //发生时间是无效请求日
         reportAffairDTO.setOccurredTime(addClaimHistoryDTO.getClaimHistoryTime());
         //备注
@@ -580,6 +585,9 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateClaimHistoryDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //2. 拿到报告事务id，获取报告事务
         ReportAffair reportAffair = this.getById(reportAffairId);
         reportAffair.setProjectId(projectId);
@@ -611,11 +619,12 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(addSupplyEvidenceDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
-        //补充证据及理由 7
-        reportAffairDTO.setAffairType(7);
         //发生时间是无效请求日
         reportAffairDTO.setOccurredTime(addSupplyEvidenceDTO.getSupplyEvidenceTime());
         //备注
@@ -661,6 +670,9 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(updateSupplyEvidenceDTO.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //2. 拿到报告事务id，获取报告事务
         ReportAffair reportAffair = this.getById(reportAffairId);
         reportAffair.setProjectId(projectId);
@@ -732,6 +744,9 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(vo.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //1. 首先上传报告事务,拿到报告事务id
         ReportAffairDTO reportAffairDTO = new ReportAffairDTO();
         reportAffairDTO.setProjectId(projectId);
@@ -780,6 +795,9 @@ public class ReportAffairService extends ServiceImpl<ReportAffairMapper, ReportA
         if (projectId == null) {
             throw new XiaoShiException("报告id为空");
         }
+        if (ObjectUtils.isEmpty(vo.getAssoCasePhaseId())) {
+            throw new XiaoShiException("案件流程阶段id为空");
+        }
         //2. 拿到报告事务id，获取报告事务
         ReportAffair reportAffair = this.getById(reportAffairId);
         reportAffair.setProjectId(projectId);