1

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

@@ -50,10 +50,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Array;
 import java.sql.Timestamp;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.text.*;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -2462,6 +2459,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             //totalFee保留小数点后两位
             totalFee = Double.parseDouble(df.format(totalFee));
             map.put("allCost",totalFee);
+            BigDecimal budget = new BigDecimal(map.get("budget").toString());
+            map.put("budget",budget.doubleValue());
         }
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         Map<String, Object> map = new HashMap<>();
@@ -2508,6 +2507,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<String> titles=new ArrayList<>();
         titles.add("项目编号");
         titles.add("项目名称");
+        titles.add("总预算");
         titles.add("人工成本");
         for (ExpenseMainType expenseMainType : expenseMainTypes) {
             titles.add(expenseMainType.getName());
@@ -2519,6 +2519,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<String> data = new ArrayList<>();
             data.add(String.valueOf(item.get("projectCode")));
             data.add(String.valueOf(item.get("projectName")));
+            data.add(item.get("budget")==null?"":String.valueOf(item.get("budget")));
             data.add(String.valueOf(item.get("feeMan")));
             BigDecimal bigDecimal=new BigDecimal(0);
             for (ExpenseMainType expenseMainType : expenseMainTypes) {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -595,7 +595,7 @@
     </select>
     <!--分页获取项目成本 -->
     <select id="getAllProjectCost"  resultType="java.util.Map">
-        SELECT id, project_code as projectCode, project_name as projectName,
+        SELECT id, project_code as projectCode, project_name as projectName,budget,
         (SELECT IFNULL(SUM(cost),0) FROM report WHERE state = 1 AND project_id = project.id) AS feeMan
         FROM project WHERE project.`company_id` = #{companyId}
         and (project.status &lt;&gt; 3 or project.status is null)

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -564,6 +564,7 @@
   "shi-ji-gong-shi": "实际工时",
   "expirationdate": "截止日期",
   "artificialcost": "人工成本",
+  "budget": "总预算",
   "generalcost": "一般费用",
   "travelexpenses": "差旅费用",
   "outsourcingcost": "外包费用",

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -267,6 +267,11 @@
                     {{scope.row.projectName}}
                   </template>
                 </el-table-column>
+                <el-table-column prop="budget" :label="$t('budget')"  width="100"  align="right">
+                  <template slot-scope="scope">
+                        {{scope.row.budget==null?0:scope.row.budget.toFixed(2)}}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="feeMan" :label="$t('artificialcost')"  width="100"  align="right">
                   <template slot-scope="scope">
                         {{scope.row.feeMan==null?0:scope.row.feeMan.toFixed(2)}}