From 88d3bf1d791282518c0d3e13562860e8c7d53b72 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Thu, 25 Apr 2024 18:34:04 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=BB=A9=E6=95=88=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E6=94=BE=E7=BB=A9=E6=95=88=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ErpTechniqueMeritsController.java | 14 +-
.../system/domain/ErpTechniqueMerits.java | 13 ++
.../technicalMerits/technicalMerits.html | 189 ++++++++++++------
3 files changed, 147 insertions(+), 69 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java
index 873efb32..b273e6b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java
@@ -5,11 +5,7 @@ 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.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.ErpTechniqueMerits;
@@ -152,6 +148,10 @@ public class ErpTechniqueMeritsController extends BaseController
{
return toAjax(erpTechniqueMeritsService.restoreErpTechniqueMeritsById(id));
}
-
-
+ @GetMapping("/getTechnicalMerits")
+ @ResponseBody
+ public AjaxResult getTechnicalMerits(@RequestParam("id") Long id)
+ {
+ return AjaxResult.success(erpTechniqueMeritsService.selectErpTechniqueMeritsById(id));
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java
index 86ad82ad..214fb8fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java
@@ -5,6 +5,7 @@ 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;
+import org.apache.poi.hpsf.Decimal;
/**
* 技术绩效列表对象 erp_technique_merits
@@ -55,6 +56,9 @@ public class ErpTechniqueMerits extends BaseEntity
@Excel(name = "已发放绩效")
private Long grantNum;
+ //本次发放绩效
+ private Decimal benGrantNum;
+
public void setId(Long id)
{
this.id = id;
@@ -146,6 +150,15 @@ public class ErpTechniqueMerits extends BaseEntity
return grantNum;
}
+
+ public Decimal getBenGrantNum() {
+ return benGrantNum;
+ }
+
+ public void setBenGrantNum(Decimal benGrantNum) {
+ this.benGrantNum = benGrantNum;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
index 44c99a72..a4f1cd08 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
@@ -36,12 +36,11 @@
-
+