314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化bug

Browse Source
master
elliott 2 years ago
parent cbb5f8f0d5
commit 14cb516925
6 changed files with 73 additions and 11 deletions
Show Stats Download Patch File Download Diff File

41
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.flossom.common.core.domain.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.flossom.common.core.annotation.Excel;
import com.flossom.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@ -10,6 +11,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -26,16 +28,18 @@ public class SysTag extends BaseEntity
/** 父标签ID */
private Long parentId;
/** 父标签名称 */
@Excel(name = "一级标签名称")
private String parentName;
/** 祖级列表 */
private String ancestors;
/** 标签名称 */
@Excel(name = "标签名称")
@Excel(name = "二级标签名称")
private String tagName;
/** 显示顺序 */
@Excel(name = "排序顺序")
private Integer orderNum;
/** 负责人 */
@ -47,18 +51,25 @@ public class SysTag extends BaseEntity
/** 邮箱 */
private String email;
/** 标签状态:1小程序标签,2企微标签 */
@Excel(name = "标签类型")
private String type;
/** 标签状态:0正常,1停用 */
@Excel(name = "标签状态:0正常,1停用")
// @Excel(name = "标签状态:0正常,1停用")
private String status;
/** 标签状态:1小程序标签,2企微标签 */
private String type;
@Excel(name = "标签添加时间")
private String addTime;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 父标签名称 */
private String parentName;
@Excel(name = "标签人数")
private Integer tagUsers;
/** 子标签 */
private List<SysTag> children = new ArrayList<SysTag>();
@ -194,6 +205,22 @@ public class SysTag extends BaseEntity
this.type = type;
}
public String getAddTime() {
return addTime;
}
public void setAddTime(String addTime) {
this.addTime = addTime;
}
public Integer getTagUsers() {
return tagUsers;
}
public void setTagUsers(Integer tagUsers) {
this.tagUsers = tagUsers;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

6
flossom-common/flossom-common-core/src/main/resources/mapper/SysTagMapper.xml
Unescape Escape View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
<result property="tagName" column="tag_name" />
<result property="parentName" column="parent_name" />
<result property="orderNum" column="order_num" />
<result property="leader" column="leader" />
<result property="phone" column="phone" />
@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDeptVo">
select d.id, d.parent_id, d.ancestors, d.tag_name, d.order_num, d.leader, d.phone, d.email, d.status, d.type, d.del_flag, d.create_by, d.create_time
select d.id,d.parent_name, d.parent_id, d.ancestors, d.tag_name, d.order_num, d.leader, d.phone, d.email, d.status, d.type, d.del_flag, d.create_by, d.create_time
from sys_tag d
</sql>
@ -102,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into sys_tag(
<if test="id != null and id != 0">id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
<if test="parentName != null">parent_name,</if>
<if test="tagName != null and tagName != ''">tag_name,</if>
<if test="ancestors != null and ancestors != ''">ancestors,</if>
<if test="orderNum != null">order_num,</if>
@ -115,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)values(
<if test="id != null and id != 0">#{id},</if>
<if test="parentId != null and parentId != 0">#{parentId},</if>
<if test="parentName != null">#{parentName},</if>
<if test="tagName != null and tagName != ''">#{tagName},</if>
<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
<if test="orderNum != null">#{orderNum},</if>
@ -132,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_tag
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="parentName != null">parent_name = #{parentName},</if>
<if test="tagName != null and tagName != ''">tag_name = #{tagName},</if>
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>

30
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java
Unescape Escape View File

@ -5,6 +5,9 @@ import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.SysFiringInfo;
import com.flossom.common.core.domain.entity.SysDept;
import com.flossom.common.core.domain.entity.SysTag;
import com.flossom.common.core.domain.entity.WxUserTag;
import com.flossom.common.core.enums.TagTypeStatus;
import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.core.utils.poi.ExcelUtil;
import com.flossom.common.core.web.controller.BaseController;
@ -39,6 +42,8 @@ public class SysTagController extends BaseController {
private IWxUserTagService wxUserTagService;
@Autowired
private IWxScriptTagService wxScriptTagService;
@Autowired
private IWxUserTagService userTagService;
/**
* 获取标签列表
*/
@ -165,8 +170,31 @@ public class SysTagController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, SysTag tag)
{
String sheetName = "";
String s = DateUtils.dateTimeNow("yyyyMMddHHmmss");
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(tag.getType())) {
sheetName += "小程序标签数据"+ s ;
} else {
sheetName += "企微标签数据"+ s ;
}
List<SysTag> list = tagService.selectDeptList(tag);
for (SysTag sysTag: list) {
if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())) {
sysTag.setType("小程序标签");
} else {
sysTag.setType("企微标签");
}
if (0 == sysTag.getParentId()) {
sysTag.setParentName(sysTag.getTagName());
sysTag.setTagName("");
}
sysTag.setAddTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sysTag.getCreateTime()));
WxUserTag userTag = new WxUserTag();
userTag.setTagId(sysTag.getId());
List<WxUserTag> wxUserTags = userTagService.selectWxUserTagList(userTag);
sysTag.setTagUsers(wxUserTags.size());
}
ExcelUtil<SysTag> util = new ExcelUtil<SysTag>(SysTag.class);
util.exportExcel(response, list, "标签信息数据");
util.exportExcel(response, list, sheetName);
}
}

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysTagServiceImpl.java
Unescape Escape View File

@ -204,6 +204,8 @@ public class SysTagServiceImpl implements ISysTagService {
if (Objects.isNull(info)) {
tag.setAncestors("0");
tag.setParentId(0l);
} else {
tag.setParentName(info.getTagName());
}
return tagMapper.insertDept(tag);
@ -225,6 +227,7 @@ public class SysTagServiceImpl implements ISysTagService {
tag.setAncestors(newAncestors);
updateDeptChildren(tag.getId(), newAncestors, oldAncestors);
}
tag.setParentName(newParentDept.getTagName());
int result = tagMapper.updateDept(tag);
if (UserConstants.DEPT_NORMAL.equals(tag.getStatus()) && StringUtils.isNotEmpty(tag.getAncestors())
&& !StringUtils.equals("0", tag.getAncestors())) {

2
flossom-ui/src/views/system/companyTag/index.vue
Unescape Escape View File

@ -345,7 +345,7 @@ export default {
handleExport() {
this.download('system/tagInfo/export', {
...this.queryParams
}, `info_${new Date().getTime()}.xlsx`)
}, `企微标签数据_${new Date().getTime()}.xlsx`)
}
}
};

2
flossom-ui/src/views/system/wechatTag/index.vue
Unescape Escape View File

@ -339,7 +339,7 @@ export default {
handleExport() {
this.download('system/tagInfo/export', {
...this.queryParams
}, `info_${new Date().getTime()}.xlsx`)
}, `小程序标签数据_${new Date().getTime()}.xlsx`)
}
}
};

Write Preview
Loading…
Cancel
Save