新增专业领域表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcResourceFieldController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcResourceField;
+import com.ruoyi.oa.service.ICmcResourceFieldService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 专业领域Controller
+ * 
+ * @author cmc
+ * @date 2025-03-21
+ */
+@RestController
+@RequestMapping("/oa/field")
+public class CmcResourceFieldController extends BaseController
+{
+    @Autowired
+    private ICmcResourceFieldService cmcResourceFieldService;
+
+    /**
+     * 查询专业领域列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcResourceField cmcResourceField)
+    {
+        startPage();
+        List<CmcResourceField> list = cmcResourceFieldService.selectCmcResourceFieldList(cmcResourceField);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出专业领域列表
+     */
+    @Log(title = "专业领域", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcResourceField cmcResourceField)
+    {
+        List<CmcResourceField> list = cmcResourceFieldService.selectCmcResourceFieldList(cmcResourceField);
+        ExcelUtil<CmcResourceField> util = new ExcelUtil<CmcResourceField>(CmcResourceField.class);
+        util.exportExcel(response, list, "专业领域数据");
+    }
+
+    /**
+     * 获取专业领域详细信息
+     */
+    @GetMapping(value = "/{fieldId}")
+    public AjaxResult getInfo(@PathVariable("fieldId") Integer fieldId)
+    {
+        return success(cmcResourceFieldService.selectCmcResourceFieldByFieldId(fieldId));
+    }
+
+    /**
+     * 新增专业领域
+     */
+    @Log(title = "专业领域", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcResourceField cmcResourceField)
+    {
+        return toAjax(cmcResourceFieldService.insertCmcResourceField(cmcResourceField));
+    }
+
+    /**
+     * 修改专业领域
+     */
+    @Log(title = "专业领域", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcResourceField cmcResourceField)
+    {
+        return toAjax(cmcResourceFieldService.updateCmcResourceField(cmcResourceField));
+    }
+
+    /**
+     * 删除专业领域
+     */
+    @Log(title = "专业领域", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fieldIds}")
+    public AjaxResult remove(@PathVariable Integer[] fieldIds)
+    {
+        return toAjax(cmcResourceFieldService.deleteCmcResourceFieldByFieldIds(fieldIds));
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcResource.java

@@ -47,6 +47,8 @@ public class CmcResource extends BaseEntity
     private String type;
 
     /** 专业领域 */
+    private Integer fieldId;
+    private CmcResourceField resourceField;
     @Excel(name = "专业领域")
     private String field;
 
@@ -113,15 +115,24 @@ public class CmcResource extends BaseEntity
     {
         return type;
     }
-    public void setField(String field) 
+    public void setField(String field)
     {
         this.field = field;
     }
 
-    public String getField() 
+    public String getField()
     {
         return field;
     }
+    public void setFieldId(Integer fieldId)
+    {
+        this.fieldId = fieldId;
+    }
+
+    public Integer getFieldId()
+    {
+        return fieldId;
+    }
     public void setUploadTime(Date uploadTime) 
     {
         this.uploadTime = uploadTime;
@@ -160,6 +171,16 @@ public class CmcResource extends BaseEntity
     {
         return dept;
     }
+    public void setResourceField(CmcResourceField resourceField)
+    {
+        this.resourceField = resourceField;
+        this.field = resourceField == null ? "" : resourceField.getField();
+    }
+
+    public CmcResourceField getResourceField()
+    {
+        return resourceField;
+    }
 
     @Override
     public String toString() {
@@ -170,7 +191,7 @@ public class CmcResource extends BaseEntity
             .append("title", getTitle())
             .append("sourcePath", getSourcePath())
             .append("type", getType())
-            .append("field", getField())
+            .append("fieldId", getFieldId())
             .append("uploadTime", getUploadTime())
             .append("hours", getHours())
             .toString();

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcResourceField.java

@@ -0,0 +1,65 @@
+package com.ruoyi.oa.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 专业领域对象 cmc_resource_field
+ * 
+ * @author cmc
+ * @date 2025-03-21
+ */
+public class CmcResourceField extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 专业领域id */
+    private Integer fieldId;
+
+    /** 专业领域 */
+    @Excel(name = "专业领域")
+    private String field;
+
+    /** 父id */
+    @Excel(name = "父id")
+    private Integer parentId;
+
+    public void setFieldId(Integer fieldId)
+    {
+        this.fieldId = fieldId;
+    }
+
+    public Integer getFieldId()
+    {
+        return fieldId;
+    }
+    public void setField(String field) 
+    {
+        this.field = field;
+    }
+
+    public String getField() 
+    {
+        return field;
+    }
+    public void setParentId(Integer parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Integer getParentId() 
+    {
+        return parentId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("FieldId", getFieldId())
+            .append("field", getField())
+            .append("parentId", getParentId())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcResourceFieldMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcResourceField;
+
+/**
+ * 资料类别Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-03-21
+ */
+public interface CmcResourceFieldMapper 
+{
+    /**
+     * 查询资料类别
+     * 
+     * @param fieldId 资料类别主键
+     * @return 资料类别
+     */
+    public CmcResourceField selectCmcResourceFieldByFieldId(Integer fieldId);
+
+    /**
+     * 查询资料类别列表
+     * 
+     * @param cmcResourceField 资料类别
+     * @return 资料类别集合
+     */
+    public List<CmcResourceField> selectCmcResourceFieldList(CmcResourceField cmcResourceField);
+
+    /**
+     * 新增资料类别
+     * 
+     * @param cmcResourceField 资料类别
+     * @return 结果
+     */
+    public int insertCmcResourceField(CmcResourceField cmcResourceField);
+
+    /**
+     * 修改资料类别
+     * 
+     * @param cmcResourceField 资料类别
+     * @return 结果
+     */
+    public int updateCmcResourceField(CmcResourceField cmcResourceField);
+
+    /**
+     * 删除资料类别
+     * 
+     * @param fieldId 资料类别主键
+     * @return 结果
+     */
+    public int deleteCmcResourceFieldByFieldId(Integer fieldId);
+
+    /**
+     * 批量删除资料类别
+     * 
+     * @param fieldIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcResourceFieldByFieldIds(Integer[] fieldIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcResourceFieldService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcResourceField;
+
+/**
+ * 专业领域Service接口
+ * 
+ * @author cmc
+ * @date 2025-03-21
+ */
+public interface ICmcResourceFieldService
+{
+    /**
+     * 查询专业领域
+     * 
+     * @param fieldId 专业领域主键
+     * @return 专业领域
+     */
+    public CmcResourceField selectCmcResourceFieldByFieldId(Integer fieldId);
+
+    /**
+     * 查询专业领域列表
+     * 
+     * @param cmcResourceField 专业领域
+     * @return 专业领域集合
+     */
+    public List<CmcResourceField> selectCmcResourceFieldList(CmcResourceField cmcResourceField);
+
+    /**
+     * 新增专业领域
+     * 
+     * @param cmcResourceField 专业领域
+     * @return 结果
+     */
+    public int insertCmcResourceField(CmcResourceField cmcResourceField);
+
+    /**
+     * 修改专业领域
+     * 
+     * @param cmcResourceField 专业领域
+     * @return 结果
+     */
+    public int updateCmcResourceField(CmcResourceField cmcResourceField);
+
+    /**
+     * 批量删除专业领域
+     * 
+     * @param fieldIds 需要删除的专业领域主键集合
+     * @return 结果
+     */
+    public int deleteCmcResourceFieldByFieldIds(Integer[] fieldIds);
+
+    /**
+     * 删除专业领域信息
+     * 
+     * @param fieldId 专业领域主键
+     * @return 结果
+     */
+    public int deleteCmcResourceFieldByFieldId(Integer fieldId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcResourceFieldServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcResourceFieldMapper;
+import com.ruoyi.oa.domain.CmcResourceField;
+import com.ruoyi.oa.service.ICmcResourceFieldService;
+
+/**
+ * 专业领域Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-03-21
+ */
+@Service
+public class CmcResourceFieldServiceImpl implements ICmcResourceFieldService
+{
+    @Autowired
+    private CmcResourceFieldMapper cmcResourceFieldMapper;
+
+    /**
+     * 查询专业领域
+     * 
+     * @param fieldId 专业领域主键
+     * @return 专业领域
+     */
+    @Override
+    public CmcResourceField selectCmcResourceFieldByFieldId(Integer fieldId)
+    {
+        return cmcResourceFieldMapper.selectCmcResourceFieldByFieldId(fieldId);
+    }
+
+    /**
+     * 查询专业领域列表
+     * 
+     * @param cmcResourceField 专业领域
+     * @return 专业领域
+     */
+    @Override
+    public List<CmcResourceField> selectCmcResourceFieldList(CmcResourceField cmcResourceField)
+    {
+        return cmcResourceFieldMapper.selectCmcResourceFieldList(cmcResourceField);
+    }
+
+    /**
+     * 新增专业领域
+     * 
+     * @param cmcResourceField 专业领域
+     * @return 结果
+     */
+    @Override
+    public int insertCmcResourceField(CmcResourceField cmcResourceField)
+    {
+        return cmcResourceFieldMapper.insertCmcResourceField(cmcResourceField);
+    }
+
+    /**
+     * 修改专业领域
+     * 
+     * @param cmcResourceField 专业领域
+     * @return 结果
+     */
+    @Override
+    public int updateCmcResourceField(CmcResourceField cmcResourceField)
+    {
+        return cmcResourceFieldMapper.updateCmcResourceField(cmcResourceField);
+    }
+
+    /**
+     * 批量删除专业领域
+     * 
+     * @param fieldIds 需要删除的专业领域主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcResourceFieldByFieldIds(Integer[] fieldIds)
+    {
+        return cmcResourceFieldMapper.deleteCmcResourceFieldByFieldIds(fieldIds);
+    }
+
+    /**
+     * 删除专业领域信息
+     * 
+     * @param fieldId 专业领域主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcResourceFieldByFieldId(Integer fieldId)
+    {
+        return cmcResourceFieldMapper.deleteCmcResourceFieldByFieldId(fieldId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceMapper.xml

@@ -31,7 +31,7 @@
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select d.device_id, d.device_number, d.device_user, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name, de.document from cmc_device as d
+        select distinct d.device_id, d.device_number, d.device_user, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name, de.document from cmc_device as d
         left join sys_dept as dept on dept.dept_id = d.manage_dept
         left join (select * from cmc_device_expense as cde where cde.expense_type = '3') as de on de.device_id = d.device_id
     </sql>
@@ -54,11 +54,13 @@
             <if test="manageDept != null "> and d.manage_dept = #{manageDept}</if>
             <if test="status != null "> and d.status = #{status}</if>
         </where>
+        group by d.device_id
     </select>
 
     <select id="selectCmcDeviceByDeviceId" parameterType="Integer" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
         where d.device_id = #{deviceId}
+        group by d.device_id
     </select>
 
     <select id="selectCmcDeviceNameList" resultType="java.util.Map">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceFieldMapper.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcResourceFieldMapper">
+    
+    <resultMap type="CmcResourceField" id="CmcResourceFieldResult">
+        <result property="fieldId"    column="field_id"    />
+        <result property="field"    column="field"    />
+        <result property="parentId"    column="parent_id"    />
+    </resultMap>
+
+    <sql id="selectCmcResourceFieldVo">
+        select field_id, field, parent_id from cmc_resource_field
+    </sql>
+
+    <select id="selectCmcResourceFieldList" parameterType="CmcResourceField" resultMap="CmcResourceFieldResult">
+        <include refid="selectCmcResourceFieldVo"/>
+        <where>  
+            <if test="field != null  and field != ''"> and field like concat('%', #{field}, '%')</if>
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcResourceFieldByFieldId" parameterType="Integer" resultMap="CmcResourceFieldResult">
+        <include refid="selectCmcResourceFieldVo"/>
+        where field_id = #{fieldId}
+    </select>
+        
+    <insert id="insertCmcResourceField" parameterType="CmcResourceField" useGeneratedKeys="true" keyProperty="fieldId">
+        insert into cmc_resource_field
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="field != null">field,</if>
+            <if test="parentId != null">parent_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="field != null">#{field},</if>
+            <if test="parentId != null">#{parentId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcResourceField" parameterType="CmcResourceField">
+        update cmc_resource_field
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="field != null">field = #{field},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+        </trim>
+        where field_id = #{fieldId}
+    </update>
+
+    <delete id="deleteCmcResourceFieldByFieldId" parameterType="Integer">
+        delete from cmc_resource_field where field_id = #{fieldId}
+    </delete>
+
+    <delete id="deleteCmcResourceFieldByFieldIds" parameterType="String">
+        delete from cmc_resource_field where field_id in 
+        <foreach item="fieldId" collection="array" open="(" separator="," close=")">
+            #{fieldId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -11,11 +11,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title"    column="title"    />
         <result property="sourcePath"    column="source_path"    />
         <result property="type"    column="type"    />
-        <result property="field"    column="field"    />
+        <result property="fieldId"    column="field_id"    />
         <result property="uploadTime"    column="upload_time"    />
         <result property="hours"    column="hours"    />
         <association property="uploadUser"    javaType="SysUser"         resultMap="UploadUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="resourceField"    javaType="CmcResourceField"         resultMap="CmcResourceFieldResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="UploadUserResult">
@@ -28,10 +29,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName"    column="dept_name"    />
     </resultMap>
 
+    <resultMap type="CmcResourceField" id="CmcResourceFieldResult">
+        <result property="fieldId"    column="field_id"    />
+        <result property="field"    column="field"    />
+    </resultMap>
+
     <sql id="selectCmcResourceVo">
-        select r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field, r.upload_time, r.hours from cmc_resource as r
+        select r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, rf.field, r.upload_time, r.hours from cmc_resource as r
         left join sys_user as u on u.user_id = r.uploader
         left join sys_dept as d on d.dept_id = r.upload_dept
+        left join cmc_resource_field as rf on rf.field_id = r.field_id
     </sql>
 
     <select id="selectCmcResourceList" parameterType="CmcResource" resultMap="CmcResourceResult">
@@ -42,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and r.title like concat('%', #{title}, '%')</if>
             <if test="sourcePath != null  and sourcePath != ''"> and r.source_path = #{sourcePath}</if>
             <if test="type != null  and type != ''"> and r.type = #{type}</if>
-            <if test="field != null  and field != ''"> and r.field = #{field}</if>
+            <if test="fieldId != null "> and r.field_id = #{fieldId}</if>
             <if test="uploadTime != null "> and r.upload_time = #{uploadTime}</if>
             <if test="hours != null "> and r.hours = #{hours}</if>
         </where>
@@ -61,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null">title,</if>
             <if test="sourcePath != null">source_path,</if>
             <if test="type != null">type,</if>
-            <if test="field != null">field,</if>
+            <if test="fieldId != null">field_id,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="hours != null">hours,</if>
          </trim>
@@ -71,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null">#{title},</if>
             <if test="sourcePath != null">#{sourcePath},</if>
             <if test="type != null">#{type},</if>
-            <if test="field != null">#{field},</if>
+            <if test="fieldId != null">#{fieldId},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="hours != null">#{hours},</if>
          </trim>
@@ -85,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null">title = #{title},</if>
             <if test="sourcePath != null">source_path = #{sourcePath},</if>
             <if test="type != null">type = #{type},</if>
-            <if test="field != null">field = #{field},</if>
+            <if test="fieldId != null">field_id = #{fieldId},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="hours != null">hours = #{hours},</if>
         </trim>