故障小类下拉框 和 项目管理合同基础接口

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultSubcategoryTypeController.java

@@ -0,0 +1,105 @@
+package org.dromara.platform.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.platform.domain.vo.FaultSubcategoryTypeVo;
+import org.dromara.platform.domain.bo.FaultSubcategoryTypeBo;
+import org.dromara.platform.service.IFaultSubcategoryTypeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 故障小类-类别
+ *
+ * @author gejunhao
+ * @date 2025-04-10
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/platform/subcategoryType")
+public class FaultSubcategoryTypeController extends BaseController {
+
+    private final IFaultSubcategoryTypeService faultSubcategoryTypeService;
+
+    /**
+     * 查询故障小类-类别列表
+     */
+    @SaCheckPermission("platform:subcategoryType:list")
+    @GetMapping("/list")
+    public TableDataInfo<FaultSubcategoryTypeVo> list(FaultSubcategoryTypeBo bo, PageQuery pageQuery) {
+        return faultSubcategoryTypeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出故障小类-类别列表
+     */
+    @SaCheckPermission("platform:subcategoryType:export")
+    @Log(title = "故障小类-类别", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(FaultSubcategoryTypeBo bo, HttpServletResponse response) {
+        List<FaultSubcategoryTypeVo> list = faultSubcategoryTypeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "故障小类-类别", FaultSubcategoryTypeVo.class, response);
+    }
+
+    /**
+     * 获取故障小类-类别详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("platform:subcategoryType:query")
+    @GetMapping("/{id}")
+    public R<FaultSubcategoryTypeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(faultSubcategoryTypeService.queryById(id));
+    }
+
+    /**
+     * 新增故障小类-类别
+     */
+    @SaCheckPermission("platform:subcategoryType:add")
+    @Log(title = "故障小类-类别", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FaultSubcategoryTypeBo bo) {
+        return toAjax(faultSubcategoryTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改故障小类-类别
+     */
+    @SaCheckPermission("platform:subcategoryType:edit")
+    @Log(title = "故障小类-类别", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FaultSubcategoryTypeBo bo) {
+        return toAjax(faultSubcategoryTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除故障小类-类别
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("platform:subcategoryType:remove")
+    @Log(title = "故障小类-类别", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(faultSubcategoryTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java

@@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.platform.domain.ContractInfo;
 import org.dromara.platform.domain.vo.ProjectSelectVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -113,4 +115,23 @@ public class ProjectInfoController extends BaseController {
         return R.ok(projectInfoService.getNames());
     }
 
+
+    /**
+     * 根据项目名称获取合同名称
+     */
+    @SaCheckPermission("platform:projectInfo:getContractNameByProjectName")
+    @GetMapping("/getContractNameByProjectName")
+    public R<String> getContractNameByProjectName(@Param("projectName") String projectName) {
+        String contractName = projectInfoService.getContractNameByProjectName(projectName);
+        return R.ok(contractName);
+    }
+
+
+    @SaCheckPermission("platform:projectInfo:getContractInfoByProjectName")
+    @GetMapping("/getContractInfoByProjectName")
+    public R<List<ContractInfo>> getContractInfoByProjectName(@Param("projectName") String projectName) {
+        List<ContractInfo> rs = projectInfoService.getContractInfoByProjectName(projectName);
+        return R.ok(rs);
+    }
+
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/FaultSubcategoryType.java

@@ -0,0 +1,47 @@
+package org.dromara.platform.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 故障小类-类别对象 fault_subcategory_type
+ *
+ * @author gejunhao
+ * @date 2025-04-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fault_subcategory_type")
+public class FaultSubcategoryType extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识符
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 故障小类名称
+     */
+    private String typeName;
+
+    /**
+     * 当前状态
+     */
+    private Long status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/FaultSubcategoryTypeBo.java

@@ -0,0 +1,42 @@
+package org.dromara.platform.domain.bo;
+
+import org.dromara.platform.domain.FaultSubcategoryType;
+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.*;
+
+/**
+ * 故障小类-类别业务对象 fault_subcategory_type
+ *
+ * @author gejunhao
+ * @date 2025-04-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FaultSubcategoryType.class, reverseConvertGenerate = false)
+public class FaultSubcategoryTypeBo extends BaseEntity {
+
+    /**
+     * 唯一标识符
+     */
+    @NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 故障小类名称
+     */
+    @NotBlank(message = "故障小类名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeName;
+
+    /**
+     * 当前状态
+     */
+    @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/FaultSubcategoryTypeVo.java

@@ -0,0 +1,50 @@
+package org.dromara.platform.domain.vo;
+
+import org.dromara.platform.domain.FaultSubcategoryType;
+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 java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 故障小类-类别视图对象 fault_subcategory_type
+ *
+ * @author gejunhao
+ * @date 2025-04-10
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = FaultSubcategoryType.class)
+public class FaultSubcategoryTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识符
+     */
+    @ExcelProperty(value = "唯一标识符")
+    private String id;
+
+    /**
+     * 故障小类名称
+     */
+    @ExcelProperty(value = "故障小类名称")
+    private String typeName;
+
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Long status;
+
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/FaultSubcategoryTypeMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.platform.mapper;
+
+import org.dromara.platform.domain.FaultSubcategoryType;
+import org.dromara.platform.domain.vo.FaultSubcategoryTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 故障小类-类别Mapper接口
+ *
+ * @author gejunhao
+ * @date 2025-04-10
+ */
+public interface FaultSubcategoryTypeMapper extends BaseMapperPlus<FaultSubcategoryType, FaultSubcategoryTypeVo> {
+
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IFaultSubcategoryTypeService.java

@@ -0,0 +1,68 @@
+package org.dromara.platform.service;
+
+import org.dromara.platform.domain.vo.FaultSubcategoryTypeVo;
+import org.dromara.platform.domain.bo.FaultSubcategoryTypeBo;
+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 gejunhao
+ * @date 2025-04-10
+ */
+public interface IFaultSubcategoryTypeService {
+
+    /**
+     * 查询故障小类-类别
+     *
+     * @param id 主键
+     * @return 故障小类-类别
+     */
+    FaultSubcategoryTypeVo queryById(String id);
+
+    /**
+     * 分页查询故障小类-类别列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 故障小类-类别分页列表
+     */
+    TableDataInfo<FaultSubcategoryTypeVo> queryPageList(FaultSubcategoryTypeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的故障小类-类别列表
+     *
+     * @param bo 查询条件
+     * @return 故障小类-类别列表
+     */
+    List<FaultSubcategoryTypeVo> queryList(FaultSubcategoryTypeBo bo);
+
+    /**
+     * 新增故障小类-类别
+     *
+     * @param bo 故障小类-类别
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(FaultSubcategoryTypeBo bo);
+
+    /**
+     * 修改故障小类-类别
+     *
+     * @param bo 故障小类-类别
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(FaultSubcategoryTypeBo bo);
+
+    /**
+     * 校验并批量删除故障小类-类别信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IProjectInfoService.java

@@ -76,6 +76,20 @@ public interface IProjectInfoService {
      */
     List<ProjectSelectVo> getNames();
 
+    /**
+     * 根据项目名称查询合同名称
+     * @param projectName
+     * @return
+     */
+    String getContractNameByProjectName(String projectName);
+
+    /**
+     * 根据项目名称查询合同信息
+     * @param projectName
+     * @return
+     */
+    List<ContractInfo> getContractInfoByProjectName(String projectName);
+
     /**
      * 根据项目名称查询项目信息
      * @param projectName

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/FaultSubcategoryTypeServiceImpl.java

@@ -0,0 +1,130 @@
+package org.dromara.platform.service.impl;
+
+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.springframework.stereotype.Service;
+import org.dromara.platform.domain.bo.FaultSubcategoryTypeBo;
+import org.dromara.platform.domain.vo.FaultSubcategoryTypeVo;
+import org.dromara.platform.domain.FaultSubcategoryType;
+import org.dromara.platform.mapper.FaultSubcategoryTypeMapper;
+import org.dromara.platform.service.IFaultSubcategoryTypeService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 故障小类-类别Service业务层处理
+ *
+ * @author gejunhao
+ * @date 2025-04-10
+ */
+@RequiredArgsConstructor
+@Service
+public class FaultSubcategoryTypeServiceImpl implements IFaultSubcategoryTypeService {
+
+    private final FaultSubcategoryTypeMapper baseMapper;
+
+    /**
+     * 查询故障小类-类别
+     *
+     * @param id 主键
+     * @return 故障小类-类别
+     */
+    @Override
+    public FaultSubcategoryTypeVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询故障小类-类别列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 故障小类-类别分页列表
+     */
+    @Override
+    public TableDataInfo<FaultSubcategoryTypeVo> queryPageList(FaultSubcategoryTypeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<FaultSubcategoryType> lqw = buildQueryWrapper(bo);
+        Page<FaultSubcategoryTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的故障小类-类别列表
+     *
+     * @param bo 查询条件
+     * @return 故障小类-类别列表
+     */
+    @Override
+    public List<FaultSubcategoryTypeVo> queryList(FaultSubcategoryTypeBo bo) {
+        LambdaQueryWrapper<FaultSubcategoryType> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<FaultSubcategoryType> buildQueryWrapper(FaultSubcategoryTypeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<FaultSubcategoryType> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getTypeName()), FaultSubcategoryType::getTypeName, bo.getTypeName());
+        lqw.eq(bo.getStatus() != null, FaultSubcategoryType::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增故障小类-类别
+     *
+     * @param bo 故障小类-类别
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(FaultSubcategoryTypeBo bo) {
+        FaultSubcategoryType add = MapstructUtils.convert(bo, FaultSubcategoryType.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改故障小类-类别
+     *
+     * @param bo 故障小类-类别
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(FaultSubcategoryTypeBo bo) {
+        FaultSubcategoryType update = MapstructUtils.convert(bo, FaultSubcategoryType.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(FaultSubcategoryType entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除故障小类-类别信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+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;
@@ -9,7 +10,10 @@ 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.platform.domain.ContractInfo;
 import org.dromara.platform.domain.vo.ProjectSelectVo;
+import org.dromara.platform.mapper.ContractInfoMapper;
+import org.dromara.platform.service.IContractInfoService;
 import org.springframework.stereotype.Service;
 import org.dromara.platform.domain.bo.ProjectInfoBo;
 import org.dromara.platform.domain.vo.ProjectInfoVo;
@@ -34,6 +38,9 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
 
     private final ProjectInfoMapper baseMapper;
 
+    @Resource
+    private ContractInfoMapper contractInfoMapper;
+
     /**
      * 查询项目信息
      *
@@ -162,4 +169,21 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
         }
         return selectVoList;
     }
+
+    @Override
+    public String getContractNameByProjectName(String projectName) {
+        LambdaQueryWrapper<ContractInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ContractInfo::getProjectName, projectName);
+        ContractInfo contractInfo = contractInfoMapper.selectOne(queryWrapper);
+        String contractName = contractInfo.getContractName();
+        return contractName;
+    }
+
+    @Override
+    public List<ContractInfo> getContractInfoByProjectName(String projectName) {
+        LambdaQueryWrapper<ContractInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ContractInfo::getProjectName, projectName);
+        List<ContractInfo> contractInfos = contractInfoMapper.selectList(queryWrapper);
+        return contractInfos;
+    }
 }