src/main/java/com/zy/crm/common/CodeBuilder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/controller/OrderController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/controller/OrderFollController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/entity/OrderFoll.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/mapper/OrderFollMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/service/OrderFollService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/crm/manager/service/impl/OrderFollServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/OrderFollMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/crm/common/CodeBuilder.java
@@ -23,12 +23,12 @@ generator.url="localhost:1433;databasename=zy_crm"; generator.username="sa"; generator.password="sa@123"; generator.table="man_order"; generator.table="man_order_foll"; generator.packagePath="com.zy.crm.manager"; // generator.js = false; // generator.html = false; // generator.htmlDetail = false; // generator.sql = false; generator.js = false; generator.html = false; generator.htmlDetail = false; generator.sql = false; generator.build(); } src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -1,22 +1,24 @@ package com.zy.crm.manager.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; import com.zy.crm.manager.entity.Order; import com.zy.crm.manager.service.OrderService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; import com.zy.crm.common.web.BaseController; import com.zy.crm.manager.entity.Order; import com.zy.crm.manager.service.OrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @RestController public class OrderController extends BaseController { src/main/java/com/zy/crm/manager/controller/OrderFollController.java
New file @@ -0,0 +1,125 @@ package com.zy.crm.manager.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; import com.zy.crm.manager.entity.OrderFoll; import com.zy.crm.manager.service.OrderFollService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; import com.zy.crm.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; @RestController public class OrderFollController extends BaseController { @Autowired private OrderFollService orderFollService; @RequestMapping(value = "/orderFoll/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { return R.ok(orderFollService.selectById(String.valueOf(id))); } @RequestMapping(value = "/orderFoll/list/auth") @ManagerAuth public R list(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam(required = false)String condition, @RequestParam Map<String, Object> param){ EntityWrapper<OrderFoll> wrapper = new EntityWrapper<>(); excludeTrash(param); convert(param, wrapper); allLike(OrderFoll.class, param.keySet(), wrapper, condition); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(orderFollService.selectPage(new Page<>(curr, limit), wrapper)); } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ String val = String.valueOf(entry.getValue()); if (val.contains(RANGE_TIME_LINK)){ String[] dates = val.split(RANGE_TIME_LINK); wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { wrapper.like(entry.getKey(), val); } } } @RequestMapping(value = "/orderFoll/add/auth") @ManagerAuth public R add(OrderFoll orderFoll) { orderFollService.insert(orderFoll); return R.ok(); } @RequestMapping(value = "/orderFoll/update/auth") @ManagerAuth public R update(OrderFoll orderFoll){ if (Cools.isEmpty(orderFoll) || null==orderFoll.getId()){ return R.error(); } orderFollService.updateById(orderFoll); return R.ok(); } @RequestMapping(value = "/orderFoll/delete/auth") @ManagerAuth public R delete(@RequestParam(value="ids[]") Long[] ids){ for (Long id : ids){ orderFollService.deleteById(id); } return R.ok(); } @RequestMapping(value = "/orderFoll/export/auth") @ManagerAuth public R export(@RequestBody JSONObject param){ EntityWrapper<OrderFoll> wrapper = new EntityWrapper<>(); List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); Map<String, Object> map = excludeTrash(param.getJSONObject("orderFoll")); convert(map, wrapper); List<OrderFoll> list = orderFollService.selectList(wrapper); return R.ok(exportSupport(list, fields)); } @RequestMapping(value = "/orderFollQuery/auth") @ManagerAuth public R query(String condition) { EntityWrapper<OrderFoll> wrapper = new EntityWrapper<>(); wrapper.like("id", condition); Page<OrderFoll> page = orderFollService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (OrderFoll orderFoll : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", orderFoll.getId()); map.put("value", orderFoll.getId()); result.add(map); } return R.ok(result); } @RequestMapping(value = "/orderFoll/check/column/auth") @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<OrderFoll> wrapper = new EntityWrapper<OrderFoll>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); if (null != orderFollService.selectOne(wrapper)){ return R.parse(BaseRes.REPEAT).add(getComment(OrderFoll.class, String.valueOf(param.get("key")))); } return R.ok(); } } src/main/java/com/zy/crm/manager/entity/OrderFoll.java
New file @@ -0,0 +1,76 @@ package com.zy.crm.manager.entity; import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.enums.IdType; import com.core.common.SpringUtils; import com.zy.crm.manager.service.OrderService; import com.zy.crm.manager.entity.Order; import com.baomidou.mybatisplus.annotations.TableField; import com.core.common.SpringUtils; import com.zy.crm.system.service.UserService; import com.zy.crm.system.entity.User; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; @Data @TableName("man_order_foll") public class OrderFoll implements Serializable { private static final long serialVersionUID = 1L; /** * ID */ @ApiModelProperty(value= "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 项目 */ @ApiModelProperty(value= "项目") @TableField("order_id") private Long orderId; /** * 跟进人 */ @ApiModelProperty(value= "跟进人") @TableField("user_id") private Long userId; public OrderFoll() {} public OrderFoll(Long orderId,Long userId) { this.orderId = orderId; this.userId = userId; } // OrderFoll orderFoll = new OrderFoll( // null, // 项目 // null // 跟进人[非空] // ); public String getOrderId$(){ OrderService service = SpringUtils.getBean(OrderService.class); Order order = service.selectById(this.orderId); if (!Cools.isEmpty(order)){ return String.valueOf(order.getName()); } return null; } public String getUserId$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.userId); if (!Cools.isEmpty(user)){ return String.valueOf(user.getNickname()); } return null; } } src/main/java/com/zy/crm/manager/mapper/OrderFollMapper.java
New file @@ -0,0 +1,12 @@ package com.zy.crm.manager.mapper; import com.zy.crm.manager.entity.OrderFoll; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface OrderFollMapper extends BaseMapper<OrderFoll> { } src/main/java/com/zy/crm/manager/service/OrderFollService.java
New file @@ -0,0 +1,8 @@ package com.zy.crm.manager.service; import com.zy.crm.manager.entity.OrderFoll; import com.baomidou.mybatisplus.service.IService; public interface OrderFollService extends IService<OrderFoll> { } src/main/java/com/zy/crm/manager/service/impl/OrderFollServiceImpl.java
New file @@ -0,0 +1,12 @@ package com.zy.crm.manager.service.impl; import com.zy.crm.manager.mapper.OrderFollMapper; import com.zy.crm.manager.entity.OrderFoll; import com.zy.crm.manager.service.OrderFollService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service("orderFollService") public class OrderFollServiceImpl extends ServiceImpl<OrderFollMapper, OrderFoll> implements OrderFollService { } src/main/resources/mapper/OrderFollMapper.xml
New file @@ -0,0 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zy.crm.manager.mapper.OrderFollMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.OrderFoll"> <id column="id" property="id" /> <result column="order_id" property="orderId" /> <result column="user_id" property="userId" /> </resultMap> </mapper>