Merge remote-tracking branch 'origin/dev' into dev

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -226,6 +226,10 @@ public class EmployeesServiceImpl implements IEmployeesService {
      */
      */
     @Override
     @Override
     public TableDataInfo<EmployeesVo> queryPageAppRanking(EmployeesBo bo, PageQuery pageQuery) {
     public TableDataInfo<EmployeesVo> queryPageAppRanking(EmployeesBo bo, PageQuery pageQuery) {
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 获取当前年份
+        int year = currentDate.getYear();
         Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery.build());
         Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery.build());
         Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> {
         Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> {
             EmployeesVo.forEach(t -> {
             EmployeesVo.forEach(t -> {
@@ -235,6 +239,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
                     .orderByDesc(TotalOrder::getId)
                     .orderByDesc(TotalOrder::getId)
                     .last("LIMIT 1"));
                     .last("LIMIT 1"));
                 t.setTotalOrderVo(totalOrder);
                 t.setTotalOrderVo(totalOrder);
+                t.setWrokYear(year - Integer.parseInt(t.getStartYear()));
             });
             });
         });
         });
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
@@ -246,6 +251,10 @@ public class EmployeesServiceImpl implements IEmployeesService {
      */
      */
     @Override
     @Override
     public EmployeesVo queryByApp(Integer id) {
     public EmployeesVo queryByApp(Integer id) {
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 获取当前年份
+        int year = currentDate.getYear();
         EmployeesVo employeesVo = baseMapper.selectEmployeesById(id);
         EmployeesVo employeesVo = baseMapper.selectEmployeesById(id);
         if(null != employeesVo){
         if(null != employeesVo){
             List<TotalOrderVo> totalOrder = totalOrderMapper.selectVoList(Wrappers.<TotalOrder>lambdaQuery()
             List<TotalOrderVo> totalOrder = totalOrderMapper.selectVoList(Wrappers.<TotalOrder>lambdaQuery()
@@ -260,6 +269,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
                     }
                     }
                 }
                 }
             }
             }
+            employeesVo.setWrokYear(year - Integer.parseInt(employeesVo.getStartYear()));
             employeesVo.setTotalOrderVo(totalOrder);
             employeesVo.setTotalOrderVo(totalOrder);
         }
         }
         return employeesVo;
         return employeesVo;