From f614347a41aa29d5050e3da3a921cdc204c23dde Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:38:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/WeeklyCostTypesController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyCostTypesController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyCostTypesController.java
index 1ec71d1..098848e 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyCostTypesController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyCostTypesController.java
@@ -6,16 +6,13 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import com.zy.crm.manager.entity.ReimburseCostTypes;
-import com.zy.crm.manager.entity.ReimburseOnlineDetl;
-import com.zy.crm.manager.entity.WeeklyCostTypes;
-import com.zy.crm.manager.entity.WeeklyDailyPlan;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.manager.service.WeeklyCostTypesService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.core.domain.KeyValueVo;
import com.zy.crm.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -137,9 +134,16 @@
@RequestMapping(value = "/weeklyCostTypes/covert/plan/{id}/auth")
@ManagerAuth
- public R covert(@PathVariable("id") Integer id) {
+ public R covertPlan(@PathVariable("id") Integer id) {
WeeklyDailyPlan weeklyDailyPlan = new WeeklyDailyPlan(id);
return R.ok().add(weeklyDailyPlan);
+ }
+
+ @RequestMapping(value = "/weeklyCostTypes/covert/reality/{id}/auth")
+ @ManagerAuth
+ public R covertReality(@PathVariable("id") Integer id) {
+ WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality(id);
+ return R.ok().add(weeklyDailyReality);
}
// xm-select 鎼滅储鍟嗗搧鍒楄〃
@@ -151,10 +155,10 @@
List<WeeklyCostTypes> weeklyCostTypesList = weeklyCostTypesService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<com.zy.crm.manager.entity.result.KeyValueVo> valueVos = new ArrayList<>();
for (WeeklyCostTypes weeklyCostTypes : weeklyCostTypesList) {
- com.zy.crm.manager.entity.result.KeyValueVo vo = new com.zy.crm.manager.entity.result.KeyValueVo();
- vo.setName(weeklyCostTypes.getTypeName());
- vo.setValue(weeklyCostTypes.getId());
- valueVos.add(vo);
+ KeyValueVo keyValueVo = new KeyValueVo();
+ keyValueVo.setName(weeklyCostTypes.getTypeName());
+ keyValueVo.setValue(weeklyCostTypes.getId());
+ valueVos.add(keyValueVo);
}
return R.ok().add(valueVos);
}
--
Gitblit v1.9.1