去除科目拦截

src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetBo.java

@@ -32,7 +32,6 @@ public class TbsBudgetBo implements Serializable {
     private String budgetCode;
 
     /** 科目id */
-    @NotNull(message = "科目id不能为空")
     private Long subjectId;
 
     /** 成本中心id */

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -194,7 +194,7 @@ public class TbsBudgetApplicationService {
         if(budgetIds.size()>0){
             LambdaQueryWrapper<TbsBudget> budgetLqw = new LambdaQueryWrapper<>();
             budgetLqw.in(TbsBudget::getId,budgetIds);
-            budgetLqw.in(TbsBudget::getSubjectId,subjectIds);
+            budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds)));
             budgetLqw.in(TbsBudget::getCenterId,centerIds);
             budgetLqw.eq(TbsBudget::getBudgetState,1);
             budgetList = tbsBudgetMapper.selectList(budgetLqw);
@@ -443,31 +443,19 @@ public class TbsBudgetApplicationService {
             if(!activityCostItem.getActivityId().equals(activity.getId())){
                 continue;
             }
-            //拦截非当前科目
+            //当前科目
-            Long subjectId = null;
+            Long subjectId = activityCostItem.getSubjectId();
-            for (TbsActivitySubject activitySubject : activitySubjects) {
-                if(activityCostItem.getSubjectId().equals(activitySubject.getSubjectId())){
-                    subjectId = activitySubject.getSubjectId();
-                    break;
-                }
-            }
             //拦截非当前成本中心
-            String centerId = null;
+            String centerId = activityCostItem.getCenterId();
-            String centerType = null;
+            String centerType = activityCostItem.getCenterType();
-            for (TbsActivityCenter activityCenter : activityCenterList) {
-                if(activityCostItem.getCenterId().equals(activityCenter.getCenterId())
-                        && activityCostItem.getCenterType().equals(activityCenter.getCenterType())){
-                    centerId = activityCenter.getCenterId();
-                    centerType = activityCenter.getCenterType();
-                    break;
-                }
-            }
             for (TbsBudget budget : currentItemBudgetList) {
-                if(!budget.getSubjectId().equals(subjectId) ||
+                if(!budget.getCenterId().equals(centerId) ||
-                        !budget.getCenterId().equals(centerId) ||
                         !budget.getCenterType().equals(centerType) ){
                     continue;
                 }
+                if(!subjectId.equals(budget.getSubjectId())&&budget.getSubjectId().equals(0L)){
+                    continue;
+                }
                 List<TbsScheduleItemBudget> scheduleItemBudgets = activity.getScheduleItemBudgetList();
                 for (TbsScheduleItemBudget scheduleItemBudget : scheduleItemBudgets) {
                     if(scheduleItemBudget.getBudgetId().equals(budget.getId())){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -67,6 +67,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void modify(TbsBudgetBo budgetBo) {
+        if(budgetBo.getSubjectId()==null){
+            budgetBo.setSubjectId(0L);
+        }
         TbsBudget budget;
         if(budgetBo.getId()!=null){
             budget = this.getById(budgetBo.getId());
@@ -79,7 +82,10 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         }else {
             budget = CopierUtil.copy(budgetBo,new TbsBudget());
         }
-        BmsSubject subject = subjectService.getById(budgetBo.getSubjectId());
+        BmsSubject subject = null;
+        if(budget.getSubjectId()!=0L){
+            subject = subjectService.getById(budgetBo.getSubjectId());
+        }
         TbsCenterDto centerDto = tbsCenterDtoService.getCenterDto(budgetBo.getCenterType(),budgetBo.getCenterId());
         TbsSchedule schedule = scheduleService.getById(budgetBo.getScheduleId());
         initEmptyBudget(budget,subject,centerDto,schedule);
@@ -475,15 +481,18 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
      * @param schedule
      */
     private void initEmptyBudget(TbsBudget budget,BmsSubject subject,TbsCenterDto centerDto,TbsSchedule schedule){
-        if(subject==null){
-            Assert.throwEx("科目不存在");
-        }
         if(schedule==null){
             Assert.throwEx("考核期不存在");
         }
+        if(subject!=null){
             budget.setSubjectId(subject.getId());
             budget.setSubjectCode(subject.getSubjectCode());
             budget.setSubjectName(subject.getSubjectName());
+        }else {
+            budget.setSubjectId(0L);
+            budget.setSubjectCode("");
+            budget.setSubjectName("");
+        }
         budget.setCenterId(centerDto.getId());
         budget.setCenterType(centerDto.getCenterType());
         budget.setCenterCode(centerDto.getCenterCode());