he2802 2 vuotta sitten
vanhempi
commit
cc2ff07eb6

+ 144 - 0
zhongzheng-common/src/main/java/com/zhongzheng/common/core/bo/SysRoleBo.java

@@ -0,0 +1,144 @@
+package com.zhongzheng.common.core.bo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.common.annotation.Excel.ColumnType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Value;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author zhongzheng
+ */
+@ApiModel("角色")
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class SysRoleBo implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 角色ID */
+    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    @TableId(value = "role_id",type = IdType.AUTO)
+    private Long roleId;
+
+    /** 角色名称 */
+    @ApiModelProperty(value ="角色名称")
+    @Excel(name = "角色名称")
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+    private String roleName;
+
+    /** 角色权限 */
+    @ApiModelProperty(value ="权限字符")
+    @Excel(name = "角色权限")
+    @NotBlank(message = "权限字符不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+    private String roleKey;
+
+    /** 角色排序 */
+    @ApiModelProperty(value ="角色排序")
+    @Excel(name = "角色排序")
+    @NotBlank(message = "显示顺序不能为空")
+    private String roleSort;
+
+    /** 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限) */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
+    private String dataScope;
+
+    @Value("true")
+    /** 菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示) */
+    private boolean menuCheckStrictly;
+
+    @Value("true")
+    /** 部门树选择项是否关联显示(0:父子不互相关联显示 1:父子互相关联显示 ) */
+    private boolean deptCheckStrictly;
+
+    /** 角色状态(0正常 1停用) */
+    @ApiModelProperty(value ="状态 1=正常,0=停用")
+    @Value("1")
+    @Excel(name = "角色状态", readConverterExp = "1=正常,0=停用")
+    private String status;
+
+    /** 删除标志(0代表存在 2代表删除) */
+    @TableLogic
+    private String delFlag;
+
+    /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty(value ="备注")
+    private String remark;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /** 用户是否存在此角色标识 默认不存在 */
+    @TableField(exist = false)
+    private boolean flag = false;
+
+    /** 菜单组 */
+    @ApiModelProperty(value ="菜单数组")
+    @TableField(exist = false)
+    private Long[] menuIds;
+
+    /** 部门组(数据权限) */
+    @TableField(exist = false)
+    private Long[] deptIds;
+
+    @TableField(exist = false)
+    private List<String> statusArray;
+    /** 业务层次ID */
+    @TableField(exist = false)
+    private List<Long> businessIds;
+
+    public SysRoleBo(Long roleId)
+    {
+        this.roleId = roleId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.roleId);
+    }
+
+    public static boolean isAdmin(Long roleId)
+    {
+        return roleId != null && 1L == roleId;
+    }
+
+}

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityPosterQueryBo.java

@@ -51,4 +51,7 @@ public class DistributionActivityPosterQueryBo extends BaseEntity {
 	@ApiModelProperty("分享码")
 	private String shareCode;
 
+	@ApiModelProperty("模板名称")
+	private String name;
+
 }

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityPosterServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -31,7 +32,6 @@ import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
 import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +44,9 @@ import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.net.URL;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -211,6 +210,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
         LambdaQueryWrapper<DistributionActivityPoster> lqw = Wrappers.lambdaQuery();
         lqw.eq(StrUtil.isNotBlank(bo.getUrl()), DistributionActivityPoster::getUrl, bo.getUrl());
         lqw.in(bo.getStatus() != null, DistributionActivityPoster::getStatus, bo.getStatus());
+        lqw.like(StringUtils.isNotBlank(bo.getName()),DistributionActivityPoster::getName,bo.getName());
         return entity2Vo(this.list(lqw));
     }
 

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionOrderVo.java

@@ -41,6 +41,9 @@ public class DistributionOrderVo implements Serializable {
     /** 下单人 */
     @ApiModelProperty("下单人")
     private String orderUserName;
+    /** 业务员名称 */
+    @ApiModelProperty("业务员名称")
+    private String sellerName;
     /** 手机号 */
     @ApiModelProperty("手机号")
     private String telphone;

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/vo/TenantOrderVo.java

@@ -40,6 +40,9 @@ public class TenantOrderVo implements Serializable {
     /** 下单人 */
     @ApiModelProperty("下单人")
     private String orderUserName;
+    /** 业务员名称 */
+    @ApiModelProperty("业务员名称")
+    private String sellerName;
     /** 手机号 */
     @ApiModelProperty("手机号")
     private String telphone;

+ 8 - 2
zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionActivityMapper.xml

@@ -118,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.goods_name,
             t.tenant_id,
             t.tenant_name,
+            ds.realname as sellerName,
             (SELECT SUM(cash) FROM distribution_rebate WHERE order_sn = og.order_sn GROUP BY order_sn) AS orderCash
         FROM
                 (SELECT DISTINCT(dre.order_goods_id) FROM distribution_rebate dre
@@ -126,6 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </if >
                     ) dr
                     LEFT JOIN order_goods og ON dr.order_goods_id = og.order_goods_id
+                    LEFT JOIN distribution_rebate dre ON og.order_goods_id = dre.order_goods_id
+                    LEFT JOIN distribution_seller ds ON dre.seller_id = ds.seller_id
                     LEFT JOIN `order` o ON og.order_sn = o.order_sn
                     LEFT JOIN `user` u ON o.user_id = u.user_id
                     LEFT JOIN distribution_activity d ON og.distribution_code = d.`code`
@@ -142,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND o.create_time <![CDATA[  <=  ]]> #{endTime}
         </if >
         <if test = "orderSn != null and orderSn != ''" >
-            AND og.`order` = #{orderSn}
+            AND og.order_sn = #{orderSn}
         </if >
         <if test = "userName != null and userName != ''" >
             AND u.realname like concat('%', #{userName}, '%')
@@ -245,6 +248,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.goods_name,
         t.tenant_id,
         t.tenant_name,
+        ds.realname as sellerName,
         (SELECT SUM(cash) FROM distribution_rebate WHERE order_sn = og.order_sn GROUP BY order_sn) AS orderCash
         FROM
         (SELECT DISTINCT(dre.order_goods_id) FROM distribution_rebate dre
@@ -253,6 +257,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if >
         ) dr
         LEFT JOIN order_goods og ON dr.order_goods_id = og.order_goods_id
+        LEFT JOIN distribution_rebate dre ON og.order_goods_id = dre.order_goods_id
+        LEFT JOIN distribution_seller ds ON dre.seller_id = ds.seller_id
         LEFT JOIN `order` o ON og.order_sn = o.order_sn
         LEFT JOIN `user` u ON o.user_id = u.user_id
         LEFT JOIN distribution_activity d ON og.distribution_code = d.`code`
@@ -266,7 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND o.create_time <![CDATA[  <=  ]]> #{endTime}
         </if >
         <if test = "orderSn != null and orderSn != ''" >
-            AND og.`order` = #{orderSn}
+            AND og.order_sn = #{orderSn}
         </if >
         <if test = "userName != null and userName != ''" >
             AND u.realname like concat('%', #{userName}, '%')