Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -963,6 +963,7 @@ public class TaskController {
         collect.add(-1);
         List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().in("task_id", collect));
         List<Integer> pids = list.stream().map(Task::getProjectId).collect(Collectors.toList());
+        pids.add(-1);
         List<Project> projectList = projectService.list(new QueryWrapper<Project>().in("id", pids));
         list.forEach(l->{
             List<TaskExecutor> executorList = taskExecutorList.stream().filter(tl -> tl.getTaskId().equals(l.getId())&&tl.getExecutorId()!=null).collect(Collectors.toList());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -11806,7 +11806,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<ServiceProduct> serviceProducts = projectServiceData.getServiceProducts();
             if(serviceProducts!=null&&serviceProducts.size()>0){
                 for (ServiceProduct serviceProduct : serviceProducts) {
-                    if(serviceProduct.getProductCategoryID().equals("901")&&serviceProduct.getBaseMeasureUnitCode().equals("HUR")){
+                    if(serviceProduct.getProductCategoryID().equals("901")&&serviceProduct.getBaseMeasureUnitCode().equals("HUR")&&serviceProduct.getSales().getLifeCycleStatusCode().equals("2")){
                         SapProjectService sapProjectService=new SapProjectService();
                         sapProjectService.setServiceCode(serviceProduct.getInternalID());
                         sapProjectService.setServiceName(serviceProduct.getDescription().getDescription());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/Sales.java

@@ -0,0 +1,17 @@
+package com.management.platform.webservice.po;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlElement;
+
+@Data
+public class Sales {
+
+    private String lifeCycleStatusCode;
+
+
+    @XmlElement(name = "LifeCycleStatusCode")
+    public String getLifeCycleStatusCode() {
+        return lifeCycleStatusCode;
+    }
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/webservice/po/ServiceProduct.java

@@ -12,6 +12,7 @@ public class ServiceProduct {
     private String productCategoryID;
     private Description description;
     private String baseMeasureUnitCode;
+    private Sales sales;
 
     @XmlElement(name = "ChangeStateID")
     public String getChangeStateID() {
@@ -37,4 +38,9 @@ public class ServiceProduct {
     public String getBaseMeasureUnitCode() {
         return baseMeasureUnitCode;
     }
+
+    @XmlElement(name = "Sales")
+    public Sales getSales() {
+        return sales;
+    }
 }