Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
This commit is contained in:
commit
2347d46a9b
@ -2,7 +2,7 @@ name: Gitea Actions Demo
|
||||
run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
|
||||
on:
|
||||
push:
|
||||
branches: [ main ] # 当main分支有推送时触发
|
||||
branches: [ master ] # 当main分支有推送时触发
|
||||
jobs:
|
||||
Explore-Gitea-Actions:
|
||||
runs-on: ubuntu-latest
|
||||
@ -15,7 +15,7 @@ jobs:
|
||||
# - name: Checkout code
|
||||
# uses: actions/checkout@v4 # 拉取代码到工作目录
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
uses: http://47.109.37.87:3000/bichangxiong/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
@ -25,12 +25,8 @@ jobs:
|
||||
with:
|
||||
maven-version: 3.8.2
|
||||
|
||||
- name: List files in the repository
|
||||
run: |
|
||||
ls ${{ gitea.workspace }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: mvn clean package -DskipTests
|
||||
run: mvn clean package -DskipTests -Dmaven.repo.local=/home/runner/maven-repo
|
||||
- name: copy file via ssh password
|
||||
uses: appleboy/scp-action@v0.1.7
|
||||
with:
|
||||
|
||||
@ -42,7 +42,7 @@ public class ServiceWorkOrdersController extends BaseController {
|
||||
/**
|
||||
* 查询【工单处理】列表
|
||||
*/
|
||||
@SaCheckPermission("system:workOrders:list")
|
||||
//@SaCheckPermission("system:workOrders:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
|
||||
return serviceWorkOrdersService.queryPageList(bo, pageQuery);
|
||||
@ -51,7 +51,7 @@ public class ServiceWorkOrdersController extends BaseController {
|
||||
/**
|
||||
* 导出【工单处理】列表
|
||||
*/
|
||||
@SaCheckPermission("system:workOrders:export")
|
||||
// @SaCheckPermission("system:workOrders:export")
|
||||
@Log(title = "【工单处理】", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ServiceWorkOrdersBo bo, HttpServletResponse response) {
|
||||
@ -74,7 +74,7 @@ public class ServiceWorkOrdersController extends BaseController {
|
||||
/**
|
||||
* 新增【工单处理】
|
||||
*/
|
||||
@SaCheckPermission("system:workOrders:add")
|
||||
// @SaCheckPermission("system:workOrders:add")
|
||||
@Log(title = "【工单处理】", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
@ -85,7 +85,7 @@ public class ServiceWorkOrdersController extends BaseController {
|
||||
/**
|
||||
* 修改【工单处理】
|
||||
*/
|
||||
@SaCheckPermission("system:workOrders:edit")
|
||||
//@SaCheckPermission("system:workOrders:edit")
|
||||
@Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
@ -98,7 +98,7 @@ public class ServiceWorkOrdersController extends BaseController {
|
||||
*
|
||||
* @param ids 主键串
|
||||
*/
|
||||
@SaCheckPermission("system:workOrders:remove")
|
||||
// @SaCheckPermission("system:workOrders:remove")
|
||||
@Log(title = "【工单处理】", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
|
||||
@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
@ -37,7 +39,7 @@ public class ServerBooking extends TenantEntity {
|
||||
/**
|
||||
* 预约数量
|
||||
*/
|
||||
private Long serverNum;
|
||||
private Integer serverNum;
|
||||
|
||||
/**
|
||||
* 预约类型
|
||||
@ -67,17 +69,17 @@ public class ServerBooking extends TenantEntity {
|
||||
/**
|
||||
* 预约价格
|
||||
*/
|
||||
private Long bookingPrice;
|
||||
private BigDecimal bookingPrice;
|
||||
|
||||
/**
|
||||
* 实付价格
|
||||
*/
|
||||
private Long payPrice;
|
||||
private BigDecimal payPrice;
|
||||
|
||||
/**
|
||||
* 支付方式
|
||||
*/
|
||||
private Long payType;
|
||||
private Integer payType;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
@ -87,7 +89,7 @@ public class ServerBooking extends TenantEntity {
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private Long state;
|
||||
private Integer state;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
|
||||
@ -47,7 +47,7 @@ public class ServiceWorkOrders extends TenantEntity {
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private int status;
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 派单时间
|
||||
@ -59,10 +59,6 @@ public class ServiceWorkOrders extends TenantEntity {
|
||||
*/
|
||||
private String initiatorName;
|
||||
|
||||
/**
|
||||
* 发起人手机号
|
||||
*/
|
||||
private String initiatorPhone;
|
||||
|
||||
/**
|
||||
* 处理人姓名
|
||||
@ -87,12 +83,12 @@ public class ServiceWorkOrders extends TenantEntity {
|
||||
/**
|
||||
* 评价
|
||||
*/
|
||||
private String serviceEvalua;
|
||||
private Integer serviceEvalua;
|
||||
|
||||
/**
|
||||
* 是否超时
|
||||
*/
|
||||
private int isTimeOut;
|
||||
private Integer isTimeOut;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
@ -104,10 +100,5 @@ public class ServiceWorkOrders extends TenantEntity {
|
||||
*/
|
||||
private Long updateById;
|
||||
|
||||
/**
|
||||
* 搜索值
|
||||
*/
|
||||
private String searchValue;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -45,17 +45,17 @@ public class ServiceWorkOrdersType extends TenantEntity {
|
||||
/**
|
||||
* 排序值
|
||||
*/
|
||||
private int sort;
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 累计工单数量
|
||||
*/
|
||||
private int number;
|
||||
private Integer completionNumber;
|
||||
|
||||
/**
|
||||
* 是否支持转单(0支持,1不支持)
|
||||
*/
|
||||
private int isTransfers;
|
||||
private Integer isTransfers;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
|
||||
@ -46,7 +46,7 @@ public class MeetBo extends BaseEntity {
|
||||
* 容纳人数
|
||||
*/
|
||||
@NotBlank(message = "容纳人数不能为空")
|
||||
private Long personNumber;
|
||||
private Integer personNumber;
|
||||
|
||||
/**
|
||||
* 基础服务
|
||||
@ -61,11 +61,12 @@ public class MeetBo extends BaseEntity {
|
||||
/**
|
||||
* 增值服务是否启用
|
||||
*/
|
||||
private Long attach;
|
||||
private Integer attach;
|
||||
|
||||
/**
|
||||
* 负责人
|
||||
*/
|
||||
@NotBlank(message = "负责人不能为空")
|
||||
private String principals;
|
||||
|
||||
/**
|
||||
|
||||
@ -46,7 +46,7 @@ public class ServiceWorkOrdersBo extends BaseEntity {
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private int status;
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 派单时间
|
||||
@ -58,10 +58,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
|
||||
*/
|
||||
private String initiatorName;
|
||||
|
||||
/**
|
||||
* 发起人手机号
|
||||
*/
|
||||
private String initiatorPhone;
|
||||
|
||||
/**
|
||||
* 处理人姓名
|
||||
@ -86,12 +82,12 @@ public class ServiceWorkOrdersBo extends BaseEntity {
|
||||
/**
|
||||
* 评价
|
||||
*/
|
||||
private String serviceEvalua;
|
||||
private Integer serviceEvalua;
|
||||
|
||||
/**
|
||||
* 是否超时
|
||||
*/
|
||||
private int isTimeOut;
|
||||
private Integer isTimeOut;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
@ -103,10 +99,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
|
||||
*/
|
||||
private Long updateById;
|
||||
|
||||
/**
|
||||
* 搜索值
|
||||
*/
|
||||
private String searchValue;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import io.github.linpeilie.annotations.AutoMapper;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.property.domain.ServiceWorkOrdersType;
|
||||
@ -33,27 +34,31 @@ public class ServiceWorkOrdersTypeBo extends BaseEntity {
|
||||
/**
|
||||
* 工单类型名称
|
||||
*/
|
||||
@NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String orderTypeName;
|
||||
|
||||
/**
|
||||
* 运作模式
|
||||
*/
|
||||
@NotNull(message = "运作模式不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private String operationMode;
|
||||
|
||||
/**
|
||||
* 排序值
|
||||
*/
|
||||
private int sort;
|
||||
@NotNull(message = "排序值不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 累计工单数量
|
||||
* 完成时效
|
||||
*/
|
||||
private int number;
|
||||
@NotNull(message = "完成时效不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Integer completionNumber;
|
||||
|
||||
/**
|
||||
* 是否支持转单(0支持,1不支持)
|
||||
*/
|
||||
private int isTransfers;
|
||||
private Integer isTransfers;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
|
||||
@ -51,7 +51,7 @@ public class ServiceWorkOrdersInfoVo implements Serializable {
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态")
|
||||
private int status;
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 派单时间
|
||||
@ -87,7 +87,11 @@ public class ServiceWorkOrdersInfoVo implements Serializable {
|
||||
@ExcelProperty(value = "处理人姓名文本")
|
||||
private String handlerText;
|
||||
|
||||
|
||||
/**
|
||||
* 处理人姓名电话
|
||||
*/
|
||||
@ExcelProperty(value = "处理人电话")
|
||||
private String handlerPhone;
|
||||
/**
|
||||
* 地址
|
||||
*/
|
||||
@ -116,10 +120,15 @@ public class ServiceWorkOrdersInfoVo implements Serializable {
|
||||
* 是否超时
|
||||
*/
|
||||
@ExcelProperty(value = "是否超时")
|
||||
private int isTimeOut;
|
||||
private Integer isTimeOut;
|
||||
/**
|
||||
* 类型名称
|
||||
*/
|
||||
@ExcelProperty(value = "类型名称")
|
||||
private String typeName;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ExcelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
}
|
||||
|
||||
@ -22,6 +22,7 @@ import java.io.Serializable;
|
||||
@AutoMapper(target = ServiceWorkOrdersType.class)
|
||||
public class ServiceWorkOrdersTypeVo implements Serializable {
|
||||
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ -53,19 +54,19 @@ public class ServiceWorkOrdersTypeVo implements Serializable {
|
||||
* 排序值
|
||||
*/
|
||||
@ExcelProperty(value = "排序值")
|
||||
private int sort;
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 累计工单数量
|
||||
* 完成时效
|
||||
*/
|
||||
@ExcelProperty(value = "累计工单数量")
|
||||
private int number;
|
||||
@ExcelProperty(value = "完成时效")
|
||||
private Integer completionNumber;
|
||||
|
||||
/**
|
||||
* 是否支持转单(0支持,1不支持)
|
||||
*/
|
||||
@ExcelProperty(value = "是否支持转单(0支持,1不支持)")
|
||||
private int isTransfers;
|
||||
private Integer isTransfers;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
@ -85,5 +86,4 @@ public class ServiceWorkOrdersTypeVo implements Serializable {
|
||||
@ExcelProperty(value = "搜索值")
|
||||
private String searchValue;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -49,6 +49,11 @@ public class ServiceWorkOrdersVo implements Serializable {
|
||||
*/
|
||||
@ExcelProperty(value = "工单类型")
|
||||
private Long type;
|
||||
/**
|
||||
* 工单类型名称
|
||||
*/
|
||||
@ExcelProperty(value = "工单类型名称")
|
||||
private String typeName;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
@ -113,7 +118,7 @@ public class ServiceWorkOrdersVo implements Serializable {
|
||||
* 评价
|
||||
*/
|
||||
@ExcelProperty(value = "评价")
|
||||
private String serviceEvalua;
|
||||
private Integer serviceEvalua;
|
||||
|
||||
/**
|
||||
* 是否超时
|
||||
@ -139,5 +144,9 @@ public class ServiceWorkOrdersVo implements Serializable {
|
||||
@ExcelProperty(value = "搜索值")
|
||||
private String searchValue;
|
||||
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ExcelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
}
|
||||
|
||||
@ -105,7 +105,6 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
|
||||
s.setPhone(residentPersonVo.getPhone());
|
||||
meetBookingVoList.add(s);
|
||||
});
|
||||
new Page<MeetBookingVo>().setRecords(meetBookingVoList);
|
||||
return TableDataInfo.build(new Page<MeetBookingVo>().setRecords(meetBookingVoList));
|
||||
}
|
||||
|
||||
|
||||
@ -57,8 +57,10 @@ public class MeetServiceImpl implements IMeetService {
|
||||
public MeetVo queryById(Long id){
|
||||
MeetVo meetVo= baseMapper.selectVoById(id);
|
||||
ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetVo.getPrincipals());
|
||||
if(ObjectUtil.isNotEmpty(residentPersonVo)){
|
||||
meetVo.setPrincipalsName(residentPersonVo.getUserName());
|
||||
meetVo.setPhoneNo(residentPersonVo.getPhone());
|
||||
}
|
||||
String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation()));
|
||||
meetVo.setLocationName(locationName);
|
||||
return meetVo;
|
||||
|
||||
@ -2,6 +2,7 @@ package org.dromara.property.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@ -14,10 +15,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.property.domain.ServiceWorkOrders;
|
||||
import org.dromara.property.domain.ServiceWorkOrdersType;
|
||||
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
|
||||
import org.dromara.property.domain.vo.ResidentPersonVo;
|
||||
import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo;
|
||||
import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
|
||||
import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
|
||||
import org.dromara.property.domain.vo.*;
|
||||
import org.dromara.property.mapper.ResidentPersonMapper;
|
||||
import org.dromara.property.mapper.ServiceWorkOrdersMapper;
|
||||
import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper;
|
||||
@ -25,10 +23,8 @@ import org.dromara.property.service.IServiceWorkOrdersService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 【工单处理】Service业务层处理
|
||||
@ -67,6 +63,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
|
||||
ResidentPersonVo residentPersonHandler = residentPersonMapper.selectVoById(Long.valueOf(serviceWorkOrdersVo.getHandler()));
|
||||
if (Objects.nonNull(residentPersonHandler)) {
|
||||
serviceWorkOrdersInfoVo.setHandlerText(residentPersonHandler.getUserName());
|
||||
serviceWorkOrdersInfoVo.setHandlerPhone(residentPersonHandler.getPhone());
|
||||
}
|
||||
return serviceWorkOrdersInfoVo;
|
||||
}
|
||||
@ -82,8 +79,23 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
|
||||
public TableDataInfo<ServiceWorkOrdersVo> queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
|
||||
Page<ServiceWorkOrdersVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
if (ObjectUtil.isEmpty(result.getRecords())) {
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
List<Long> typeList = result.getRecords().stream()
|
||||
.map(vo -> vo.getType())
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
|
||||
List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
|
||||
result.getRecords().stream().forEach(s -> {
|
||||
ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream()
|
||||
.filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
|
||||
s.setTypeName(serviceWorkOrdersTypeVo.getOrderTypeName());
|
||||
serviceWorkOrdersVoList.add(s);
|
||||
});
|
||||
return TableDataInfo.build(new Page<ServiceWorkOrdersVo>().setRecords(serviceWorkOrdersVoList));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的【工单处理】列表
|
||||
@ -105,12 +117,12 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
|
||||
lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName());
|
||||
lqw.eq(bo.getDispatchTime() != null, ServiceWorkOrders::getDispatchTime, bo.getDispatchTime());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getInitiatorName()), ServiceWorkOrders::getInitiatorName, bo.getInitiatorName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getInitiatorPhone()), ServiceWorkOrders::getInitiatorPhone, bo.getInitiatorPhone());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getHandler()), ServiceWorkOrders::getHandler, bo.getHandler());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getLocation()), ServiceWorkOrders::getLocation, bo.getLocation());
|
||||
lqw.eq(bo.getPlanCompleTime() != null, ServiceWorkOrders::getPlanCompleTime, bo.getPlanCompleTime());
|
||||
lqw.eq(bo.getCompleTime() != null, ServiceWorkOrders::getCompleTime, bo.getCompleTime());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua());
|
||||
lqw.eq(Objects.nonNull(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua());
|
||||
lqw.eq(Objects.nonNull(bo.getType()), ServiceWorkOrders::getType, bo.getType());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrders::getSearchValue, bo.getSearchValue());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user