首页和盘点的部门改为显示名称

ruoyi-admin/src/main/java/com/ruoyi/inventory/controller/TbAssetInventoryController.java

@@ -2,6 +2,9 @@ package com.ruoyi.inventory.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +37,7 @@ public class TbAssetInventoryController extends BaseController
     @Autowired
     private ITbAssetInventoryService tbAssetInventoryService;
 
+
     /**
      * 查询资产盘点记录列表
      */
@@ -47,6 +51,18 @@ public class TbAssetInventoryController extends BaseController
     }
 
     /**
+     * 查询资产盘点记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:list')")
+    @GetMapping("/listDTO")
+    public TableDataInfo listDTO(TbAssetInventoryDTO dto)
+    {
+        startPage();
+        List<TbAssetInventoryDTO> list = tbAssetInventoryService.selectTbAssetInventoryDTOList(dto);
+        return getDataTable(list);
+    }
+
+    /**
      * 导出资产盘点记录列表
      */
     @PreAuthorize("@ss.hasPermi('inventory:inventory:export')")

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/dto/TbAssetInventoryDTO.java

@@ -0,0 +1,64 @@
+package com.ruoyi.inventory.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class TbAssetInventoryDTO {
+    /** 资产盘点记录编号 */
+    private Long id;
+
+    /** 单据编号 */
+    @Excel(name = "单据编号")
+    private String orderNumber;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String name;
+
+    /** 盘点部门 */
+    @Excel(name = "盘点部门")
+    private String deptName;
+
+    /** 盘点人 */
+    @Excel(name = "盘点人")
+    private String inventoryBy;
+
+    /** 盘点日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "盘点日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inventoryDate;
+
+    /** 盘点位置 */
+    @Excel(name = "盘点位置")
+    private String inventoryLocation;
+
+    /** 盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停 */
+    @Excel(name = "盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停")
+    private Long inventoryStatus;
+
+    /** 盘点结果，0：盘亏，1：盘盈，2：正常 */
+    @Excel(name = "盘点结果，0：盘亏，1：盘盈，2：正常")
+    private Long inventoryResult;
+
+    /** 记录状态，0：未提交，1：已提交 */
+    @Excel(name = "记录状态，0：未提交，1：已提交")
+    private Long recordStatus;
+
+    /** 记录创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    /** 记录更新时间 */
+    private Date updatedTime;
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/mapper/TbAssetInventoryMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.inventory.mapper;
 
 import java.util.List;
 import com.ruoyi.inventory.domain.TbAssetInventory;
+import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 
 /**
  * 资产盘点记录Mapper接口
@@ -58,4 +59,12 @@ public interface TbAssetInventoryMapper
      * @return 结果
      */
     public int deleteTbAssetInventoryByIds(Long[] ids);
+
+    /**
+     * 查询资产盘点记录列表
+     *
+     * @param dto 资产盘点记录
+     * @return 资产盘点记录集合
+     */
+    public List<TbAssetInventoryDTO> selectTbAssetInventoryDTOList(TbAssetInventoryDTO dto);
 }

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/ITbAssetInventoryService.java

@@ -2,6 +2,7 @@ package com.ruoyi.inventory.service;
 
 import java.util.List;
 import com.ruoyi.inventory.domain.TbAssetInventory;
+import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 
 /**
  * 资产盘点记录Service接口
@@ -58,4 +59,12 @@ public interface ITbAssetInventoryService
      * @return 结果
      */
     public int deleteTbAssetInventoryById(Long id);
+
+    /**
+     * 查询资产盘点记录列表
+     *
+     * @param dto 资产盘点记录
+     * @return 资产盘点记录集合
+     */
+    public List<TbAssetInventoryDTO> selectTbAssetInventoryDTOList(TbAssetInventoryDTO dto);
 }

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbAssetInventoryServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.inventory.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.inventory.mapper.TbAssetInventoryMapper;
@@ -14,7 +16,7 @@ import com.ruoyi.inventory.service.ITbAssetInventoryService;
  * @date 2023-06-01
  */
 @Service
-public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService 
+public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
 {
     @Autowired
     private TbAssetInventoryMapper tbAssetInventoryMapper;
@@ -90,4 +92,9 @@ public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService
     {
         return tbAssetInventoryMapper.deleteTbAssetInventoryById(id);
     }
+
+    @Override
+    public List<TbAssetInventoryDTO> selectTbAssetInventoryDTOList(TbAssetInventoryDTO dto) {
+        return tbAssetInventoryMapper.selectTbAssetInventoryDTOList(dto);
+    }
 }

ruoyi-admin/src/main/resources/mapper/inventory/TbAssetInventoryMapper.xml

