feat: 成绩查询增加年龄查询返回

钟日健

2026-06-01 62eb499b0c969f246d3245d1429a97da4de1ce28

 src/main/java/org/springblade/modules/performance/controller/PerformanceController.java

@@ -27,16 +27,20 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.performance.entity.Performance;
import org.springblade.modules.performance.service.IPerformanceService;
import org.springblade.modules.performance.vo.PerformanceVO;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 *  保安员表现管理
 * 保安员表现管理
 *
 * @author BladeX
 * @since 2021-07-05
 */
@@ -47,7 +51,7 @@
public class PerformanceController extends BladeController {

   private final IPerformanceService performanceService;

   private final MyAsyncService myAsyncService;
   /**
    * 详情
    */
@@ -88,7 +92,17 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入performance")
   public R save(@Valid @RequestBody Performance performance) {
      return R.status(performanceService.save(performance));
      boolean save = performanceService.save(performance);
      String s1 =
         "insert into sys_performance(id,securityId,Achievements,time,score) " +
            "values(" + "'" + performance.getId() + "'" + "," +
            "'" + performance.getSecurityid() + "'" + "," +
            "'" + performance.getAchievements() + "'" + "," +
            "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" + "," +
            "'" + performance.getScore() + "'" + ")";
      //FtpUtil.sqlFileUpload(s1);
      myAsyncService.dataSync(s1);
      return R.status(save);
   }

   /**
@@ -98,7 +112,16 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入performance")
   public R update(@Valid @RequestBody Performance performance) {
      return R.status(performanceService.updateById(performance));
      boolean b = performanceService.updateById(performance);
      //内网同步
      String s1 = "update sys_performance set securityId = " + "'" + performance.getSecurityid() + "'" +
         ",Achievements = " + "'" + performance.getAchievements() + "'" +
         ",time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" +
         ",score = " + "'" + performance.getScore() + "'" +
         " " + "where id = " + "'" + performance.getId() + "'";
      //FtpUtil.sqlFileUpload(s1);
      myAsyncService.dataSync(s1);
      return R.status(b);
   }

   /**
@@ -125,6 +148,7 @@

   /**
    * 查询本年所有月份的表现差的数量
    *
    * @return
    */
   @GetMapping("/queryYearPer")
@@ -132,12 +156,12 @@
      Calendar cal = Calendar.getInstance();
      String year = String.valueOf(cal.get(Calendar.YEAR));
      Map<String, String> map = performanceService.queryYearPer(year);
      map = (HashMap<String, String>) sortMapBykeyAsc(map) ;//key升序
      map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
      return R.data(map);
   }

   //升序
   public  static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
   public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
      Map<String, String> sortedMap = new LinkedHashMap<String, String>();
      try {
         if (oriMap != null && !oriMap.isEmpty()) {