From 4ffae6f9446978e5c3187cdd7643c096553630ce Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Wed, 23 Nov 2022 17:47:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B5=84=E9=87=91=E6=8A=A5=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=B3=E8=AF=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TAbilityApplicationController.java | 13 ++-- .../service/impl/SysUserTokenServiceImpl.java | 60 ------------------- .../processForm/TAbilityApplicationDao.xml | 12 ++-- 3 files changed, 16 insertions(+), 69 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 3c73dcf4..7689a578 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -514,6 +514,7 @@ public class TAbilityApplicationController { List data = new ArrayList<>(); data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString()); data.add(index.getOrDefault("resourceType", "") == null ? "" : index.getOrDefault("resourceType", "").toString()); + data.add(index.getOrDefault("applyResult", "") == null ? "" : index.getOrDefault("applyResult", "").toString()); data.add(index.getOrDefault("provideDept", "") == null ? "" : index.getOrDefault("provideDept", "").toString()); data.add(index.getOrDefault("applyDept", "") == null ? "" : index.getOrDefault("applyDept", "").toString()); data.add(index.getOrDefault("applyDate", "") == null ? "" : index.getOrDefault("applyDate", "").toString()); @@ -536,17 +537,19 @@ public class TAbilityApplicationController { String total = "累计节省财政资金约" + priceTotal + "万元"; List> list = new ArrayList<>(); List head0 = new ArrayList<>(Arrays.asList(total, "资源名称")); - List head1 = new ArrayList<>(Arrays.asList(total, "类型")); - List head2 = new ArrayList<>(Arrays.asList(total, "提供部门")); - List head3 = new ArrayList<>(Arrays.asList(total, "申请部门")); - List head4 = new ArrayList<>(Arrays.asList(total, "申请时间")); - List head5 = new ArrayList<>(Arrays.asList(total, "参考价格(元)")); + List head1 = new ArrayList<>(Arrays.asList(total, "资源类型")); + List head2 = new ArrayList<>(Arrays.asList(total, "审核状态")); + List head3 = new ArrayList<>(Arrays.asList(total, "提供部门")); + List head4 = new ArrayList<>(Arrays.asList(total, "申请部门")); + List head5 = new ArrayList<>(Arrays.asList(total, "申请时间")); + List head6 = new ArrayList<>(Arrays.asList(total, "参考价格(元)")); list.add(head0); list.add(head1); list.add(head2); list.add(head3); list.add(head4); list.add(head5); + list.add(head6); return list; } diff --git a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java index 77f42c24..b30400d4 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java @@ -23,7 +23,6 @@ import java.util.Map; @Service public class SysUserTokenServiceImpl extends BaseServiceImpl implements SysUserTokenService { - /** * 12小时后过期 */ @@ -33,65 +32,6 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl map = new HashMap<>(2); - map.put(Constant.TOKEN_HEADER, token); - map.put("expire", EXPIRE); - return new Result().ok(map); - } -*/ - - @Override public Result createToken(Long userId) { //用户token diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml index a020b545..3a910ffc 100644 --- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml +++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml @@ -356,7 +356,8 @@ sd.NAME AS "provideDept", taa.unit AS "applyDept", taa.create_date AS "applyDate", - taa.apply_price AS "applyPrice" + taa.apply_price AS "applyPrice", + taa.approve_status AS "applyResult" FROM t_ability_application taa LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id @@ -401,7 +402,8 @@ '青岛市大数据发展管理局' AS "provideDept", tmb.dept AS "applyDept", tmb.create_date AS "applyDate", - tmb.apply_price AS "applyPrice" + tmb.apply_price AS "applyPrice", + ( CASE tmb.state WHEN 0 THEN '审核中' WHEN 2 THEN '通过' ELSE '审核中' END ) AS "applyResult" FROM t_meetingroom_book tmb LEFT JOIN t_meetingroom tm ON tmb.room_id = tm.id @@ -529,7 +531,8 @@ sd.NAME AS "provideDept", taa.unit AS "applyDept", taa.create_date AS "applyDate", - taa.apply_price AS "applyPrice" + taa.apply_price AS "applyPrice", + taa.approve_status AS "applyResult" FROM t_ability_application taa LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id @@ -574,7 +577,8 @@ '青岛市大数据发展管理局' AS "provideDept", tmb.dept AS "applyDept", tmb.create_date AS "applyDate", - tmb.apply_price AS "applyPrice" + tmb.apply_price AS "applyPrice", + ( CASE tmb.state WHEN 0 THEN '审核中' WHEN 2 THEN '通过' ELSE '审核中' END ) AS "applyResult" FROM t_meetingroom_book tmb LEFT JOIN t_meetingroom tm ON tmb.room_id = tm.id