车间修改

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

@@ -391,7 +391,9 @@ public class WxCorpInfoController {
                             JSONObject formula = value.getJSONObject("formula");
                             if(!formula.getString("value").equals("")){
                                 double formulaDoubleValue = formula.getDoubleValue("value");
-                                plan.setMoneyOfJob(new BigDecimal(formulaDoubleValue));
+                                BigDecimal bigDecimal = new BigDecimal(formulaDoubleValue);
+                                BigDecimal divide = bigDecimal.divide(new BigDecimal(workTime), 0, RoundingMode.HALF_UP);
+                                plan.setMoneyOfJob(divide);
                             }
                         }
                     }
@@ -414,7 +416,7 @@ public class WxCorpInfoController {
                         report.setCreateTime(LocalDateTime.now());
                         BigDecimal bigDecimal = new BigDecimal(workTime);
                         bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()),1,RoundingMode.HALF_UP);
-                        report.setWorkingTime(bigDecimal.doubleValue()*60);
+                        report.setWorkingTime(bigDecimal.doubleValue());
                         bigDecimal=bigDecimal.multiply(price);
                         report.setCost(bigDecimal);
                         report.setStatus(2);

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

@@ -5037,8 +5037,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             item.add("");
 //            item.add(String.valueOf(map.get("progress"))+"%");
             item.add(String.valueOf(map.get("finishNum")));
-            item.add(String.valueOf(map.get("workingTime")));
-            item.add(String.valueOf(map.get("unitPrice")));
+            if(planType==0){
+                item.add(String.valueOf(map.get("workingTime")));
+                item.add(String.valueOf(map.get("unitPrice")));
+            }else {
+                item.add(String.valueOf(map.get("workingTime"))+" h");
+                item.add(String.valueOf(map.get("unitPrice"))+" 元/h");
+            }
             String cost = String.valueOf(map.get("cost"));
             BigDecimal finishNum = new BigDecimal(map.get("finishNum")==null?String.valueOf(0):String.valueOf(map.get("finishNum")));
             finishNum=finishNum.multiply(new BigDecimal(map.get("unitPrice")==null?String.valueOf(0):String.valueOf(map.get("unitPrice")))).setScale(2,RoundingMode.HALF_UP);

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

@@ -531,7 +531,9 @@ public class TimingTask {
                             JSONObject formula = value.getJSONObject("formula");
                             if(!formula.getString("value").equals("")){
                                 double formulaDoubleValue = formula.getDoubleValue("value");
-                                plan.setMoneyOfJob(new BigDecimal(formulaDoubleValue));
+                                BigDecimal bigDecimal = new BigDecimal(formulaDoubleValue);
+                                BigDecimal divide = bigDecimal.divide(new BigDecimal(workTime), 0, RoundingMode.HALF_UP);
+                                plan.setMoneyOfJob(divide);
                             }
                         }
                     }
@@ -554,7 +556,7 @@ public class TimingTask {
                         report.setCreateTime(LocalDateTime.now());
                         BigDecimal bigDecimal = new BigDecimal(workTime);
                         bigDecimal=bigDecimal.divide(new BigDecimal(plan.getPlanManNum()==null?0:plan.getPlanManNum()),1,RoundingMode.HALF_UP);
-                        report.setWorkingTime(bigDecimal.doubleValue()*60);
+                        report.setWorkingTime(bigDecimal.doubleValue());
                         bigDecimal=bigDecimal.multiply(price);
                         report.setCost(bigDecimal);
                         report.setStatus(2);