From ca5cf868592b7b99b6616362d4226f2827d60640 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 三月 2024 15:41:45 +0800
Subject: [PATCH] #框架初版
---
src/main/resources/mapper/WeeklyDailyPlanMapper.xml | 31
src/main/java/com/zy/crm/manager/service/WeeklyFollService.java | 8
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java | 351 ++++++++++
src/main/java/com/zy/crm/manager/entity/WeeklyFoll.java | 77 ++
src/main/java/com/zy/crm/manager/entity/Weekly.java | 405 ++++++++++++
src/main/java/com/zy/crm/manager/controller/WeeklyDailyRealityController.java | 135 ++++
src/main/java/com/zy/crm/common/CodeBuilder.java | 4
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java | 350 ++++++++++
src/main/java/com/zy/crm/manager/service/WeeklyDailyRealityService.java | 8
src/main/java/com/zy/crm/manager/controller/WeeklyFollController.java | 135 ++++
src/main/resources/mapper/WeeklyFollMapper.xml | 13
src/main/java/com/zy/crm/manager/service/WeeklyDailyPlanService.java | 8
src/main/java/com/zy/crm/manager/service/WeeklyService.java | 8
src/main/resources/mapper/WeeklyDailyRealityMapper.xml | 31
src/main/java/com/zy/crm/manager/mapper/WeeklyMapper.java | 12
src/main/java/com/zy/crm/manager/mapper/WeeklyDailyRealityMapper.java | 12
src/main/java/com/zy/crm/manager/mapper/WeeklyFollMapper.java | 12
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 135 ++++
src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyPlanServiceImpl.java | 12
src/main/java/com/zy/crm/manager/service/impl/WeeklyServiceImpl.java | 12
src/main/java/com/zy/crm/manager/controller/WeeklyDailyPlanController.java | 135 ++++
src/main/java/com/zy/crm/manager/service/impl/WeeklyFollServiceImpl.java | 12
src/main/java/com/zy/crm/manager/mapper/WeeklyDailyPlanMapper.java | 12
src/main/resources/mapper/WeeklyMapper.xml | 36 +
src/main/resources/application.yml | 7
src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyRealityServiceImpl.java | 12
26 files changed, 1,969 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/CodeBuilder.java b/src/main/java/com/zy/crm/common/CodeBuilder.java
index 3547cf4..953ffe3 100644
--- a/src/main/java/com/zy/crm/common/CodeBuilder.java
+++ b/src/main/java/com/zy/crm/common/CodeBuilder.java
@@ -17,13 +17,13 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="192.168.4.15:1433;databasename=zy_crm";
+ generator.url="127.0.0.1:1433;databasename=zy_crm";
generator.username="sa";
generator.password="sa@123";
// generator.url="localhost:1433;databasename=zy_crm";
// generator.username="sa";
// generator.password="sa@123";
- generator.table="man_pri_quote_budget";
+ generator.table="man_weekly_foll";
generator.packagePath="com.zy.crm.manager";
generator.js = false;
generator.html = false;
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
new file mode 100644
index 0000000..7200aca
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -0,0 +1,135 @@
+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.Weekly;
+import com.zy.crm.manager.service.WeeklyService;
+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.*;
+
+import java.util.*;
+
+@RestController
+public class WeeklyController extends BaseController {
+
+ @Autowired
+ private WeeklyService weeklyService;
+
+ @RequestMapping(value = "/weekly/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(weeklyService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/weekly/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Weekly> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(Weekly.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(weeklyService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/weekly/add/auth")
+ @ManagerAuth
+ public R add(Weekly weekly) {
+ weeklyService.insert(weekly);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weekly/update/auth")
+ @ManagerAuth
+ public R update(Weekly weekly){
+ if (Cools.isEmpty(weekly) || null==weekly.getId()){
+ return R.error();
+ }
+ weeklyService.updateById(weekly);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weekly/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ weeklyService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weekly/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<Weekly> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("weekly"));
+ convert(map, wrapper);
+ List<Weekly> list = weeklyService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/weeklyQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<Weekly> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<Weekly> page = weeklyService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Weekly weekly : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", weekly.getId());
+ map.put("value", weekly.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/weekly/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<Weekly> wrapper = new EntityWrapper<Weekly>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != weeklyService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(Weekly.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/weekly/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ Wrapper<Weekly> wrapper = new EntityWrapper<Weekly>().andNew().like("id", condition).orderBy("create_time", false);
+ weeklyService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ return R.ok().add(vos);
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyDailyPlanController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyDailyPlanController.java
new file mode 100644
index 0000000..f683d15
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyDailyPlanController.java
@@ -0,0 +1,135 @@
+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.WeeklyDailyPlan;
+import com.zy.crm.manager.service.WeeklyDailyPlanService;
+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.*;
+
+import java.util.*;
+
+@RestController
+public class WeeklyDailyPlanController extends BaseController {
+
+ @Autowired
+ private WeeklyDailyPlanService weeklyDailyPlanService;
+
+ @RequestMapping(value = "/weeklyDailyPlan/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(weeklyDailyPlanService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlan/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<WeeklyDailyPlan> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WeeklyDailyPlan.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(weeklyDailyPlanService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlan/add/auth")
+ @ManagerAuth
+ public R add(WeeklyDailyPlan weeklyDailyPlan) {
+ weeklyDailyPlanService.insert(weeklyDailyPlan);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlan/update/auth")
+ @ManagerAuth
+ public R update(WeeklyDailyPlan weeklyDailyPlan){
+ if (Cools.isEmpty(weeklyDailyPlan) || null==weeklyDailyPlan.getId()){
+ return R.error();
+ }
+ weeklyDailyPlanService.updateById(weeklyDailyPlan);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlan/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ weeklyDailyPlanService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlan/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WeeklyDailyPlan> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("weeklyDailyPlan"));
+ convert(map, wrapper);
+ List<WeeklyDailyPlan> list = weeklyDailyPlanService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlanQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WeeklyDailyPlan> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WeeklyDailyPlan> page = weeklyDailyPlanService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WeeklyDailyPlan weeklyDailyPlan : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", weeklyDailyPlan.getId());
+ map.put("value", weeklyDailyPlan.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/weeklyDailyPlan/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WeeklyDailyPlan> wrapper = new EntityWrapper<WeeklyDailyPlan>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != weeklyDailyPlanService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WeeklyDailyPlan.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/weeklyDailyPlan/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ Wrapper<WeeklyDailyPlan> wrapper = new EntityWrapper<WeeklyDailyPlan>().andNew().like("id", condition).orderBy("create_time", false);
+ weeklyDailyPlanService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ return R.ok().add(vos);
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyDailyRealityController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyDailyRealityController.java
new file mode 100644
index 0000000..18d9f08
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyDailyRealityController.java
@@ -0,0 +1,135 @@
+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.WeeklyDailyReality;
+import com.zy.crm.manager.service.WeeklyDailyRealityService;
+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.*;
+
+import java.util.*;
+
+@RestController
+public class WeeklyDailyRealityController extends BaseController {
+
+ @Autowired
+ private WeeklyDailyRealityService weeklyDailyRealityService;
+
+ @RequestMapping(value = "/weeklyDailyReality/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(weeklyDailyRealityService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/weeklyDailyReality/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<WeeklyDailyReality> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WeeklyDailyReality.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(weeklyDailyRealityService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/weeklyDailyReality/add/auth")
+ @ManagerAuth
+ public R add(WeeklyDailyReality weeklyDailyReality) {
+ weeklyDailyRealityService.insert(weeklyDailyReality);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyDailyReality/update/auth")
+ @ManagerAuth
+ public R update(WeeklyDailyReality weeklyDailyReality){
+ if (Cools.isEmpty(weeklyDailyReality) || null==weeklyDailyReality.getId()){
+ return R.error();
+ }
+ weeklyDailyRealityService.updateById(weeklyDailyReality);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyDailyReality/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ weeklyDailyRealityService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyDailyReality/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WeeklyDailyReality> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("weeklyDailyReality"));
+ convert(map, wrapper);
+ List<WeeklyDailyReality> list = weeklyDailyRealityService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/weeklyDailyRealityQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WeeklyDailyReality> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WeeklyDailyReality> page = weeklyDailyRealityService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WeeklyDailyReality weeklyDailyReality : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", weeklyDailyReality.getId());
+ map.put("value", weeklyDailyReality.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/weeklyDailyReality/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WeeklyDailyReality> wrapper = new EntityWrapper<WeeklyDailyReality>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != weeklyDailyRealityService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WeeklyDailyReality.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/weeklyDailyReality/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ Wrapper<WeeklyDailyReality> wrapper = new EntityWrapper<WeeklyDailyReality>().andNew().like("id", condition).orderBy("create_time", false);
+ weeklyDailyRealityService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ return R.ok().add(vos);
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyFollController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyFollController.java
new file mode 100644
index 0000000..1fb49ee
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyFollController.java
@@ -0,0 +1,135 @@
+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.WeeklyFoll;
+import com.zy.crm.manager.service.WeeklyFollService;
+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.*;
+
+import java.util.*;
+
+@RestController
+public class WeeklyFollController extends BaseController {
+
+ @Autowired
+ private WeeklyFollService weeklyFollService;
+
+ @RequestMapping(value = "/weeklyFoll/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(weeklyFollService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/weeklyFoll/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<WeeklyFoll> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(WeeklyFoll.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(weeklyFollService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/weeklyFoll/add/auth")
+ @ManagerAuth
+ public R add(WeeklyFoll weeklyFoll) {
+ weeklyFollService.insert(weeklyFoll);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyFoll/update/auth")
+ @ManagerAuth
+ public R update(WeeklyFoll weeklyFoll){
+ if (Cools.isEmpty(weeklyFoll) || null==weeklyFoll.getId()){
+ return R.error();
+ }
+ weeklyFollService.updateById(weeklyFoll);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyFoll/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ weeklyFollService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/weeklyFoll/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WeeklyFoll> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("weeklyFoll"));
+ convert(map, wrapper);
+ List<WeeklyFoll> list = weeklyFollService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/weeklyFollQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WeeklyFoll> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<WeeklyFoll> page = weeklyFollService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WeeklyFoll weeklyFoll : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", weeklyFoll.getId());
+ map.put("value", weeklyFoll.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/weeklyFoll/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WeeklyFoll> wrapper = new EntityWrapper<WeeklyFoll>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != weeklyFollService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WeeklyFoll.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/weeklyFoll/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ Wrapper<WeeklyFoll> wrapper = new EntityWrapper<WeeklyFoll>().andNew().like("id", condition).orderBy("create_time", false);
+ weeklyFollService.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ return R.ok().add(vos);
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/Weekly.java b/src/main/java/com/zy/crm/manager/entity/Weekly.java
new file mode 100644
index 0000000..17b01b1
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/Weekly.java
@@ -0,0 +1,405 @@
+package com.zy.crm.manager.entity;
+
+import com.core.common.Cools;import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.system.entity.*;
+import com.zy.crm.system.service.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_weekly")
+public class Weekly implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 寮�濮嬫棩鏈�
+ */
+ @ApiModelProperty(value= "寮�濮嬫棩鏈�")
+ @TableId(value = "start_time", type = IdType.INPUT)
+ @TableField("start_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃ユ湡
+ */
+ @ApiModelProperty(value= "缁撴潫鏃ユ湡")
+ @TableId(value = "end_time", type = IdType.INPUT)
+ @TableField("end_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
+ * 鎵�灞炰汉鍛�
+ */
+ @ApiModelProperty(value= "鎵�灞炰汉鍛�")
+ @TableId(value = "user_id", type = IdType.INPUT)
+ @TableField("user_id")
+ private Long userId;
+
+ /**
+ * 鎵�灞炲晢鎴�
+ */
+ @ApiModelProperty(value= "鎵�灞炲晢鎴�")
+ @TableField("host_id")
+ private Long hostId;
+
+ /**
+ * 鎵�灞為儴闂�
+ */
+ @ApiModelProperty(value= "鎵�灞為儴闂�")
+ @TableField("dept_id")
+ private Long deptId;
+
+ /**
+ * 瀹為檯鐢叉柟鍗曚綅ID闆嗗悎
+ */
+ @ApiModelProperty(value= "瀹為檯鐢叉柟鍗曚綅ID闆嗗悎")
+ @TableField("cstmr_ids_reality")
+ private String cstmrIdsReality;
+
+ /**
+ * 鐘舵�� 3: 宸插叧闂� 2: 闇�澶勭悊 1: 杩涜涓� 0: 鏈紑濮�
+ */
+ @ApiModelProperty(value= "鐘舵�� 3: 宸插叧闂� 2: 闇�澶勭悊 1: 杩涜涓� 0: 鏈紑濮� ")
+ private Integer status;
+
+ /**
+ * 杩涘害 0: 榛樿 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃
+ */
+ @ApiModelProperty(value= "杩涘害 0: 榛樿 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃 ")
+ private Integer settle;
+
+ /**
+ * 瀹℃牳杩涘害
+ */
+ @ApiModelProperty(value= "瀹℃牳杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
+
+ /**
+ * 璇勮
+ */
+ @ApiModelProperty(value= "璇勮")
+ private String comment;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * update_time
+ */
+ @ApiModelProperty(value= "update_time")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞锛�50瀛楋級
+ */
+ @ApiModelProperty(value= "澶囨敞锛�50瀛楋級")
+ private String memo;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ @ApiModelProperty(value= "瀹℃壒浜�")
+ private Long director;
+
+ /**
+ * 娴佺▼闀垮害
+ */
+ @ApiModelProperty(value= "娴佺▼闀垮害")
+ @TableField("settle_size")
+ private Integer settleSize;
+
+ /**
+ * 褰撳墠杩涘害
+ */
+ @ApiModelProperty(value= "褰撳墠杩涘害")
+ @TableField("settle_current")
+ private Integer settleCurrent;
+
+ /**
+ * 璁″垝鐢叉柟鍗曚綅ID闆嗗悎
+ */
+ @ApiModelProperty(value= "璁″垝鐢叉柟鍗曚綅ID闆嗗悎")
+ @TableField("cstmr_ids_plan")
+ private String cstmrIdsPlan;
+
+ /**
+ * 鍛ㄦ暟
+ */
+ @ApiModelProperty(value= "鍛ㄦ暟")
+ @TableField("weekly_all")
+ private Integer weeklyAll;
+
+ /**
+ * 褰撴湀绗嚑鍛�
+ */
+ @ApiModelProperty(value= "褰撴湀绗嚑鍛�")
+ @TableField("weekly_now_month")
+ private Integer weeklyNowMonth;
+
+ /**
+ * 骞�
+ */
+ @ApiModelProperty(value= "骞�")
+ @TableField("weekly_year")
+ private Integer weeklyYear;
+
+ /**
+ * 鏈�
+ */
+ @ApiModelProperty(value= "鏈�")
+ @TableField("weekly_month")
+ private Integer weeklyMonth;
+
+ /**
+ * 鏃�
+ */
+ @ApiModelProperty(value= "鏃�")
+ @TableField("weekly_day")
+ private Integer weeklyDay;
+
+ /**
+ * 鍛�
+ */
+ @ApiModelProperty(value= "鍛�")
+ @TableField("weekly_day_month")
+ private String weeklyDayMonth;
+
+ public Weekly() {}
+
+ public Weekly(Date startTime,Date endTime,Long userId,Long hostId,Long deptId,String cstmrIdsReality,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long director,Integer settleSize,Integer settleCurrent,String cstmrIdsPlan,Integer weeklyAll,Integer weeklyNowMonth,Integer weeklyYear,Integer weeklyMonth,Integer weeklyDay,String weeklyDayMonth) {
+ this.startTime = startTime;
+ this.endTime = endTime;
+ this.userId = userId;
+ this.hostId = hostId;
+ this.deptId = deptId;
+ this.cstmrIdsReality = cstmrIdsReality;
+ this.status = status;
+ this.settle = settle;
+ this.settleMsg = settleMsg;
+ this.comment = comment;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.director = director;
+ this.settleSize = settleSize;
+ this.settleCurrent = settleCurrent;
+ this.cstmrIdsPlan = cstmrIdsPlan;
+ this.weeklyAll = weeklyAll;
+ this.weeklyNowMonth = weeklyNowMonth;
+ this.weeklyYear = weeklyYear;
+ this.weeklyMonth = weeklyMonth;
+ this.weeklyDay = weeklyDay;
+ this.weeklyDayMonth = weeklyDayMonth;
+ }
+
+// Weekly weekly = new Weekly(
+// null, // 寮�濮嬫棩鏈焄闈炵┖]
+// null, // 缁撴潫鏃ユ湡[闈炵┖]
+// null, // 鎵�灞炰汉鍛榌闈炵┖]
+// null, // 鎵�灞炲晢鎴穂闈炵┖]
+// null, // 鎵�灞為儴闂╗闈炵┖]
+// null, // 瀹為檯鐢叉柟鍗曚綅ID闆嗗悎
+// null, // 鐘舵�乕闈炵┖]
+// null, // 杩涘害
+// null, // 瀹℃牳杩涘害
+// null, // 璇勮
+// null, // 娣诲姞浜哄憳[闈炵┖]
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳[闈炵┖]
+// null, // update_time[闈炵┖]
+// null, // 澶囨敞锛�50瀛楋級
+// null, // 瀹℃壒浜篬闈炵┖]
+// null, // 娴佺▼闀垮害[闈炵┖]
+// null, // 褰撳墠杩涘害
+// null, // 璁″垝鐢叉柟鍗曚綅ID闆嗗悎
+// null, // 鍛ㄦ暟[闈炵┖]
+// null, // 褰撴湀绗嚑鍛╗闈炵┖]
+// null, // 骞碵闈炵┖]
+// null, // 鏈圼闈炵┖]
+// null, // 鏃闈炵┖]
+// null // 鍛╗闈炵┖]
+// );
+
+ public String getStartTime$(){
+ if (Cools.isEmpty(this.startTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ }
+
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.selectById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 3:
+ return "宸插叧闂�";
+ case 2:
+ return "闇�澶勭悊";
+ case 1:
+ return "杩涜涓�";
+ case 0:
+ return "鏈紑濮�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "榛樿";
+ case 1:
+ return "寮�濮�";
+ case 2:
+ return "缁勯暱寰呭";
+ case 3:
+ return "缁勯暱瀹℃牳";
+ case 4:
+ return "瑙勫垝寰呭";
+ case 5:
+ return "瑙勫垝瀹℃牳";
+ case 6:
+ return "瀹℃壒涓�";
+ case 7:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getDirector$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.director);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
new file mode 100644
index 0000000..ec4b599
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
@@ -0,0 +1,351 @@
+package com.zy.crm.manager.entity;
+
+import com.core.common.Cools;import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.system.entity.*;
+import com.zy.crm.system.service.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.DeptService;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_weekly_daily_plan")
+public class WeeklyDailyPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 鏃ユ姤鏃ユ湡
+ */
+ @ApiModelProperty(value= "鏃ユ姤鏃ユ湡")
+ @TableId(value = "daily_time", type = IdType.INPUT)
+ @TableField("daily_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date dailyTime;
+
+ /**
+ * 鎵�灞炰汉鍛�
+ */
+ @ApiModelProperty(value= "鎵�灞炰汉鍛�")
+ @TableField("user_id")
+ private Long userId;
+
+ /**
+ * 鎵�灞炲晢鎴�
+ */
+ @ApiModelProperty(value= "鎵�灞炲晢鎴�")
+ @TableField("host_id")
+ private Long hostId;
+
+ /**
+ * 鎵�灞為儴闂�
+ */
+ @ApiModelProperty(value= "鎵�灞為儴闂�")
+ @TableField("dept_id")
+ private Long deptId;
+
+ /**
+ * 鐘舵�� 3: 宸插叧闂� 2: 闇�澶勭悊 1: 杩涜涓� 0: 鏈紑濮�
+ */
+ @ApiModelProperty(value= "鐘舵�� 3: 宸插叧闂� 2: 闇�澶勭悊 1: 杩涜涓� 0: 鏈紑濮� ")
+ private Integer status;
+
+ /**
+ * 杩涘害 0: 榛樿 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃
+ */
+ @ApiModelProperty(value= "杩涘害 0: 榛樿 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃 ")
+ private Integer settle;
+
+ /**
+ * 瀹℃牳杩涘害
+ */
+ @ApiModelProperty(value= "瀹℃牳杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
+
+ /**
+ * 璇勮
+ */
+ @ApiModelProperty(value= "璇勮")
+ private String comment;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * update_time
+ */
+ @ApiModelProperty(value= "update_time")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 闇�鍗忓姪浜嬮」
+ */
+ @ApiModelProperty(value= "闇�鍗忓姪浜嬮」")
+ @TableField("weekly_matter")
+ private String weeklyMatter;
+
+ /**
+ * 璐熻矗浜�
+ */
+ @ApiModelProperty(value= "璐熻矗浜�")
+ private Long director;
+
+ /**
+ * 娴佺▼闀垮害
+ */
+ @ApiModelProperty(value= "娴佺▼闀垮害")
+ @TableField("settle_size")
+ private Integer settleSize;
+
+ /**
+ * 褰撳墠杩涘害
+ */
+ @ApiModelProperty(value= "褰撳墠杩涘害")
+ @TableField("settle_current")
+ private Integer settleCurrent;
+
+ /**
+ * 鍛ㄦ姤ID
+ */
+ @ApiModelProperty(value= "鍛ㄦ姤ID")
+ @TableId(value = "weekly_id", type = IdType.INPUT)
+ @TableField("weekly_id")
+ private Integer weeklyId;
+
+ /**
+ * 鐢叉柟鍗曚綅ID
+ */
+ @ApiModelProperty(value= "鐢叉柟鍗曚綅ID")
+ @TableId(value = "cstmr_id", type = IdType.INPUT)
+ @TableField("cstmr_id")
+ private Long cstmrId;
+
+ /**
+ * 鏄熸湡
+ */
+ @ApiModelProperty(value= "鏄熸湡")
+ @TableField("weekly_day")
+ private Integer weeklyDay;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public WeeklyDailyPlan() {}
+
+ public WeeklyDailyPlan(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Integer weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
+ this.dailyTime = dailyTime;
+ this.userId = userId;
+ this.hostId = hostId;
+ this.deptId = deptId;
+ this.status = status;
+ this.settle = settle;
+ this.settleMsg = settleMsg;
+ this.comment = comment;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.weeklyMatter = weeklyMatter;
+ this.director = director;
+ this.settleSize = settleSize;
+ this.settleCurrent = settleCurrent;
+ this.weeklyId = weeklyId;
+ this.cstmrId = cstmrId;
+ this.weeklyDay = weeklyDay;
+ this.memo = memo;
+ }
+
+// WeeklyDailyPlan weeklyDailyPlan = new WeeklyDailyPlan(
+// null, // 鏃ユ姤鏃ユ湡[闈炵┖]
+// null, // 鎵�灞炰汉鍛榌闈炵┖]
+// null, // 鎵�灞炲晢鎴穂闈炵┖]
+// null, // 鎵�灞為儴闂╗闈炵┖]
+// null, // 鐘舵�乕闈炵┖]
+// null, // 杩涘害
+// null, // 瀹℃牳杩涘害
+// null, // 璇勮
+// null, // 娣诲姞浜哄憳[闈炵┖]
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳[闈炵┖]
+// null, // update_time[闈炵┖]
+// null, // 闇�鍗忓姪浜嬮」
+// null, // 璐熻矗浜篬闈炵┖]
+// null, // 娴佺▼闀垮害[闈炵┖]
+// null, // 褰撳墠杩涘害[闈炵┖]
+// null, // 鍛ㄦ姤ID[闈炵┖]
+// null, // 鐢叉柟鍗曚綅ID[闈炵┖]
+// null, // 鏄熸湡[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getDailyTime$(){
+ if (Cools.isEmpty(this.dailyTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.dailyTime);
+ }
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.selectById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 3:
+ return "宸插叧闂�";
+ case 2:
+ return "闇�澶勭悊";
+ case 1:
+ return "杩涜涓�";
+ case 0:
+ return "鏈紑濮�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "榛樿";
+ case 1:
+ return "寮�濮�";
+ case 2:
+ return "缁勯暱寰呭";
+ case 3:
+ return "缁勯暱瀹℃牳";
+ case 4:
+ return "瑙勫垝寰呭";
+ case 5:
+ return "瑙勫垝瀹℃牳";
+ case 6:
+ return "瀹℃壒涓�";
+ case 7:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getDirector$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.director);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
new file mode 100644
index 0000000..f5f5039
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
@@ -0,0 +1,350 @@
+package com.zy.crm.manager.entity;
+
+import com.core.common.Cools;import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.system.entity.*;
+import com.zy.crm.system.service.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_weekly_daily_reality")
+public class WeeklyDailyReality implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 鏃ユ姤鏃ユ湡
+ */
+ @ApiModelProperty(value= "鏃ユ姤鏃ユ湡")
+ @TableId(value = "daily_time", type = IdType.INPUT)
+ @TableField("daily_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date dailyTime;
+
+ /**
+ * 鎵�灞炰汉鍛�
+ */
+ @ApiModelProperty(value= "鎵�灞炰汉鍛�")
+ @TableField("user_id")
+ private Long userId;
+
+ /**
+ * 鎵�灞炲晢鎴�
+ */
+ @ApiModelProperty(value= "鎵�灞炲晢鎴�")
+ @TableField("host_id")
+ private Long hostId;
+
+ /**
+ * 鎵�灞為儴闂�
+ */
+ @ApiModelProperty(value= "鎵�灞為儴闂�")
+ @TableField("dept_id")
+ private Long deptId;
+
+ /**
+ * 鐘舵�� 3: 宸插叧闂� 2: 闇�澶勭悊 1: 杩涜涓� 0: 鏈紑濮�
+ */
+ @ApiModelProperty(value= "鐘舵�� 3: 宸插叧闂� 2: 闇�澶勭悊 1: 杩涜涓� 0: 鏈紑濮� ")
+ private Integer status;
+
+ /**
+ * 杩涘害 0: 榛樿 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃
+ */
+ @ApiModelProperty(value= "杩涘害 0: 榛樿 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃 ")
+ private Integer settle;
+
+ /**
+ * 瀹℃牳杩涘害
+ */
+ @ApiModelProperty(value= "瀹℃牳杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
+
+ /**
+ * 璇勮
+ */
+ @ApiModelProperty(value= "璇勮")
+ private String comment;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * update_time
+ */
+ @ApiModelProperty(value= "update_time")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 闇�鍗忓姪浜嬮」
+ */
+ @ApiModelProperty(value= "闇�鍗忓姪浜嬮」")
+ @TableField("weekly_matter")
+ private String weeklyMatter;
+
+ /**
+ * 璐熻矗浜�
+ */
+ @ApiModelProperty(value= "璐熻矗浜�")
+ private Long director;
+
+ /**
+ * 娴佺▼闀垮害
+ */
+ @ApiModelProperty(value= "娴佺▼闀垮害")
+ @TableField("settle_size")
+ private Integer settleSize;
+
+ /**
+ * 褰撳墠杩涘害
+ */
+ @ApiModelProperty(value= "褰撳墠杩涘害")
+ @TableField("settle_current")
+ private Integer settleCurrent;
+
+ /**
+ * 鍛ㄦ姤ID
+ */
+ @ApiModelProperty(value= "鍛ㄦ姤ID")
+ @TableId(value = "weekly_id", type = IdType.INPUT)
+ @TableField("weekly_id")
+ private Integer weeklyId;
+
+ /**
+ * 鐢叉柟鍗曚綅ID
+ */
+ @ApiModelProperty(value= "鐢叉柟鍗曚綅ID")
+ @TableId(value = "cstmr_id", type = IdType.INPUT)
+ @TableField("cstmr_id")
+ private Long cstmrId;
+
+ /**
+ * 鏄熸湡
+ */
+ @ApiModelProperty(value= "鏄熸湡")
+ @TableField("weekly_day")
+ private Integer weeklyDay;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public WeeklyDailyReality() {}
+
+ public WeeklyDailyReality(Date dailyTime,Long userId,Long hostId,Long deptId,Integer status,Integer settle,String settleMsg,String comment,Long createBy,Date createTime,Long updateBy,Date updateTime,String weeklyMatter,Long director,Integer settleSize,Integer settleCurrent,Integer weeklyId,Long cstmrId,Integer weeklyDay,String memo) {
+ this.dailyTime = dailyTime;
+ this.userId = userId;
+ this.hostId = hostId;
+ this.deptId = deptId;
+ this.status = status;
+ this.settle = settle;
+ this.settleMsg = settleMsg;
+ this.comment = comment;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.weeklyMatter = weeklyMatter;
+ this.director = director;
+ this.settleSize = settleSize;
+ this.settleCurrent = settleCurrent;
+ this.weeklyId = weeklyId;
+ this.cstmrId = cstmrId;
+ this.weeklyDay = weeklyDay;
+ this.memo = memo;
+ }
+
+// WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality(
+// null, // 鏃ユ姤鏃ユ湡[闈炵┖]
+// null, // 鎵�灞炰汉鍛榌闈炵┖]
+// null, // 鎵�灞炲晢鎴穂闈炵┖]
+// null, // 鎵�灞為儴闂╗闈炵┖]
+// null, // 鐘舵�乕闈炵┖]
+// null, // 杩涘害
+// null, // 瀹℃牳杩涘害
+// null, // 璇勮
+// null, // 娣诲姞浜哄憳[闈炵┖]
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳[闈炵┖]
+// null, // update_time[闈炵┖]
+// null, // 闇�鍗忓姪浜嬮」
+// null, // 璐熻矗浜篬闈炵┖]
+// null, // 娴佺▼闀垮害[闈炵┖]
+// null, // 褰撳墠杩涘害[闈炵┖]
+// null, // 鍛ㄦ姤ID[闈炵┖]
+// null, // 鐢叉柟鍗曚綅ID[闈炵┖]
+// null, // 鏄熸湡[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getDailyTime$(){
+ if (Cools.isEmpty(this.dailyTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.dailyTime);
+ }
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.selectById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 3:
+ return "宸插叧闂�";
+ case 2:
+ return "闇�澶勭悊";
+ case 1:
+ return "杩涜涓�";
+ case 0:
+ return "鏈紑濮�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "榛樿";
+ case 1:
+ return "寮�濮�";
+ case 2:
+ return "缁勯暱寰呭";
+ case 3:
+ return "缁勯暱瀹℃牳";
+ case 4:
+ return "瑙勫垝寰呭";
+ case 5:
+ return "瑙勫垝瀹℃牳";
+ case 6:
+ return "瀹℃壒涓�";
+ case 7:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getDirector$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.director);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyFoll.java b/src/main/java/com/zy/crm/manager/entity/WeeklyFoll.java
new file mode 100644
index 0000000..fc53342
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyFoll.java
@@ -0,0 +1,77 @@
+package com.zy.crm.manager.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.crm.manager.service.WeeklyService;
+import com.zy.crm.manager.entity.Weekly;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.crm.system.service.UserService;
+import com.zy.crm.system.entity.User;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_weekly_foll")
+public class WeeklyFoll implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 鍛ㄦ姤
+ */
+ @ApiModelProperty(value= "鍛ㄦ姤")
+ @TableId(value = "weekly_id", type = IdType.INPUT)
+ @TableField("weekly_id")
+ private Long weeklyId;
+
+ /**
+ * 璺熻繘浜�
+ */
+ @ApiModelProperty(value= "璺熻繘浜�")
+ @TableId(value = "user_id", type = IdType.INPUT)
+ @TableField("user_id")
+ private Long userId;
+
+ public WeeklyFoll() {}
+
+ public WeeklyFoll(Long weeklyId,Long userId) {
+ this.weeklyId = weeklyId;
+ this.userId = userId;
+ }
+
+// WeeklyFoll weeklyFoll = new WeeklyFoll(
+// null, // 鍛ㄦ姤[闈炵┖]
+// null // 璺熻繘浜篬闈炵┖]
+// );
+
+ public String getWeeklyId$(){
+ WeeklyService service = SpringUtils.getBean(WeeklyService.class);
+ Weekly weekly = service.selectById(this.weeklyId);
+ if (!Cools.isEmpty(weekly)){
+ return String.valueOf(weekly.getId());
+ }
+ return null;
+ }
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/WeeklyDailyPlanMapper.java b/src/main/java/com/zy/crm/manager/mapper/WeeklyDailyPlanMapper.java
new file mode 100644
index 0000000..6b4c56d
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/WeeklyDailyPlanMapper.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.mapper;
+
+import com.zy.crm.manager.entity.WeeklyDailyPlan;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WeeklyDailyPlanMapper extends BaseMapper<WeeklyDailyPlan> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/WeeklyDailyRealityMapper.java b/src/main/java/com/zy/crm/manager/mapper/WeeklyDailyRealityMapper.java
new file mode 100644
index 0000000..26ed634
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/WeeklyDailyRealityMapper.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.mapper;
+
+import com.zy.crm.manager.entity.WeeklyDailyReality;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WeeklyDailyRealityMapper extends BaseMapper<WeeklyDailyReality> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/WeeklyFollMapper.java b/src/main/java/com/zy/crm/manager/mapper/WeeklyFollMapper.java
new file mode 100644
index 0000000..0700f90
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/WeeklyFollMapper.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.mapper;
+
+import com.zy.crm.manager.entity.WeeklyFoll;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WeeklyFollMapper extends BaseMapper<WeeklyFoll> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/WeeklyMapper.java b/src/main/java/com/zy/crm/manager/mapper/WeeklyMapper.java
new file mode 100644
index 0000000..7ac82dc
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/WeeklyMapper.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.mapper;
+
+import com.zy.crm.manager.entity.Weekly;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WeeklyMapper extends BaseMapper<Weekly> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/WeeklyDailyPlanService.java b/src/main/java/com/zy/crm/manager/service/WeeklyDailyPlanService.java
new file mode 100644
index 0000000..18a0ce3
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/WeeklyDailyPlanService.java
@@ -0,0 +1,8 @@
+package com.zy.crm.manager.service;
+
+import com.zy.crm.manager.entity.WeeklyDailyPlan;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WeeklyDailyPlanService extends IService<WeeklyDailyPlan> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/WeeklyDailyRealityService.java b/src/main/java/com/zy/crm/manager/service/WeeklyDailyRealityService.java
new file mode 100644
index 0000000..81d0202
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/WeeklyDailyRealityService.java
@@ -0,0 +1,8 @@
+package com.zy.crm.manager.service;
+
+import com.zy.crm.manager.entity.WeeklyDailyReality;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WeeklyDailyRealityService extends IService<WeeklyDailyReality> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/WeeklyFollService.java b/src/main/java/com/zy/crm/manager/service/WeeklyFollService.java
new file mode 100644
index 0000000..29b2638
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/WeeklyFollService.java
@@ -0,0 +1,8 @@
+package com.zy.crm.manager.service;
+
+import com.zy.crm.manager.entity.WeeklyFoll;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WeeklyFollService extends IService<WeeklyFoll> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/WeeklyService.java b/src/main/java/com/zy/crm/manager/service/WeeklyService.java
new file mode 100644
index 0000000..dac5a3d
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/WeeklyService.java
@@ -0,0 +1,8 @@
+package com.zy.crm.manager.service;
+
+import com.zy.crm.manager.entity.Weekly;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WeeklyService extends IService<Weekly> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyPlanServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyPlanServiceImpl.java
new file mode 100644
index 0000000..ee62bb5
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyPlanServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.zy.crm.manager.mapper.WeeklyDailyPlanMapper;
+import com.zy.crm.manager.entity.WeeklyDailyPlan;
+import com.zy.crm.manager.service.WeeklyDailyPlanService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("weeklyDailyPlanService")
+public class WeeklyDailyPlanServiceImpl extends ServiceImpl<WeeklyDailyPlanMapper, WeeklyDailyPlan> implements WeeklyDailyPlanService {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyRealityServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyRealityServiceImpl.java
new file mode 100644
index 0000000..56b554f
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyRealityServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.zy.crm.manager.mapper.WeeklyDailyRealityMapper;
+import com.zy.crm.manager.entity.WeeklyDailyReality;
+import com.zy.crm.manager.service.WeeklyDailyRealityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("weeklyDailyRealityService")
+public class WeeklyDailyRealityServiceImpl extends ServiceImpl<WeeklyDailyRealityMapper, WeeklyDailyReality> implements WeeklyDailyRealityService {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/WeeklyFollServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/WeeklyFollServiceImpl.java
new file mode 100644
index 0000000..2448471
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/WeeklyFollServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.zy.crm.manager.mapper.WeeklyFollMapper;
+import com.zy.crm.manager.entity.WeeklyFoll;
+import com.zy.crm.manager.service.WeeklyFollService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("weeklyFollService")
+public class WeeklyFollServiceImpl extends ServiceImpl<WeeklyFollMapper, WeeklyFoll> implements WeeklyFollService {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/WeeklyServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/WeeklyServiceImpl.java
new file mode 100644
index 0000000..2ebf899
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/WeeklyServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.zy.crm.manager.mapper.WeeklyMapper;
+import com.zy.crm.manager.entity.Weekly;
+import com.zy.crm.manager.service.WeeklyService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("weeklyService")
+public class WeeklyServiceImpl extends ServiceImpl<WeeklyMapper, Weekly> implements WeeklyService {
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 325b2da..64fa213 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,9 +20,12 @@
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm
# username: sa
# password: sa@123
- url: jdbc:sqlserver://127.0.0.1:51433;databasename=zy_crm
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=zy_crm
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:51433;databasename=zy_crm
+# username: sa
+# password: Zoneyung@zy56$
# url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
# username: sa
# password: Zoneyung@zy56$
diff --git a/src/main/resources/mapper/WeeklyDailyPlanMapper.xml b/src/main/resources/mapper/WeeklyDailyPlanMapper.xml
new file mode 100644
index 0000000..ee68f97
--- /dev/null
+++ b/src/main/resources/mapper/WeeklyDailyPlanMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.WeeklyDailyPlanMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.WeeklyDailyPlan">
+ <id column="id" property="id" />
+ <result column="daily_time" property="dailyTime" />
+ <result column="user_id" property="userId" />
+ <result column="host_id" property="hostId" />
+ <result column="dept_id" property="deptId" />
+ <result column="status" property="status" />
+ <result column="settle" property="settle" />
+ <result column="settle_msg" property="settleMsg" />
+ <result column="comment" property="comment" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="weekly_matter" property="weeklyMatter" />
+ <result column="director" property="director" />
+ <result column="settle_size" property="settleSize" />
+ <result column="settle_current" property="settleCurrent" />
+ <result column="weekly_id" property="weeklyId" />
+ <result column="cstmr_id" property="cstmrId" />
+ <result column="weekly_day" property="weeklyDay" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WeeklyDailyRealityMapper.xml b/src/main/resources/mapper/WeeklyDailyRealityMapper.xml
new file mode 100644
index 0000000..3a288ea
--- /dev/null
+++ b/src/main/resources/mapper/WeeklyDailyRealityMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.WeeklyDailyRealityMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.WeeklyDailyReality">
+ <id column="id" property="id" />
+ <result column="daily_time" property="dailyTime" />
+ <result column="user_id" property="userId" />
+ <result column="host_id" property="hostId" />
+ <result column="dept_id" property="deptId" />
+ <result column="status" property="status" />
+ <result column="settle" property="settle" />
+ <result column="settle_msg" property="settleMsg" />
+ <result column="comment" property="comment" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="weekly_matter" property="weeklyMatter" />
+ <result column="director" property="director" />
+ <result column="settle_size" property="settleSize" />
+ <result column="settle_current" property="settleCurrent" />
+ <result column="weekly_id" property="weeklyId" />
+ <result column="cstmr_id" property="cstmrId" />
+ <result column="weekly_day" property="weeklyDay" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WeeklyFollMapper.xml b/src/main/resources/mapper/WeeklyFollMapper.xml
new file mode 100644
index 0000000..9fc5dbb
--- /dev/null
+++ b/src/main/resources/mapper/WeeklyFollMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.WeeklyFollMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.WeeklyFoll">
+ <id column="id" property="id" />
+ <result column="weekly_id" property="weeklyId" />
+ <result column="user_id" property="userId" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WeeklyMapper.xml b/src/main/resources/mapper/WeeklyMapper.xml
new file mode 100644
index 0000000..d4a0c4e
--- /dev/null
+++ b/src/main/resources/mapper/WeeklyMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.WeeklyMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.Weekly">
+ <id column="id" property="id" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="user_id" property="userId" />
+ <result column="host_id" property="hostId" />
+ <result column="dept_id" property="deptId" />
+ <result column="cstmr_ids_reality" property="cstmrIdsReality" />
+ <result column="status" property="status" />
+ <result column="settle" property="settle" />
+ <result column="settle_msg" property="settleMsg" />
+ <result column="comment" property="comment" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="director" property="director" />
+ <result column="settle_size" property="settleSize" />
+ <result column="settle_current" property="settleCurrent" />
+ <result column="cstmr_ids_plan" property="cstmrIdsPlan" />
+ <result column="weekly_all" property="weeklyAll" />
+ <result column="weekly_now_month" property="weeklyNowMonth" />
+ <result column="weekly_year" property="weeklyYear" />
+ <result column="weekly_month" property="weeklyMonth" />
+ <result column="weekly_day" property="weeklyDay" />
+ <result column="weekly_day_month" property="weeklyDayMonth" />
+
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.1