1

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

@@ -296,6 +296,12 @@ public class WxCorpInfoController {
                             plan.setTaskName(text);
                         }
                     }
+                    if(title.getJSONObject(0).getString("text").equals("审批编号")){
+                        if(control.equals("Text")||control.equals("Textarea")){
+                            String text = value.getString("text");
+                            plan.setTaskChangeNoticeNum(text);
+                        }
+                    }
                     //先处理多个人员 公用此单据非工时部分内容
                     if(title.getJSONObject(0).getString("text").equals("参与人员")){
                         if(control.equals("Contact")){
@@ -365,6 +371,13 @@ public class WxCorpInfoController {
                             price=new BigDecimal(new_money);
                         }
                     }
+                    if(title.getJSONObject(0).getString("text").contains("结算总额")){
+                        if(control.equals("Formula")){
+                            JSONObject formula = value.getJSONObject("formula");
+                            double formulaDoubleValue = formula.getDoubleValue("value");
+                            plan.setMoneyOfJob(new BigDecimal(formulaDoubleValue));
+                        }
+                    }
                     if(title.getJSONObject(0).getString("text").equals("备注")){
                         if(control.equals("Text")||control.equals("Textarea")){
                             String text = value.getString("text");

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/Plan.java

@@ -279,6 +279,12 @@ public class Plan extends Model<Plan> {
     @JsonFormat( pattern="yyyy-MM-dd")
     private LocalDate realEndDate;
 
+    /**
+     * 结算总金额
+     */
+    @TableField("settlement_amount")
+    private BigDecimal settlementAmount;
+
     @TableField(exist = false)
     private String  steelStampNumber;
 

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

@@ -496,8 +496,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 List<ProdProcedure> prodProcedures = prodProcedureMapper.selectList(new LambdaQueryWrapper<ProdProcedure>().in(ProdProcedure::getProductId, productIds));
                 List<Plan> planList = planService.list(new LambdaQueryWrapper<Plan>().select(Plan::getId).in(Plan::getProductId, productIds));
                 for (Product product : productList) {
-                    List<ProdProcedure> procedureList = prodProcedures.stream().filter(p -> p.getProductId().equals(product.getId())).collect(Collectors.toList());
-                    List<Plan> plans = planList.stream().filter(p -> p.getProductId().equals(product.getId())).collect(Collectors.toList());
+                    List<ProdProcedure> procedureList = prodProcedures.stream().filter(p ->p.getProductId()!=null&& p.getProductId().equals(product.getId())).collect(Collectors.toList());
+                    List<Plan> plans = planList.stream().filter(p ->p.getProductId()!=null&& p.getProductId().equals(product.getId())).collect(Collectors.toList());
                     plans.forEach(p->{
                         p.setProjectName(product.getProjectName());
                         p.setProjectCode(product.getCode());

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

@@ -437,6 +437,12 @@ public class TimingTask {
                             plan.setTaskName(text);
                         }
                     }
+                    if(title.getJSONObject(0).getString("text").equals("审批编号")){
+                        if(control.equals("Text")||control.equals("Textarea")){
+                            String text = value.getString("text");
+                            plan.setTaskChangeNoticeNum(text);
+                        }
+                    }
                     //先处理多个人员 公用此单据非工时部分内容
                     if(title.getJSONObject(0).getString("text").equals("参与人员")){
                         if(control.equals("Contact")){
@@ -506,6 +512,13 @@ public class TimingTask {
                             price=new BigDecimal(new_money);
                         }
                     }
+                    if(title.getJSONObject(0).getString("text").contains("结算总额")){
+                        if(control.equals("Formula")){
+                            JSONObject formula = value.getJSONObject("formula");
+                            double formulaDoubleValue = formula.getDoubleValue("value");
+                            plan.setMoneyOfJob(new BigDecimal(formulaDoubleValue));
+                        }
+                    }
                     if(title.getJSONObject(0).getString("text").equals("备注")){
                         if(control.equals("Text")||control.equals("Textarea")){
                             String text = value.getString("text");

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

@@ -131,9 +131,10 @@
           </el-form-item>
           <el-form-item label="计划工时" prop="planWorkHour">
             <div style="display: flex;">
-              <el-input v-model="todayPlanForm.planWorkHour" type="number" placeholder="请输入" style="flex: 1;"
+              <el-input v-model="todayPlanForm.planWorkHour" type="number" placeholder="请输入" style="width: 100px"
                 maxlength="5"></el-input>
               <div style="margin-left: 10px;">分钟</div>
+              <div style="margin-left: 10px;">{{ hourNum }} 小时</div>
             </div>
           </el-form-item>
           <el-form-item label="单价" prop="moneyOfJob">
@@ -167,6 +168,9 @@
               value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="结算总额(元)" prop="settlementAmount">
+            <el-input v-model="todayPlanForm.settlementAmount"></el-input>
+          </el-form-item>
           <el-form-item label="描述" style="width: 100%">
             <el-input type="textarea" :rows="6" placeholder="请输入描述" v-model="todayPlanForm.describtion" maxlength="200">
             </el-input>
@@ -370,7 +374,13 @@ export default {
       }
     };
   },
-  computed: {},
+  computed: {
+    hourNum() {
+      let hour = Math.floor((this.todayPlanForm.planWorkHour || 0) / 60);
+      let xiaos = (this.todayPlanForm.planWorkHour || 0) % 60
+      return `${hour}.${xiaos}`
+    }
+  },
   watch: {},
   mounted() {
     this.getDepartmentList(),