web端客户列表，订单列表

leromro-admin/src/main/java/com/leromro/web/controller/system/SysUserController.java

@@ -65,6 +65,16 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+
+    @GetMapping("/userList")
+    public TableDataInfo<SysUser> userList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.userList(user);
+        return getDataTable(list);
+    }
+
+
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.leromro.common.core.domain.R;
+import com.leromro.common.core.page.TableDataInfo;
 import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.domain.Address;
 import com.leromro.core.domain.MainOrders;
@@ -14,6 +15,8 @@ import com.leromro.core.domain.dto.OrderRequestDTO;
 import com.leromro.core.domain.dto.UserOrderReviewDTO;
 import com.leromro.core.domain.vo.MainOrdersVO;
 import com.leromro.core.domain.vo.OrdersInfoVO;
+import com.leromro.core.domain.vo.VolunteerInfoVO;
+import com.leromro.core.domain.vo.webMainOrderListVO;
 import com.leromro.core.service.IAddressService;
 import com.leromro.core.service.IMainOrderService;
 import com.leromro.core.service.ISecondOrderService;
@@ -46,6 +49,18 @@ public class OrdersController extends BaseController {
     @Autowired
     private IVolunteerInfoService volunteerInfoService;
 
+
+    /**
+     * 后台管理web页面订单列表
+     */
+    @ApiOperation("后台管理web页面订单列表")
+    @GetMapping("/web/mainOrderList")
+    public TableDataInfo<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO) {
+        startPage();
+        List<webMainOrderListVO> list = mainOrderService.webMainOrderList(mainOrdersVO);
+        return getDataTable(list);
+    }
+
     /**
      * 查询订单主列表
      */

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

@@ -133,5 +133,10 @@ public class MainOrders extends BaseEntity
     @ApiModelProperty("是否删除 0未删除，1已删除")
     private Integer isDelete;
 
+    @ApiModelProperty("业务id")
+    private Long businessManagementId;
+
+    @ApiModelProperty("志愿者信息主键")
+    private Long volunteerInfoId;
 
 }

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

@@ -122,4 +122,7 @@ public class VolunteerInfo extends BaseEntity {
 
     @ApiModelProperty("科目名称")
     private String serviceSubjectName;
+
+    @ApiModelProperty("业务层级名称")
+    private String businessTierName;
 }

leromro-core/src/main/java/com/leromro/core/domain/vo/MainOrdersVO.java

@@ -1,6 +1,7 @@
 package com.leromro.core.domain.vo;
 
 import com.leromro.core.domain.MainOrders;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,4 +10,7 @@ import lombok.Setter;
 public class MainOrdersVO extends MainOrders {
     private String name;
     private String skillDescribe;
+
+    @ApiModelProperty("业务层级名称")
+    private String businessTierName;
 }

leromro-core/src/main/java/com/leromro/core/domain/vo/webMainOrderListVO.java

@@ -0,0 +1,46 @@
+package com.leromro.core.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.leromro.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 后台管理订单页面
+ */
+@Data
+public class webMainOrderListVO {
+
+
+
+    @ApiModelProperty("订单id")
+    private String mainOrderId;
+
+    @ApiModelProperty("单价")
+    private BigDecimal serviceOnePrice;
+
+    @ApiModelProperty("总价")
+    private BigDecimal serviceTotalPrice;
+
+    @ApiModelProperty(" 0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款 8 待评价 ")
+    private Integer orderStatus;
+
+    @ApiModelProperty("志愿者信息主键")
+    private Long volunteerInfoId;
+
+    @TableField("project_name")
+    @ApiModelProperty("服务项目名称")
+    private String projectName;
+
+    @TableField("project_type_name")
+    @ApiModelProperty("项目类别名称")
+    private String  projectTypeName;
+
+    @ApiModelProperty("科目名称")
+    private String serviceSubjectName;
+
+    @ApiModelProperty("业务层级名称")
+    private String businessTierName;
+}

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