@@ -105,4 +105,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+
+    <select id="selectTbAssetInventoryDTOList" parameterType="com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO" resultType="com.ruoyi.inventory.domain.dto.TbAssetInventoryDTO">
+        select
+            a.id,
+            a.order_number orderNumber,
+            a.name,
+            b.dept_name deptName,
+            a.inventory_by inventoryBy,
+            a.inventory_date inventoryDate,
+            a.inventory_location inventoryLocation,
+            a.inventory_status inventoryStatus,
+            a.inventory_result inventoryResult,
+            a.record_status recordResult,
+            a.record_status recordStatus,
+            a.remark,
+            a.created_time createdTime,
+            a.updated_time updatedTime
+        from
+            tb_asset_inventory a
+        left join
+            sys_dept b
+        on
+            a.inventory_department = b.dept_id
+        where
+            a.inventory_by = #{inventoryBy}
+    </select>
 </mapper>

ruoyi-ui/src/api/inventory/inventory.js

@@ -9,6 +9,15 @@ export function listInventory(query) {
   })
 }
 
+// 查询资产盘点记录视图列表
+export function listInventoryDTO(query) {
+  return request({
+    url: '/inventory/inventory/listDTO',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询资产盘点记录详细
 export function getInventory(id) {
   return request({

ruoyi-ui/src/views/index.vue

@@ -211,11 +211,11 @@
       style="width: 100%"
       :default-sort="{ prop: 'applicationDate', order: 'descending' }"
     >
-    <el-table-column type="selection" width="55" align="center" />
+    <el-table-column  width="55" align="center" />
       <el-table-column label="资产盘点记录编号" align="center" prop="id" />
       <el-table-column label="单据编号" align="center" prop="orderNumber" />
       <el-table-column label="任务名称" align="center" prop="name" />
-      <el-table-column label="盘点部门" align="center" prop="inventoryDepartment" />
+      <el-table-column label="盘点部门" align="center" prop="deptName" />
       <el-table-column label="盘点人" align="center" prop="inventoryBy" />
       <el-table-column label="盘点日期" align="center" prop="inventoryDate" width="180">
         <template slot-scope="scope">
@@ -225,6 +225,7 @@
       <el-table-column label="盘点位置" align="center" prop="inventoryLocation" />
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
+
     <!-- 【调整】资产信息 -->
     <el-dialog
       title="资产调整"
@@ -245,7 +246,8 @@
 
 <script>
 import { listOrder, auditOrder } from "@/api/order/order";
-import { listInventory } from "@/api/inventory/inventory";
+import { listInventoryDTO } from "@/api/inventory/inventory";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   dicts: ["asset_order_type", "asset_record_status"],
@@ -255,6 +257,8 @@ export default {
   },
   data() {
     return {
+      //用户信息
+      user: {},
       // 表单参数
       form: {},
       // 资产单据表格数据
@@ -271,6 +275,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         recordStatus: 1,
+        inventoryBy: '',
       },
     };
   },
@@ -281,9 +286,13 @@ export default {
     /** 查询资产单据列表 */
     getList() {
       this.loading = true;
-      listInventory(this.queryParams).then(response => {
+      getUserProfile().then(response => {
+        this.user = response.data;
+        this.queryParams.inventoryBy = this.user.userName
+        listInventoryDTO(this.queryParams).then(response => {
         this.inventoryList = response.rows;
       });
+      });
       listOrder(this.queryParams).then((response) => {
         this.orderList = response.rows;
         this.total = response.total;

ruoyi-ui/src/views/inventory/inventory/index.vue

@@ -129,7 +129,11 @@
       <el-table-column label="资产盘点记录编号" align="center" prop="id" />
       <el-table-column label="单据编号" align="center" prop="orderNumber" />
       <el-table-column label="任务名称" align="center" prop="name" />
-      <el-table-column label="盘点部门" align="center" prop="inventoryDepartment" />
+      <el-table-column label="盘点部门" align="center" prop="inventoryDepartment" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.inventoryDepartment != null ? companyName(scope.row.inventoryDepartment) : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="盘点人" align="center" prop="inventoryBy" />
       <el-table-column label="盘点日期" align="center" prop="inventoryDate" width="180">
         <template slot-scope="scope">
@@ -177,7 +181,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -251,6 +255,7 @@
 import { deptTreeSelect } from '@/api/system/user.js'
 import { listInventory, getInventory, delInventory, addInventory, updateInventory } from "@/api/inventory/inventory";
 import { listLocation } from "@/api/asset/location";
+import { listDept } from "@/api/system/dept";
 import UserSearch from '@/components/SysUserSearch/index.vue'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -281,6 +286,7 @@ export default {
       locationList: [],
       // 部门树选项
       deptOptions: [],
+      arr: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -346,12 +352,21 @@ export default {
       listLocation().then((response) => {
         this.locationList = response.rows;
       });
+      listDept().then((response) => {
+        this.arr = response.data
+      });
       listInventory(this.queryParams).then(response => {
         this.inventoryList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    //获取公司名
+    companyName(val){
+       let num = parseInt(val)
+       let arr2 = this.arr.filter(item => item.deptId===num);
+       return arr2[0].deptName
+    },
     // 取消按钮
     cancel() {
       this.open = false;