工单管理基础接口,并关联计划

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WorkOrderInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.demo.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.demo.domain.vo.WorkOrderInfoVo;
+import org.dromara.demo.domain.bo.WorkOrderInfoBo;
+import org.dromara.demo.service.IWorkOrderInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 工单管理
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/air/orderInfo")
+public class WorkOrderInfoController extends BaseController {
+
+    private final IWorkOrderInfoService workOrderInfoService;
+
+    /**
+     * 查询工单管理列表
+     */
+    //@SaCheckPermission("air:orderInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<WorkOrderInfoVo> list(WorkOrderInfoBo bo, PageQuery pageQuery) {
+        return workOrderInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出工单管理列表
+     */
+    //@SaCheckPermission("air:orderInfo:export")
+    @Log(title = "工单管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WorkOrderInfoBo bo, HttpServletResponse response) {
+        List<WorkOrderInfoVo> list = workOrderInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "工单管理", WorkOrderInfoVo.class, response);
+    }
+
+    /**
+     * 获取工单管理详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("air:orderInfo:query")
+    @GetMapping("/{id}")
+    public R<WorkOrderInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(workOrderInfoService.queryById(id));
+    }
+
+    /**
+     * 新增工单管理
+     */
+    //@SaCheckPermission("air:orderInfo:add")
+    @Log(title = "工单管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WorkOrderInfoBo bo) {
+        return toAjax(workOrderInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改工单管理
+     */
+    //@SaCheckPermission("air:orderInfo:edit")
+    @Log(title = "工单管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WorkOrderInfoBo bo) {
+        return toAjax(workOrderInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除工单管理
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("air:orderInfo:remove")
+    @Log(title = "工单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(workOrderInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/WorkOrderInfo.java

@@ -0,0 +1,77 @@
+package org.dromara.demo.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+
+/**
+ * 工单管理对象 work_order_info
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("work_order_info")
+public class WorkOrderInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 工单编号
+     */
+    private String orderNum;
+
+    /**
+     * 工作日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date workDate;
+
+    /**
+     * 子站名称
+     */
+    private String station;
+
+    /**
+     * 子站状态
+     */
+    private String status;
+
+    /**
+     * 所属区域
+     */
+    private String area;
+
+    /**
+     * 监理类型
+     */
+    private String monitorType;
+
+    /**
+     * 监理人员
+     */
+    private String monitorPerson;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PlanInfoBo.java

@@ -85,5 +85,8 @@ public class PlanInfoBo extends BaseEntity {
     //@NotBlank(message = "监理公司不能为空", groups = { AddGroup.class, EditGroup.class })
     private String monitorCompany;
 
+    /**
+     * 是否被添加工单
+     */
     private String flag;
 }

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/WorkOrderInfoBo.java

@@ -0,0 +1,80 @@
+package org.dromara.demo.domain.bo;
+
+import org.dromara.demo.domain.WorkOrderInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 工单管理业务对象 work_order_info
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WorkOrderInfo.class, reverseConvertGenerate = false)
+public class WorkOrderInfoBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    //@NotBlank(message = "主键ID不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 工单编号
+     */
+    //@NotBlank(message = "工单编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String orderNum;
+
+    /**
+     * 工作日期
+     */
+    //@NotNull(message = "工作日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date workDate;
+
+    /**
+     * 子站名称
+     */
+    //@NotBlank(message = "子站名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String station;
+
+    /**
+     * 子站状态
+     */
+    //@NotBlank(message = "子站状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 所属区域
+     */
+    //@NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String area;
+
+    /**
+     * 监理类型
+     */
+    //@NotBlank(message = "监理类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String monitorType;
+
+    /**
+     * 监理人员
+     */
+    //@NotBlank(message = "监理人员不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String monitorPerson;
+
+    /**
+     * 计划ID
+     */
+    private String planId;
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PlanSelectVo.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class PlanSelectVo {
+    private String lable;
     private String value;
 
-
 }

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/WorkOrderInfoVo.java

@@ -0,0 +1,85 @@
+package org.dromara.demo.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.demo.domain.WorkOrderInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 工单管理视图对象 work_order_info
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = WorkOrderInfo.class)
+public class WorkOrderInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private String id;
+
+    /**
+     * 工单编号
+     */
+    @ExcelProperty(value = "工单编号")
+    private String orderNum;
+
+    /**
+     * 工作日期
+     */
+    @ExcelProperty(value = "工作日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date workDate;
+
+    /**
+     * 子站名称
+     */
+    @ExcelProperty(value = "子站名称")
+    private String station;
+
+    /**
+     * 子站状态
+     */
+    @ExcelProperty(value = "子站状态")
+    private String status;
+
+    /**
+     * 所属区域
+     */
+    @ExcelProperty(value = "所属区域")
+    private String area;
+
+    /**
+     * 监理类型
+     */
+    @ExcelProperty(value = "监理类型")
+    private String monitorType;
+
+    /**
+     * 监理人员
+     */
+    @ExcelProperty(value = "监理人员")
+    private String monitorPerson;
+
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/WorkOrderInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.demo.mapper;
+
+import org.dromara.demo.domain.WorkOrderInfo;
+import org.dromara.demo.domain.vo.WorkOrderInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 工单管理Mapper接口
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+public interface WorkOrderInfoMapper extends BaseMapperPlus<WorkOrderInfo, WorkOrderInfoVo> {
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IWorkOrderInfoService.java

@@ -0,0 +1,68 @@
+package org.dromara.demo.service;
+
+import org.dromara.demo.domain.vo.WorkOrderInfoVo;
+import org.dromara.demo.domain.bo.WorkOrderInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 工单管理Service接口
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+public interface IWorkOrderInfoService {
+
+    /**
+     * 查询工单管理
+     *
+     * @param id 主键
+     * @return 工单管理
+     */
+    WorkOrderInfoVo queryById(String id);
+
+    /**
+     * 分页查询工单管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 工单管理分页列表
+     */
+    TableDataInfo<WorkOrderInfoVo> queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的工单管理列表
+     *
+     * @param bo 查询条件
+     * @return 工单管理列表
+     */
+    List<WorkOrderInfoVo> queryList(WorkOrderInfoBo bo);
+
+    /**
+     * 新增工单管理
+     *
+     * @param bo 工单管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(WorkOrderInfoBo bo);
+
+    /**
+     * 修改工单管理
+     *
+     * @param bo 工单管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(WorkOrderInfoBo bo);
+
+    /**
+     * 校验并批量删除工单管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PlanInfoServiceImpl.java

@@ -144,6 +144,7 @@ public class PlanInfoServiceImpl implements IPlanInfoService {
         List<PlanSelectVo> list = new ArrayList<>();
         for (PlanInfoVo planInfoVo : planInfoVos) {
             PlanSelectVo planSelectVo = new PlanSelectVo();
+            String planId = planInfoVo.getId();
             // 街道名称
             String station = planInfoVo.getStation();
             // 计划日期
@@ -154,7 +155,8 @@ public class PlanInfoServiceImpl implements IPlanInfoService {
             String monitorType = planInfoVo.getMonitorType();
             // 需要拼接: 街道名称 (计划日期,监理类型) 得到rs
             String rs = String.format("%s (%s, %s)", station, formattedDate, monitorType);
-            planSelectVo.setValue(rs);
+            planSelectVo.setLable(rs);
+            planSelectVo.setValue(planId);
             list.add(planSelectVo);
         }
         return list;

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/WorkOrderInfoServiceImpl.java

@@ -0,0 +1,148 @@
+package org.dromara.demo.service.impl;
+
+import jakarta.annotation.Resource;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.demo.domain.bo.PlanInfoBo;
+import org.dromara.demo.mapper.PlanInfoMapper;
+import org.springframework.stereotype.Service;
+import org.dromara.demo.domain.bo.WorkOrderInfoBo;
+import org.dromara.demo.domain.vo.WorkOrderInfoVo;
+import org.dromara.demo.domain.WorkOrderInfo;
+import org.dromara.demo.mapper.WorkOrderInfoMapper;
+import org.dromara.demo.service.IWorkOrderInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 工单管理Service业务层处理
+ *
+ * @author GJH
+ * @date 2025-07-03
+ */
+@RequiredArgsConstructor
+@Service
+public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
+
+    private final WorkOrderInfoMapper baseMapper;
+
+    @Resource
+    private PlanInfoServiceImpl planInfoService;
+
+    @Resource
+    private PlanInfoMapper planInfoMapper;
+    /**
+     * 查询工单管理
+     *
+     * @param id 主键
+     * @return 工单管理
+     */
+    @Override
+    public WorkOrderInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询工单管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 工单管理分页列表
+     */
+    @Override
+    public TableDataInfo<WorkOrderInfoVo> queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WorkOrderInfo> lqw = buildQueryWrapper(bo);
+        Page<WorkOrderInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的工单管理列表
+     *
+     * @param bo 查询条件
+     * @return 工单管理列表
+     */
+    @Override
+    public List<WorkOrderInfoVo> queryList(WorkOrderInfoBo bo) {
+        LambdaQueryWrapper<WorkOrderInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<WorkOrderInfo> buildQueryWrapper(WorkOrderInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<WorkOrderInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderNum()), WorkOrderInfo::getOrderNum, bo.getOrderNum());
+        lqw.eq(bo.getWorkDate() != null, WorkOrderInfo::getWorkDate, bo.getWorkDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getStation()), WorkOrderInfo::getStation, bo.getStation());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WorkOrderInfo::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getArea()), WorkOrderInfo::getArea, bo.getArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonitorType()), WorkOrderInfo::getMonitorType, bo.getMonitorType());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonitorPerson()), WorkOrderInfo::getMonitorPerson, bo.getMonitorPerson());
+        return lqw;
+    }
+
+    /**
+     * 新增工单管理
+     *
+     * @param bo 工单管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(WorkOrderInfoBo bo) {
+        WorkOrderInfo add = MapstructUtils.convert(bo, WorkOrderInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+            // 更改计划状态 因为根据计划来创建工单
+            PlanInfoBo planInfoBo = new PlanInfoBo();
+            planInfoBo.setId(bo.getPlanId());
+            planInfoBo.setFlag("是");
+            planInfoService.updateByBo(planInfoBo);
+        }
+        return flag;
+    }
+
+    /**
+     * 修改工单管理
+     *
+     * @param bo 工单管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(WorkOrderInfoBo bo) {
+        WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(WorkOrderInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除工单管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}