leromro-core/src/main/java/com/leromro/core/controller/OrgStatDataController.java

@@ -27,6 +27,7 @@ import com.leromro.core.service.IVolunteerInfoService;
 import com.leromro.framework.web.domain.server.Sys;
 import com.leromro.system.mapper.SysUserMapper;
 import com.leromro.system.service.ISysDeptService;
+import com.leromro.system.service.impl.SysConfigServiceImpl;
 import com.leromro.system.service.impl.SysUserServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -73,8 +74,11 @@ public class OrgStatDataController extends BaseController {
     private final ISysDeptService deptService;
 
     private final SysUserServiceImpl sysUserServiceImpl;
+
     private final SysUserMapper sysUserMapper;
 
+    private final SysConfigServiceImpl sysConfigService;
+
     /**
      * 订单总览
      */
@@ -88,16 +92,28 @@ public class OrgStatDataController extends BaseController {
             dto.setDeptId(SecurityUtils.getDeptId());
         }
         LocalDate today = LocalDate.now();
+        int orderTotal = Integer.parseInt(sysConfigService.selectConfigByKey("orderTotal"));
+        int orderRefund = Integer.parseInt(sysConfigService.selectConfigByKey("orderRefund"));
+        int orderFinish = Integer.parseInt(sysConfigService.selectConfigByKey("yesterdayOrderFinish"));
+        String totalOrderMoney = sysConfigService.selectConfigByKey("totalOrderMoney");
         switch (dto.getPageType()) {
             case "1":
                 //昨天
                 dto.setStartDate(today.minusDays(1));
                 dto.setEndDate(today);
+                orderTotal = Integer.parseInt(sysConfigService.selectConfigByKey("yesterdayOrderTotal"));
+                orderRefund = Integer.parseInt(sysConfigService.selectConfigByKey("yesterdayOrderRefund"));
+                orderFinish = Integer.parseInt(sysConfigService.selectConfigByKey("yesterdayOrderFinish"));
+                totalOrderMoney = sysConfigService.selectConfigByKey("yesterdayTotalOrderMoney");
                 break;
             case "2":
                 //今天
                 dto.setStartDate(today);
                 dto.setEndDate(today.plusDays(1));
+                orderTotal = Integer.parseInt(sysConfigService.selectConfigByKey("todayOrderTotal"));
+                orderRefund = Integer.parseInt(sysConfigService.selectConfigByKey("todayOrderRefund"));
+                orderFinish = Integer.parseInt(sysConfigService.selectConfigByKey("todayOrderFinish"));
+                totalOrderMoney = sysConfigService.selectConfigByKey("todayTotalOrderMoney");
                 break;
             case "3":
                 //本月
@@ -107,17 +123,22 @@ public class OrgStatDataController extends BaseController {
                 dto.setEndDate(lastDayOfMonth);
                 break;
         }
-
+        if (!sysDept.getAreaType().equals("0")){
+            orderTotal = 0;
+            orderRefund = 0;
+            orderFinish = 0;
+            totalOrderMoney = "0";
+        }
         //获取指定时间范围的订单
         List<SecondOrder> list = secondOrderService.getCurrentOrgSecondOrderList(dto);
         //订单总量
-        orderSummaryVO.setOrderTotal(list.size());
+        orderSummaryVO.setOrderTotal(list.size()+orderTotal);
         //取消单量
-        orderSummaryVO.setOrderCancelTotal((int) list.stream().filter(item -> "4".equals(item.getOrderStatus())).count());
+        orderSummaryVO.setOrderCancelTotal((int) list.stream().filter(item -> "4".equals(item.getOrderStatus())).count()+orderRefund);
         //订单金额
-        orderSummaryVO.setOrderTotalAmount(BigDecimal.valueOf(list.stream().mapToDouble(item -> item.getServiceTotalPrice().doubleValue()).sum()));
+        orderSummaryVO.setOrderTotalAmount(BigDecimal.valueOf(list.stream().mapToDouble(item -> item.getServiceTotalPrice().doubleValue()).sum()).add(new BigDecimal(totalOrderMoney)));
         //完成单量
-        orderSummaryVO.setOrderFinishTotal((int) list.stream().filter(item -> "2".equals(item.getOrderStatus())).count());
+        orderSummaryVO.setOrderFinishTotal((int) list.stream().filter(item -> "2".equals(item.getOrderStatus())).count()+orderFinish);
         return R.ok(orderSummaryVO);
     }
 
@@ -127,6 +148,12 @@ public class OrgStatDataController extends BaseController {
     @ApiOperation(value = "人员总览", notes = "前端传入人员类型")
     @PostMapping("/userSummary")
     public R<UserSummaryVO> userSummary(@RequestBody HomePageDTO dto) {
+        try{
+
+
+        }catch (Exception e) {
+
+        }
         UserSummaryVO userSummaryVO = new UserSummaryVO();
         //判断人员类型是否有值
         if (ObjectUtil.isNull(dto.getUserType())) {

leromro-core/src/main/java/com/leromro/core/controller/VolunteerWorkDateController.java

@@ -9,8 +9,11 @@ import javax.validation.Valid;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.leromro.common.core.domain.R;
+import com.leromro.core.domain.VolunteerInfo;
 import com.leromro.core.domain.vo.VolunteerReservationTimeVO;
 import com.leromro.core.facade.VolunteerWorkDateFacade;
+import com.leromro.core.service.IVolunteerInfoService;
+import com.leromro.system.service.impl.SysUserServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -44,6 +47,9 @@ public class VolunteerWorkDateController extends BaseController
     @Autowired
     private VolunteerWorkDateFacade workDateFacade;
 
+    @Autowired
+    private IVolunteerInfoService volunteerInfoService;
+
     /**
      * 修改志愿者排班日期
      */
@@ -76,6 +82,10 @@ public class VolunteerWorkDateController extends BaseController
     })
     @GetMapping("/getVolunteerWorkDate")
     public R<List<LocalDate>> getVolunteerWorkDate(@RequestParam("volunteerId") Long volunteerId) {
+        String isExample = volunteerInfoService.list(new LambdaQueryWrapper<VolunteerInfo>().eq(VolunteerInfo::getVolunteerId, volunteerId).select(VolunteerInfo::getIsExample)).get(0).getIsExample();
+        if (("1").equals(isExample)){
+            volunteerId = 109L;
+        }
         List<LocalDate> list = volunteerWorkDateService.list(new LambdaQueryWrapper<VolunteerWorkDate>()
                 .eq(VolunteerWorkDate::getVolunteerId, volunteerId)
                 .ge(VolunteerWorkDate::getWorkDate, LocalDate.now()))

leromro-core/src/main/java/com/leromro/core/domain/VolunteerInfo.java

@@ -165,4 +165,11 @@ public class VolunteerInfo extends BaseEntity {
     @TableField("district_name")
     @ApiModelProperty("区级名称")
     private String districtName;
+
+    @TableField("is_example")
+    @ApiModelProperty("是否是例据")
+    private String isExample;
+
+
+
 }

leromro-core/src/main/java/com/leromro/core/facade/VolunteerWorkDateFacade.java

@@ -4,13 +4,16 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.leromro.common.core.domain.R;
+import com.leromro.core.domain.VolunteerInfo;
 import com.leromro.core.domain.VolunteerReservationTime;
 import com.leromro.core.domain.VolunteerWorkDate;
 import com.leromro.core.domain.dto.AddReservationTimesDTO;
 import com.leromro.core.domain.vo.VolunteerReservationTimeVO;
+import com.leromro.core.service.IVolunteerInfoService;
 import com.leromro.core.service.IVolunteerReservationTimeService;
 import com.leromro.core.service.IVolunteerWorkDateService;
 import com.leromro.core.utils.DateTimeUtil;
+import com.leromro.system.service.impl.SysConfigServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +34,10 @@ public class VolunteerWorkDateFacade {
 
     private final IVolunteerReservationTimeService reservationTimeService;
 
+    private final IVolunteerInfoService volunteerInfoService;
+
+    private final SysConfigServiceImpl sysConfigService;
+
 
     /**
      * 根据日期获取志愿者工作时间
@@ -38,6 +45,12 @@ public class VolunteerWorkDateFacade {
      * @return
      */
     public R<List<VolunteerReservationTimeVO>> getTimesByDate(Long volunteerId, LocalDate date) {
+        String isExample = volunteerInfoService.list(new LambdaQueryWrapper<VolunteerInfo>().eq(VolunteerInfo::getVolunteerId, volunteerId).select(VolunteerInfo::getIsExample)).get(0).getIsExample();
+        if (("1").equals(isExample)){
+            //如果是测试数据，我们直接排满
+            volunteerId = Long.valueOf(sysConfigService.selectConfigByKey("exampleWorkTimeVolunteerId"));
+        }
+
         //判断志愿者当前日期是否排班
         VolunteerWorkDate dateInfo = workDateService.getOne(new LambdaQueryWrapper<VolunteerWorkDate>()
                 .eq(VolunteerWorkDate::getVolunteerId, volunteerId)

leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerInfoServiceImpl.java

@@ -385,7 +385,7 @@ public class VolunteerInfoServiceImpl extends ServiceImpl<VolunteerInfoMapper, V
     public VolunteerInfoDetailVO selectLVolunteerInfoByVolunteerId(VolunteerInfo volunteerInfo) {
         VolunteerInfo info = this.getOne(new LambdaQueryWrapper<VolunteerInfo>()
                 .eq(VolunteerInfo::getVolunteerId, volunteerInfo.getVolunteerId())
-                .eq(VolunteerInfo::getBusinessManagementId, volunteerInfo.getBusinessManagementId()));
+                .eq(VolunteerInfo::getBusinessManagementId, volunteerInfo.getBusinessManagementId()).last("limit 1"));
         if (ObjectUtil.isNull(info)){
             throw new ServiceException("获取志愿者信息异常，请稍后再试");
         }

leromro-core/src/main/resources/mapper/core/VolunteerInfoMapper.xml

@@ -53,7 +53,7 @@
         select volunteer_id, skill_describe,age ,service_category,name,volunteer_picture,score,business_management_id ,
                business_price,business_tier_name , business_unit,business_describe
         from l_volunteer_info lvi
-        <where> app_status = 2
+        <where> app_status = 2 or is_example = 1
 
        /* AND EXISTS (
         SELECT 1