1

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

@@ -356,15 +356,10 @@ public class WxCorpInfoController {
                         if(control.equals("Number")){
                             double new_number = StringUtils.isEmpty(value.getString("new_number")) ?0.0:value.getDoubleValue("new_number");
                             BigDecimal bigDecimal = new BigDecimal(new_number);
-                            bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()),1,RoundingMode.HALF_UP);
                             workTime=bigDecimal.doubleValue();
                         }
                     }
-                    BigDecimal bigDecimal = new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum());
-                    //工时以分钟为单位 *60
-                    bigDecimal=bigDecimal.multiply(new BigDecimal(workTime));
-                    bigDecimal=bigDecimal.multiply(new BigDecimal(60));
-                    plan.setPlanWorkHour(bigDecimal.doubleValue());
+                    plan.setPlanWorkHour(workTime*60);
                     if(title.getJSONObject(0).getString("text").equals("所属工位")){
                         if(control.equals("Contact")){
                             JSONArray departments = value.getJSONArray("departments");
@@ -418,9 +413,10 @@ public class WxCorpInfoController {
                         report.setCreatorId(user.get().getId());
                         report.setCreateTime(LocalDateTime.now());
                         BigDecimal bigDecimal = new BigDecimal(workTime);
+                        bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()));
+                        report.setWorkingTime(bigDecimal.doubleValue()*60);
                         bigDecimal=bigDecimal.multiply(price);
                         report.setCost(bigDecimal);
-                        report.setWorkingTime(workTime);
                         report.setStatus(2);
                         report.setPlanId(plan.getId());
                         report.setCompanyId(7);

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

@@ -4300,7 +4300,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             u.setTotalResult(String.format("%.2f",bigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", cost) + "元");
             u.setTotalPlanResult(String.format("%.2f",planBigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", planCost) + "元");
             u.setTotalSurplusResult(String.format("%.2f",surplusBigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", surplusCost) + "元");
-            u.setTotalTempResult(String.format("%.2f",tempBigDecimal.doubleValue()) + "小时 " + String.format("%.2f", tempCost) + "元");
+            u.setTotalTempResult(String.format("%.2f",tempBigDecimal.doubleValue()) + "分钟 " + String.format("%.2f", tempCost) + "元");
         }
         resultMap.put("total",userIPage.getTotal());
         resultMap.put("records",userList);

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/task/TimingTask.java

@@ -496,15 +496,10 @@ public class TimingTask {
                         if(control.equals("Number")){
                             double new_number = StringUtils.isEmpty(value.getString("new_number")) ?0.0:value.getDoubleValue("new_number");
                             BigDecimal bigDecimal = new BigDecimal(new_number);
-                            bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()),1,RoundingMode.HALF_UP);
                             workTime=bigDecimal.doubleValue();
                         }
                     }
-                    BigDecimal bigDecimal = new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum());
-                    //工时以分钟为单位 *60
-                    bigDecimal=bigDecimal.multiply(new BigDecimal(workTime));
-                    bigDecimal=bigDecimal.multiply(new BigDecimal(60));
-                    plan.setPlanWorkHour(bigDecimal.doubleValue());
+                    plan.setPlanWorkHour(workTime*60);
                     if(title.getJSONObject(0).getString("text").equals("所属工位")){
                         if(control.equals("Contact")){
                             JSONArray departments = value.getJSONArray("departments");
@@ -558,9 +553,10 @@ public class TimingTask {
                         report.setCreatorId(user.get().getId());
                         report.setCreateTime(LocalDateTime.now());
                         BigDecimal bigDecimal = new BigDecimal(workTime);
+                        bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()));
+                        report.setWorkingTime(bigDecimal.doubleValue()*60);
                         bigDecimal=bigDecimal.multiply(price);
                         report.setCost(bigDecimal);
-                        report.setWorkingTime(workTime);
                         report.setStatus(2);
                         report.setPlanId(plan.getId());
                         report.setCompanyId(7);

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -94,7 +94,7 @@
                               <!-- <div @click.stop="showReportDetail(scope.row,item,0)" v-if="items.workTime>0">已填 {{items.workTime}}分钟  {{items.cost}}元 </div>{{items.leave}}
                               <div style="color: green;" @click.stop="showTempReportDetail(scope.row,item,0)" v-if="items.tempWorkTime>0||items.tempCost>0">临时报工 {{items.tempWorkTime}}分钟  {{items.tempCost}}元</div> -->
                               <div  v-if="items.workTime>0">已填 {{items.workTime}}分钟  {{items.cost}}元 </div>{{items.leave}}
-                              <div style="color: green;" v-if="items.tempWorkTime>0||items.tempCost>0">临时报工 {{items.tempWorkTime}}小时  {{items.tempCost}}元</div>
+                              <div style="color: green;" v-if="items.tempWorkTime>0||items.tempCost>0">临时报工 {{items.tempWorkTime}}分钟  {{items.tempCost}}元</div>
                               <div style="color: red;" v-if="items.surplusTime">剩余 {{items.surplusTime}}分钟  {{items.surplusCost}}元</div>
                             </div>
                         </div>
@@ -393,7 +393,7 @@
               <el-table-column prop="checkerName" label="质检人" width="180"></el-table-column>
               <el-table-column prop="working_time" label="工作时长" width="180">
                 <template slot-scope="scope" v-if="scope.row.working_time">
-                  {{scope.row.working_time}}{{scope.row.planType==0?'分钟':'小时'}}
+                  {{scope.row.working_time}}{{'分钟'}}
                 </template>
               </el-table-column>
             </el-table>