From 92459e3e326488acae77e068c37eb4b96eae5ebf Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 27 三月 2024 12:41:48 +0800 Subject: [PATCH] #周计划 --- src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java index 7200aca..a28ae8e 100644 --- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java +++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java @@ -1,12 +1,15 @@ package com.zy.crm.manager.controller; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; +import com.zy.crm.manager.entity.ReimburseOnlineDetl; import com.zy.crm.manager.entity.Weekly; +import com.zy.crm.manager.entity.WeeklyDailyPlan; +import com.zy.crm.manager.entity.param.WeeklyDomainParam; +import com.zy.crm.manager.service.WeeklyDailyPlanService; import com.zy.crm.manager.service.WeeklyService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; @@ -14,7 +17,9 @@ import com.core.common.R; import com.core.domain.KeyValueVo; import com.zy.crm.common.web.BaseController; +import com.zy.crm.manager.utils.TimeCalculatorUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -24,6 +29,8 @@ @Autowired private WeeklyService weeklyService; + @Autowired + private WeeklyDailyPlanService weeklyDailyPlanService; @RequestMapping(value = "/weekly/{id}/auth") @ManagerAuth @@ -132,4 +139,64 @@ return R.ok().add(vos); } + @RequestMapping(value = "/weekly/from/add/auth") + @ManagerAuth(memo = "鍛ㄨ鍒�/鏃ヨ鍒�/鏃ュ疄闄�") + @Transactional + public R formAdd(@RequestBody WeeklyDomainParam param){ + try{ + if (Cools.isEmpty(param)){ + return R.error("鍙傛暟涓虹┖锛歐eeklyDomainParam"); + } else if (Cools.isEmpty(param.getWeeklyDailyPlanList()) || param.getWeeklyDailyPlanList().size()==0){ + return R.error("鍙傛暟涓虹┖锛歐eeklyDailyPlanList"); + } else if (Cools.isEmpty(param.getWeeklyType())){ + return R.error("鍙傛暟涓虹┖锛歐eeklyDailyPlanList"); + } else if (Cools.isEmpty(param.getType())){ + return R.error("鍙傛暟涓虹┖锛歍ype"); + } else if (Cools.isEmpty(param.getWeeklyType())){ + return R.error("鍙傛暟涓虹┖锛歐eekly"); + } + Date now = new Date(); + Weekly weekly = new Weekly(); + weekly.setHostId(getHostId()); + weekly.setDeptId(getDeptId()); // 鎵�灞為儴闂� + weekly.setUserId(getUserId()); // 鎵�灞炰汉鍛� + + weekly.setCreateBy(getUserId()); + weekly.setCreateTime(now); + weekly.setUpdateBy(getUserId()); + weekly.setUpdateTime(now); + + + List<Date> dateList = new ArrayList<>();//鑾峰彇鍛ㄤ竴涓庡懆鏃ユ棩鏈� + switch (param.getType()){ + case 1: + dateList = TimeCalculatorUtils.WeeklyMondayAndSundayFront(now); + weekly.setStatus(2); + break; + case 2: + dateList = TimeCalculatorUtils.WeeklyMondayAndSundayNow(now); + weekly.setStatus(1); + break; + case 3: + dateList = TimeCalculatorUtils.WeeklyMondayAndSundayAfter(now); + weekly.setStatus(0); + break; + default: + return R.error("鍙傛暟寮傚父锛歐eekly="+param.getType()); + } + List<Date> dates = TimeCalculatorUtils.WeeklyListDays(dateList);//鑾峰彇鍛ㄤ竴鍒板懆鏃ユ棩鏈� + System.out.println(dates.toString()); + } catch (Exception e){ + return R.error("寮傚父锛�"+e); + } + + return R.ok(); + } + + @RequestMapping(value = "/weekly/detl/all/auth") + @Transactional + public R head(@RequestParam Integer weeklyId){ + List<WeeklyDailyPlan> weeklyDailyPlans = weeklyDailyPlanService.selectList(new EntityWrapper<WeeklyDailyPlan>().eq("weekly_id", weeklyId)); + return R.ok().add(weeklyDailyPlans); + } } -- Gitblit v1.9.1