合同统计合同列表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -159,25 +159,32 @@ public class CmcContractController extends BaseController
         JSONObject jsonObject = new JSONObject();
         List<CmcContract> cmcContractList = cmcContractService.selectCmcContractStatistic();
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(cmcContractList));
+        if (field.equals("")) {
+            jsonObject.put("sort", jsonArray);
+        }
+        if (field.equals("amount")) {
+            jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("amount").subtract(((JSONObject)a).getBigDecimal("amount")).intValue());
+            jsonObject.put("sort", jsonArray);
+        }
         if (field.equals("amount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("amount").subtract(((JSONObject)a).getBigDecimal("amount")).intValue());
-            jsonObject.put("sortByAmount", jsonArray);
+            jsonObject.put("sort", jsonArray);
         }
         if (field.equals("subAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("subAmount").subtract(((JSONObject)a).getBigDecimal("subAmount")).intValue());
-            jsonObject.put("sortBySubAmount", jsonArray);
+            jsonObject.put("sort", jsonArray);
         }
         if (field.equals("budgetAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("budgetAmount").subtract(((JSONObject)a).getBigDecimal("budgetAmount")).intValue());
-            jsonObject.put("sortByBudgetAmount", jsonArray);
+            jsonObject.put("sort", jsonArray);
         }
         if (field.equals("borrowAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("borrowAmount").subtract(((JSONObject)a).getBigDecimal("borrowAmount")).intValue());
-            jsonObject.put("sortByBorrowAmount", jsonArray);
+            jsonObject.put("sort", jsonArray);
         }
         if (field.equals("settleAmount")) {
             jsonArray.sort((a,b)->((JSONObject)b).getBigDecimal("settleAmount").subtract(((JSONObject)a).getBigDecimal("settleAmount")).intValue());
-            jsonObject.put("sortBySettleAmount", jsonArray);
+            jsonObject.put("sort", jsonArray);
         }
         return success(jsonObject);
     }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractMapper.xml

@@ -117,7 +117,8 @@
     left join cmc_sub_contract as sc on sc.sub_contract_id = csc.sub_contract_id
     left join cmc_project_contract as pc on pc.contract_id = c.contract_id
     left join cmc_project as p on p.project_id = pc.project_id
-    group by c.contract_id) as t1
+    group by c.contract_id
+    order by c.draft_time desc) as t1
     left join
     (select distinct c.contract_id, sum(b.total_budget) as budget_amount from cmc_contract as c
     left join cmc_project_contract as pc on pc.contract_id = c.contract_id

oa-ui/src/views/oa/staff/index.vue

@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="text" plain size="mini" @click="lookOnTheJob()"
-              v-hasPermi="['system:user:edit']">查看正式员工</el-button>
+              v-hasPermi="['system:user:edit']">查看在岗员工</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="text" plain size="mini" @click="lookResign()"