中扬CRM客户关系管理系统
LSH
2024-03-26 ca5cf868592b7b99b6616362d4226f2827d60640
#框架初版
24个文件已添加
2个文件已修改
1973 ■■■■■ 已修改文件
src/main/java/com/zy/crm/common/CodeBuilder.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/WeeklyController.java 135 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/WeeklyDailyPlanController.java 135 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/WeeklyDailyRealityController.java 135 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/controller/WeeklyFollController.java 135 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/Weekly.java 405 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java 351 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java 350 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/entity/WeeklyFoll.java 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/mapper/WeeklyDailyPlanMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/mapper/WeeklyDailyRealityMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/mapper/WeeklyFollMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/mapper/WeeklyMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/WeeklyDailyPlanService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/WeeklyDailyRealityService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/WeeklyFollService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/WeeklyService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyPlanServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyRealityServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/impl/WeeklyFollServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/manager/service/impl/WeeklyServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WeeklyDailyPlanMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WeeklyDailyRealityMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WeeklyFollMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WeeklyMapper.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
src/main/java/com/zy/crm/manager/controller/WeeklyController.java
New file
@@ -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);
    }
}
src/main/java/com/zy/crm/manager/controller/WeeklyDailyPlanController.java
New file
@@ -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);
    }
}
src/main/java/com/zy/crm/manager/controller/WeeklyDailyRealityController.java
New file
@@ -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);
    }
}
src/main/java/com/zy/crm/manager/controller/WeeklyFollController.java
New file
@@ -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);
    }
}
src/main/java/com/zy/crm/manager/entity/Weekly.java
New file
@@ -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;
    }
}
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
New file
@@ -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;
    }
}
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
New file
@@ -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;
    }
}
src/main/java/com/zy/crm/manager/entity/WeeklyFoll.java
New file
@@ -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;
    }
}
src/main/java/com/zy/crm/manager/mapper/WeeklyDailyPlanMapper.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/mapper/WeeklyDailyRealityMapper.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/mapper/WeeklyFollMapper.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/mapper/WeeklyMapper.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/service/WeeklyDailyPlanService.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/service/WeeklyDailyRealityService.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/service/WeeklyFollService.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/service/WeeklyService.java
New file
@@ -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> {
}
src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyPlanServiceImpl.java
New file
@@ -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 {
}
src/main/java/com/zy/crm/manager/service/impl/WeeklyDailyRealityServiceImpl.java
New file
@@ -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 {
}
src/main/java/com/zy/crm/manager/service/impl/WeeklyFollServiceImpl.java
New file
@@ -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 {
}
src/main/java/com/zy/crm/manager/service/impl/WeeklyServiceImpl.java
New file
@@ -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 {
}
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$
src/main/resources/mapper/WeeklyDailyPlanMapper.xml
New file
@@ -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>
src/main/resources/mapper/WeeklyDailyRealityMapper.xml
New file
@@ -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>
src/main/resources/mapper/WeeklyFollMapper.xml
New file
@@ -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>
src/main/resources/mapper/WeeklyMapper.xml
New file
@@ -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>