23 changed files with 836 additions and 43 deletions
@ -0,0 +1,184 @@ |
|||
package com.qs.serve.modules.oms.entity; |
|||
|
|||
import java.time.LocalDate; |
|||
import java.io.Serializable; |
|||
import java.math.BigDecimal; |
|||
import java.time.LocalDateTime; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.*; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
import org.springframework.format.annotation.DateTimeFormat; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* 销路通订单 实体类 |
|||
* @author YenHex |
|||
* @since 2023-10-09 |
|||
*/ |
|||
@Data |
|||
@TableName("oms_xlt_order") |
|||
public class OmsXltOrder implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** id */ |
|||
@TableId(type = IdType.ASSIGN_UUID) |
|||
private String id; |
|||
|
|||
/** 订单号 */ |
|||
@NotBlank(message = "订单号不能为空") |
|||
@Length(max = 100,message = "订单号长度不能超过100字") |
|||
@TableField("dingDanHao") |
|||
private String dingDanHao; |
|||
|
|||
/** 申请日期 */ |
|||
@Length(max = 0,message = "申请日期长度不能超过0字") |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("shenQingRiQi") |
|||
private LocalDateTime shenQingRiQi; |
|||
|
|||
/** 客户编号 */ |
|||
@NotBlank(message = "客户编号不能为空") |
|||
@Length(max = 100,message = "客户编号长度不能超过100字") |
|||
@TableField("keHuBianHao") |
|||
private String keHuBianHao; |
|||
|
|||
/** 收货地址 */ |
|||
@Length(max = 100,message = "收货地址长度不能超过100字") |
|||
@TableField("shouHuoDiZhi") |
|||
private String shouHuoDiZhi; |
|||
|
|||
/** 人员编号 */ |
|||
@Length(max = 100,message = "人员编号长度不能超过100字") |
|||
@TableField("renYuanBianHao") |
|||
private String renYuanBianHao; |
|||
|
|||
/** 注意事项 */ |
|||
@TableField("zhuYiShiXian") |
|||
private String zhuYiShiXian; |
|||
|
|||
/** 写入时间 */ |
|||
@NotNull(message = "写入时间不能为空") |
|||
@Length(max = 0,message = "写入时间长度不能超过0字") |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("xieRuShiJian") |
|||
private LocalDateTime xieRuShiJian; |
|||
|
|||
/** 处理时间 */ |
|||
@Length(max = 0,message = "处理时间长度不能超过0字") |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("chuLiShiJian") |
|||
private LocalDateTime chuLiShiJian; |
|||
|
|||
/** 状态 */ |
|||
@TableField("zhuangTai") |
|||
private Integer zhuangTai; |
|||
|
|||
/** 行创建日期 */ |
|||
@Length(max = 0,message = "行创建日期长度不能超过0字") |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("rowCreateDate") |
|||
private LocalDateTime rowCreateDate; |
|||
|
|||
/** 人员姓名 */ |
|||
@Length(max = 100,message = "人员姓名长度不能超过100字") |
|||
@TableField("renYuanXingMing") |
|||
private String renYuanXingMing; |
|||
|
|||
/** 人员电话 */ |
|||
@Length(max = 100,message = "人员电话长度不能超过100字") |
|||
@TableField("renYuanDianHua") |
|||
private String renYuanDianHua; |
|||
|
|||
/** 限制纬度 */ |
|||
@Length(max = 100,message = "限制纬度长度不能超过100字") |
|||
@TableField("xianZhiWeiDu") |
|||
private String xianZhiWeiDu; |
|||
|
|||
/** 限制纬度名称 */ |
|||
@Length(max = 100,message = "限制纬度名称长度不能超过100字") |
|||
@TableField("xianZhiWeiDuMingChen") |
|||
private String xianZhiWeiDuMingChen; |
|||
|
|||
/** 状态:0未使用；1报价单；2销售订单 */ |
|||
private Integer status; |
|||
|
|||
|
|||
|
|||
/** |
|||
* 人员名称 |
|||
*/ |
|||
@TableField("empName") |
|||
private String empName; |
|||
|
|||
/** |
|||
* 客户编码 |
|||
*/ |
|||
@TableField("cusCode") |
|||
private String cusCode; |
|||
|
|||
/** |
|||
* 客户名称 |
|||
*/ |
|||
@TableField("cusName") |
|||
private String cusName; |
|||
|
|||
/** |
|||
* 城市 |
|||
*/ |
|||
@TableField("dealerCity") |
|||
private String dealerCity; |
|||
|
|||
/** |
|||
* 省份 |
|||
*/ |
|||
@TableField("dealerProvince") |
|||
private String dealerProvince; |
|||
|
|||
/** |
|||
* 区域 |
|||
*/ |
|||
@TableField("dealerArea") |
|||
private String dealerArea; |
|||
|
|||
/** 创建时间 */ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField(fill = FieldFill.INSERT) |
|||
private LocalDateTime createTime; |
|||
|
|||
/** 创建人 */ |
|||
@TableField(fill = FieldFill.INSERT) |
|||
private String createBy; |
|||
|
|||
/** 更新时间 */ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField(fill = FieldFill.UPDATE) |
|||
private LocalDateTime updateTime; |
|||
|
|||
/** 更新人 */ |
|||
@TableField(fill = FieldFill.UPDATE) |
|||
private String updateBy; |
|||
|
|||
/** 租户id */ |
|||
@JsonIgnore |
|||
@JsonProperty |
|||
private String tenantId; |
|||
|
|||
/** 删除标识 */ |
|||
@JsonIgnore |
|||
@JsonProperty |
|||
private Boolean delFlag; |
|||
} |
|||
|
|||
@ -0,0 +1,124 @@ |
|||
package com.qs.serve.modules.oms.entity; |
|||
|
|||
import java.time.LocalDate; |
|||
import java.io.Serializable; |
|||
import java.math.BigDecimal; |
|||
import java.time.LocalDateTime; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.*; |
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import com.fasterxml.jackson.annotation.JsonProperty; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
import org.springframework.format.annotation.DateTimeFormat; |
|||
|
|||
import javax.validation.constraints.NotNull; |
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* 销路通订单明细 实体类 |
|||
* @author YenHex |
|||
* @since 2023-10-09 |
|||
*/ |
|||
@Data |
|||
@TableName("oms_xlt_order_item") |
|||
public class OmsXltOrderItem implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** id */ |
|||
@TableId(type = IdType.ASSIGN_ID) |
|||
private String id; |
|||
|
|||
/** 订单id */ |
|||
@NotBlank(message = "订单id不能为空") |
|||
@Length(max = 100,message = "订单id长度不能超过100字") |
|||
@TableField("dingDanID") |
|||
private String dingDanID; |
|||
|
|||
/** 产品编号 */ |
|||
@Length(max = 100,message = "产品编号长度不能超过100字") |
|||
@TableField("chanPinBianHao") |
|||
private String chanPinBianHao; |
|||
|
|||
/** 产品单位 */ |
|||
@Length(max = 100,message = "产品单位长度不能超过100字") |
|||
@TableField("chanPinDanWei") |
|||
private String chanPinDanWei; |
|||
|
|||
/** 订货数量 */ |
|||
@TableField("dingHuoShuLiang") |
|||
private Integer dingHuoShuLiang; |
|||
|
|||
/** 搭赠数量 */ |
|||
@TableField("daZengShuLiang") |
|||
private BigDecimal daZengShuLiang; |
|||
|
|||
/** 产品原件 */ |
|||
@TableField("chanPinYuanJia") |
|||
private BigDecimal chanPinYuanJia; |
|||
|
|||
/** 产品现价 */ |
|||
@TableField("chanPinXianJia") |
|||
private BigDecimal chanPinXianJia; |
|||
|
|||
/** 写入时间 */ |
|||
@NotNull(message = "写入时间不能为空") |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("xieRuShiJian") |
|||
private LocalDateTime xieRuShiJian; |
|||
|
|||
/** 处理时间 */ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("chuLiShiJian") |
|||
private LocalDateTime chuLiShiJian; |
|||
|
|||
/** 状态 */ |
|||
@TableField("zhuangTai") |
|||
private Integer zhuangTai; |
|||
|
|||
/** 行创建时间 */ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField("rowCreateDate") |
|||
private LocalDateTime rowCreateDate; |
|||
|
|||
/** 备注 */ |
|||
@TableField("beiZhu") |
|||
private String beiZhu; |
|||
|
|||
/** 创建时间 */ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField(fill = FieldFill.INSERT) |
|||
private LocalDateTime createTime; |
|||
|
|||
/** 创建人 */ |
|||
@TableField(fill = FieldFill.INSERT) |
|||
private String createBy; |
|||
|
|||
/** 更新时间 */ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
|||
@TableField(fill = FieldFill.UPDATE) |
|||
private LocalDateTime updateTime; |
|||
|
|||
/** 更新人 */ |
|||
@TableField(fill = FieldFill.UPDATE) |
|||
private String updateBy; |
|||
|
|||
/** 租户id */ |
|||
@JsonIgnore |
|||
@JsonProperty |
|||
private String tenantId; |
|||
|
|||
/** 删除标识 */ |
|||
@JsonIgnore |
|||
@JsonProperty |
|||
private Boolean delFlag; |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,14 @@ |
|||
package com.qs.serve.modules.oms.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.qs.serve.modules.oms.entity.OmsXltOrderItem; |
|||
|
|||
/** |
|||
* 销路通订单明细 Mapper |
|||
* @author YenHex |
|||
* @date 2023-10-09 |
|||
*/ |
|||
public interface OmsXltOrderItemMapper extends BaseMapper<OmsXltOrderItem> { |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,14 @@ |
|||
package com.qs.serve.modules.oms.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import com.qs.serve.modules.oms.entity.OmsXltOrder; |
|||
|
|||
/** |
|||
* 销路通订单 Mapper |
|||
* @author YenHex |
|||
* @date 2023-10-09 |
|||
*/ |
|||
public interface OmsXltOrderMapper extends BaseMapper<OmsXltOrder> { |
|||
|
|||
} |
|||
|
|||
@ -0,0 +1,120 @@ |
|||
<?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.qs.serve.modules.baz.mapper.BazVisitInstanceMapper"> |
|||
|
|||
<resultMap id="bazVisitInstanceMap" type="com.qs.serve.modules.baz.entity.BazVisitInstance" > |
|||
<result property="id" column="id"/> |
|||
<result property="title" column="title"/> |
|||
<result property="visitId" column="visit_id"/> |
|||
<result property="targetType" column="target_type"/> |
|||
<result property="visitState" column="visit_state"/> |
|||
<result property="visitorId" column="visitor_id"/> |
|||
<result property="visitorCode" column="visitor_code"/> |
|||
<result property="visitorName" column="visitor_name"/> |
|||
<result property="targetId" column="target_id"/> |
|||
<result property="targetCode" column="target_code"/> |
|||
<result property="targetName" column="target_name"/> |
|||
<result property="targetLocalX" column="target_local_x"/> |
|||
<result property="targetLocalY" column="target_local_y"/> |
|||
<result property="targetAddress" column="target_address"/> |
|||
<result property="targetMapAddress" column="target_map_address"/> |
|||
<result property="finishedTime" column="finished_time"/> |
|||
<result property="missLocalFlag" column="miss_local_flag"/> |
|||
<result property="remark" column="remark"/> |
|||
<result property="positionStatusContent" column="position_status_content"/> |
|||
<result property="positionStatus" column="position_status"/> |
|||
<result property="createTime" column="create_time"/> |
|||
<result property="updateTime" column="update_time"/> |
|||
<result property="tenantId" column="tenant_id"/> |
|||
<result property="delFlag" column="del_flag"/> |
|||
<result property="createBy" column="create_by"/> |
|||
<result property="updateBy" column="update_by"/> |
|||
</resultMap> |
|||
|
|||
<sql id="bazVisitInstanceSql"> |
|||
baz_visit_instance.`id`, |
|||
baz_visit_instance.`title`, |
|||
baz_visit_instance.`visit_id`, |
|||
baz_visit_instance.`target_type`, |
|||
baz_visit_instance.`visit_state`, |
|||
baz_visit_instance.`visitor_id`, |
|||
baz_visit_instance.`visitor_code`, |
|||
baz_visit_instance.`visitor_name`, |
|||
baz_visit_instance.`target_id`, |
|||
baz_visit_instance.`target_code`, |
|||
baz_visit_instance.`target_name`, |
|||
baz_visit_instance.`target_local_x`, |
|||
baz_visit_instance.`target_local_y`, |
|||
baz_visit_instance.`target_address`, |
|||
baz_visit_instance.`target_map_address`, |
|||
baz_visit_instance.`finished_time`, |
|||
baz_visit_instance.`miss_local_flag`, |
|||
baz_visit_instance.`remark`, |
|||
baz_visit_instance.`position_status_content`, |
|||
baz_visit_instance.`position_status`, |
|||
baz_visit_instance.`create_time`, |
|||
baz_visit_instance.`update_time`, |
|||
baz_visit_instance.`tenant_id`, |
|||
baz_visit_instance.`del_flag`, |
|||
baz_visit_instance.`create_by`, |
|||
baz_visit_instance.`update_by` </sql> |
|||
|
|||
<select id="selectBazVisitInstanceList" parameterType="com.qs.serve.modules.baz.entity.BazVisitInstance" resultMap="bazVisitInstanceMap"> |
|||
SELECT |
|||
ins_flow.remark as summary, |
|||
ins_flow2.create_time as sign_time, |
|||
ins_flow3.create_time as out_time, |
|||
<include refid="bazVisitInstanceSql"/> |
|||
FROM `baz_visit_instance` `baz_visit_instance` |
|||
left join ( |
|||
select baz_visit_instance_flow.remark,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '3' |
|||
) ins_flow on ins_flow.visit_instance_id = baz_visit_instance.id |
|||
left join ( |
|||
select baz_visit_instance_flow.create_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '1' |
|||
) ins_flow2 on ins_flow2.visit_instance_id = baz_visit_instance.id |
|||
left join ( |
|||
select baz_visit_instance_flow.create_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '2' |
|||
) ins_flow3 on ins_flow3.visit_instance_id = baz_visit_instance.id |
|||
<where> |
|||
<if test="query.id != null"> and `baz_visit_instance`.`id` = #{query.id}</if> |
|||
<if test="query.title != null and query.title != ''"> and `baz_visit_instance`.`title` = #{query.title}</if> |
|||
<if test="query.visitId != null"> and `baz_visit_instance`.`visit_id` = #{query.visitId}</if> |
|||
<if test="query.targetType != null and query.targetType != ''"> and `baz_visit_instance`.`target_type` = #{query.targetType}</if> |
|||
<if test="query.visitState != null"> and `baz_visit_instance`.`visit_state` = #{query.visitState}</if> |
|||
<if test="query.visitorId != null and query.visitorId != ''"> and `baz_visit_instance`.`visitor_id` = #{query.visitorId}</if> |
|||
<if test="query.visitorCode != null and query.visitorCode != ''"> and `baz_visit_instance`.`visitor_code` = #{query.visitorCode}</if> |
|||
<if test="query.visitorName != null and query.visitorName != ''"> and `baz_visit_instance`.`visitor_name` = #{query.visitorName}</if> |
|||
<if test="query.targetId != null and query.targetId != ''"> and `baz_visit_instance`.`target_id` = #{query.targetId}</if> |
|||
<if test="query.targetCode != null and query.targetCode != ''"> and `baz_visit_instance`.`target_code` = #{query.targetCode}</if> |
|||
<if test="query.targetName != null and query.targetName != ''"> and `baz_visit_instance`.`target_name` = #{query.targetName}</if> |
|||
<if test="query.targetLocalX != null and query.targetLocalX != ''"> and `baz_visit_instance`.`target_local_x` = #{query.targetLocalX}</if> |
|||
<if test="query.targetLocalY != null and query.targetLocalY != ''"> and `baz_visit_instance`.`target_local_y` = #{query.targetLocalY}</if> |
|||
<if test="query.targetAddress != null and query.targetAddress != ''"> and `baz_visit_instance`.`target_address` = #{query.targetAddress}</if> |
|||
<if test="query.targetMapAddress != null and query.targetMapAddress != ''"> and `baz_visit_instance`.`target_map_address` = #{query.targetMapAddress}</if> |
|||
<if test="query.finishedTime != null"> and `baz_visit_instance`.`finished_time` = #{query.finishedTime}</if> |
|||
<if test="query.missLocalFlag != null"> and `baz_visit_instance`.`miss_local_flag` = #{query.missLocalFlag}</if> |
|||
<if test="query.remark != null and query.remark != ''"> and `baz_visit_instance`.`remark` = #{query.remark}</if> |
|||
<if test="query.positionStatus != null and query.positionStatus != ''"> and `baz_visit_instance`.`position_status` = #{query.positionStatus}</if> |
|||
<if test="query.createTime != null"> and `baz_visit_instance`.`create_time` = #{query.createTime}</if> |
|||
<if test="query.updateTime != null"> and `baz_visit_instance`.`update_time` = #{query.updateTime}</if> |
|||
<if test="query.tenantId != null and query.tenantId != ''"> and `baz_visit_instance`.`tenant_id` = #{query.tenantId}</if> |
|||
<if test="query.delFlag != null and query.delFlag != ''"> and `baz_visit_instance`.`del_flag` = #{query.delFlag}</if> |
|||
<if test="query.createBy != null and query.createBy != ''"> and `baz_visit_instance`.`create_by` = #{query.createBy}</if> |
|||
<if test="query.updateBy != null and query.updateBy != ''"> and `baz_visit_instance`.`update_by` = #{query.updateBy}</if> |
|||
<if test="query.queryUserIds!=null and query.queryUserIds.size > 0"> |
|||
and `baz_visit_instance`.`visitor_id` in |
|||
<foreach collection="query.queryUserIds" item ="selectId" index="i" open="(" close=")" separator=","> |
|||
#{selectId} |
|||
</foreach> |
|||
</if> |
|||
<if test="query.ignoreUserId != null and query.ignoreUserId != ''"> and `baz_visit_instance`.`visitor_id` != #{query.ignoreUserId}</if> |
|||
|
|||
<if test="query.queryStartDate != null"> and `baz_visit_instance`.`create_time` >= #{query.queryStartDate}</if> |
|||
<if test="query.queryEndDate != null"> and `baz_visit_instance`.`create_time` <= #{query.queryEndDate}</if> |
|||
</where> |
|||
order by `baz_visit_instance`.`create_time` desc |
|||
</select> |
|||
|
|||
</mapper> |
|||
Loading…
Reference in new issue