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

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

@@ -243,6 +243,7 @@ public class WxCorpInfoController {
                 JSONArray contents = apply_data.getJSONArray("contents");
                 //生成 车间插单计划
                 Plan plan=new Plan();
+                plan.setCompanyId(7);
                 plan.setCreateTime(LocalDateTime.now());
                 plan.setPlanType(1);
                 plan.setCreateId(first.get().getId());
@@ -340,7 +341,7 @@ public class WxCorpInfoController {
                             workTime=new_number;
                         }
                     }
-                    if(title.getJSONObject(0).getString("text").equals("申请总时长")){
+                    if(title.getJSONObject(0).getString("text").equals("结算总时长")){
                         if(control.equals("Number")){
                             double new_number = value.getDoubleValue("new_number");
                             plan.setPlanWorkHour(new_number);
@@ -364,8 +365,8 @@ public class WxCorpInfoController {
                         }
                     }
                     if(title.getJSONObject(0).getString("text").contains("单价")){
-                        if(control.equals("Money")){
-                            Double new_money = value.getDouble("new_money");
+                        if(control.equals("Number")){
+                            Double new_money = value.getDouble("new_number");
                             plan.setMoneyOfJob(new BigDecimal(new_money));
                             price=new BigDecimal(new_money);
                         }

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

@@ -6070,7 +6070,7 @@
                                     stages:aiReportData[i].stages,
                                     stage:aiReportData[i].stage == '-'?null:aiReportData[i].stage,
                                     pics: null,
-                                    multiWorktime: aiReportData[i].multiWorktime,
+                                    multiWorktime: aiReportData[i].multiWorktime || 0,
                                     worktimeList: [{}],
                                     degreeId: aiReportData[i].degreeId==-1?null:aiReportData[i].degreeId,
                                     multiDegrIdArray: aiReportData[i].multiDegrId?JSON.parse(aiReportData[i].multiDegrId):null,