按照易知鸟修改 2

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -152,7 +152,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/customer/**/**", "anon");
         filterChainDefinitionMap.put("/customer/customerPublic/list", "anon");
         filterChainDefinitionMap.put("/sys/common/delUploadTemp", "anon");
-        filterChainDefinitionMap.put("/shanks/test/hello", "anon");
+        filterChainDefinitionMap.put("/shanks/test/**", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);

jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -23,30 +23,6 @@ import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication
 @EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
-//public class JeecgSystemApplication extends SpringBootServletInitializer {
-//
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//        return application.sources(JeecgSystemApplication.class);
-//    }
-//
-//    public static void main(String[] args) throws UnknownHostException {
-//        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
-//        Environment env = application.getEnvironment();
-//        String ip = InetAddress.getLocalHost().getHostAddress();
-//        String port = env.getProperty("server.port");
-//        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-//        log.info("\n----------------------------------------------------------\n\t" +
-//                "Application Jeecg-Boot is running! Access URLs:\n\t" +
-//                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
-//                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-//                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
-//                "----------------------------------------------------------");
-//
-//    }
-//
-//}
-
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     @Override
@@ -54,8 +30,32 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
         return application.sources(JeecgSystemApplication.class);
     }
 
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
+        log.info("\n----------------------------------------------------------\n\t" +
+                "Application Jeecg-Boot is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
+                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
+                "----------------------------------------------------------");
 
-    public static void main(String[] args) {
-        SpringApplication.run(JeecgSystemApplication.class, args);
     }
