From 07cae683ee473e2560472c46c6c1366304d9c893 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Tue, 6 Aug 2024 10:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=8A=A5=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../property/TdPropertyDestoryController.java | 69 ++++++++
.../TdPropertyDestoryListController.java | 65 +++++++
.../propertychange/changeproperty.html | 10 +-
.../property/propertychange/destory.html | 43 +++--
.../property/propertydestory/destory.html | 103 +++++++++++
.../propertydestory/destoryproperty.html | 117 +++++++++++++
.../propertydestory/list/property.html | 164 ++++++++++++++++++
7 files changed, 547 insertions(+), 24 deletions(-)
create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java
create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destory.html
create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html
create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java
new file mode 100644
index 0000000..3622380
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.web.controller.system.property;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.TdPropertyInfo;
+import com.ruoyi.system.service.ITdPropertyInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/system/propertyDestory")
+public class TdPropertyDestoryController extends BaseController {
+ private String prefix = "system/property/propertydestory";
+ @Autowired
+ private ITdPropertyInfoService tdPropertyInfoService;
+
+ @RequiresPermissions("system:destoryproperty:view")
+ @GetMapping()
+ public String destoryProperty()
+ {
+ return prefix + "/destoryproperty";
+ }
+
+ /**
+ * 资产登记列表
+ */
+ @RequiresPermissions("system:destoryproperty:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(TdPropertyInfo tdPropertyInfo)
+ {
+ startPage();
+ List tdPropertyInfos = tdPropertyInfoService.selectTdPropertyInfoList(tdPropertyInfo);
+ return getDataTable(tdPropertyInfos);
+ }
+
+ /**
+ * 涉密资产报废
+ */
+ @RequiresPermissions("system:destoryproperty:destory")
+ @GetMapping("/destory/{id}")
+ public String destory(@PathVariable("id") String id, ModelMap mmap)
+ {
+ TdPropertyInfo tdPropertyInfo = tdPropertyInfoService.selectTdPropertyInfoById(id);
+ mmap.put("tdPropertyInfo", tdPropertyInfo);
+ return prefix + "/destory";
+ }
+
+ /**
+ * 保存变更修改
+ */
+ @RequiresPermissions("system:destoryproperty:destory")
+ @Log(title = "资产变更", businessType = BusinessType.UPDATE)
+ @PostMapping("/destory")
+ @ResponseBody
+ public AjaxResult destorySave(TdPropertyInfo tdPropertyInfo)
+ {
+ return toAjax(tdPropertyInfoService.updateTdPropertyInfo(tdPropertyInfo));
+ }
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
new file mode 100644
index 0000000..5861f49
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
@@ -0,0 +1,65 @@
+package com.ruoyi.web.controller.system.property;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.TdPropertyManager;
+import com.ruoyi.system.service.ITdPropertyManagerService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * packageName com.ruoyi.web.controller.system.property
+ *
+ * @author luoluo
+ * @version JDK 8
+ * @className TdPropertyDestoryListController
+ * @date 2024/6/24
+ * @description 资产销毁
+ */
+@Controller
+@RequestMapping("/system/propertyDestory/list")
+public class TdPropertyDestoryListController extends BaseController {
+
+ private String prefix = "system/property/propertydestory/list";
+
+ @Autowired
+ private ITdPropertyManagerService tdPropertyManagerService;
+
+ @RequiresPermissions("system:propertyDestory:view")
+ @GetMapping()
+ public String property()
+ {
+ return prefix + "/property";
+ }
+
+ /**
+ * 查询资产登记列表
+ */
+ @RequiresPermissions("system:destory:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(TdPropertyManager tdPropertyManager)
+ {
+ startPage();
+ List list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
+ return getDataTable(list);
+ }
+
+
+
+ /**
+ * 资产条目
+ */
+ @RequiresPermissions("system:destory:detail")
+ @GetMapping("/detail/{useId}")
+ public String detail(@PathVariable("useId") String useId, ModelMap mmap)
+ {
+ mmap.put("useId",useId);
+ return "system/property/propertydestory/destoryproperty";
+ }
+}
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
index 40bc007..587be9b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
@@ -47,6 +47,7 @@
var destoryFlag = [[${@permission.hasPermi('system:changeproperty:destory')}]];
var removeFlag = [[${@permission.hasPermi('system:changeproperty:remove')}]];
var propertyTypeDatas = [[${@dict.getType('sys_sm_property')}]];
+ var destoryTypeDatas = [[${@dict.getType('sys_baofei_type')}]];
var prefix = ctx + "system/propertychange";
$(function() {
@@ -80,6 +81,13 @@
field: 'propertySn',
title: '资产SN码'
},
+ {
+ field: 'destoryType',
+ title: '报废状态',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(destoryTypeDatas, value);
+ }
+ },
{
title: '操作',
align: 'center',
@@ -103,7 +111,7 @@
function destory(id) {
var url = prefix + '/destory/' + id;
- $.modal.open("销毁资产", url);
+ $.modal.open("资产报废", url);
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html
index a8cfc50..e38b4da 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/destory.html
@@ -48,32 +48,29 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+