@@ -53,11 +53,12 @@ public class VolunteerWorkDateFacade {
         List<LocalTime> times = reservationTimes.stream().map(VolunteerReservationTime::getReservationTime).collect(Collectors.toList());
         Map<LocalTime, Long> timeMapUser = reservationTimes.stream().collect(Collectors.toMap(VolunteerReservationTime::getReservationTime, VolunteerReservationTime::getClientId));
         //按照开始时间到结束时间生成数组，间隔为30分钟，第一个时间为整点，第二个时间为整点加30分钟，第三个时间为整点加60分钟，以此类推
+
         while (startTime.isBefore(endTime)){
             VolunteerReservationTimeVO vo = VolunteerReservationTimeVO.builder()
                     .reservationTime(startTime)
                     .build();
-            if (times.contains(startTime) || startTime.isBefore(LocalTime.now())){
+            if (date.equals(LocalDate.now()) && (times.contains(startTime) || startTime.isBefore(LocalTime.now()))){
                 vo.setHasReservation(1);
 //                vo.setClientId(timeMapUser.get(startTime));
             }else {

leromro-core/src/main/java/com/leromro/core/mapper/MainOrdersMapper.java

@@ -3,6 +3,7 @@ package com.leromro.core.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.leromro.core.domain.MainOrders;
 import com.leromro.core.domain.vo.MainOrdersVO;
+import com.leromro.core.domain.vo.webMainOrderListVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,4 +12,6 @@ public interface MainOrdersMapper extends BaseMapper<MainOrders> {
      int insertMainOrders(MainOrders mainOrders);
 
      List<MainOrdersVO> selectByUserId(@Param("orderStatus") Integer orderStatus, @Param("userId") Long userId);
+
+    List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO);
 }

leromro-core/src/main/java/com/leromro/core/service/IMainOrderService.java

@@ -6,6 +6,7 @@ import com.leromro.core.domain.SecondOrder;
 import com.leromro.core.domain.VolunteerWorkDate;
 import com.leromro.core.domain.dto.OrderRequestDTO;
 import com.leromro.core.domain.vo.MainOrdersVO;
+import com.leromro.core.domain.vo.webMainOrderListVO;
 
 
 import java.util.List;
@@ -16,4 +17,5 @@ public interface IMainOrderService extends IService<MainOrders> {
     void createOrders(OrderRequestDTO orderRequest);
 
 
+    List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO);
 }

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

@@ -7,6 +7,7 @@ import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.domain.*;
 import com.leromro.core.domain.dto.OrderRequestDTO;
 import com.leromro.core.domain.vo.MainOrdersVO;
+import com.leromro.core.domain.vo.webMainOrderListVO;
 import com.leromro.core.mapper.*;
 import com.leromro.core.service.IMainOrderService;
 import com.leromro.core.utils.DateTimeUtil;
@@ -148,5 +149,11 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
 
     }
 
+    @Override
+    public List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO) {
+        List<webMainOrderListVO> vos = baseMapper.webMainOrderList(mainOrdersVO);
+        return vos;
+    }
+
 
 }

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

@@ -73,9 +73,9 @@ public class VolunteerInfoServiceImpl extends ServiceImpl<VolunteerInfoMapper, V
         volunteerInfo.setProjectTypeName(businessTierName[1]);
         switch(Integer.parseInt(String.valueOf(serviceCategory))) {
             case 1:
-                volunteerInfo.setServiceSubjectName(businessTierName[2]);
                 break;
             case 2:
+                volunteerInfo.setServiceSubjectName(businessTierName[2]);
                 break;
             default:
                 throw new RuntimeException("当前服务项目层级名称错误");

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

@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <select id="selectByUserId" resultType="com.leromro.core.domain.vo.MainOrdersVO">
         select
-        lmo.*,lvi.name ,lvi.skill_describe from  l_main_orders lmo left join l_volunteer_info lvi on lmo.volunteer_id = lvi.volunteer_id
+        lmo.*,lvi.name ,lvi.skill_describe,lvi.business_tier_name from  l_main_orders lmo left join l_volunteer_info lvi on lmo.volunteer_id = lvi.volunteer_id
         <where>
             <if test="orderStatus != null and orderStatus != ''">
                 and order_status = #{orderStatus}
@@ -130,7 +130,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and user_id = #{userId}
             </if>
         </where>
-        group by main_order_id
+    </select>
+    <select id="webMainOrderList" resultType="com.leromro.core.domain.vo.webMainOrderListVO">
+        select *,project_name,project_type_name,service_subject_name,business_tier_name
+        from l_main_orders lmo left join l_volunteer_info lvi on lmo.volunteer_info_id = lvi.volunteer_info_id
     </select>
     <!--
         <update id="updateMainOrders" parameterType="MainOrders">

leromro-system/src/main/java/com/leromro/system/mapper/SysUserMapper.java

@@ -126,4 +126,6 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> userList(SysUser user);
 }

leromro-system/src/main/java/com/leromro/system/service/ISysUserService.java

@@ -205,4 +205,6 @@ public interface ISysUserService extends IService<SysUser>
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    List<SysUser> userList(SysUser user);
 }

leromro-system/src/main/java/com/leromro/system/service/impl/SysUserServiceImpl.java

@@ -551,4 +551,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return successMsg.toString();
     }
+
+    @Override
+    public List<SysUser> userList(SysUser user) {
+        return baseMapper.userList(user);
+    }
 }

leromro-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
+		where u.del_flag = '0' and u.user_or_worker = 0
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>
@@ -143,7 +143,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+	<select id="userList" resultType="com.leromro.common.core.domain.entity.SysUser">
+		select * from sys_user where del_flag = '0' and user_or_worker != 0
+	</select>
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>