Administrator
2021-08-28 7327c2b113573bccaeef5b3fc5c82011abc00cd8
src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -303,8 +303,8 @@
    * 保安派遣数量统计
    */
   @PostMapping("/selectDisp")
   public R selectDisp(String deptid) {
      List<Map<Object, Object>> lists = informationService.selectDisp(deptid);
   public R selectDisp(String deptid,String jurisdiction) {
      List<Map<Object, Object>> lists = informationService.selectDisp(deptid,jurisdiction);
      return R.data(lists);
   }
@@ -347,12 +347,11 @@
    * @return
    */
   @PostMapping("/queryYearKh")
   public R queryYearKh(String jurisdiction, String deptid) {
   public List queryYearKh(String jurisdiction, String deptid) {
      Calendar cal = Calendar.getInstance();
      String year = String.valueOf(cal.get(Calendar.YEAR));
      Map<String, String> map = informationService.queryYearKh(year, jurisdiction, deptid);
      map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
      return R.data(map);
      List list = informationService.queryYearKh(year, jurisdiction, deptid);
      return list;
   }
   //升序
   public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {