代码提交 用章
This commit is contained in:
123
parent
018c608f27
commit
10d13946fb
@ -70,12 +70,13 @@ public class PageQuery implements Serializable {
|
||||
if (CollUtil.isNotEmpty(orderItems)) {
|
||||
page.addOrder(orderItems);
|
||||
}
|
||||
page.setOptimizeCountSql(false);
|
||||
return page;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建排序
|
||||
*
|
||||
* <p>
|
||||
* 支持的用法如下:
|
||||
* {isAsc:"asc",orderByColumn:"id"} order by id asc
|
||||
* {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc
|
||||
|
||||
@ -32,7 +32,7 @@ public class LxMaterialSeal extends BaseEntity {
|
||||
/**
|
||||
* 印章类型
|
||||
*/
|
||||
private Long sealType;
|
||||
private Integer sealType;
|
||||
|
||||
/**
|
||||
* 公章名称
|
||||
@ -52,8 +52,8 @@ public class LxMaterialSeal extends BaseEntity {
|
||||
/**
|
||||
* 删除标志
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
@TableLogic("del_flag")
|
||||
private Integer delFlag;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -45,9 +45,15 @@ public class LxMaterialSealVo implements Serializable {
|
||||
/**
|
||||
* 印章管理员
|
||||
*/
|
||||
@ExcelProperty(value = "印章管理员")
|
||||
@ExcelProperty(value = "印章管理员id")
|
||||
private Long sealAdminId;
|
||||
|
||||
/**
|
||||
* 印章管理员姓名
|
||||
*/
|
||||
@ExcelProperty(value = "印章管理员姓名")
|
||||
private String sealAdminName;
|
||||
|
||||
/**
|
||||
* 启用状态
|
||||
*/
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
package org.dromara.lx.operate.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.lx.operate.domain.LxMaterialSeal;
|
||||
import org.dromara.lx.operate.domain.vo.LxMaterialSealVo;
|
||||
@ -12,4 +16,5 @@ import org.dromara.lx.operate.domain.vo.LxMaterialSealVo;
|
||||
*/
|
||||
public interface LxMaterialSealMapper extends BaseMapperPlus<LxMaterialSeal, LxMaterialSealVo> {
|
||||
|
||||
Page<LxMaterialSealVo> querySealVoPage(@Param("page") Page<LxMaterialSealVo> page, @Param(Constants.WRAPPER) Wrapper<LxMaterialSeal> queryWrapper);
|
||||
}
|
||||
|
||||
@ -52,8 +52,8 @@ public class LxMaterialSealServiceImpl implements ILxMaterialSealService {
|
||||
@Override
|
||||
public TableDataInfo<LxMaterialSealVo> queryPageList(LxMaterialSealBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<LxMaterialSeal> lqw = buildQueryWrapper(bo);
|
||||
Page<LxMaterialSealVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
Page<LxMaterialSealVo> page = baseMapper.querySealVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(page);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -89,6 +89,7 @@ public class LxMaterialSealServiceImpl implements ILxMaterialSealService {
|
||||
public Boolean insertByBo(LxMaterialSealBo bo) {
|
||||
LxMaterialSeal add = MapstructUtils.convert(bo, LxMaterialSeal.class);
|
||||
validEntityBeforeSave(add);
|
||||
add.setDelFlag(0);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setId(add.getId());
|
||||
|
||||
@ -1,7 +1,26 @@
|
||||
<?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="org.dromara.system.mapper.LxMaterialSealMapper">
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.lx.operate.mapper.LxMaterialSealMapper">
|
||||
|
||||
<select id="querySealVoPage" resultType="org.dromara.lx.operate.domain.vo.LxMaterialSealVo">
|
||||
select seal.id,
|
||||
seal.seal_type,
|
||||
seal.seal_name,
|
||||
seal.seal_admin_id,
|
||||
seal.seal_status,
|
||||
seal.create_time,
|
||||
seal.create_by,
|
||||
seal.update_time,
|
||||
seal.update_by,
|
||||
seal.del_flag,
|
||||
seal.create_dept,
|
||||
su.user_id,
|
||||
su.dept_id,
|
||||
su.employee_name as seal_admin_name
|
||||
from lx_material_seal seal
|
||||
left join sys_user su on seal.seal_admin_id = su.user_id
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@ -2,6 +2,6 @@
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.lx.mapper.LxTreeTableMapper">
|
||||
<mapper namespace="org.dromara.lx.operate.mapper.LxTreeTableMapper">
|
||||
|
||||
</mapper>
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
oa.take_out_end_date,
|
||||
oa.file_count,
|
||||
oa.initiator_type,
|
||||
m_seal.id,
|
||||
m_seal.seal_type,
|
||||
m_seal.seal_name
|
||||
from lx_oa_seal oa
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user