diff --git a/pom.xml b/pom.xml
index b4931dbc5..a412b63af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
ruoyi
3.8.1
- ruoyi
- http://www.ruoyi.vip
- 若依管理系统
+ jlt-private-farm
+ 私家农场管理系统
+ 1.0.0
3.8.1
UTF-8
UTF-8
@@ -199,6 +199,13 @@
${ruoyi.version}
+
+
+ com.jlt.farming
+ private-farm
+ ${private-farm.version}
+
+
@@ -209,6 +216,7 @@
ruoyi-quartz
ruoyi-generator
ruoyi-common
+ private-farm
pom
diff --git a/private-farm/pom.xml b/private-farm/pom.xml
new file mode 100644
index 000000000..54c362aba
--- /dev/null
+++ b/private-farm/pom.xml
@@ -0,0 +1,24 @@
+
+
+
+ ruoyi
+ com.ruoyi
+ 3.8.1
+
+ 4.0.0
+
+ com.jlt.farming
+ private-farm
+ 1.0.0
+ 私家农场(社区支持农业)管理系统
+
+
+
+ com.ruoyi
+ ruoyi-common
+
+
+
+
\ No newline at end of file
diff --git a/private-farm/src/main/java/com/jlt/farming/crm/controller/VisitorController.java b/private-farm/src/main/java/com/jlt/farming/crm/controller/VisitorController.java
new file mode 100644
index 000000000..56fb46891
--- /dev/null
+++ b/private-farm/src/main/java/com/jlt/farming/crm/controller/VisitorController.java
@@ -0,0 +1,105 @@
+package com.jlt.farming.crm.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jlt.farming.crm.domain.Visitor;
+import com.jlt.farming.crm.service.IVisitorService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 访客信息Controller
+ *
+ * @author ruoyi
+ * @date 2022-02-08
+ */
+@RestController
+@RequestMapping("/crm/visitor")
+public class VisitorController extends BaseController
+{
+ @Autowired
+ private IVisitorService VisitorService;
+
+ /**
+ * 查询访客信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('crm:visitor:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(Visitor Visitor)
+ {
+ startPage();
+ List list = VisitorService.selectVisitorList(Visitor);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出访客信息列表
+ */
+ @PreAuthorize("@ss.hasPermi('crm:visitor:export')")
+ @Log(title = "访客信息", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, Visitor Visitor)
+ {
+ List list = VisitorService.selectVisitorList(Visitor);
+ ExcelUtil util = new ExcelUtil(Visitor.class);
+ util.exportExcel(response, list, "访客信息数据");
+ }
+
+ /**
+ * 获取访客信息详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('crm:visitor:query')")
+ @GetMapping(value = "/{visitorId}")
+ public AjaxResult getInfo(@PathVariable("visitorId") Long visitorId)
+ {
+ return AjaxResult.success(VisitorService.selectVisitorByVisitorId(visitorId));
+ }
+
+ /**
+ * 新增访客信息
+ */
+ @PreAuthorize("@ss.hasPermi('crm:visitor:add')")
+ @Log(title = "访客信息", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody Visitor Visitor)
+ {
+ return toAjax(VisitorService.insertVisitor(Visitor));
+ }
+
+ /**
+ * 修改访客信息
+ */
+ @PreAuthorize("@ss.hasPermi('crm:visitor:edit')")
+ @Log(title = "访客信息", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody Visitor Visitor)
+ {
+ return toAjax(VisitorService.updateVisitor(Visitor));
+ }
+
+ /**
+ * 删除访客信息
+ */
+ @PreAuthorize("@ss.hasPermi('crm:visitor:remove')")
+ @Log(title = "访客信息", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{visitorIds}")
+ public AjaxResult remove(@PathVariable Long[] visitorIds)
+ {
+ return toAjax(VisitorService.deleteVisitorByVisitorIds(visitorIds));
+ }
+}
diff --git a/private-farm/src/main/java/com/jlt/farming/crm/domain/Visitor.java b/private-farm/src/main/java/com/jlt/farming/crm/domain/Visitor.java
new file mode 100644
index 000000000..e6f8a8721
--- /dev/null
+++ b/private-farm/src/main/java/com/jlt/farming/crm/domain/Visitor.java
@@ -0,0 +1,129 @@
+package com.jlt.farming.crm.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 访客信息对象 pr_visitor
+ *
+ * @author ruoyi
+ * @date 2022-02-08
+ */
+public class Visitor extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 访客Id */
+ private Long visitorId;
+
+ /** 访客姓名 */
+ @Excel(name = "访客姓名")
+ private String visitorName;
+
+ /** 访客电话 */
+ @Excel(name = "访客电话")
+ private String phone;
+
+ /** 访客事由 */
+ @Excel(name = "访客事由")
+ private String matter;
+
+ /** 待办事项 */
+ @Excel(name = "待办事项")
+ private String backlog;
+
+ /** 访问时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date visitTime;
+
+ /** 状态（0正常 1停用） */
+ @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ public void setVisitorId(Long visitorId)
+ {
+ this.visitorId = visitorId;
+ }
+
+ public Long getVisitorId()
+ {
+ return visitorId;
+ }
+ public void setVisitorName(String visitorName)
+ {
+ this.visitorName = visitorName;
+ }
+
+ public String getVisitorName()
+ {
+ return visitorName;
+ }
+ public void setPhone(String phone)
+ {
+ this.phone = phone;
+ }
+
+ public String getPhone()
+ {
+ return phone;
+ }
+ public void setMatter(String matter)
+ {
+ this.matter = matter;
+ }
+
+ public String getMatter()
+ {
+ return matter;
+ }
+ public void setBacklog(String backlog)
+ {
+ this.backlog = backlog;
+ }
+
+ public String getBacklog()
+ {
+ return backlog;
+ }
+ public void setVisitTime(Date visitTime)
+ {
+ this.visitTime = visitTime;
+ }
+
+ public Date getVisitTime()
+ {
+ return visitTime;
+ }
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("visitorId", getVisitorId())
+ .append("visitorName", getVisitorName())
+ .append("phone", getPhone())
+ .append("matter", getMatter())
+ .append("backlog", getBacklog())
+ .append("visitTime", getVisitTime())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/private-farm/src/main/java/com/jlt/farming/crm/mapper/VisitorMapper.java b/private-farm/src/main/java/com/jlt/farming/crm/mapper/VisitorMapper.java
new file mode 100644
index 000000000..8bb969fdc
--- /dev/null
+++ b/private-farm/src/main/java/com/jlt/farming/crm/mapper/VisitorMapper.java
@@ -0,0 +1,61 @@
+package com.jlt.farming.crm.mapper;
+
+import java.util.List;
+import com.jlt.farming.crm.domain.Visitor;
+
+/**
+ * 访客信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-02-08
+ */
+public interface VisitorMapper
+{
+ /**
+ * 查询访客信息
+ *
+ * @param visitorId 访客信息主键
+ * @return 访客信息
+ */
+ public Visitor selectVisitorByVisitorId(Long visitorId);
+
+ /**
+ * 查询访客信息列表
+ *
+ * @param Visitor 访客信息
+ * @return 访客信息集合
+ */
+ public List selectVisitorList(Visitor Visitor);
+
+ /**
+ * 新增访客信息
+ *
+ * @param Visitor 访客信息
+ * @return 结果
+ */
+ public int insertVisitor(Visitor Visitor);
+
+ /**
+ * 修改访客信息
+ *
+ * @param Visitor 访客信息
+ * @return 结果
+ */
+ public int updateVisitor(Visitor Visitor);
+
+ /**
+ * 删除访客信息
+ *
+ * @param visitorId 访客信息主键
+ * @return 结果
+ */
+ public int deleteVisitorByVisitorId(Long visitorId);
+
+ /**
+ * 批量删除访客信息
+ *
+ * @param visitorIds 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteVisitorByVisitorIds(Long[] visitorIds);
+}
diff --git a/private-farm/src/main/java/com/jlt/farming/crm/service/IVisitorService.java b/private-farm/src/main/java/com/jlt/farming/crm/service/IVisitorService.java
new file mode 100644
index 000000000..0bbe698d5
--- /dev/null
+++ b/private-farm/src/main/java/com/jlt/farming/crm/service/IVisitorService.java
@@ -0,0 +1,61 @@
+package com.jlt.farming.crm.service;
+
+import java.util.List;
+import com.jlt.farming.crm.domain.Visitor;
+
+/**
+ * 访客信息Service接口
+ *
+ * @author ruoyi
+ * @date 2022-02-08
+ */
+public interface IVisitorService
+{
+ /**
+ * 查询访客信息
+ *
+ * @param visitorId 访客信息主键
+ * @return 访客信息
+ */
+ public Visitor selectVisitorByVisitorId(Long visitorId);
+
+ /**
+ * 查询访客信息列表
+ *
+ * @param Visitor 访客信息
+ * @return 访客信息集合
+ */
+ public List selectVisitorList(Visitor Visitor);
+
+ /**
+ * 新增访客信息
+ *
+ * @param Visitor 访客信息
+ * @return 结果
+ */
+ public int insertVisitor(Visitor Visitor);
+
+ /**
+ * 修改访客信息
+ *
+ * @param Visitor 访客信息
+ * @return 结果
+ */
+ public int updateVisitor(Visitor Visitor);
+
+ /**
+ * 批量删除访客信息
+ *
+ * @param visitorIds 需要删除的访客信息主键集合
+ * @return 结果
+ */
+ public int deleteVisitorByVisitorIds(Long[] visitorIds);
+
+ /**
+ * 删除访客信息信息
+ *
+ * @param visitorId 访客信息主键
+ * @return 结果
+ */
+ public int deleteVisitorByVisitorId(Long visitorId);
+}
diff --git a/private-farm/src/main/java/com/jlt/farming/crm/service/impl/VisitorServiceImpl.java b/private-farm/src/main/java/com/jlt/farming/crm/service/impl/VisitorServiceImpl.java
new file mode 100644
index 000000000..a0bd9d947
--- /dev/null
+++ b/private-farm/src/main/java/com/jlt/farming/crm/service/impl/VisitorServiceImpl.java
@@ -0,0 +1,97 @@
+package com.jlt.farming.crm.service.impl;
+
+import java.util.List;
+
+import com.jlt.farming.crm.domain.Visitor;
+import com.jlt.farming.crm.mapper.VisitorMapper;
+import com.jlt.farming.crm.service.IVisitorService;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 访客信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-02-08
+ */
+@Service
+public class VisitorServiceImpl implements IVisitorService
+{
+ @Autowired
+ private VisitorMapper VisitorMapper;
+
+ /**
+ * 查询访客信息
+ *
+ * @param visitorId 访客信息主键
+ * @return 访客信息
+ */
+ @Override
+ public Visitor selectVisitorByVisitorId(Long visitorId)
+ {
+ return VisitorMapper.selectVisitorByVisitorId(visitorId);
+ }
+
+ /**
+ * 查询访客信息列表
+ *
+ * @param Visitor 访客信息
+ * @return 访客信息
+ */
+ @Override
+ public List selectVisitorList(Visitor Visitor)
+ {
+ return VisitorMapper.selectVisitorList(Visitor);
+ }
+
+ /**
+ * 新增访客信息
+ *
+ * @param Visitor 访客信息
+ * @return 结果
+ */
+ @Override
+ public int insertVisitor(Visitor Visitor)
+ {
+ Visitor.setCreateTime(DateUtils.getNowDate());
+ return VisitorMapper.insertVisitor(Visitor);
+ }
+
+ /**
+ * 修改访客信息
+ *
+ * @param Visitor 访客信息
+ * @return 结果
+ */
+ @Override
+ public int updateVisitor(Visitor Visitor)
+ {
+ Visitor.setUpdateTime(DateUtils.getNowDate());
+ return VisitorMapper.updateVisitor(Visitor);
+ }
+
+ /**
+ * 批量删除访客信息
+ *
+ * @param visitorIds 需要删除的访客信息主键
+ * @return 结果
+ */
+ @Override
+ public int deleteVisitorByVisitorIds(Long[] visitorIds)
+ {
+ return VisitorMapper.deleteVisitorByVisitorIds(visitorIds);
+ }
+
+ /**
+ * 删除访客信息信息
+ *
+ * @param visitorId 访客信息主键
+ * @return 结果
+ */
+ @Override
+ public int deleteVisitorByVisitorId(Long visitorId)
+ {
+ return VisitorMapper.deleteVisitorByVisitorId(visitorId);
+ }
+}
diff --git a/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml b/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml
new file mode 100644
index 000000000..bc18c3152
--- /dev/null
+++ b/private-farm/src/main/resources/mapper/crm/VisitorMapper.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select visitor_id, visitor_name, phone, matter, backlog, visit_time, status, create_by, create_time, update_by, update_time, remark from crm_visitor
+
+
+
+
+
+
+
+ insert into crm_visitor
+
+ visitor_name,
+ phone,
+ matter,
+ backlog,
+ visit_time,
+ status,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ remark,
+
+
+ #{visitorName},
+ #{phone},
+ #{matter},
+ #{backlog},
+ #{visitTime},
+ #{status},
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+ #{remark},
+
+
+
+
+ update crm_visitor
+
+ visitor_name = #{visitorName},
+ phone = #{phone},
+ matter = #{matter},
+ backlog = #{backlog},
+ visit_time = #{visitTime},
+ status = #{status},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+ remark = #{remark},
+
+ where visitor_id = #{visitorId}
+
+
+
+ delete from crm_visitor where visitor_id = #{visitorId}
+
+
+
+ delete from crm_visitor where visitor_id in
+
+ #{visitorId}
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 14769e515..53da51b2c 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -61,6 +61,11 @@
ruoyi-generator
+
+ com.jlt.farming
+ private-farm
+
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index e3c56ee54..2e31c797f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,8 +1,10 @@
package com.ruoyi;
+import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
/**
* 启动程序
@@ -10,6 +12,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author ruoyi
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@ComponentScan({"com.ruoyi", "com.jlt.farming"})
+@MapperScan({"com.jlt.farming.**.mapper"})
public class RuoYiApplication
{
public static void main(String[] args)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1f098e407..6358e5ab9 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/private-farm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: password
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ccef2502d..a1d08a272 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -94,7 +94,7 @@ token:
# MyBatis配置
mybatis:
# 搜索指定包别名
- typeAliasesPackage: com.ruoyi.**.domain
+ typeAliasesPackage: com.ruoyi.**.domain,com.jlt.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VisitorMapper.xml
similarity index 97%
rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
rename to ruoyi-system/src/main/resources/mapper/system/VisitorMapper.xml
index 4a095a6f3..a86f1d3e9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VisitorMapper.xml
@@ -1,220 +1,220 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
- from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into sys_user(
- user_id,
- dept_id,
- user_name,
- nick_name,
- email,
- avatar,
- phonenumber,
- sex,
- password,
- status,
- create_by,
- remark,
- create_time
- )values(
- #{userId},
- #{deptId},
- #{userName},
- #{nickName},
- #{email},
- #{avatar},
- #{phonenumber},
- #{sex},
- #{password},
- #{status},
- #{createBy},
- #{remark},
- sysdate()
- )
-
-
-
- update sys_user
-
- dept_id = #{deptId},
- user_name = #{userName},
- nick_name = #{nickName},
- email = #{email},
- phonenumber = #{phonenumber},
- sex = #{sex},
- avatar = #{avatar},
- password = #{password},
- status = #{status},
- login_ip = #{loginIp},
- login_date = #{loginDate},
- update_by = #{updateBy},
- remark = #{remark},
- update_time = sysdate()
-
- where user_id = #{userId}
-
-
-
- update sys_user set status = #{status} where user_id = #{userId}
-
-
-
- update sys_user set avatar = #{avatar} where user_name = #{userName}
-
-
-
- update sys_user set password = #{password} where user_name = #{userName}
-
-
-
- update sys_user set del_flag = '2' where user_id = #{userId}
-
-
-
- update sys_user set del_flag = '2' where user_id in
-
- #{userId}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+ from sys_user u
+ left join sys_dept d on u.dept_id = d.dept_id
+ left join sys_user_role ur on u.user_id = ur.user_id
+ left join sys_role r on r.role_id = ur.role_id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into sys_user(
+ user_id,
+ dept_id,
+ user_name,
+ nick_name,
+ email,
+ avatar,
+ phonenumber,
+ sex,
+ password,
+ status,
+ create_by,
+ remark,
+ create_time
+ )values(
+ #{userId},
+ #{deptId},
+ #{userName},
+ #{nickName},
+ #{email},
+ #{avatar},
+ #{phonenumber},
+ #{sex},
+ #{password},
+ #{status},
+ #{createBy},
+ #{remark},
+ sysdate()
+ )
+
+
+
+ update sys_user
+
+ dept_id = #{deptId},
+ user_name = #{userName},
+ nick_name = #{nickName},
+ email = #{email},
+ phonenumber = #{phonenumber},
+ sex = #{sex},
+ avatar = #{avatar},
+ password = #{password},
+ status = #{status},
+ login_ip = #{loginIp},
+ login_date = #{loginDate},
+ update_by = #{updateBy},
+ remark = #{remark},
+ update_time = sysdate()
+
+ where user_id = #{userId}
+
+
+
+ update sys_user set status = #{status} where user_id = #{userId}
+
+
+
+ update sys_user set avatar = #{avatar} where user_name = #{userName}
+
+
+
+ update sys_user set password = #{password} where user_name = #{userName}
+
+
+
+ update sys_user set del_flag = '2' where user_id = #{userId}
+
+
+
+ update sys_user set del_flag = '2' where user_id in
+
+ #{userId}
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/farming/crm/visitor.js b/ruoyi-ui/src/api/farming/crm/visitor.js
new file mode 100644
index 000000000..d92e799e9
--- /dev/null
+++ b/ruoyi-ui/src/api/farming/crm/visitor.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询访客信息列表
+export function listVisitor(query) {
+ return request({
+ url: '/crm/visitor/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询访客信息详细
+export function getVisitor(visitorId) {
+ return request({
+ url: '/crm/visitor/' + visitorId,
+ method: 'get'
+ })
+}
+
+// 新增访客信息
+export function addVisitor(data) {
+ return request({
+ url: '/crm/visitor',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改访客信息
+export function updateVisitor(data) {
+ return request({
+ url: '/crm/visitor',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除访客信息
+export function delVisitor(visitorId) {
+ return request({
+ url: '/crm/visitor/' + visitorId,
+ method: 'delete'
+ })
+}
diff --git a/ruoyi-ui/src/views/crm/visitor/index.vue b/ruoyi-ui/src/views/crm/visitor/index.vue
new file mode 100644
index 000000000..ca397738d
--- /dev/null
+++ b/ruoyi-ui/src/views/crm/visitor/index.vue
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+