From a626ad5c966e1edc89346f8173c169adc6d41375 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 13 八月 2023 01:22:25 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java | 27 ++++++++++-----------------
ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml | 6 ++++--
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
index aea023b..7825127 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
@@ -1,28 +1,21 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-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.annotation.RepeatSubmit;
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.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseFinancesubject;
import com.ruoyi.project.service.IBaseFinancesubjectService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鏀跺叆璐圭敤绉戠洰Controller
@@ -42,7 +35,7 @@
* 鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃
*/
@ApiOperation("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:financesubject:list')")
+ //@PreAuthorize("@ss.hasPermi('project::list')")
@GetMapping("/list")
public TableDataInfo list(BaseFinancesubject baseFinancesubject)
{
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml
index f4bbca5..63b84ed 100644
--- a/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml
@@ -23,10 +23,12 @@
<result property="itemunit" column="ItemUnit" />
<result property="usestate" column="UseState" />
<result property="orderno" column="OrderNo" />
+ <result property="expensetype" column="ExpenseType" />
+ <result property="expensetypename" column="ExpenseTypeName" />
</resultMap>
<sql id="selectBaseFinancesubjectVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, SubjectType, ItemType, ItemTypeName, Remark, ItemName, ItemDescribe, ItemUnit, UseState, SubjectTypeName, ItemPinYin, ItemCode, OrderNo from base_financesubject
+ select ID, del_flag, create_by, create_time, update_by, update_time, SubjectType, ItemType, ItemTypeName, Remark, ItemName, ItemDescribe, ItemUnit, UseState, SubjectTypeName, ItemPinYin, ItemCode, OrderNo,ExpenseType,ExpenseTypeName from base_financesubject
</sql>
<select id="selectBaseFinancesubjectList" parameterType="com.ruoyi.project.domain.BaseFinancesubject" resultMap="BaseFinancesubjectResult">
@@ -39,7 +41,7 @@
order by OrderNo
</select>
<select id="getItemName" resultType="com.ruoyi.project.domain.vo.FinanceSubjectVO">
- select ItemName as itemname, ID as id, ItemPinYin as itempinyin, ItemDescribe as itemdescribe, ItemCode as itemcode from base_financesubject
+ select ItemName as itemname, ID as id, ItemPinYin as itempinyin, ItemDescribe as itemdescribe, ItemCode as itemcode,ExpenseType as expensetype,ExpenseTypeName as expensetypename from base_financesubject
where ItemType = #{itemType} AND del_flag=0
order by ID
</select>
--
Gitblit v1.9.3