From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
index 585f3ea..7ea7202 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningController.java
@@ -1,21 +1,24 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.service.LWhWarningCoreServiceImpl;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.query.WhWarningQry;
-import com.consum.base.service.LWhWarningServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.util.Map;
+import com.consum.base.BaseController;
+import com.consum.base.service.core.LWhWarningCoreService;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.query.WhWarningQry;
+import com.consum.base.service.LWhWarningService;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
/**
* @ClassName LWhWarningConfigController
@@ -30,11 +33,39 @@
public class LWhWarningController extends BaseController {
@Resource
- private LWhWarningServiceImpl lWhWarningService;
+ private LWhWarningService lWhWarningService;
+ @Resource
+ private LWhWarningCoreService lWhWarningCoreService;
+
+
+ @GetMapping("/getWarningTypeNum")
+ public ResponseValue getWarningTypeNum() {
+ WhWarningQry param = CommonUtil.getObjFromReq(WhWarningQry.class);
+ WhWarningQry param2 = new WhWarningQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+
+ if (param.getStates() == null) {
+ param.setStates(1);
+ } else if (param.getStates() == 0) {
+ param.setStates(null);
+ }
+ return ResponseValue.success(lWhWarningService.getWarningTypeNum(param));
+ }
@GetMapping("/getList")
public ResponseValue getList() {
WhWarningQry param = CommonUtil.getObjFromReq(WhWarningQry.class);
+ WhWarningQry param2 = new WhWarningQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
/*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
FinSysTenantUser sysInfo = this.getSysInfo();
String tenantId = sysInfo.getTenantId();
@@ -53,13 +84,14 @@
}
- @Resource
- private LWhWarningCoreServiceImpl lWhWarningCoreService;
@GetMapping("/handerChenKuCun")
public ResponseValue handerChenKuCun() {
WhWarningQry param = CommonUtil.getObjFromReq(WhWarningQry.class);
+ WhWarningQry param2 = new WhWarningQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
FinSysTenantUser sysInfo = this.getSysInfo();
long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
--
Gitblit v1.9.1