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

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

@@ -7695,7 +7695,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             "   </soapenv:Body>\n" +
                             "</soapenv:Envelope>");
                     String result = "";
+                    System.out.println(sb.toString());
                     try {
+//                        result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/manageemployeetimein?sap-vhost=my601432.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
                         if(isDev){
                             result = WebServiceUtils.requestByXml("https://my602728.sapbyd.cn/sap/bc/srt/scs/sap/manageemployeetimein?sap-vhost=my602728.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
                         }else {
@@ -7757,10 +7759,10 @@ 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;
-                }
+//                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);
@@ -7780,12 +7782,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();
                 }

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

@@ -85,6 +85,7 @@ public class SyncSapUtils {
             System.out.println(sb.toString());
             String result = "";
             try {
+//                result = WebServiceUtils.requestByXml("https://my601432.sapbyd.cn/sap/bc/srt/scs/sap/yyatr5vf6y_manageprojecttaskwo?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_manageprojecttaskwo?sap-vhost=my602728.sapbyd.cn", sb.toString(), 0, "_BYDHOST", "Welcome1");
                 }else {
@@ -308,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/service/impl/ReportServiceImpl.java

@@ -4186,12 +4186,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Map<String,Object>> theData=new ArrayList<>();
                 for (String id : creatorId) {
                     Map<String, Object> nameItem = mapMap.get(id);
-                    theData.add(nameItem);
+                    Optional<User> first = userList.stream().filter(u -> u.getId().equals(id)).findFirst();
+                    //没有查看全部的权限就只能查看自己负责的数据
+                    if(canViewAll?true:(targetDeptIds.size()>0&&targetDeptIds.contains(first.get().getDepartmentId()))){
+                        theData.add(nameItem);
+                    }
                 }
                 if(checkStatus==1){
                     List<User> users = userList.stream().filter(ul -> !theData.stream().anyMatch(td -> td.get("creatorId").equals(ul.getId()))).collect(Collectors.toList());
                     for (User u : users) {
-                        if(canViewAll?(targetDeptIds.size()>0):(targetDeptIds.size()>0&&targetDeptIds.contains(u.getDepartmentId()))){
+                        if(canViewAll?true:(targetDeptIds.size()>0&&targetDeptIds.contains(u.getDepartmentId()))){
                             Map<String, Object> nameItem =new HashMap<>();
                             nameItem.put("working_time", 0);
                             nameItem.put("creatorName",u.getName());

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -133,14 +133,14 @@
           <el-form-item label="排产工单号" style="width: 100%" prop="productSchedulingNum">
             <el-input v-model="todayPlanForm.productSchedulingNum" maxlength="50"></el-input>
           </el-form-item>
-          <el-form-item label="项目代码" style="width: 100%" prop="productId">
-            <el-select v-model="todayPlanForm.productId" placeholder="请选择" class="w100" @change="setProductCode">
-              <el-option v-for="item in productList" :key="item.id" :label="item.code" :value="item.id">
+          <el-form-item label="产品名称" style="width: 100%" prop="productId">
+            <el-select :disabled="todayPlanForm.id==null?false:true" v-model="todayPlanForm.productId" placeholder="请选择" class="w100" @change="setProductCode" filterable>
+              <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="产品名称" style="width: 100%" prop="productName">
-            <el-input v-model="todayPlanForm.productName" maxlength="50" readonly></el-input>
+          <el-form-item label="项目代码" style="width: 100%" prop="projectCode">
+            <el-input :disabled="todayPlanForm.id==null?false:true" v-model="todayPlanForm.projectCode" maxlength="50" readonly></el-input>
           </el-form-item>
 
           <div v-for="(item, index) in todayPlanForm.steelStampNumberList" style="width: 100%;margin-bottom: 10px;">

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -133,7 +133,7 @@
                                     </span>
                                 </span>
                                 <span style="float:right;">
-                                    <el-link type="primary" v-if="user.timeType.enableNewWeeklyfill != 1 && user.companyId != '4374'" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">{{$t('textLink.fillInTheWork')}}</el-link>
+                                    <el-link type="primary" v-if="user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">{{$t('textLink.fillInTheWork')}}</el-link>
                                     <el-link v-if="reportTimeType.type != 0 && user.companyId != yuzhongCompId && user.timeType.enableNewWeeklyfill != 1 && user.companyId != 3092" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportss()">{{$t('textLink.fillInAWeek')}}</el-link>
                                     <el-link v-if="user.timeType.enableNewWeeklyfill == 1" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报</el-link>
                                     <!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报</el-link> -->