1

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

@@ -7741,10 +7741,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<SapSyncLog> sapSyncLogs=new ArrayList<>();
             List<String> uuidList = ListUtil.convertLongIdsArrayToList(uuids);
             for (String uuid : uuidList) {
-//                int count = reportPushLogService.count(new LambdaQueryWrapper<ReportPushLog>().eq(ReportPushLog::getUuid, uuid));
-//                if(count>0){
-//                    continue;
-//                }
                 XmlRequestData xmlRequestData=new XmlRequestData();
                 ZDeleteEmployeeTime zDeleteEmployeeTime=new ZDeleteEmployeeTime();
                 zDeleteEmployeeTime.setEmployeeTimeUUID(uuid);
@@ -7764,12 +7760,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 System.out.println(sb.toString());
                 String result = "";
                 try {
-//                    result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_deleteemployeetime?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
-                    if(isDev){
-                        result = WebServiceUtils.requestByXml("https://my602728.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_deleteemployeetime?sap-vhost=my602728.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
-                    }else{
-                        result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_deleteemployeetime?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
-                    }
+                    result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_deleteemployeetime?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
+//                    if(isDev){
+//                        result = WebServiceUtils.requestByXml("https://my602728.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_deleteemployeetime?sap-vhost=my602728.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
+//                    }else{
+//                        result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_deleteemployeetime?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
+//                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -8447,8 +8443,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         //是否要撤销相关数据
         List<ActualEmployeeTime> actualEmployeeTimes = hasPushForSap.getActualEmployeeTimes();
         List<String> allUuids = actualEmployeeTimes.stream().map(ActualEmployeeTime::getUUID).distinct().collect(Collectors.toList());
-        List<String> needUuidList=new ArrayList<>();
-        String uuids = allUuids.stream().map(n -> n).collect(Collectors.joining(","));
+        String uuids = allUuids.stream().collect(Collectors.joining(","));
         cancelReportPushSap(uuids,user);
         msg.setData(actualEmployeeTimes);
         return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/SyncSapUtils.java

@@ -309,12 +309,12 @@ public class SyncSapUtils {
         System.out.println(sb.toString());
         String result = "";
         try {
-//            result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/queryemployeetimein?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
-            if(isDev){
-                result = WebServiceUtils.requestByXml("https://my602728.sapbyd.cn/sap/bc/srt/scs/sap/queryemployeetimein?sap-vhost=my602728.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
-            }else {
-                result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/queryemployeetimein?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
-            }
+            result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/queryemployeetimein?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
+//            if(isDev){
+//                result = WebServiceUtils.requestByXml("https://my602728.sapbyd.cn/sap/bc/srt/scs/sap/queryemployeetimein?sap-vhost=my602728.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
+//            }else {
+//                result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/queryemployeetimein?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
+//            }
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -94,6 +94,7 @@ public class PlanController {
     }
 
     @RequestMapping("/importData")
+    @Transactional
     public HttpRespMsg importData(MultipartFile file,Integer planType){
         return planService.importData(file,planType);
     }

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

@@ -136,6 +136,13 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                                 .eq(product.getId()!=null,ProdProcedure::getProductId,product.getId())
                                 .eq(user.getCompanyId() != null, ProdProcedure::getCompanyId, user.getCompanyId())
                 );
+                //修改相关计划下 产品名称以及编码
+                List<Plan> planList = planMapper.selectList(new LambdaQueryWrapper<Plan>().eq(Plan::getProductId, product.getId()));
+                planList.forEach(p->{
+                    p.setProductId(product.getId());
+                    p.setProductName(product.getName());
+                    p.setProjectCode(product.getCode());
+                });
             }else{
                 msg.setError("产品名重复");
             }