1

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

@@ -11592,13 +11592,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<ServiceProduct> serviceProducts = projectServiceData.getServiceProducts();
             if(serviceProducts!=null&&serviceProducts.size()>0){
                 for (ServiceProduct serviceProduct : serviceProducts) {
-                    SapProjectService sapProjectService=new SapProjectService();
-                    sapProjectService.setServiceCode(serviceProduct.getInternalID());
-                    sapProjectService.setServiceName(serviceProduct.getDescription().getDescription());
-                    sapProjectService.setCompanyId(companyId);
-                    boolean match = serviceList.stream().anyMatch(s -> s.getServiceCode().equals(serviceProduct.getInternalID()));
-                    if(!match){
-                        sapProjectServiceList.add(sapProjectService);
+                    if(serviceProduct.getProductCategoryID().equals("901")&&serviceProduct.getBaseMeasureUnitCode().equals("HUR")){
+                        SapProjectService sapProjectService=new SapProjectService();
+                        sapProjectService.setServiceCode(serviceProduct.getInternalID());
+                        sapProjectService.setServiceName(serviceProduct.getDescription().getDescription());
+                        sapProjectService.setCompanyId(companyId);
+                        boolean match = serviceList.stream().anyMatch(s -> s.getServiceCode().equals(serviceProduct.getInternalID()));
+                        if(!match){
+                            sapProjectServiceList.add(sapProjectService);
+                        }
                     }
                 }
             }

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

@@ -31,4 +31,9 @@ public class ServiceProduct {
     public Description getDescription() {
         return description;
     }
+
+    @XmlElement(name = "BaseMeasureUnitCode")
+    public Description getBaseMeasureUnitCode() {
+        return description;
+    }
 }