-}
+
+}
+
+//public class JeecgSystemApplication extends SpringBootServletInitializer {
+//
+//    @Override
+//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+//        return application.sources(JeecgSystemApplication.class);
+//    }
+//
+//
+//    public static void main(String[] args) {
+//        SpringApplication.run(JeecgSystemApplication.class, args);
+//    }
+//}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerAuditionController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.controller;
+package org.jeecg.modules.mili.customer.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
-import org.jeecg.modules.miliCustomer.service.ICustomerAuditionService;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.service.ICustomerAuditionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerFollowController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.controller;
+package org.jeecg.modules.mili.customer.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,11 +10,13 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollow;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollowShow;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import org.jeecg.modules.miliCustomer.mapper.CustomerPotentialMapper;
-import org.jeecg.modules.miliCustomer.service.ICustomerFollowService;
+import org.jeecg.modules.mili.customer.entity.CustomerFollow;
+import org.jeecg.modules.mili.customer.entity.CustomerFollowShow;
+import org.jeecg.modules.mili.customer.entity.CustomerInfo;
+import org.jeecg.modules.mili.customer.entity.CustomerLogs;
+import org.jeecg.modules.mili.customer.service.ICustomerFollowService;
+import org.jeecg.modules.mili.customer.service.ICustomerInfoService;
+import org.jeecg.modules.mili.customer.service.ICustomerLogsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -24,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -41,9 +42,10 @@ import java.util.List;
 public class CustomerFollowController extends JeecgController<CustomerFollow, ICustomerFollowService> {
 	@Autowired
 	private ICustomerFollowService customerFollowService;
-
 	@Autowired
-	private CustomerPotentialMapper customerPotentialMapper;
+	private ICustomerInfoService customerInfoService;
+	@Autowired
+	private ICustomerLogsService customerLogsService;
 
 	/**
 	 * 分页列表查询
@@ -174,22 +176,53 @@ public class CustomerFollowController extends JeecgController<CustomerFollow, IC
 	 @ApiOperation(value="潜客跟进信息-添加", notes="潜客跟进信息-添加")
 	 @PostMapping(value = "/addFollow")
 	 public Result<String> addFollow(@RequestBody HashMap obj) throws ParseException {
-		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
 		 CustomerFollow customerFollow = new CustomerFollow();
-		 customerFollow.setFollowContent((String) obj.get("schoolDistrictId"));
+		 customerFollow.setFollowContent((String) obj.get("followContent"));
 		 customerFollow.setCpId((String) obj.get("cpId"));
 		 customerFollow.setFollowType((String) obj.get("followType"));
 		 customerFollow.setFollowContent((String) obj.get("followContent"));
 		 customerFollow.setFollowPic((String) obj.get("followPic"));
 		 customerFollow.setSalesCode((String) obj.get("salesCode"));
 		 customerFollow.setCreateBy((String) obj.get("createBy"));
+		 customerFollow.setFollow_time(sdf.parse((String) obj.get("followDate")));
+		 int schoolDistrictId = Integer.parseInt((String) obj.get("schoolDistrictId"));
+		 customerFollow.setSchoolDistrictId(schoolDistrictId);
 		 customerFollowService.save(customerFollow);
-		 CustomerPotential customerPotential = new CustomerPotential();
-		 customerPotential.setId(customerFollow.getCpId());
-		 customerPotential.setLastFollowTime(new Date());
-		 Date nextTemp = sdf.parse((String) obj.get("nextFollowTime"));
-		 customerPotential.setNextFollowTime(nextTemp);
-		 customerPotentialMapper.updateById(customerPotential);
+		 CustomerInfo customerInfo = new CustomerInfo();
+		 customerInfo.setId((String) obj.get("cpId"));
+		 customerInfo.setLastFollowTime(sdf.parse((String) obj.get("followDate")));
+		 customerInfo.setNextFollowTime(sdf2.parse((String) obj.get("nextFollowTime")));
+		 customerInfoService.updateById(customerInfo);
+		 //添加跟进日志 不优雅 后面优化
+		 CustomerLogs customerLogs = new CustomerLogs();
+		 customerLogs.setCustomerId((String) obj.get("cpId"));
+		 customerLogs.setLastFollowTime(sdf.parse((String) obj.get("followDate")));
+		 customerLogs.setNextFollowTime(sdf2.parse((String) obj.get("nextFollowTime")));
+		 switch ((String) obj.get("followType")) {
+			 case "1":
+				 customerLogs.setType(11);
+				 customerLogs.setTypeDes("电话咨询");
+				 break;
+			 case "2":
+				 customerLogs.setType(12);
+				 customerLogs.setTypeDes("来电洽谈");
+				 break;
+			 case "3":
+				 customerLogs.setType(13);
+				 customerLogs.setTypeDes("微信沟通");
+				 break;
+			 case "4":
+				 customerLogs.setType(14);
+				 customerLogs.setTypeDes("其他沟通");
+				 break;
+		 }
+		 customerLogs.setDescType1((String) obj.get("跟进详情"));
+		 customerLogs.setDescType1((String) obj.get("followContent"));
+		 customerLogs.setSchoolDistrictId(schoolDistrictId);
+		 customerLogsService.save(customerLogs);
 		 return Result.OK("添加成功！");
 	 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/controller/CustomerInfoController.java

@@ -0,0 +1,372 @@
+package org.jeecg.modules.mili.customer.controller;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.entity.CustomerInfo;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
+import org.jeecg.modules.mili.customer.service.ICustomerFollowService;
+import org.jeecg.modules.mili.customer.service.ICustomerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+* @Description: 名单管理
+* @Author: jeecg-boot
+* @Date:   2022-06-27
+* @Version: V1.0
+*/
+@Api(tags="公池管理")
+@RestController
+@RequestMapping("/customer/customerInfo")
+@Slf4j
+public class CustomerInfoController extends JeecgController<CustomerInfo, ICustomerInfoService> {
+   @Autowired
+   private ICustomerInfoService customerInfoService;
+
+    @Autowired
+    private ICustomerFollowService customerFollowService;
+
+   /**
+    * 分页列表查询
+    *
+    * @param customerInfo
+    * @param pageNo
+    * @param pageSize
+    * @param req
+    * @return
+    */
+   //@AutoLog(value = "名单管理-分页列表查询")
+   @ApiOperation(value="名单管理-分页列表查询", notes="名单管理-分页列表查询")
+   @GetMapping(value = "/list")
+   public Result<IPage<CustomerInfo>> queryPageList(CustomerInfo customerInfo,
+                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                  HttpServletRequest req) {
+       QueryWrapper<CustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(customerInfo, req.getParameterMap());
+       //关键字查询
+       if(req.getParameterMap().get("keywords") !=null) {
+           String keywords = req.getParameterMap().get("keywords")[0];
+           queryWrapper.apply(" (name like '%"+keywords+"%' or " +
+                   "nickname like '%"+keywords+"%' or " +
+                   "contact_phone like'%"+keywords+"%' or " +
+                   "mark like'%"+keywords+"%' or " +
+                   "contact_name like'%"+keywords+"%' )");
+       }
+       // 判断日期段
+       if(req.getParameterMap().get("beginTime") !=null) {
+           String beginDate = req.getParameterMap().get("beginTime")[0];
+           String finishDate = req.getParameterMap().get("endTime")[0];
+           if (!StringUtils.isEmpty(beginDate) || StringUtils.isEmpty(finishDate)) {
+               DateTime beginOfDay = DateUtil.beginOfDay(DateUtil.parse(beginDate));
+               DateTime endOfDay = DateUtil.endOfDay(DateUtil.parse(finishDate));
+               queryWrapper.ge("create_time", beginOfDay).le("create_time", endOfDay);
+           }
+       }
+       //tabs查询
+       if(req.getParameterMap().get("tabs") !=null) {
+           String saleCode = req.getParameterMap().get("saleCode")[0];
+           queryWrapper.eq("sale_code",saleCode);
+       }
+       //groups查询
+       if(req.getParameterMap().get("groups") !=null) {
+           String group =  req.getParameterMap().get("groups")[0];
+           if(group.equals("2")) {
+               queryWrapper.eq("follow_status",0);
+           }else if(group.equals("3")) {
+               //date_format(now(), '%Y-%m-%d') = date_format(next_follow_time, '%Y-%m-%d')
+               queryWrapper.apply("date_format(now(), '%Y-%m-%d') = date_format(next_follow_time, '%Y-%m-%d')");
+           }else if(group.equals("4")) {
+               // date_format(now(), '%Y-%m-%d') > date_format(next_follow_time, '%Y-%m-%d')
+               queryWrapper.apply("date_format(now(), '%Y-%m-%d') > date_format(next_follow_time, '%Y-%m-%d')");
+           }
+       }
+       //年龄查询 ageMin
+       if(req.getParameterMap().get("ageMin") !=null) {
+           String ageMin =  req.getParameterMap().get("ageMin")[0];
+           String ageMax =  req.getParameterMap().get("ageMax")[0];
+           queryWrapper.between("YEAR(now())-YEAR(birthday)",ageMin,ageMax);
+       }
+       //不显示失效
+       if(req.getParameterMap().get("noInvalid") !=null) {
+           queryWrapper.ne("follow_status",0);
+       }
+       Page<CustomerInfo> page = new Page<CustomerInfo>(pageNo, pageSize);
+       IPage<CustomerInfo> pageList = customerInfoService.page(page, queryWrapper);
+       // 不是特别优雅
+       for(int i=0 ; i< pageList.getRecords().size(); i++) {
+           String log = customerFollowService.getFollowLimit(pageList.getRecords().get(i).getId());
+           pageList.getRecords().get(i).setFollow_log(log);
+       }
+
+       return Result.OK(pageList);
+   }
+
+   /**
+    *   添加
+    *
+    * @param customerInfo
+    * @return
+    */
+   @AutoLog(value = "名单管理-添加")
+   @ApiOperation(value="名单管理-添加", notes="名单管理-添加")
+   @PostMapping(value = "/add")
+   public Result<String> add(@RequestBody CustomerInfo customerInfo) {
+       customerInfoService.save(customerInfo);
+       return Result.OK("添加成功！");
+   }
+
+   /**
+    *  编辑
+    *
+    * @param customerInfo
+    * @return
+    */
+   @AutoLog(value = "名单管理-编辑")
+   @ApiOperation(value="名单管理-编辑", notes="名单管理-编辑")
+   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+   public Result<String> edit(@RequestBody CustomerInfo customerInfo) {
+       customerInfoService.updateById(customerInfo);
+       return Result.OK("编辑成功!");
+   }
+
+   /**
+    *   通过id删除
+    *
+    * @param id
+    * @return
+    */
+   @AutoLog(value = "名单管理-通过id删除")
+   @ApiOperation(value="名单管理-通过id删除", notes="名单管理-通过id删除")
+   @DeleteMapping(value = "/delete")
+   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+       customerInfoService.removeById(id);
+       return Result.OK("删除成功!");
+   }
+
+   /**
+    *  批量删除
+    *
+    * @param ids
+    * @return
+    */
+   @AutoLog(value = "名单管理-批量删除")
+   @ApiOperation(value="名单管理-批量删除", notes="名单管理-批量删除")
+   @DeleteMapping(value = "/deleteBatch")
+   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+       this.customerInfoService.removeByIds(Arrays.asList(ids.split(",")));
+       return Result.OK("批量删除成功!");
+   }
+
+   /**
+    * 通过id查询
+    *
+    * @param id
+    * @return
+    */
+   //@AutoLog(value = "名单管理-通过id查询")
+   @ApiOperation(value="名单管理-通过id查询", notes="名单管理-通过id查询")
+   @GetMapping(value = "/queryById")
+   public Result<CustomerInfo> queryById(@RequestParam(name="id",required=true) String id) {
+       CustomerInfo customerInfo = customerInfoService.getById(id);
+       if(customerInfo==null) {
+           return Result.error("未找到对应数据");
+       }
+       return Result.OK(customerInfo);
+   }
+
+   /**
+   * 导出excel
+   *
+   * @param request
+   * @param customerInfo
+   */
+   @RequestMapping(value = "/exportXls")
+   public ModelAndView exportXls(HttpServletRequest request, CustomerInfo customerInfo) {
+       return super.exportXls(request, customerInfo, CustomerInfo.class, "名单管理");
+   }
+
+   /**
+     * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+       return super.importExcel(request, response, CustomerInfo.class);
+   }
+
+    /**
+     *   顾问分配
+     *
+     * @param
+     * @return
+     */
+
+
+
+
+
+    @AutoLog(value = "名单管理-顾问分配")
+    @ApiOperation(value="名单管理-顾问分配", notes="名单管理-顾问分配")
+    @RequestMapping(value = "/appoint")
+    public Result<String> appoint(@RequestBody String jsonParam) {
+
+        JSONObject jsonObject = JSONObject.parseObject(jsonParam);
+        CustomerInfo customerInfo = JSON.parseObject(String.valueOf(jsonObject.get("customerInfo")),CustomerInfo.class);
+        JSONObject appointInfo = (JSONObject) jsonObject.get("appointInfo");
+        String saleName = String.valueOf(appointInfo.get("saleName"));
+        String schoolName = String.valueOf(appointInfo.get("schoolName"));
+        customerInfoService.appoint(customerInfo,saleName,schoolName);
+        return Result.OK("分配成功!");
+    }
+
+    /**
+     *  签约
+     *
+     * @param customerInfo
+     * @return
+     */
+    @AutoLog(value = "潜客管理-签约")
+    @ApiOperation(value="潜客管理-签约", notes="潜客管理-签约")
+    @RequestMapping(value = "/sign", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> sign(@RequestBody CustomerInfo customerInfo ) {
+        customerInfoService.sign(customerInfo);
+        return Result.OK("报名成功!");
+    }
+
+    /**
+     * 潜客管理-状态编辑
+     *
+     * @param customerInfo
+     * @return
+     */
+    @AutoLog(value = "潜客管理-状态编辑")
+    @ApiOperation(value="潜客管理-状态编辑", notes="潜客管理-状态编辑")
+    @RequestMapping(value = "/statusEdit", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> statusEdit(@RequestBody CustomerInfo customerInfo) {
+        customerInfoService.statusEdit(customerInfo);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 潜客管理-预约来访
+     *
+     * @param customerVisiting
+     * @return
+     */
+    @AutoLog(value = "潜客管理-预约来访")
+    @ApiOperation(value="潜客管理-预约来访", notes="潜客管理-预约来访")
+    @PostMapping(value = "/addVisit")
+    public Result<String> addVisit(@RequestBody CustomerVisiting customerVisiting) {
+        Result<String> customerPotential = customerInfoService.addVisit(customerVisiting);
+        return customerPotential;
+    }
+
+    /**
+     * 潜客管理-预约试听
+     *
+     * @param customerAudition
+     * @return
+     */
+    @AutoLog(value = "潜客管理-预约试听")
+    @ApiOperation(value="潜客管理-预约试听", notes="潜客管理-预约试听")
+    @PostMapping(value = "/addAudition")
+    public Result<String> addAudition(@RequestBody CustomerAudition customerAudition) {
+        Result<String> customerPotential = customerInfoService.addAudition(customerAudition);
+        return customerPotential;
+    }
+
+    /**
+     * 潜客管理分组数据
+     *
+     * @param json
+     * @return
+     */
+    @AutoLog(value = "潜客管理-分组数据")
+    @ApiOperation(value="潜客管理-分组数据", notes="潜客管理-分组数据")
+    @PostMapping(value = "/getGroupCounts")
+    public Result<JSONObject>  getGroupCounts(@RequestBody JSONObject json) {
+        Result<JSONObject> result = new Result<JSONObject>();
+        List<CustomerInfo> newAppoints = new ArrayList<>();
+        List<CustomerInfo> todayAppoints = new ArrayList<>();
+        List<CustomerInfo> agoAppoints = new ArrayList<>();
+
+        QueryWrapper<CustomerInfo> qw_newAppoint = new QueryWrapper<>();
+        QueryWrapper<CustomerInfo> qw_todayAppoint = new QueryWrapper<>();
+        QueryWrapper<CustomerInfo> qw_agoAppoint = new QueryWrapper<>();
+        qw_newAppoint.eq("follow_status",0);
+        qw_todayAppoint.apply("date_format(now(), '%Y-%m-%d') = date_format(next_follow_time, '%Y-%m-%d')");
+        qw_agoAppoint.apply("date_format(now(), '%Y-%m-%d') > date_format(next_follow_time, '%Y-%m-%d')");
+        String tabs = json.getString("tabs");
+        if (tabs != null && tabs.equals("2")) {
+            String saleCode = json.getString("saleCode");
+            qw_newAppoint.eq("sale_code", saleCode);
+            qw_todayAppoint.eq("sale_code", saleCode);
+            qw_agoAppoint.eq("sale_code", saleCode);
+        }
+        newAppoints = customerInfoService.list(qw_newAppoint);
+        todayAppoints = customerInfoService.list(qw_todayAppoint);
+        agoAppoints = customerInfoService.list(qw_agoAppoint);
+        JSONObject obj=new JSONObject();
+        obj.put("newAppoint",newAppoints.size());
+        obj.put("todayAppoint",todayAppoints.size());
+        obj.put("agoAppoint",agoAppoints.size());
+        result.setResult(obj);
+        result.setSuccess(true);
+        result.setCode(200);
+        return result;
+    }
+
+//    /**
+//     * 潜客管理获取分组
+//     *
+//     * @param json
+//     * @return
+//     */
+//    @AutoLog(value = "潜客管理-获取分组")
+//    @ApiOperation(value="潜客管理-获取分组", notes="潜客管理-获取分组")
+//    @PostMapping(value = "/getGroups")
+//    public Result<IPage<CustomerInfo>>  getGroups(@RequestBody JSONObject json) {
+//        Result<List<CustomerInfo>> result = new Result<List<CustomerInfo>>();
+//        CustomerInfo customerInfo = new CustomerInfo();
+//        String group = json.getString("group");
+//        List<CustomerInfo> customerInfos = new ArrayList<>();
+//        QueryWrapper<CustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(customerInfo, null);
+//        if(group.equals("2")) {
+//            queryWrapper.eq("follow_status",0);
+//        }else if(group.equals("3")) {
+//            //date_format(now(), '%Y-%m-%d') = date_format(next_follow_time, '%Y-%m-%d')
+//            queryWrapper.apply("date_format(now(), '%Y-%m-%d') = date_format(next_follow_time, '%Y-%m-%d')");
+//        }else if(group.equals("4")) {
+//            // date_format(now(), '%Y-%m-%d') > date_format(next_follow_time, '%Y-%m-%d')
+//            queryWrapper.apply("date_format(now(), '%Y-%m-%d') > date_format(next_follow_time, '%Y-%m-%d')");
+//        }
+//        Page<CustomerInfo> page = new Page<CustomerInfo>(1, 99999);
+//        IPage<CustomerInfo> pageList = customerInfoService.page(page, queryWrapper);
+//        return  Result.OK(pageList);
+//    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/controller/CustomerLogsController.java

@@ -0,0 +1,181 @@
+package org.jeecg.modules.mili.customer.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.mili.customer.entity.CustomerLogs;
+import org.jeecg.modules.mili.customer.service.ICustomerLogsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.HashMap;
+
+/**
+ * @Description: 名单操作记录
+ * @Author: jeecg-boot
+ * @Date:   2022-08-10
+ * @Version: V1.0
+ */
+@Api(tags="名单操作记录")
+@RestController
+@RequestMapping("/customer/customerLogs")
+@Slf4j
+public class CustomerLogsController extends JeecgController<CustomerLogs, ICustomerLogsService> {
+	@Autowired
+	private ICustomerLogsService customerLogsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param customerLogs
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "名单操作记录-分页列表查询")
+	@ApiOperation(value="名单操作记录-分页列表查询", notes="名单操作记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CustomerLogs>> queryPageList(CustomerLogs customerLogs,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CustomerLogs> queryWrapper = QueryGenerator.initQueryWrapper(customerLogs, req.getParameterMap());
+		Page<CustomerLogs> page = new Page<CustomerLogs>(pageNo, pageSize);
+		IPage<CustomerLogs> pageList = customerLogsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param customerLogs
+	 * @return
+	 */
+	@AutoLog(value = "名单操作记录-添加")
+	@ApiOperation(value="名单操作记录-添加", notes="名单操作记录-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CustomerLogs customerLogs) {
+		customerLogsService.save(customerLogs);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param customerLogs
+	 * @return
+	 */
+	@AutoLog(value = "名单操作记录-编辑")
+	@ApiOperation(value="名单操作记录-编辑", notes="名单操作记录-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CustomerLogs customerLogs) {
+		customerLogsService.updateById(customerLogs);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "名单操作记录-通过id删除")
+	@ApiOperation(value="名单操作记录-通过id删除", notes="名单操作记录-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		customerLogsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "名单操作记录-批量删除")
+	@ApiOperation(value="名单操作记录-批量删除", notes="名单操作记录-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.customerLogsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "名单操作记录-通过id查询")
+	@ApiOperation(value="名单操作记录-通过id查询", notes="名单操作记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CustomerLogs> queryById(@RequestParam(name="id",required=true) String id) {
+		CustomerLogs customerLogs = customerLogsService.getById(id);
+		if(customerLogs==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(customerLogs);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param customerLogs
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CustomerLogs customerLogs) {
+        return super.exportXls(request, customerLogs, CustomerLogs.class, "名单操作记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CustomerLogs.class);
+    }
+
+
+
+
+	/**
+	 *  操作日志-通过用户id查询
+	 *
+	 * @param obj
+	 * @return
+	 */
+	@AutoLog(value = "操作日志-通过用户id查询")
+	@ApiOperation(value="操作日志-通过用户id查询", notes="操作日志-通过用户id查询")
+	@PostMapping(value = "/queryByCustomerId")
+	public Result<IPage<CustomerLogs>> queryByCustomerId(@RequestBody HashMap obj) {
+//		List<CustomerLogs> customerLogs = customerLogsService.queryByCustomerId((String) obj.get("customer_id"));
+//		return customerLogs;
+
+		CustomerLogs customerLogsQ = new CustomerLogs();
+		customerLogsQ.setCustomerId((String) obj.get("customer_id"));
+		QueryWrapper<CustomerLogs> queryWrapper = QueryGenerator.initQueryWrapper(customerLogsQ, null);
+		queryWrapper.orderByDesc("create_time");
+		Page<CustomerLogs> page = new Page<CustomerLogs>(1, 99999);
+		IPage<CustomerLogs> pageList = customerLogsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerPublicController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.controller;
+package org.jeecg.modules.mili.customer.controller;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.miliCustomer.entity.CustomerPublic;
-import org.jeecg.modules.miliCustomer.service.ICustomerPublicService;
+import org.jeecg.modules.mili.customer.entity.CustomerPublic;
+import org.jeecg.modules.mili.customer.service.ICustomerPublicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -67,9 +67,11 @@ public class CustomerPublicController extends JeecgController<CustomerPublic, IC
 		//关键字查询
 		if(req.getParameterMap().get("keywords") !=null) {
 			String keywords = req.getParameterMap().get("keywords")[0];
-			queryWrapper.like("name", keywords).or().like("nickname", keywords)
-					.or().like("contact_phone", keywords) .or().like("mark" ,keywords)
-					.or().like("contact_name" ,keywords);
+			queryWrapper.apply(" (name like '%"+keywords+"%' or " +
+					"nickname like '%"+keywords+"%' or " +
+					"contact_phone like'%"+keywords+"%' or " +
+					"mark like'%"+keywords+"%' or " +
+					"contact_name like'%"+keywords+"%' )");
 		}
 
 		Page<CustomerPublic> page = new Page<CustomerPublic>(pageNo, pageSize);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerVisitingController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.controller;
+package org.jeecg.modules.mili.customer.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,8 +10,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
-import org.jeecg.modules.miliCustomer.service.ICustomerVisitingService;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
+import org.jeecg.modules.mili.customer.service.ICustomerVisitingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerAudition.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.miliCustomer.entity;
+package org.jeecg.modules.mili.customer.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -96,6 +96,10 @@ public class CustomerAudition implements Serializable {
 	@Excel(name = "备注", width = 15)
     private transient String markString;
 
+    @Excel(name = "课表id", width = 15)
+    @ApiModelProperty(value = "课表")
+    private String schedule_id;
+
     private byte[] mark;
 
     public byte[] getMark(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerFollow.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.entity;
+package org.jeecg.modules.mili.customer.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -76,5 +76,9 @@ public class CustomerFollow implements Serializable {
 	@Excel(name = "顾问code", width = 15)
     @ApiModelProperty(value = "顾问code")
     private String salesCode;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "跟进日期")
+    private Date follow_time;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerFollowShow.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.entity;
+package org.jeecg.modules.mili.customer.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -15,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * @Description: 潜客跟进信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerPotential.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.entity;
+package org.jeecg.modules.mili.customer.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,174 +13,188 @@ import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.util.Date;
 
 /**
- * @Description: 潜客管理
+ * @Description: 公池管理
  * @Author: jeecg-boot
- * @Date:   2022-07-05
+ * @Date:   2022-06-27
  * @Version: V1.0
  */
 @Data
-@TableName("customer_potential")
+@TableName("customer_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="customer_potential对象", description="潜客管理")
-public class CustomerPotential implements Serializable {
+@ApiModel(value="customer_info对象", description="公池管理")
+public class CustomerInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
+    @ApiModelProperty(value = "id")
+    private String id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
+    private Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
+    private String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
+    private Date updateTime;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
+    private String sysOrgCode;
 	/**校区ID*/
 	@Excel(name = "校区ID", width = 15, dictTable = "school_organization", dicText = "name", dicCode = "id")
 	@Dict(dictTable = "school_organization", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "校区ID")
-    private java.lang.Integer schoolDistrictId;
+    private Integer schoolDistrictId;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")
-    private java.lang.String name;
+    private String name;
 	/**昵称*/
 	@Excel(name = "昵称", width = 15)
     @ApiModelProperty(value = "昵称")
-    private java.lang.String nickname;
+    private String nickname;
+    /**学员类型*/
+    @Excel(name = "学员类型", width = 15, dicCode = "customer_pc_type")
+    @Dict(dicCode = "customer_pc_type")
+    @ApiModelProperty(value = "学员类型")
+    private Integer type;
 	/**性别*/
 	@Excel(name = "性别", width = 15, dicCode = "sex")
 	@Dict(dicCode = "sex")
     @ApiModelProperty(value = "性别")
-    private java.lang.Integer sex;
+    private Integer sex;
 	/**家长姓名*/
 	@Excel(name = "家长姓名", width = 15)
     @ApiModelProperty(value = "家长姓名")
-    private java.lang.String contactName;
+    private String contactName;
 	/**家长电话*/
 	@Excel(name = "家长电话", width = 15)
     @ApiModelProperty(value = "家长电话")
-    private java.lang.String contactPhone;
+    private String contactPhone;
 	/**备选联系人1*/
 	@Excel(name = "备选联系人1", width = 15)
     @ApiModelProperty(value = "备选联系人1")
-    private java.lang.String contact1Name;
+    private String contact1Name;
 	/**备选联系人1电话*/
 	@Excel(name = "备选联系人1电话", width = 15)
     @ApiModelProperty(value = "备选联系人1电话")
-    private java.lang.String contact1Phone;
+    private String contact1Phone;
 	/**备选联系人2*/
 	@Excel(name = "备选联系人2", width = 15)
     @ApiModelProperty(value = "备选联系人2")
-    private java.lang.String contact2Name;
+    private String contact2Name;
 	/**备选联系人2电话*/
 	@Excel(name = "备选联系人2电话", width = 15)
     @ApiModelProperty(value = "备选联系人2电话")
-    private java.lang.String contact2Phone;
+    private String contact2Phone;
 	/**年龄*/
 	@Excel(name = "年龄", width = 15)
     @ApiModelProperty(value = "年龄")
-    private java.lang.Integer age;
+    private Integer age;
 	/**生日*/
 	@Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "生日")
-    private java.util.Date birthday;
+    private Date birthday;
 	/**学校*/
 	@Excel(name = "学校", width = 15, dictTable = "school_school", dicText = "name", dicCode = "id")
 	@Dict(dictTable = "school_school", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "学校")
-    private java.lang.String school;
+    private String school;
 	/**年级*/
-	@Excel(name = "年级", width = 15, dicCode = "grade")
-	@Dict(dicCode = "grade")
+	@Excel(name = "年级", width = 15, dicCode = "customer_grade")
+	@Dict(dicCode = "customer_grade")
     @ApiModelProperty(value = "年级")
-    private java.lang.String grade;
+    private String grade;
 	/**班级*/
 	@Excel(name = "班级", width = 15)
     @ApiModelProperty(value = "班级")
-    private java.lang.String classes;
+    private String classes;
 	/**身份证*/
 	@Excel(name = "身份证", width = 15)
     @ApiModelProperty(value = "身份证")
-    private java.lang.String idCard;
+    private String idCard;
 	/**住址*/
 	@Excel(name = "住址", width = 15)
     @ApiModelProperty(value = "住址")
-    private java.lang.String address;
+    private String address;
 	/**渠道类型*/
 	@Excel(name = "渠道类型", width = 15, dictTable = "promotion_channel", dicText = "name", dicCode = "id")
 	@Dict(dictTable = "promotion_channel", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "渠道类型")
-    private java.lang.String channelType;
+    private String channelType;
 	/**意向课程*/
-	@Excel(name = "意向课程", width = 15, dictTable = "school_curriculum", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "school_curriculum", dicText = "name", dicCode = "id")
+	@Excel(name = "意向课程", width = 15, dictTable = "education_course", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "education_course", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "意向课程")
-    private java.lang.String intendedCourse;
+    private String intendedCourse;
 	/**意向度*/
-	@Excel(name = "意向度", width = 15, dicCode = "intention_status")
-	@Dict(dicCode = "intention_status")
+	@Excel(name = "意向度", width = 15,dicCode = "customer_intention_status")
+    @Dict(dicCode = "customer_intention_status")
     @ApiModelProperty(value = "意向度")
-    private java.lang.Integer intendedDegress;
+    private Integer intendedDegress;
 	/**顾问*/
 	@Excel(name = "顾问", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "顾问")
-    private java.lang.String saleCode;
+    private String saleCode;
 	/**推荐人*/
-	@Excel(name = "推荐人", width = 15)
+	@Excel(name = "推荐人", width = 15 ,dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "推荐人")
-    private java.lang.String referencesPhone;
+    private String referencesPhone;
 	/**采单员*/
 	@Excel(name = "采单员", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "采单员")
-    private java.lang.String collectinoCode;
+    private String collectinoCode;
 	/**状态*/
-	@Excel(name = "状态", width = 15, dicCode = "pc_status")
-	@Dict(dicCode = "pc_status")
+	@Excel(name = "状态", width = 15, dicCode = "customer_pc_status")
+	@Dict(dicCode = "customer_pc_status")
     @ApiModelProperty(value = "状态")
-    private java.lang.Integer status;
+    private Integer status;
 	/**跟进状态*/
-	@Excel(name = "跟进状态", width = 15, dicCode = "pc_follow_status")
-	@Dict(dicCode = "pc_follow_status")
+	@Excel(name = "跟进状态", width = 15, dicCode = "customer_follow_status")
+	@Dict(dicCode = "customer_follow_status")
     @ApiModelProperty(value = "跟进状态")
-    private java.lang.Integer followStatus;
+    private Integer followStatus;
 	/**上次跟进*/
-	@Excel(name = "上次跟进", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "上次跟进", width = 15, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上次跟进")
-    private java.util.Date lastFollowTime;
+    private Date lastFollowTime;
 	/**下次跟进*/
-	@Excel(name = "下次跟进", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "下次跟进", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "下次跟进")
-    private java.util.Date nextFollowTime;
+    private Date nextFollowTime;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
-    private transient java.lang.String markString;
+    private transient String markString;
+
+    @Transient //不映射
+    private transient String follow_log;
+
+
 
     private byte[] mark;
 
@@ -196,12 +210,12 @@ public class CustomerPotential implements Serializable {
         return null;
     }
 
-    public String getMarkString(){
-        if(mark==null || mark.length==0){
+    public String getMarkString() {
+        if (mark == null || mark.length == 0) {
             return "";
         }
         try {
-            return new String(mark,"UTF-8");
+            return new String(mark, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/entity/CustomerLogs.java

@@ -0,0 +1,113 @@
+package org.jeecg.modules.mili.customer.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 名单操作记录
+ * @Author: jeecg-boot
+ * @Date:   2022-08-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("customer_logs")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="customer_logs对象", description="名单操作记录")
+public class CustomerLogs implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**日志类型*/
+	@Excel(name = "日志类型", width = 15)
+    @ApiModelProperty(value = "日志类型")
+    @Dict(dicCode = "customer_logs_type")
+    private Integer type;
+	/**日志描述*/
+	@Excel(name = "日志描述", width = 15)
+    @ApiModelProperty(value = "日志描述")
+    private String typeDes;
+	/**关键描述1*/
+	@Excel(name = "关键描述1", width = 15)
+    @ApiModelProperty(value = "关键描述1")
+    private String descType1;
+	/**关键字1*/
+	@Excel(name = "关键字1", width = 15)
+    @ApiModelProperty(value = "关键字1")
+    private String descComm1;
+	/**关键描述2*/
+	@Excel(name = "关键描述2", width = 15)
+    @ApiModelProperty(value = "关键描述2")
+    private String descType2;
+	/**关键字2*/
+	@Excel(name = "关键字2", width = 15)
+    @ApiModelProperty(value = "关键字2")
+    private String descComm2;
+	/**关键描述3*/
+	@Excel(name = "关键描述3", width = 15)
+    @ApiModelProperty(value = "关键描述3")
+    private String descType3;
+	/**关键字3*/
+	@Excel(name = "关键字3", width = 15)
+    @ApiModelProperty(value = "关键字3")
+    private String descComm3;
+    /**用户ID*/
+    @Excel(name = "用户ID", width = 15)
+    @ApiModelProperty(value = "用户ID")
+    private String customerId;
+
+    @Excel(name = "校区ID", width = 15)
+    @ApiModelProperty(value = "校区ID")
+    @Dict(dictTable = "school_organization", dicText = "name", dicCode = "id")
+    private Integer schoolDistrictId;
+
+    /**上次跟进*/
+    @Excel(name = "上次跟进", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "上次跟进")
+    private Date lastFollowTime;
+    /**下次跟进*/
+    @Excel(name = "下次跟进", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "下次跟进")
+    private Date nextFollowTime;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerPublic.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.miliCustomer.entity;
+package org.jeecg.modules.mili.customer.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -38,6 +38,13 @@ public class CustomerPublic implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private String updateBy;
@@ -107,8 +114,8 @@ public class CustomerPublic implements Serializable {
     @ApiModelProperty(value = "学校")
     private String school;
 	/**年级*/
-	@Excel(name = "年级", width = 15, dicCode = "grade")
-	@Dict(dicCode = "grade")
+	@Excel(name = "年级", width = 15, dicCode = "customer_grade")
+	@Dict(dicCode = "customer_grade")
     @ApiModelProperty(value = "年级")
     private String grade;
 	/**班级*/
@@ -129,8 +136,8 @@ public class CustomerPublic implements Serializable {
     @ApiModelProperty(value = "渠道类型")
     private String channelType;
 	/**意向课程*/
-	@Excel(name = "意向课程", width = 15, dictTable = "school_curriculum", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "school_curriculum", dicText = "name", dicCode = "id")
+	@Excel(name = "意向课程", width = 15, dictTable = "education_course", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "education_course", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "意向课程")
     private String intendedCourse;
 	/**意向度*/
@@ -152,13 +159,13 @@ public class CustomerPublic implements Serializable {
     @ApiModelProperty(value = "采单员")
     private String collectinoCode;
 	/**状态*/
-	@Excel(name = "状态", width = 15, dicCode = "pc_status")
-	@Dict(dicCode = "pc_status")
+	@Excel(name = "状态", width = 15, dicCode = "customer_pc_status")
+	@Dict(dicCode = "customer_pc_status")
     @ApiModelProperty(value = "状态")
     private Integer status;
 	/**跟进状态*/
-	@Excel(name = "跟进状态", width = 15, dicCode = "pc_follow_status")
-	@Dict(dicCode = "pc_follow_status")
+	@Excel(name = "跟进状态", width = 15, dicCode = "customer_follow_status")
+	@Dict(dicCode = "customer_follow_status")
     @ApiModelProperty(value = "跟进状态")
     private Integer followStatus;
 	/**上次跟进*/
@@ -191,20 +198,15 @@ public class CustomerPublic implements Serializable {
         return null;
     }
 
-    public String getMarkString(){
-        if(mark==null || mark.length==0){
+    public String getMarkString() {
+        if (mark == null || mark.length == 0) {
             return "";
         }
         try {
-            return new String(mark,"UTF-8");
+            return new String(mark, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
         return "";
     }
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "创建日期")
-    private Date createTime;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerVisiting.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.miliCustomer.entity;
+package org.jeecg.modules.mili.customer.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerAuditionMapper.java

@@ -1,12 +1,10 @@
-package org.jeecg.modules.miliCustomer.mapper;
+package org.jeecg.modules.mili.customer.mapper;
 
 import java.util.Date;
-import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
 
 /**
  * @Description: 试听管理

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerFollowMapper.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.miliCustomer.mapper;
+package org.jeecg.modules.mili.customer.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollow;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollowShow;
+import org.jeecg.modules.mili.customer.entity.CustomerFollow;
+import org.jeecg.modules.mili.customer.entity.CustomerFollowShow;
 
 import java.util.List;
 
@@ -15,4 +15,6 @@ import java.util.List;
  */
 public interface CustomerFollowMapper extends BaseMapper<CustomerFollow> {
     public List<CustomerFollowShow> followDetail(@Param("cp_id") String cp_id);
+
+    public String getFollowLimit(@Param("cp_id") String cp_id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/mapper/CustomerInfoMapper.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.mili.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mili.customer.entity.CustomerInfo;
+
+/**
+ * @Description: 公池管理
+ * @Author: jeecg-boot
+ * @Date:   2022-06-27
+ * @Version: V1.0
+ */
+public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
+    public CustomerInfo getCustomerByNameAndPhone(@Param("name") String name, @Param("contact_phone") String contact_phone);
+    public Integer getNewAppoint();
+    public Integer getTodayAppoint();
+    public Integer getAgoAppoint();
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/mapper/CustomerLogsMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.mili.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mili.customer.entity.CustomerLogs;
+
+/**
+ * @Description: 名单操作记录
+ * @Author: jeecg-boot
+ * @Date:   2022-08-10
+ * @Version: V1.0
+ */
+public interface CustomerLogsMapper extends BaseMapper<CustomerLogs> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerPublicMapper.java

@@ -1,10 +1,7 @@
-package org.jeecg.modules.miliCustomer.mapper;
-
-import java.util.List;
+package org.jeecg.modules.mili.customer.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import org.jeecg.modules.miliCustomer.entity.CustomerPublic;
+import org.jeecg.modules.mili.customer.entity.CustomerPublic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerVisitingMapper.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.miliCustomer.mapper;
+package org.jeecg.modules.mili.customer.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
 
 import java.util.Date;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/xml/CustomerAuditionMapper.xml

@@ -1,7 +1,7 @@
 <?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="org.jeecg.modules.miliCustomer.mapper.CustomerAuditionMapper">
-    <select id="getAuditionByIdTime" resultType="org.jeecg.modules.miliCustomer.entity.CustomerAudition">
+<mapper namespace="org.jeecg.modules.mili.customer.mapper.CustomerAuditionMapper">
+    <select id="getAuditionByIdTime" resultType="org.jeecg.modules.mili.customer.entity.CustomerAudition">
         select * from customer_audition  where cp_id = #{cp_id} and date_format(audition_time,'%Y-%m-%d') = date_format(#{audition_time},'%Y-%m-%d')
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/xml/CustomerFollowMapper.xml

@@ -1,18 +1,28 @@
 <?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="org.jeecg.modules.miliCustomer.mapper.CustomerFollowMapper">
-    <select id="followDetail" parameterType="String" resultType="org.jeecg.modules.miliCustomer.entity.CustomerFollowShow">
+<mapper namespace="org.jeecg.modules.mili.customer.mapper.CustomerFollowMapper">
+    <select id="followDetail" parameterType="String" resultType="org.jeecg.modules.mili.customer.entity.CustomerFollowShow">
         SELECT
             customer_follow.*,
             sys_user.realname salesName,
             school_organization.`name` schoolDistrictName,
-            customer_potential.`name` cpName
+        customer_info.`name` cpName
         FROM
             customer_follow
             LEFT JOIN sys_user ON customer_follow.sales_code = sys_user.username
             LEFT JOIN school_organization ON customer_follow.school_district_id = school_organization.id
-            LEFT JOIN customer_potential ON customer_follow.cp_id = customer_potential.id
+            LEFT JOIN customer_info ON customer_follow.cp_id = customer_info.id
         WHERE
         cp_id = #{cp_id}
     </select>
+    <select id="getFollowLimit" parameterType="String" resultType="java.lang.String">
+        SELECT
+            follow_content
+        FROM
+            customer_follow
+        WHERE
+            cp_id = #{cp_id}
+        order by create_time desc
+        limit 1
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/mapper/xml/CustomerInfoMapper.xml

@@ -0,0 +1,22 @@
+<?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="org.jeecg.modules.mili.customer.mapper.CustomerInfoMapper">
+    <!-- 根据用户名查询 -->
+    <select id="getCustomerByNameAndPhone" resultType="org.jeecg.modules.mili.customer.entity.CustomerInfo">
+        select * from customer_info  where name = #{name} and contact_phone = #{contact_phone}
+    </select>
+
+
+    <select id="getNewAppoint" resultType="java.lang.Integer">
+        select count(1) from customer_info where follow_status = 0
+    </select>
+    <select id="getTodayAppoint" resultType="java.lang.Integer">
+        select count(1) from customer_info where date_format(now(), '%Y-%m-%d') = date_format(next_follow_time, '%Y-%m-%d')
+    </select>
+    <select id="getAgoAppoint" resultType="java.lang.Integer">
+        select count(1) from customer_info where date_format(now(), '%Y-%m-%d') > date_format(next_follow_time, '%Y-%m-%d')
+    </select>
+
+
+
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/mapper/xml/CustomerLogsMapper.xml

@@ -0,0 +1,4 @@
+<?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="org.jeecg.modules.mili.customer.mapper.CustomerLogsMapper">
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/xml/CustomerPublicMapper.xml

@@ -1,8 +1,8 @@
 <?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="org.jeecg.modules.miliCustomer.mapper.CustomerPublicMapper">
+<mapper namespace="org.jeecg.modules.mili.customer.mapper.CustomerPublicMapper">
     <!-- 根据用户名查询 -->
-    <select id="getCustomerByNameAndPhone" resultType="org.jeecg.modules.miliCustomer.entity.CustomerPublic">
+    <select id="getCustomerByNameAndPhone" resultType="org.jeecg.modules.mili.customer.entity.CustomerPublic">
         select * from customer_public  where name = #{name} and contact_phone = #{contact_phone}
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/xml/CustomerVisitingMapper.xml

@@ -1,7 +1,7 @@
 <?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="org.jeecg.modules.miliCustomer.mapper.CustomerVisitingMapper">
-    <select id="getVisitByIdTime" resultType="org.jeecg.modules.miliCustomer.entity.CustomerVisiting">
+<mapper namespace="org.jeecg.modules.mili.customer.mapper.CustomerVisitingMapper">
+    <select id="getVisitByIdTime" resultType="org.jeecg.modules.mili.customer.entity.CustomerVisiting">
         select * from customer_visiting  where cp_id = #{cp_id} and date_format(visiting_time,'%Y-%m-%d') = date_format(#{visiting_time},'%Y-%m-%d')
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerAuditionService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.miliCustomer.service;
+package org.jeecg.modules.mili.customer.service;
 
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerFollowService.java

@@ -1,9 +1,8 @@
-package org.jeecg.modules.miliCustomer.service;
+package org.jeecg.modules.mili.customer.service;
 
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollow;
+import org.jeecg.modules.mili.customer.entity.CustomerFollow;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollowShow;
+import org.jeecg.modules.mili.customer.entity.CustomerFollowShow;
 
 import java.util.List;
 
@@ -15,4 +14,5 @@ import java.util.List;
  */
 public interface ICustomerFollowService extends IService<CustomerFollow> {
     public List<CustomerFollowShow> followDetail(String cp_id);
+    public String getFollowLimit(String cp_id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/service/ICustomerInfoService.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.mili.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.entity.CustomerInfo;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
+
+/**
+ * @Description: 公池管理
+ * @Author: jeecg-boot
+ * @Date:   2022-06-27
+ * @Version: V1.0
+ */
+public interface ICustomerInfoService extends IService<CustomerInfo> {
+    public Result<String> appoint(CustomerInfo customerInfo,String saleName,String schoolName);
+    public Result<String> sign(CustomerInfo customerInfo);
+    public Result<String> statusEdit(CustomerInfo customerInfo);
+    public Result<String> addVisit(CustomerVisiting customerVisiting);
+    public Result<String> addAudition(CustomerAudition customerAudition);
+
+    public Integer getNewAppoint();
+    public Integer getTodayAppoint();
+    public Integer getAgoAppoint();
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/service/ICustomerLogsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.mili.customer.service;
+
+import org.jeecg.modules.mili.customer.entity.CustomerLogs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 名单操作记录
+ * @Author: jeecg-boot
+ * @Date:   2022-08-10
+ * @Version: V1.0
+ */
+public interface ICustomerLogsService extends IService<CustomerLogs> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerPublicService.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.miliCustomer.service;
+package org.jeecg.modules.mili.customer.service;
 
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.miliCustomer.entity.CustomerPublic;
+import org.jeecg.modules.mili.customer.entity.CustomerPublic;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerVisitingService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.miliCustomer.service;
+package org.jeecg.modules.mili.customer.service;
 
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerAuditionServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.miliCustomer.service.impl;
+package org.jeecg.modules.mili.customer.service.impl;
 
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
-import org.jeecg.modules.miliCustomer.mapper.CustomerAuditionMapper;
-import org.jeecg.modules.miliCustomer.service.ICustomerAuditionService;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.mapper.CustomerAuditionMapper;
+import org.jeecg.modules.mili.customer.service.ICustomerAuditionService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerFollowServiceImpl.java

@@ -1,11 +1,9 @@
-package org.jeecg.modules.miliCustomer.service.impl;
+package org.jeecg.modules.mili.customer.service.impl;
 
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollow;
-import org.jeecg.modules.miliCustomer.entity.CustomerFollowShow;
-import org.jeecg.modules.miliCustomer.mapper.CustomerFollowMapper;
-import org.jeecg.modules.miliCustomer.mapper.CustomerPublicMapper;
-import org.jeecg.modules.miliCustomer.service.ICustomerFollowService;
+import org.jeecg.modules.mili.customer.entity.CustomerFollow;
+import org.jeecg.modules.mili.customer.entity.CustomerFollowShow;
+import org.jeecg.modules.mili.customer.mapper.CustomerFollowMapper;
+import org.jeecg.modules.mili.customer.service.ICustomerFollowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -69,4 +67,8 @@ public class CustomerFollowServiceImpl extends ServiceImpl<CustomerFollowMapper,
         }
         return customerFollowShowsReturn;
     }
+
+    public String getFollowLimit(String cp_id){
+        return customerFollowMapper.getFollowLimit(cp_id);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/service/impl/CustomerInfoServiceImpl.java

@@ -0,0 +1,107 @@
+package org.jeecg.modules.mili.customer.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.mili.customer.entity.CustomerAudition;
+import org.jeecg.modules.mili.customer.entity.CustomerInfo;
+import org.jeecg.modules.mili.customer.entity.CustomerLogs;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
+import org.jeecg.modules.mili.customer.mapper.CustomerAuditionMapper;
+import org.jeecg.modules.mili.customer.mapper.CustomerInfoMapper;
+import org.jeecg.modules.mili.customer.mapper.CustomerLogsMapper;
+import org.jeecg.modules.mili.customer.mapper.CustomerVisitingMapper;
+import org.jeecg.modules.mili.customer.service.ICustomerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @Description: 公池管理
+ * @Author: jeecg-boot
+ * @Date:   2022-06-27
+ * @Version: V1.0
+ */
+@Service
+public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, CustomerInfo> implements ICustomerInfoService {
+    @Autowired
+    private CustomerInfoMapper customerInfoMapper;
+    @Autowired
+    private CustomerLogsMapper customerLogsMapper;
+    @Autowired
+    private CustomerVisitingMapper customerVisitingMapper;
+    @Autowired
+    private CustomerAuditionMapper customerAuditionMapper;
+
+    public Result<String> appoint(CustomerInfo customerInfo,String saleName,String schoolName){
+//        CustomerInfo customerInfoNew = customerInfoMapper.selectById(customerInfo.getId());
+        customerInfoMapper.updateById(customerInfo);
+        //日志记录
+        CustomerLogs customerLogs = new CustomerLogs();
+        customerLogs.setCustomerId(customerInfo.getId());
+        customerLogs.setType(2);
+        customerLogs.setTypeDes("转为潜客");
+        customerLogs.setDescType1("分配顾问:");
+        customerLogs.setDescComm1(saleName);
+        customerLogs.setDescType2("处理校区:");
+        customerLogs.setDescComm2(schoolName);
+        customerLogsMapper.insert(customerLogs);
+        return Result.OK("分配成功!");
+    }
+
+    public Result<String> sign(CustomerInfo customerInfo){
+        customerInfoMapper.updateById(customerInfo);
+        return Result.OK("报名成功!");
+    }
+
+    public Result<String> statusEdit(CustomerInfo customerInfo){
+        customerInfoMapper.updateById(customerInfo);
+        return Result.OK("编辑成功!");
+    }
+
+
+    public Result<String> addVisit(CustomerVisiting customerVisiting){
+        //判断重复预约
+        CustomerVisiting customerVisitingQ =customerVisitingMapper.getVisitByIdTime(customerVisiting.getCpId(),customerVisiting.getVisitingTime());
+        if(customerVisitingQ == null){
+            CustomerInfo customerInfo = new CustomerInfo();
+            customerInfo.setId(customerVisiting.getCpId());
+            customerInfo.setFollowStatus(2);
+            customerInfoMapper.updateById(customerInfo);
+            customerVisiting.setCreateBy("system");
+            customerVisiting.setCreateTime(new Date());
+            customerVisitingMapper.insert(customerVisiting);
+            return Result.OK("预约来访成功!");
+        }else {
+            return Result.error("客户已预约!");
+        }
+    }
+
+    public Result<String> addAudition(CustomerAudition customerAudition){
+        //判断重复预约
+        CustomerAudition customerAuditionQ =customerAuditionMapper.getAuditionByIdTime(customerAudition.getCpId(),customerAudition.getAuditionTime());
+        if(customerAuditionQ == null){
+            CustomerInfo customerInfo = new CustomerInfo();
+            customerInfo.setId(customerAudition.getCpId());
+            customerInfo.setFollowStatus(5);
+            customerInfoMapper.updateById(customerInfo);
+            customerAudition.setCreateBy("system");
+            customerAudition.setCreateTime(new Date());
+            customerAuditionMapper.insert(customerAudition);
+            return Result.OK("预约试听成功!");
+        }else {
+            return Result.error("客户已预约!");
+        }
+    }
+
+    public Integer getNewAppoint() {
+        return customerInfoMapper.getNewAppoint();
+    }
+    public Integer getTodayAppoint() {
+        return customerInfoMapper.getTodayAppoint();
+    }
+    public Integer getAgoAppoint() {
+        return customerInfoMapper.getAgoAppoint();
+    }
+}
+

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/service/impl/CustomerLogsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.mili.customer.service.impl;
+
+import org.jeecg.modules.mili.customer.entity.CustomerLogs;
+import org.jeecg.modules.mili.customer.mapper.CustomerLogsMapper;
+import org.jeecg.modules.mili.customer.service.ICustomerLogsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 名单操作记录
+ * @Author: jeecg-boot
+customerLogs = {ArrayList@15211}  size = 5 * @Date:   2022-08-10
+ * @Version: V1.0
+ */
+@Service
+public class CustomerLogsServiceImpl extends ServiceImpl<CustomerLogsMapper, CustomerLogs> implements ICustomerLogsService {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/customer/service/impl/CustomerPublicServiceImpl.java

@@ -0,0 +1,69 @@
+package org.jeecg.modules.mili.customer.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.mili.customer.entity.CustomerPublic;
+import org.jeecg.modules.mili.customer.mapper.CustomerPublicMapper;
+import org.jeecg.modules.mili.customer.service.ICustomerPublicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 公池管理
+ * @Author: jeecg-boot
+ * @Date:   2022-06-27
+ * @Version: V1.0
+ */
+@Service
+public class CustomerPublicServiceImpl extends ServiceImpl<CustomerPublicMapper, CustomerPublic> implements ICustomerPublicService {
+    @Autowired
+    private CustomerPublicMapper customerPublicMapper;
+
+
+    public Result<String> appoint(CustomerPublic customerPublic){
+        CustomerPublic customerPublicNew = customerPublicMapper.selectById(customerPublic.getId());
+        customerPublicMapper.updateById(customerPublic);
+        // 判断是否有记录
+//        CustomerPotential customerPotentialQ = customerPotentialMapper.getCustomerByNameAndPhone(customerPublicNew.getName(),customerPublicNew.getContactPhone());
+//        if (customerPotentialQ != null) {
+//            customerPotentialQ.setSaleCode(customerPublic.getSaleCode());
+//            customerPotentialMapper.updateById(customerPotentialQ);
+//        } else {
+//            CustomerPotential customerPotential = new CustomerPotential();
+//            customerPotential.setSysOrgCode(customerPublicNew.getSysOrgCode());
+//            customerPotential.setSchoolDistrictId(customerPublicNew.getSchoolDistrictId());
+//            customerPotential.setName(customerPublicNew.getName());
+//            customerPotential.setNickname(customerPublicNew.getNickname());
+//            customerPotential.setSex(customerPublicNew.getSex());
+//            customerPotential.setContactName(customerPublicNew.getContactName());
+//            customerPotential.setContactPhone(customerPublicNew.getContactPhone());
+//            customerPotential.setContact1Name(customerPublicNew.getContact1Name());
+//            customerPotential.setContact1Phone(customerPublicNew.getContact1Phone());
+//            customerPotential.setContact2Name(customerPublicNew.getContact2Name());
+//            customerPotential.setContact2Phone(customerPublicNew.getContact2Phone());
+//            customerPotential.setAge(customerPublicNew.getAge());
+//            customerPotential.setBirthday(customerPublicNew.getBirthday());
+//            customerPotential.setSchool(customerPublicNew.getSchool());
+//            customerPotential.setGrade(customerPublicNew.getGrade());
+//            customerPotential.setClasses(customerPublicNew.getClasses());
+//            customerPotential.setIdCard(customerPublicNew.getIdCard());
+//            customerPotential.setAddress(customerPublicNew.getAddress());
+//            customerPotential.setChannelType(customerPublicNew.getChannelType());
+//            customerPotential.setIntendedCourse(customerPublicNew.getIntendedCourse());
+//            customerPotential.setIntendedDegress(customerPublicNew.getIntendedDegress());
+//            customerPotential.setSaleCode(customerPublic.getSaleCode());
+//            customerPotential.setReferencesPhone(customerPublicNew.getReferencesPhone());
+//            customerPotential.setCollectinoCode(customerPublicNew.getCollectinoCode());
+//            customerPotential.setStatus(customerPublicNew.getStatus());
+//            customerPotential.setFollowStatus(customerPublicNew.getFollowStatus());
+//            customerPotential.setLastFollowTime(customerPublicNew.getLastFollowTime());
+//            customerPotential.setNextFollowTime(customerPublicNew.getNextFollowTime());
+//            customerPotential.setMark(customerPublicNew.getMark());
+//            customerPotentialMapper.insert(customerPotential);
+//        }
+        return Result.OK("分配成功!");
+    }
+
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerVisitingServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.miliCustomer.service.impl;
+package org.jeecg.modules.mili.customer.service.impl;
 
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
-import org.jeecg.modules.miliCustomer.mapper.CustomerVisitingMapper;
-import org.jeecg.modules.miliCustomer.service.ICustomerVisitingService;
+import org.jeecg.modules.mili.customer.entity.CustomerVisiting;
+import org.jeecg.modules.mili.customer.mapper.CustomerVisitingMapper;
+import org.jeecg.modules.mili.customer.service.ICustomerVisitingService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/education/controller/EducationCourseController.java

@@ -0,0 +1,180 @@
+package org.jeecg.modules.mili.education.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.mili.education.entity.EducationCourse;
+import org.jeecg.modules.mili.education.service.IEducationCourseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 课程设置
+ * @Author: jeecg-boot
+ * @Date:   2022-09-05
+ * @Version: V1.0
+ */
+@Api(tags="课程设置")
+@RestController
+@RequestMapping("/education/educationCourse")
+@Slf4j
+public class EducationCourseController extends JeecgController<EducationCourse, IEducationCourseService> {
+	@Autowired
+	private IEducationCourseService educationCourseService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param educationCourse
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "课程设置-分页列表查询")
+	@ApiOperation(value="课程设置-分页列表查询", notes="课程设置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EducationCourse>> queryPageList(EducationCourse educationCourse,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EducationCourse> queryWrapper = QueryGenerator.initQueryWrapper(educationCourse, req.getParameterMap());
+		Page<EducationCourse> page = new Page<EducationCourse>(pageNo, pageSize);
+		IPage<EducationCourse> pageList = educationCourseService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+
+	 @ApiOperation(value="课程查询列表", notes="课程查询列表")
+	 @GetMapping(value = "/queryList")
+	 public List<EducationCourse> queryList() {
+		 return educationCourseService.queryList();
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param educationCourse
+	 * @return
+	 */
+	@AutoLog(value = "课程设置-添加")
+	@ApiOperation(value="课程设置-添加", notes="课程设置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EducationCourse educationCourse) {
+		educationCourseService.save(educationCourse);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param educationCourse
+	 * @return
+	 */
+	@AutoLog(value = "课程设置-编辑")
+	@ApiOperation(value="课程设置-编辑", notes="课程设置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EducationCourse educationCourse) {
+		educationCourseService.updateById(educationCourse);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "课程设置-通过id删除")
+	@ApiOperation(value="课程设置-通过id删除", notes="课程设置-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		educationCourseService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "课程设置-批量删除")
+	@ApiOperation(value="课程设置-批量删除", notes="课程设置-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.educationCourseService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "课程设置-通过id查询")
+	@ApiOperation(value="课程设置-通过id查询", notes="课程设置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<EducationCourse> queryById(@RequestParam(name="id",required=true) String id) {
+		EducationCourse educationCourse = educationCourseService.getById(id);
+		if(educationCourse==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(educationCourse);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param educationCourse
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EducationCourse educationCourse) {
+        return super.exportXls(request, educationCourse, EducationCourse.class, "课程设置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, EducationCourse.class);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/education/entity/EducationCourse.java

@@ -0,0 +1,105 @@
+package org.jeecg.modules.mili.education.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 课程设置
+ * @Author: jeecg-boot
+ * @Date:   2022-09-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("education_course")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="education_course对象", description="课程设置")
+public class EducationCourse implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+	/**课程类型*/
+	@Excel(name = "课程类型", width = 15)
+    @ApiModelProperty(value = "课程类型")
+    private Integer type;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+	/**等级*/
+	@Excel(name = "等级", width = 15)
+    @ApiModelProperty(value = "等级")
+    private String level;
+	/**标准*/
+	@Excel(name = "标准", width = 15)
+    @ApiModelProperty(value = "标准")
+    private String standard;
+	/**语言*/
+	@Excel(name = "语言", width = 15)
+    @ApiModelProperty(value = "语言")
+    private String language;
+	/**目标*/
+	@Excel(name = "目标", width = 15)
+    @ApiModelProperty(value = "目标")
+    private String target;
+	/**科目*/
+	@Excel(name = "科目", width = 15)
+    @ApiModelProperty(value = "科目")
+    private Integer subjectId;
+	/**授课方式*/
+	@Excel(name = "授课方式", width = 15)
+    @ApiModelProperty(value = "授课方式")
+    private Integer courseTypeId;
+	/**年龄段*/
+	@Excel(name = "年龄段", width = 15)
+    @ApiModelProperty(value = "年龄段")
+    private String ageRange;
+	/**颜色*/
+	@Excel(name = "颜色", width = 15)
+    @ApiModelProperty(value = "颜色")
+    private Integer colorId;
+	/**主题*/
+	@Excel(name = "主题", width = 15)
+    @ApiModelProperty(value = "主题")
+    private String themeId;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/education/mapper/EducationCourseMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.mili.education.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mili.education.entity.EducationCourse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 课程设置
+ * @Author: jeecg-boot
+ * @Date:   2022-09-05
+ * @Version: V1.0
+ */
+public interface EducationCourseMapper extends BaseMapper<EducationCourse> {
+    public List<EducationCourse >queryList();
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/education/mapper/xml/EducationCourseMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.jeecg.modules.mili.education.mapper.EducationCourseMapper">
+    <select id="queryList" resultType="org.jeecg.modules.mili.education.entity.EducationCourse">
+        select * from education_course
+    </select>
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/education/service/IEducationCourseService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.mili.education.service;
+
+import org.jeecg.modules.mili.education.entity.EducationCourse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: 课程设置
+ * @Author: jeecg-boot
+ * @Date:   2022-09-05
+ * @Version: V1.0
+ */
+public interface IEducationCourseService extends IService<EducationCourse> {
+    public List<EducationCourse> queryList();
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/mili/education/service/impl/EducationCourseServiceImpl.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.mili.education.service.impl;
+
+import org.jeecg.modules.mili.education.entity.EducationCourse;
+import org.jeecg.modules.mili.education.mapper.EducationCourseMapper;
+import org.jeecg.modules.mili.education.service.IEducationCourseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 课程设置
+ * @Author: jeecg-boot
+ * @Date:   2022-09-05
+ * @Version: V1.0
+ */
+@Service
+public class EducationCourseServiceImpl extends ServiceImpl<EducationCourseMapper, EducationCourse> implements IEducationCourseService {
+    @Autowired
+    private EducationCourseMapper courseMapper;
+    public List<EducationCourse> queryList(){
+        return courseMapper.queryList();
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerPotentialController.java

@@ -1,213 +0,0 @@
-package org.jeecg.modules.miliCustomer.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
-import org.jeecg.modules.miliCustomer.service.ICustomerPotentialService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-
- /**
- * @Description: 潜客管理
- * @Author: jeecg-boot
- * @Date:   2022-07-05
- * @Version: V1.0
- */
-@Api(tags="潜客管理")
-@RestController
-@RequestMapping("/customer/customerPotential")
-@Slf4j
-public class CustomerPotentialController extends JeecgController<CustomerPotential, ICustomerPotentialService> {
-	@Autowired
-	private ICustomerPotentialService customerPotentialService;
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param customerPotential
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "潜客管理-分页列表查询")
-	@ApiOperation(value="潜客管理-分页列表查询", notes="潜客管理-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CustomerPotential>> queryPageList(CustomerPotential customerPotential,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CustomerPotential> queryWrapper = QueryGenerator.initQueryWrapper(customerPotential, req.getParameterMap());
-		Page<CustomerPotential> page = new Page<CustomerPotential>(pageNo, pageSize);
-		IPage<CustomerPotential> pageList = customerPotentialService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param customerPotential
-	 * @return
-	 */
-	@AutoLog(value = "潜客管理-添加")
-	@ApiOperation(value="潜客管理-添加", notes="潜客管理-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CustomerPotential customerPotential) {
-		customerPotentialService.save(customerPotential);
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param customerPotential
-	 * @return
-	 */
-	@AutoLog(value = "潜客管理-编辑")
-	@ApiOperation(value="潜客管理-编辑", notes="潜客管理-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CustomerPotential customerPotential) {
-		customerPotentialService.updateById(customerPotential);
-		return Result.OK("编辑成功!");
-	}
-
-	 /**
-	  *  编辑
-	  *
-	  * @param customerPotential
-	  * @return
-	  */
-	 @AutoLog(value = "潜客管理-签约")
-	 @ApiOperation(value="潜客管理-签约", notes="潜客管理-签约")
-	 @RequestMapping(value = "/sign", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<String> sign(@RequestBody CustomerPotential customerPotential) {
-		 customerPotentialService.sign(customerPotential);
-		 return Result.OK("报名成功!");
-	 }
-
-
-	 /**
-	  *  编辑
-	  *
-	  * @param customerPotential
-	  * @return
-	  */
-	 @AutoLog(value = "潜客管理-签约")
-	 @ApiOperation(value="潜客管理-签约", notes="潜客管理-签约")
-	 @RequestMapping(value = "/statusEdit", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<String> statusEdit(@RequestBody CustomerPotential customerPotential) {
-		 customerPotentialService.statusEdit(customerPotential);
-		 return Result.OK("编辑成功!");
-	 }
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "潜客管理-通过id删除")
-	@ApiOperation(value="潜客管理-通过id删除", notes="潜客管理-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		customerPotentialService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "潜客管理-批量删除")
-	@ApiOperation(value="潜客管理-批量删除", notes="潜客管理-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.customerPotentialService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "潜客管理-通过id查询")
-	@ApiOperation(value="潜客管理-通过id查询", notes="潜客管理-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CustomerPotential> queryById(@RequestParam(name="id",required=true) String id) {
-		CustomerPotential customerPotential = customerPotentialService.getById(id);
-		if(customerPotential==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(customerPotential);
-	}
-
-	 /**
-	  * 增加来访记录
-	  *
-	  * @param customerVisiting
-	  * @return
-	  */
-	 @AutoLog(value = "潜客管理-预约来访")
-	 @ApiOperation(value="潜客管理-预约来访", notes="潜客管理-预约来访")
-	 @PostMapping(value = "/addVisit")
-	 public Result<String> addVisit(@RequestBody CustomerVisiting customerVisiting) {
-		 Result<String> customerPotential = customerPotentialService.addVisit(customerVisiting);
-		 return customerPotential;
-	 }
-
-	 /**
-	  * 增加来访记录
-	  *
-	  * @param customerAudition
-	  * @return
-	  */
-	 @AutoLog(value = "潜客管理-预约试听")
-	 @ApiOperation(value="潜客管理-预约试听", notes="潜客管理-预约试听")
-	 @PostMapping(value = "/addAudition")
-	 public Result<String> addAudition(@RequestBody CustomerAudition customerAudition) {
-		 Result<String> customerPotential = customerPotentialService.addAudition(customerAudition);
-		 return customerPotential;
-	 }
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param customerPotential
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CustomerPotential customerPotential) {
-        return super.exportXls(request, customerPotential, CustomerPotential.class, "潜客管理");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CustomerPotential.class);
-    }
-
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerPotentialMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.miliCustomer.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 潜客管理
- * @Author: jeecg-boot
- * @Date:   2022-07-05
- * @Version: V1.0
- */
-public interface CustomerPotentialMapper extends BaseMapper<CustomerPotential> {
-    public CustomerPotential  getCustomerByNameAndPhone(@Param("name") String name,@Param("contact_phone") String contact_phone);
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/xml/CustomerPotentialMapper.xml

@@ -1,7 +0,0 @@
-<?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="org.jeecg.modules.miliCustomer.mapper.CustomerPotentialMapper">
-    <select id="getCustomerByNameAndPhone" resultType="org.jeecg.modules.miliCustomer.entity.CustomerPotential">
-        select * from  customer_potential  where name = #{name} and contact_phone = #{contact_phone}
-    </select>
-</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerPotentialService.java

@@ -1,22 +0,0 @@
-package org.jeecg.modules.miliCustomer.service;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.miliCustomer.entity.CustomerPublic;
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
-
-/**
- * @Description: 潜客管理
- * @Author: jeecg-boot
- * @Date:   2022-07-05
- * @Version: V1.0
- */
-public interface ICustomerPotentialService extends IService<CustomerPotential> {
-
-    public Result<String> sign(CustomerPotential customerPotential);
-    public Result<String> statusEdit(CustomerPotential customerPotential);
-    public Result<String> addVisit(CustomerVisiting customerVisiting);
-    public Result<String> addAudition(CustomerAudition customerAudition);
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerPotentialServiceImpl.java

@@ -1,91 +0,0 @@
-package org.jeecg.modules.miliCustomer.service.impl;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.miliCustomer.entity.CustomerAudition;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import org.jeecg.modules.miliCustomer.entity.CustomerPublic;
-import org.jeecg.modules.miliCustomer.entity.CustomerVisiting;
-import org.jeecg.modules.miliCustomer.mapper.CustomerAuditionMapper;
-import org.jeecg.modules.miliCustomer.mapper.CustomerPotentialMapper;
-import org.jeecg.modules.miliCustomer.mapper.CustomerPublicMapper;
-import org.jeecg.modules.miliCustomer.mapper.CustomerVisitingMapper;
-import org.jeecg.modules.miliCustomer.service.ICustomerPotentialService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @Description: 潜客管理
- * @Author: jeecg-boot
- * @Date:   2022-07-05
- * @Version: V1.0
- */
-@Service
-public class CustomerPotentialServiceImpl extends ServiceImpl<CustomerPotentialMapper, CustomerPotential> implements ICustomerPotentialService {
-    @Autowired
-    private CustomerPublicMapper customerPublicMapper;
-    @Autowired
-    private CustomerPotentialMapper customerPotentialMapper;
-    @Autowired
-    private CustomerVisitingMapper customerVisitingMapper;
-    @Autowired
-    private CustomerAuditionMapper customerAuditionMapper;
-
-    public Result<String> sign(CustomerPotential customerPotential){
-        customerPotentialMapper.updateById(customerPotential);
-        CustomerPublic customerPublic = customerPublicMapper.getCustomerByNameAndPhone(customerPotential.getName(),customerPotential.getContactPhone());
-        customerPublic.setStatus(customerPotential.getStatus());
-        customerPublic.setFollowStatus(customerPotential.getFollowStatus());
-        customerPublicMapper.updateById(customerPublic);
-        return Result.OK("报名成功!");
-    }
-
-    public Result<String> statusEdit(CustomerPotential customerPotential){
-        customerPotentialMapper.updateById(customerPotential);
-        CustomerPublic customerPublic = customerPublicMapper.getCustomerByNameAndPhone(customerPotential.getName(),customerPotential.getContactPhone());
-        customerPublic.setStatus(customerPotential.getStatus());
-        customerPublic.setFollowStatus(customerPotential.getFollowStatus());
-        customerPublicMapper.updateById(customerPublic);
-        return Result.OK("编辑成功!");
-    }
-
-
-    public Result<String> addVisit(CustomerVisiting customerVisiting){
-        //判断重复预约
-        CustomerVisiting customerVisitingQ =customerVisitingMapper.getVisitByIdTime(customerVisiting.getCpId(),customerVisiting.getVisitingTime());
-        if(customerVisitingQ == null){
-            CustomerPotential customerPotential = new CustomerPotential();
-            customerPotential.setId(customerVisiting.getCpId());
-            customerPotential.setFollowStatus(2);
-            customerPotentialMapper.updateById(customerPotential);
-            customerVisiting.setCreateBy("system");
-            customerVisiting.setCreateTime(new Date());
-            customerVisitingMapper.insert(customerVisiting);
-            return Result.OK("预约来访成功!");
-        }else {
-            return Result.error("客户已预约!");
-        }
-    }
-
-    public Result<String> addAudition(CustomerAudition customerAudition){
-        //判断重复预约
-        CustomerAudition customerAuditionQ =customerAuditionMapper.getAuditionByIdTime(customerAudition.getCpId(),customerAudition.getAuditionTime());
-        if(customerAuditionQ == null){
-            CustomerPotential customerPotential = new CustomerPotential();
-            customerPotential.setId(customerAudition.getCpId());
-            customerPotential.setFollowStatus(5);
-            customerPotentialMapper.updateById(customerPotential);
-            customerAudition.setCreateBy("system");
-            customerAudition.setCreateTime(new Date());
-            customerAuditionMapper.insert(customerAudition);
-            return Result.OK("预约试听成功!");
-        }else {
-            return Result.error("客户已预约!");
-        }
-    }
-
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerPublicServiceImpl.java

@@ -1,72 +0,0 @@
-package org.jeecg.modules.miliCustomer.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.miliCustomer.entity.CustomerPotential;
-import org.jeecg.modules.miliCustomer.entity.CustomerPublic;
-import org.jeecg.modules.miliCustomer.mapper.CustomerPotentialMapper;
-import org.jeecg.modules.miliCustomer.mapper.CustomerPublicMapper;
-import org.jeecg.modules.miliCustomer.service.ICustomerPublicService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 公池管理
- * @Author: jeecg-boot
- * @Date:   2022-06-27
- * @Version: V1.0
- */
-@Service
-public class CustomerPublicServiceImpl extends ServiceImpl<CustomerPublicMapper, CustomerPublic> implements ICustomerPublicService {
-    @Autowired
-    private CustomerPublicMapper customerPublicMapper;
-    @Autowired
-    private CustomerPotentialMapper customerPotentialMapper;
-
-    public Result<String> appoint(CustomerPublic customerPublic){
-        CustomerPublic customerPublicNew = customerPublicMapper.selectById(customerPublic.getId());
-        customerPublicMapper.updateById(customerPublic);
-        // 判断是否有记录
-        CustomerPotential customerPotentialQ = customerPotentialMapper.getCustomerByNameAndPhone(customerPublicNew.getName(),customerPublicNew.getContactPhone());
-        if (customerPotentialQ != null) {
-            customerPotentialQ.setSaleCode(customerPublic.getSaleCode());
-            customerPotentialMapper.updateById(customerPotentialQ);
-        } else {
-            CustomerPotential customerPotential = new CustomerPotential();
-            customerPotential.setSysOrgCode(customerPublicNew.getSysOrgCode());
-            customerPotential.setSchoolDistrictId(customerPublicNew.getSchoolDistrictId());
-            customerPotential.setName(customerPublicNew.getName());
-            customerPotential.setNickname(customerPublicNew.getNickname());
-            customerPotential.setSex(customerPublicNew.getSex());
-            customerPotential.setContactName(customerPublicNew.getContactName());
-            customerPotential.setContactPhone(customerPublicNew.getContactPhone());
-            customerPotential.setContact1Name(customerPublicNew.getContact1Name());
-            customerPotential.setContact1Phone(customerPublicNew.getContact1Phone());
-            customerPotential.setContact2Name(customerPublicNew.getContact2Name());
-            customerPotential.setContact2Phone(customerPublicNew.getContact2Phone());
-            customerPotential.setAge(customerPublicNew.getAge());
-            customerPotential.setBirthday(customerPublicNew.getBirthday());
-            customerPotential.setSchool(customerPublicNew.getSchool());
-            customerPotential.setGrade(customerPublicNew.getGrade());
-            customerPotential.setClasses(customerPublicNew.getClasses());
-            customerPotential.setIdCard(customerPublicNew.getIdCard());
-            customerPotential.setAddress(customerPublicNew.getAddress());
-            customerPotential.setChannelType(customerPublicNew.getChannelType());
-            customerPotential.setIntendedCourse(customerPublicNew.getIntendedCourse());
-            customerPotential.setIntendedDegress(customerPublicNew.getIntendedDegress());
-            customerPotential.setSaleCode(customerPublic.getSaleCode());
-            customerPotential.setReferencesPhone(customerPublicNew.getReferencesPhone());
-            customerPotential.setCollectinoCode(customerPublicNew.getCollectinoCode());
-            customerPotential.setStatus(customerPublicNew.getStatus());
-            customerPotential.setFollowStatus(customerPublicNew.getFollowStatus());
-            customerPotential.setLastFollowTime(customerPublicNew.getLastFollowTime());
-            customerPotential.setNextFollowTime(customerPublicNew.getNextFollowTime());
-            customerPotential.setMark(customerPublicNew.getMark());
-            customerPotentialMapper.insert(customerPotential);
-        }
-        return Result.OK("分配成功!");
-    }
-
-
-
-}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/test/controller/ShanksDemoController.java

@@ -25,4 +25,12 @@ public class ShanksDemoController {
         result.setSuccess(true);
         return result;
     }
+    @GetMapping(value = "/mock45")
+    public String mock45() {
+        Result<String> result = new Result<String>();
+        String temp = "{\"data\":[{\"prefixText\":\"今日累计送餐份数\",\"value\":\"45\",\"suffixText\":\"份\"}]}";
+//        result.setResult("{\"data\":[{\"backgroundColor\":\"#409EFF\",\"prefixText\":\"今日累计送餐份数\",\"value\":\"45\",\"suffixText\":\"份\"}]}");
+        result.setSuccess(true);
+        return temp;
+    }
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -172,7 +172,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -270,7 +270,7 @@ cas:
 #Mybatis输出sql日志
 logging:
   level:
-    org.jeecg.modules.system.mapper: info
+    org.jeecg.modules.system.mapper: debug
 #swagger
 knife4j:
   #开启增强配置

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -184,7 +184,7 @@ jeecg:
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: alioss
+  uploadType: local
   path:
     #文件上传根目录 设置
     upload: /usr/local/nginx/html/jeecgboot/pic
@@ -198,7 +198,7 @@ jeecg:
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
+#    staticDomain: https://static.jeecg.com
   # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
@@ -214,7 +214,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://115.29.148.71：8866
+  file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com

jeecg-boot-module-system/target/classes/application-dev.yml

@@ -172,7 +172,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -270,7 +270,7 @@ cas:
 #Mybatis输出sql日志
 logging:
   level:
-    org.jeecg.modules.system.mapper: info
+    org.jeecg.modules.system.mapper: debug
 #swagger
 knife4j:
   #开启增强配置

jeecg-boot-module-system/target/classes/application-prod.yml

@@ -184,7 +184,7 @@ jeecg:
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 本地：local\Minio：minio\阿里云：alioss
-  uploadType: alioss
+  uploadType: local
   path:
     #文件上传根目录 设置
     upload: /usr/local/nginx/html/jeecgboot/pic
@@ -198,7 +198,7 @@ jeecg:
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
+#    staticDomain: https://static.jeecg.com
   # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
@@ -214,7 +214,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: http://115.29.148.71：8866
+  file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com

jeecg-boot-module-system/target/classes/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: 'prod'
+    active: 'dev'

jeecg-boot-module-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -9,6 +9,7 @@ org/jeecg/modules/miliCustomer/entity/CustomerPublic.class
 org/jeecg/modules/system/entity/SysDict.class
 org/jeecg/config/init/TomcatFactoryConfig.class
 org/jeecg/modules/miliCustomer/mapper/CustomerPublicMapper.class
+org/jeecg/modules/miliCustomer/service/impl/CustomerLogsServiceImpl.class
 org/jeecg/modules/system/util/SecurityUtil.class
 org/jeecg/modules/system/entity/SysDepartRolePermission.class
 org/jeecg/modules/system/service/ISysFillRuleService.class
@@ -21,6 +22,7 @@ org/jeecg/modules/system/vo/thirdapp/SyncInfoVo.class
 org/jeecg/modules/system/entity/SysDepart.class
 org/jeecg/modules/system/entity/SysGatewayRoute.class
 org/jeecg/config/init/CodeGenerateDbConfig.class
+org/jeecg/modules/miliCustomer/entity/CustomerInfo.class
 org/jeecg/modules/system/service/impl/SysLogServiceImpl.class
 org/jeecg/modules/system/service/ISysDataLogService.class
 org/jeecg/modules/cas/util/XmlUtils$1.class
@@ -49,7 +51,6 @@ org/jeecg/modules/system/controller/SysFillRuleController.class
 org/jeecg/modules/miliCustomer/service/ICustomerVisitingService.class
 org/jeecg/modules/system/mapper/SysDictItemMapper.class
 org/jeecg/modules/oss/mapper/OSSFileMapper.class
-org/jeecg/modules/miliCustomer/service/ICustomerPotentialService.class
 org/jeecg/modules/miliCustomer/service/impl/CustomerPublicServiceImpl.class
 org/jeecg/modules/message/entity/SysMessage.class
 org/jeecg/modules/system/model/TreeModel.class
@@ -61,7 +62,6 @@ org/jeecg/modules/system/controller/SysRoleIndexController.class
 org/jeecg/modules/oss/entity/OSSFile.class
 org/jeecg/modules/system/mapper/SysCategoryMapper.class
 org/jeecg/modules/system/model/SysDictTree.class
-org/jeecg/modules/miliCustomer/controller/CustomerPotentialController.class
 org/jeecg/modules/system/service/ISysPositionService.class
 org/jeecg/modules/system/service/ISysDataSourceService.class
 org/jeecg/modules/system/service/impl/SysTenantServiceImpl.class
@@ -90,6 +90,8 @@ org/jeecg/modules/system/mapper/SysPermissionDataRuleMapper.class
 org/jeecg/modules/system/mapper/SysUserDepartMapper.class
 org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.class
 org/jeecg/modules/message/websocket/TestSocketController.class
+org/jeecg/modules/miliCustomer/mapper/CustomerLogsMapper.class
+org/jeecg/modules/miliCustomer/controller/CustomerLogsController.class
 org/jeecg/modules/system/service/impl/SysGatewayRouteServiceImpl.class
 org/jeecg/modules/system/mapper/SysDictMapper.class
 org/jeecg/modules/system/service/ISysUserDepartService.class
@@ -98,6 +100,7 @@ org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.class
 org/jeecg/modules/message/service/impl/SysMessageTemplateServiceImpl.class
 org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.class
 org/jeecg/modules/system/controller/SysCheckRuleController.class
+org/jeecg/modules/miliCustomer/entity/CustomerLogs.class
 org/jeecg/modules/system/vo/thirdapp/JwDepartmentTreeVo.class
 org/jeecg/modules/ngalain/service/NgAlainService.class
 org/jeecg/modules/miliCustomer/service/ICustomerAuditionService.class
@@ -109,11 +112,11 @@ org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.class
 org/jeecg/config/init/TomcatFactoryConfig$1.class
 org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.class
 org/jeecg/modules/system/service/ISysAnnouncementService.class
-org/jeecg/modules/miliCustomer/service/impl/CustomerPotentialServiceImpl.class
 org/jeecg/modules/system/controller/SysDictItemController.class
 org/jeecg/JeecgOneGUI.class
 org/jeecg/modules/system/model/SysLoginModel.class
 org/jeecg/modules/system/rule/OrderNumberRule.class
+org/jeecg/modules/miliCustomer/service/ICustomerLogsService.class
 org/jeecg/modules/message/mapper/SysMessageTemplateMapper.class
 org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.class
 org/jeecg/modules/system/service/ISysDictService.class
@@ -163,6 +166,7 @@ org/jeecg/modules/message/websocket/SocketHandler.class
 org/jeecg/modules/message/service/ISysMessageService.class
 org/jeecg/modules/system/service/ISysCategoryService.class
 org/jeecg/modules/system/service/ISysRoleService.class
+org/jeecg/modules/miliCustomer/service/ICustomerInfoService.class
 org/jeecg/modules/miliCustomer/entity/CustomerAudition.class
 org/jeecg/modules/message/controller/SysMessageController.class
 org/jeecg/config/jimureport/JimuReportTokenService.class
@@ -175,10 +179,10 @@ org/jeecg/modules/system/model/SysUserSysDepartModel.class
 org/jeecg/modules/cas/controller/CasClientController.class
 org/jeecg/modules/cas/util/XmlUtils$CustomAttributeHandler.class
 org/jeecg/modules/system/model/DuplicateCheckVo.class
-org/jeecg/modules/miliCustomer/mapper/CustomerPotentialMapper.class
 org/jeecg/modules/system/mapper/SysCheckRuleMapper.class
 org/jeecg/modules/system/controller/ThirdLoginController.class
 org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.class
+org/jeecg/modules/miliCustomer/service/impl/CustomerInfoServiceImpl.class
 org/jeecg/modules/message/util/PushMsgUtil.class
 org/jeecg/modules/message/handle/ISendMsgHandle.class
 org/jeecg/modules/system/controller/SysDataLogController.class
@@ -206,6 +210,7 @@ org/jeecg/modules/system/service/impl/SysDepartPermissionServiceImpl.class
 org/jeecg/modules/system/controller/DuplicateCheckController.class
 org/jeecg/modules/system/util/FindsDepartsChildrenUtil.class
 org/jeecg/modules/system/controller/SysPositionController.class
+org/jeecg/modules/miliCustomer/mapper/CustomerInfoMapper.class
 org/jeecg/modules/system/entity/SysDepartPermission.class
 org/jeecg/modules/system/controller/LoginController.class
 org/jeecg/modules/system/entity/SysPosition.class
@@ -221,7 +226,6 @@ org/jeecg/modules/system/service/ISysThirdAccountService.class
 org/jeecg/modules/message/controller/SysMessageTemplateController.class
 org/jeecg/modules/system/entity/SysFillRule.class
 org/jeecg/modules/system/model/AnnouncementSendModel.class
-org/jeecg/modules/miliCustomer/entity/CustomerPotential.class
 org/jeecg/modules/system/entity/SysUserDepart.class
 org/jeecg/modules/system/entity/SysUser.class
 org/jeecg/modules/system/service/impl/SysDepartRoleServiceImpl.class
@@ -235,6 +239,7 @@ org/jeecg/modules/miliCustomer/service/impl/CustomerFollowServiceImpl.class
 org/jeecg/modules/system/util/RandImageUtil.class
 org/jeecg/modules/system/controller/SysUploadController.class
 org/jeecg/modules/system/mapper/SysDepartMapper.class
+org/jeecg/modules/miliCustomer/controller/CustomerInfoController.class
 org/jeecg/modules/system/service/ISysDepartService.class
 org/jeecg/modules/miliCustomer/entity/CustomerFollow.class
 org/jeecg/modules/quartz/mapper/QuartzJobMapper.class

jeecg-boot-module-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -12,11 +12,11 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
-/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerPotentialMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/ISysMessageService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserRoleServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/entity/OSSFile.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerInfoController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRoleIndexServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/mapper/OSSFileMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerAuditionServiceImpl.java
@@ -25,6 +25,7 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysLogMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserAgentService.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerInfoServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/service/impl/OSSFileServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/SysMessageMapper.java
@@ -57,6 +58,7 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionDataRuleImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerLogsMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/mapper/SysMessageTemplateMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
@@ -65,6 +67,7 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/CASServiceUtil.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerLogsController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysRoleIndexService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysRolePermission.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -90,7 +93,6 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysCheckRuleServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/SystemAPIController.java
-/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/controller/CustomerPotentialController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
@@ -127,6 +129,7 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerVisitingMapper.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerLogs.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysTenant.java
@@ -162,7 +165,6 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerFollowServiceImpl.java
-/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerPotentialService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/monitor/domain/RedisInfo.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerAudition.java
@@ -172,6 +174,7 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/security/DictQueryBlackListHandler.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartRolePermissionServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/mapper/CustomerInfoMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysCheckRuleMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java
@@ -179,13 +182,16 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPositionServiceImpl.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerInfoService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/XSSUtils.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerInfo.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysFillRuleService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysPermissionService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysLogService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgOneToMainUtil.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/ICustomerLogsService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java
@@ -215,7 +221,6 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/service/impl/SysMessageServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysRolePermissionServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermissionDataRule.java
-/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerPotentialServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/thirdapp/SyncInfoVo.java
@@ -223,7 +228,6 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysGatewayRouteMapper.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartRoleService.java
-/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/entity/CustomerPotential.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/ThirdLoginModel.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/MsgParams.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
@@ -250,6 +254,7 @@
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/service/IOSSFileService.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
+/Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/miliCustomer/service/impl/CustomerLogsServiceImpl.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
 /Users/shanks/project/ZhuMi/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java