新增需求时服务内容禁用判断

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwRequirementApiController.java

@@ -25,6 +25,8 @@ import org.jeecg.modules.hlworder.entity.HlwRequirement;
 import org.jeecg.modules.hlworder.service.IHlwRequirementService;
 import org.jeecg.modules.hlwpayment.entity.HlwPayment;
 import org.jeecg.modules.hlwpayment.service.IHlwPaymentService;
+import org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractorInvoiceCategory;
+import org.jeecg.modules.hlwsubcontractor.service.IHlwSubcontractorInvoiceCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -54,6 +56,8 @@ public class HlwRequirementApiController extends JeecgController<HlwRequirement,
     private IHlwCpSettingService hlwCpSettingService;
     @Autowired
     private IHlwCompanyCpService hlwCompanyCpService;
+    @Autowired
+    private IHlwSubcontractorInvoiceCategoryService hlwSubcontractorInvoiceCategoryService;
 
     /**
      * 关联需求
@@ -114,6 +118,14 @@ public class HlwRequirementApiController extends JeecgController<HlwRequirement,
         Date requirementTime = jsonObject.getDate("requirementTime");
         String createBy = jsonObject.getString("createBy");
         HlwRequirement hlwRequirement = jsonObject.toJavaObject(HlwRequirement.class);
+        //查询服务内容是否被禁用
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("subcontractor_id",hlwRequirement.getSubcontractorId());
+        queryWrapper.eq("invoice_category_id",hlwRequirement.getInvoiceCategoryId());
+        HlwSubcontractorInvoiceCategory hlwSubcontractorInvoiceCategory=hlwSubcontractorInvoiceCategoryService.getOne(queryWrapper);
+        if(hlwSubcontractorInvoiceCategory.getIsOn()==0){
+            return Result.error("该服务内容已被禁用");
+        }
         HlwCompany hlwCompany=hlwCompanyService.getByCompanyCode(companyCode);
         hlwRequirement.setCompanyId(hlwCompany.getId());
         hlwRequirement.setCreateBy(createBy);