20220512导入学院信息和后台导出表格

src/main/java/com/ccsens/delivery/api/CommonController.java

@@ -1,23 +1,43 @@
 package com.ccsens.delivery.api;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.delivery.annotation.MustLogin;
 import com.ccsens.delivery.bean.dto.CommonDto;
 import com.ccsens.delivery.bean.dto.HealthDto;
+import com.ccsens.delivery.bean.dto.StudentDto;
+import com.ccsens.delivery.bean.po.SysOrganization;
+import com.ccsens.delivery.bean.po.SysOrganizationExample;
 import com.ccsens.delivery.bean.vo.CommonVo;
 import com.ccsens.delivery.bean.vo.FileVo;
 import com.ccsens.delivery.bean.vo.HealthVo;
+import com.ccsens.delivery.bean.vo.StudentVo;
+import com.ccsens.delivery.persist.mapper.SysOrganizationMapper;
 import com.ccsens.delivery.service.ICommonService;
+import com.ccsens.util.ExcelUtil;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author 逗
@@ -30,6 +50,10 @@ public class CommonController {
 
     @Resource
     private ICommonService commonService;
+    @Resource
+    private SysOrganizationMapper sysOrganizationMapper;
+    @Resource
+    private Snowflake snowflake;
 
     @MustLogin
     @ApiOperation(value = "上传文件",notes = "文件大小不能超过20M")
@@ -79,14 +103,177 @@ public class CommonController {
         return JsonResponse.newInstance().ok(statistics);
     }
 
+    @ApiOperation(value = "/查询学院年级班级等信息", notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/query/organization", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<CommonVo.OrganizationInfo>> queryOrganization(@ApiParam @RequestBody @Validated QueryDto<CommonDto.QueryOrganization> params) throws Exception {
+        log.info("查询学院或宿舍，{}",params);
+        List<CommonVo.OrganizationInfo> organizationInfoList =  commonService.queryOrganization(params.getUserId(), params.getParam());
+        log.info("返回学院或宿舍信息");
+        return JsonResponse.newInstance().ok(organizationInfoList);
+    }
+
 
     @ApiOperation(value = "导入学院班级信息",notes = "")
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/import", method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<CommonVo.Statistics> statistics(MultipartFile params) throws Exception {
+    public JsonResponse<Object> statistics(Part file) throws Exception {
-        log.info("导入学院班级信息:{}",params);
+        //返回的异常信息
+        Map<String,String> map = new HashMap<>();
+        log.info("导入学院班级信息:{}",file);
+        InputStream inputStream = file.getInputStream();
+        XSSFWorkbook wb = new XSSFWorkbook(inputStream);
+        if(ObjectUtil.isNotNull(wb)){
+//            XSSFSheet sheet = wb.getSheet("教职工-所属部门");
+//            if(ObjectUtil.isNotNull(sheet)){
+//                for (int i = 0; i <= sheet.getLastRowNum(); i++) {
+//                    XSSFRow row = sheet.getRow(i);
+//                    if(ObjectUtil.isNotNull(row)){
+//                        XSSFCell cell = row.getCell(0);
+//                        if(ObjectUtil.isNotNull(cell)){
+//                            String cellValue = ExcelUtil.getCellValue(cell);
+//                            SysOrganization organization = new SysOrganization();
+//                            organization.setId(snowflake.nextId());
+//                            organization.setName(cellValue);
+//                            organization.setPower((byte) 2);
+//                            organization.setType((byte) 0);
+//                            sysOrganizationMapper.insertSelective(organization);
+//                        }
+//                    }
+//                }
+//            }
+//            XSSFSheet sheet2 = wb.getSheet("学生-所在学院");
+//            if(ObjectUtil.isNotNull(sheet2)){
+//                for (int i = 0; i <= sheet2.getLastRowNum(); i++) {
+//                    XSSFRow row = sheet2.getRow(i);
+//                    if(ObjectUtil.isNotNull(row)){
+//                        XSSFCell cell = row.getCell(1);
+//                        if(ObjectUtil.isNotNull(cell)){
+//                            String cellValue = ExcelUtil.getCellValue(cell);
+//
+//                            SysOrganizationExample organizationExample = new SysOrganizationExample();
+//                            organizationExample.createCriteria().andNameEqualTo(cellValue).andTypeEqualTo((byte) 0);
+//                            List<SysOrganization> sysOrganizations = sysOrganizationMapper.selectByExample(organizationExample);
+//                            if(CollectionUtil.isNotEmpty(sysOrganizations)){
+//                                SysOrganization organization = sysOrganizations.get(0);
+//                                if(organization.getPower() == 2){
+//                                    organization.setPower((byte) 0);
+//                                    sysOrganizationMapper.updateByPrimaryKeySelective(organization);
+//                                }
+//                            }else {
+//                                SysOrganization organization = new SysOrganization();
+//                                organization.setId(snowflake.nextId());
+//                                organization.setName(cellValue);
+//                                organization.setPower((byte) 1);
+//                                organization.setType((byte) 0);
+//                                sysOrganizationMapper.insertSelective(organization);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+
+//            XSSFSheet sheet3 = wb.getSheet("学生-专业班级");
+//            if(ObjectUtil.isNotNull(sheet3)){
+//                Long collegeId = null;
+//                Long gradeId = null;
+//                for (int i = 0; i <= sheet3.getLastRowNum(); i++) {
+//                    XSSFRow row = sheet3.getRow(i);
+//                    if(ObjectUtil.isNotNull(row)){
+//                        //学院
+//                        String cellValue1 = ExcelUtil.getCellValue(row.getCell(1));
+//                        //年级
+//                        String cellValue2 = ExcelUtil.getCellValue(row.getCell(2));
+//                        //班级
+//                        String cellValue3 = ExcelUtil.getCellValue(row.getCell(4));
+//
+//                        if(StrUtil.isNotEmpty(cellValue1)){
+//                            SysOrganizationExample organizationExample = new SysOrganizationExample();
+//                            organizationExample.createCriteria().andNameEqualTo(cellValue1).andTypeEqualTo((byte) 0);
+//                            List<SysOrganization> o1 = sysOrganizationMapper.selectByExample(organizationExample);
+//                            if(CollectionUtil.isNotEmpty(o1)){
+//                                collegeId = o1.get(0).getId();
+//                            }else {
+//                                map.put("第"+ i +"院校",cellValue1);
+//                            }
+//                        }
+//
+//                        if(StrUtil.isNotEmpty(cellValue2)){
+//                            if(ObjectUtil.isNull(collegeId)){
+//                                continue;
+//                            }
+//                            SysOrganizationExample organizationExample = new SysOrganizationExample();
+//                            organizationExample.createCriteria().andNameEqualTo(cellValue2)
+//                                    .andTypeEqualTo((byte)2).andPatentIdEqualTo(collegeId);
+//                            List<SysOrganization> o1 = sysOrganizationMapper.selectByExample(organizationExample);
+//                            if(CollectionUtil.isNotEmpty(o1)){
+//                                gradeId = o1.get(0).getId();
+//                            }else {
+//                                SysOrganization organization = new SysOrganization();
+//                                organization.setId(snowflake.nextId());
+//                                organization.setName(cellValue2);
+//                                organization.setPower((byte) 1);
+//                                organization.setType((byte) 2);
+//                                organization.setPatentId(collegeId);
+//                                sysOrganizationMapper.insertSelective(organization);
+//                                gradeId = organization.getId();
+//                            }
+//                        }
+//                        if(StrUtil.isNotEmpty(cellValue3)){
+//                            if(ObjectUtil.isNull(gradeId)){
+//                                continue;
+//                            }
+//                            SysOrganization organization = new SysOrganization();
+//                            organization.setId(snowflake.nextId());
+//                            organization.setName(cellValue3);
+//                            organization.setPatentId(gradeId);
+//                            organization.setPower((byte) 1);
+//                            organization.setType((byte) 3);
+//                            sysOrganizationMapper.insertSelective(organization);
+//                        }
+//                    }
+//                }
+//            }
+//            XSSFSheet sheet4 = wb.getSheet("学生-所在楼栋");
+//            if(ObjectUtil.isNotNull(sheet4)){
+//                for (int i = 0; i <= sheet4.getLastRowNum(); i++) {
+//                    XSSFRow row = sheet4.getRow(i);
+//                    if(ObjectUtil.isNotNull(row)){
+//                        XSSFCell cell = row.getCell(0);
+//                        if(ObjectUtil.isNotNull(cell)){
+//                            String cellValue = ExcelUtil.getCellValue(cell);
+//                            SysOrganization organization = new SysOrganization();
+//                            organization.setId(snowflake.nextId());
+//                            organization.setName(cellValue);
+//                            organization.setPower((byte) 1);
+//                            organization.setType((byte) 1);
+//                            sysOrganizationMapper.insertSelective(organization);
+//                        }
+//                    }
+//                }
+//            }
+//            XSSFSheet sheet5 = wb.getSheet("教职工-所在楼栋");
+//            if(ObjectUtil.isNotNull(sheet5)){
+//                for (int i = 0; i <= sheet5.getLastRowNum(); i++) {
+//                    XSSFRow row = sheet5.getRow(i);
+//                    if(ObjectUtil.isNotNull(row)){
+//                        XSSFCell cell = row.getCell(1);
+//                        if(ObjectUtil.isNotNull(cell)){
+//                            String cellValue = ExcelUtil.getCellValue(cell);
+//                            SysOrganization organization = new SysOrganization();
+//                            organization.setId(snowflake.nextId());
+//                            organization.setName(cellValue);
+//                            organization.setPower((byte) 2);
+//                            organization.setType((byte) 1);
+//                            sysOrganizationMapper.insertSelective(organization);
+//                        }
+//                    }
+//                }
+//            }
+        }
 
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(map);
     }
 }

src/main/java/com/ccsens/delivery/api/MaterialController.java

@@ -97,5 +97,17 @@ public class MaterialController {
         return JsonResponse.newInstance().ok();
     }
 
+    @MustLogin
+    @ApiOperation(value = "/导出物资表单", notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/export", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<String> exportExcel(@ApiParam @RequestBody @Validated QueryDto<MaterialDto.BackQueryMaterialOrder> params) throws Exception {
+        log.info("导出物资表单，{}",params);
+        String path = materialService.exportExcel(params.getUserId(), params.getParam());
+        log.info("导出物资表单成功：{}",path);
+        return JsonResponse.newInstance().ok(path);
+    }
+
 
 }

src/main/java/com/ccsens/delivery/api/TrailsController.java

@@ -2,6 +2,7 @@ package com.ccsens.delivery.api;
 
 import com.ccsens.delivery.annotation.MustLogin;
 import com.ccsens.delivery.bean.dto.HealthDto;
+import com.ccsens.delivery.bean.dto.MaterialDto;
 import com.ccsens.delivery.bean.dto.TrailsDto;
 import com.ccsens.delivery.bean.vo.FileVo;
 import com.ccsens.delivery.bean.vo.HealthVo;
@@ -57,4 +58,16 @@ public class TrailsController {
         return JsonResponse.newInstance().ok(backQueryTrailsVoPageInfo);
     }
 
+
+    @MustLogin
+    @ApiOperation(value = "/导出活动轨迹", notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/export", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<String> exportExcel(@ApiParam @RequestBody @Validated QueryDto<TrailsDto.BackQueryTrails> params) throws Exception {
+        log.info("导出活动轨迹，{}",params);
+        String path = trailsService.exportExcel(params.getUserId(), params.getParam());
+        log.info("导出活动轨迹成功：{}",path);
+        return JsonResponse.newInstance().ok(path);
+    }
 }

src/main/java/com/ccsens/delivery/bean/dto/CommonDto.java

@@ -53,5 +53,17 @@ public class CommonDto {
         private Long endTime;
     }
 
+    @Data
+    @ApiModel("请求-查询学院年级班级等信息")
+    public static class QueryOrganization{
+        @ApiModelProperty("名称 为空则查询全部")
+        private String name;
+        @ApiModelProperty("类型 0学生 1教职工 空则查询全部")
+        private Byte post;
+        @ApiModelProperty("类型 0学院/部门 1楼栋信息 2年级 3班级")
+        private byte type;
+        @ApiModelProperty("上级id")
+        private Long parentId;
+    }
 
 }

src/main/java/com/ccsens/delivery/bean/po/SysOrganization.java

@@ -0,0 +1,117 @@
+package com.ccsens.delivery.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SysOrganization implements Serializable {
+    private Long id;
+
+    private String name;
+
+    private Long parentId;
+
+    private Byte power;
+
+    private Byte type;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public Byte getPower() {
+        return power;
+    }
+
+    public void setPower(Byte power) {
+        this.power = power;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", name=").append(name);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", power=").append(power);
+        sb.append(", type=").append(type);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/delivery/bean/po/SysOrganizationExample.java

@@ -0,0 +1,751 @@
+package com.ccsens.delivery.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class SysOrganizationExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public SysOrganizationExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNull() {
+            addCriterion("parent_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNotNull() {
+            addCriterion("parent_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdEqualTo(Long value) {
+            addCriterion("parent_id =", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotEqualTo(Long value) {
+            addCriterion("parent_id <>", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThan(Long value) {
+            addCriterion("parent_id >", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("parent_id >=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThan(Long value) {
+            addCriterion("parent_id <", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThanOrEqualTo(Long value) {
+            addCriterion("parent_id <=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIn(List<Long> values) {
+            addCriterion("parent_id in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotIn(List<Long> values) {
+            addCriterion("parent_id not in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdBetween(Long value1, Long value2) {
+            addCriterion("parent_id between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotBetween(Long value1, Long value2) {
+            addCriterion("parent_id not between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIsNull() {
+            addCriterion("power is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIsNotNull() {
+            addCriterion("power is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerEqualTo(Byte value) {
+            addCriterion("power =", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotEqualTo(Byte value) {
+            addCriterion("power <>", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerGreaterThan(Byte value) {
+            addCriterion("power >", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerGreaterThanOrEqualTo(Byte value) {
+            addCriterion("power >=", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerLessThan(Byte value) {
+            addCriterion("power <", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerLessThanOrEqualTo(Byte value) {
+            addCriterion("power <=", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIn(List<Byte> values) {
+            addCriterion("power in", values, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotIn(List<Byte> values) {
+            addCriterion("power not in", values, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerBetween(Byte value1, Byte value2) {
+            addCriterion("power between", value1, value2, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotBetween(Byte value1, Byte value2) {
+            addCriterion("power not between", value1, value2, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/delivery/bean/po/SysUserPosition.java

@@ -0,0 +1,106 @@
+package com.ccsens.delivery.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SysUserPosition implements Serializable {
+    private Long id;
+
+    private Long userId;
+
+    private Byte position;
+
+    private Byte power;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Byte getPosition() {
+        return position;
+    }
+
+    public void setPosition(Byte position) {
+        this.position = position;
+    }
+
+    public Byte getPower() {
+        return power;
+    }
+
+    public void setPower(Byte power) {
+        this.power = power;
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", position=").append(position);
+        sb.append(", power=").append(power);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/delivery/bean/po/SysUserPositionExample.java

@@ -0,0 +1,681 @@
+package com.ccsens.delivery.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class SysUserPositionExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public SysUserPositionExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionIsNull() {
+            addCriterion("position is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionIsNotNull() {
+            addCriterion("position is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionEqualTo(Byte value) {
+            addCriterion("position =", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotEqualTo(Byte value) {
+            addCriterion("position <>", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionGreaterThan(Byte value) {
+            addCriterion("position >", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionGreaterThanOrEqualTo(Byte value) {
+            addCriterion("position >=", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionLessThan(Byte value) {
+            addCriterion("position <", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionLessThanOrEqualTo(Byte value) {
+            addCriterion("position <=", value, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionIn(List<Byte> values) {
+            addCriterion("position in", values, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotIn(List<Byte> values) {
+            addCriterion("position not in", values, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionBetween(Byte value1, Byte value2) {
+            addCriterion("position between", value1, value2, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositionNotBetween(Byte value1, Byte value2) {
+            addCriterion("position not between", value1, value2, "position");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIsNull() {
+            addCriterion("power is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIsNotNull() {
+            addCriterion("power is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerEqualTo(Byte value) {
+            addCriterion("power =", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotEqualTo(Byte value) {
+            addCriterion("power <>", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerGreaterThan(Byte value) {
+            addCriterion("power >", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerGreaterThanOrEqualTo(Byte value) {
+            addCriterion("power >=", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerLessThan(Byte value) {
+            addCriterion("power <", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerLessThanOrEqualTo(Byte value) {
+            addCriterion("power <=", value, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerIn(List<Byte> values) {
+            addCriterion("power in", values, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotIn(List<Byte> values) {
+            addCriterion("power not in", values, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerBetween(Byte value1, Byte value2) {
+            addCriterion("power between", value1, value2, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andPowerNotBetween(Byte value1, Byte value2) {
+            addCriterion("power not between", value1, value2, "power");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/delivery/bean/vo/CommonVo.java

@@ -80,4 +80,14 @@ public class CommonVo {
         private int notCompleteNum;
     }
 
+
+    @Data
+    @ApiModel("返回-学院年级班级等信息")
+    public static class OrganizationInfo{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("名称")
+        private String name;
+    }
+
 }

src/main/java/com/ccsens/delivery/bean/vo/MaterialVo.java

@@ -100,6 +100,26 @@ public class MaterialVo {
             }
             return s;
         }
+
+        public String getExcelStatus() {
+            String s = "";
+            switch (status){
+                case 0:
+                    s = "未配送";
+                    break;
+                case 1:
+                    s = "已完成";
+                    break;
+                case 2:
+                    s = "无货";
+                    break;
+                case 3:
+                    s = "撤回";
+                    break;
+                default:
+            }
+            return s;
+        }
     }
 
 

src/main/java/com/ccsens/delivery/bean/vo/StudentVo.java

@@ -94,6 +94,26 @@ public class StudentVo {
             }
             return s;
         }
+
+        public String getExcelStatus() {
+            String s = "";
+            switch (status){
+                case 0:
+                    s = "未配送";
+                    break;
+                case 1:
+                    s = "已完成";
+                    break;
+                case 2:
+                    s = "无货";
+                    break;
+                case 3:
+                    s = "撤回";
+                    break;
+                default:
+            }
+            return s;
+        }
     }
 
     @Data

src/main/java/com/ccsens/delivery/bean/vo/UserVo.java

@@ -134,7 +134,7 @@ public class UserVo {
         @ApiModelProperty("身份 0学生 1教师")
         private byte post;
         @ApiModelProperty("学生身份 0 本科生 1研究生 2留学生")
-        private byte studentType;
+        private String studentType;
         @ApiModelProperty("姓名")
         private String name;
         @ApiModelProperty("学号/工号")
@@ -159,6 +159,8 @@ public class UserVo {
         private String stuClassName;
         @ApiModelProperty("详细地址")
         private String address;
+        @ApiModelProperty("权限信息")
+        private UserPower userPower;
 
         public String getNumber() {
             String s = number;
@@ -193,4 +195,13 @@ public class UserVo {
             return s;
         }
     }
+
+    @Data
+    @ApiModel("用户权限信息")
+    public static class UserPower{
+        @ApiModelProperty("职位 0校长 1院长 2部长 3辅导员 4班长")
+        private byte position;
+        @ApiModelProperty("可查看的权限 0全部 1学生 2教职工")
+        private byte power;
+    }
 }

src/main/java/com/ccsens/delivery/persist/dao/FormRecordDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.delivery.persist.dao;
 
+import com.ccsens.delivery.bean.dto.CommonDto;
 import com.ccsens.delivery.bean.dto.HealthDto;
 import com.ccsens.delivery.bean.dto.MaterialDto;
 import com.ccsens.delivery.bean.vo.CommonVo;
@@ -83,4 +84,10 @@ public interface FormRecordDao {
      */
     List<HealthVo.HealthList> queryHealthImg(@Param("params")HealthDto.HealthByDay params);
 
+    /**
+     * 查找院校楼栋班级等信息
+     * @param param 筛选条件
+     * @return 返回信息
+     */
+    List<CommonVo.OrganizationInfo> queryOrganization(@Param("param") CommonDto.QueryOrganization param);
 }

src/main/java/com/ccsens/delivery/persist/mapper/SysOrganizationMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.delivery.persist.mapper;
+
+import com.ccsens.delivery.bean.po.SysOrganization;
+import com.ccsens.delivery.bean.po.SysOrganizationExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SysOrganizationMapper {
+    long countByExample(SysOrganizationExample example);
+
+    int deleteByExample(SysOrganizationExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SysOrganization record);
+
+    int insertSelective(SysOrganization record);
+
+    List<SysOrganization> selectByExample(SysOrganizationExample example);
+
+    SysOrganization selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") SysOrganization record, @Param("example") SysOrganizationExample example);
+
+    int updateByExample(@Param("record") SysOrganization record, @Param("example") SysOrganizationExample example);
+
+    int updateByPrimaryKeySelective(SysOrganization record);
+
+    int updateByPrimaryKey(SysOrganization record);
+}

src/main/java/com/ccsens/delivery/persist/mapper/SysUserPositionMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.delivery.persist.mapper;
+
+import com.ccsens.delivery.bean.po.SysUserPosition;
+import com.ccsens.delivery.bean.po.SysUserPositionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SysUserPositionMapper {
+    long countByExample(SysUserPositionExample example);
+
+    int deleteByExample(SysUserPositionExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SysUserPosition record);
+
+    int insertSelective(SysUserPosition record);
+
+    List<SysUserPosition> selectByExample(SysUserPositionExample example);
+
+    SysUserPosition selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") SysUserPosition record, @Param("example") SysUserPositionExample example);
+
+    int updateByExample(@Param("record") SysUserPosition record, @Param("example") SysUserPositionExample example);
+
+    int updateByPrimaryKeySelective(SysUserPosition record);
+
+    int updateByPrimaryKey(SysUserPosition record);
+}

src/main/java/com/ccsens/delivery/service/CommonService.java

@@ -169,4 +169,11 @@ public class CommonService implements ICommonService {
 
         return statistics;
     }
+
+
+    @Override
+    public List<CommonVo.OrganizationInfo> queryOrganization(Long userId, CommonDto.QueryOrganization param) {
+
+        return formRecordDao.queryOrganization(param);
+    }
 }

src/main/java/com/ccsens/delivery/service/ICommonService.java

@@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author 逗
@@ -45,4 +46,12 @@ public interface ICommonService {
      * @return 返回统计数据
      */
     CommonVo.Statistics statistics(CommonDto.Statistics param, Long userId);
+
+    /**
+     * 查询学院年级班级楼栋，等信息
+     * @param userId userId
+     * @param param 查询条件
+     * @return 返回信息
+     */
+    List<CommonVo.OrganizationInfo> queryOrganization(Long userId, CommonDto.QueryOrganization param);
 }

src/main/java/com/ccsens/delivery/service/IMaterialService.java

@@ -6,6 +6,8 @@ import com.ccsens.delivery.bean.dto.StudentDto;
 import com.ccsens.delivery.bean.vo.MaterialVo;
 import com.github.pagehelper.PageInfo;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -47,4 +49,12 @@ public interface IMaterialService {
      * @param param 订单id和状态
      */
     void updateOrderStatus(Long userId, StudentDto.UpdateOrderStatus param);
+
+    /**
+     * 导出物资excel表
+     * @param userId userId
+     * @param param 筛选条件
+     * @return 返回文件路径
+     */
+    String exportExcel(Long userId, MaterialDto.BackQueryMaterialOrder param) throws IOException;
 }

src/main/java/com/ccsens/delivery/service/ITrailsService.java

@@ -4,6 +4,8 @@ import com.ccsens.delivery.bean.dto.TrailsDto;
 import com.ccsens.delivery.bean.vo.TrailsVo;
 import com.github.pagehelper.PageInfo;
 
+import java.io.IOException;
+
 /**
  * @author 逗
  */
@@ -23,4 +25,12 @@ public interface ITrailsService {
      * @return 返回活动轨迹
      */
     PageInfo<TrailsVo.BackQueryTrailsVo> backQueryTrails(TrailsDto.BackQueryTrails param, Long userId);
+
+    /**
+     * 导出活动轨迹
+     * @param userId userId
+     * @param param 筛选条件
+     * @return 返回文件路径
+     */
+    String exportExcel(Long userId, TrailsDto.BackQueryTrails param) throws IOException;
 }

src/main/java/com/ccsens/delivery/service/MaterialService.java

@@ -1,6 +1,7 @@
 package com.ccsens.delivery.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.delivery.bean.dto.CommonDto;
@@ -16,16 +17,23 @@ import com.ccsens.delivery.persist.mapper.RecordMaterialDetailMapper;
 import com.ccsens.delivery.persist.mapper.RecordMaterialMapper;
 import com.ccsens.delivery.util.DeliveryCodeError;
 import com.ccsens.delivery.util.DeliveryConstant;
+import com.ccsens.util.PoiUtil;
+import com.ccsens.util.PropUtil;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 /**
  * @author 逗
@@ -130,4 +138,117 @@ public class MaterialService implements IMaterialService {
             formRecordDao.updateMaterialStatusById(param.getOrderIdList(),param.getStatus());
         }
     }
+
+    @Override
+    public String exportExcel(Long userId, MaterialDto.BackQueryMaterialOrder param) throws IOException {
+        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+        //查找数据
+        param.setPageSize(0);
+        PageInfo<MaterialVo.MaterialOrder> materialOrder = backQueryMaterialOrder(userId, param);
+        if(ObjectUtil.isNotNull(materialOrder)){
+            if(CollectionUtil.isNotEmpty(materialOrder.getList())){
+                //生成excel数据
+                generateCellList(materialOrder.getList(),list);
+            }
+        }
+
+        XSSFWorkbook wb = new XSSFWorkbook();
+        PoiUtil.exportWB("学员物资需求表", list, wb);
+        log.info("学员物资需求表");
+        //生成文件
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String fileName = "exportExcel/" + DateUtil.today() + "/山西大学在校学生物资需求登记表_" + sdf.format(new Date()) + ".xlsx";
+        String path = PropUtil.path + fileName;
+        File tmpFile = new File(path);
+        if (!tmpFile.getParentFile().exists()) {
+            tmpFile.getParentFile().mkdirs();
+        }
+        log.info("生成流");
+        OutputStream stream = new FileOutputStream(tmpFile);
+        log.info("写入wbs");
+        wb.write(stream);
+        stream.close();
+        wb.close();
+        return PropUtil.imgDomain + "/" + fileName;
+
+    }
+
+    private void generateCellList(List<MaterialVo.MaterialOrder> materialOrderList,List<List<PoiUtil.PoiUtilCell>> list) {
+        //表头
+        List<PoiUtil.PoiUtilCell> title = new ArrayList<>();
+        title.add(new PoiUtil.PoiUtilCell("序号"));
+        title.add(new PoiUtil.PoiUtilCell("姓名"));
+        title.add(new PoiUtil.PoiUtilCell("物资名称"));
+        title.add(new PoiUtil.PoiUtilCell("数量"));
+        title.add(new PoiUtil.PoiUtilCell("备注"));
+        title.add(new PoiUtil.PoiUtilCell("希望配送时间"));
+        title.add(new PoiUtil.PoiUtilCell("学院"));
+        title.add(new PoiUtil.PoiUtilCell("年级"));
+        title.add(new PoiUtil.PoiUtilCell("班级"));
+        title.add(new PoiUtil.PoiUtilCell("学号"));
+        title.add(new PoiUtil.PoiUtilCell("提交日期"));
+        title.add(new PoiUtil.PoiUtilCell("所在楼栋"));
+        title.add(new PoiUtil.PoiUtilCell("详细地址"));
+        title.add(new PoiUtil.PoiUtilCell("联系电话"));
+        title.add(new PoiUtil.PoiUtilCell("需求状态"));
+        list.add(title);
+        //内容
+        int sequence = 1;
+        //时间格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        for (MaterialVo.MaterialOrder materialOrder : materialOrderList) {
+            if (CollectionUtil.isNotEmpty(materialOrder.getMaterialList())) {
+                int size = materialOrder.getMaterialList().size();
+                for (int i = 0; i < size; i++) {
+
+                    MaterialVo.MaterialOrderDetail materialOrderDetail = materialOrder.getMaterialList().get(i);
+                    List<PoiUtil.PoiUtilCell> details = new ArrayList<>();
+                    if(i == 0){
+                        details.add(new PoiUtil.PoiUtilCell(sequence + "",1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getName(),1,size));
+                    }else {
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                    }
+                    details.add(new PoiUtil.PoiUtilCell(materialOrderDetail.getName()));
+                    details.add(new PoiUtil.PoiUtilCell(materialOrderDetail.getNum() + ""));
+                    if(i == 0){
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getRemark(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getPlanTime() == null || materialOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(materialOrder.getPlanTime())),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getCollegeName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getGrade(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getStuClassName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell("'" + materialOrder.getNumber(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getSubmitTime() == null || materialOrder.getSubmitTime() == 0 ? "" : sdf.format(new Date(materialOrder.getSubmitTime())),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getDormitoryName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getAddress(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell("'" + materialOrder.getPhone(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(materialOrder.getExcelStatus(),1,size));
+                    }
+                    list.add(details);
+                }
+            } else {
+                //如果是空直接加一行
+                List<PoiUtil.PoiUtilCell> details = new ArrayList<>();
+                details.add(new PoiUtil.PoiUtilCell(sequence + ""));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getName()));
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getRemark()));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getPlanTime() == null || materialOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(materialOrder.getPlanTime()))));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getCollegeName()));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getGrade()));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getStuClassName()));
+                details.add(new PoiUtil.PoiUtilCell("'" + materialOrder.getNumber()));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getSubmitTime() == null || materialOrder.getSubmitTime() == 0 ? "" : sdf.format(new Date(materialOrder.getSubmitTime()))));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getDormitoryName()));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getAddress()));
+                details.add(new PoiUtil.PoiUtilCell("'" + materialOrder.getPhone()));
+                details.add(new PoiUtil.PoiUtilCell(materialOrder.getExcelStatus()));
+                list.add(details);
+            }
+            sequence++;
+        }
+        
+    }
 }

src/main/java/com/ccsens/delivery/service/StudentService.java

@@ -190,15 +190,25 @@ public class StudentService implements IStudentService {
     @Override
     public String exportExcel(Long userId, StudentDto.BackQueryOrder param) throws Exception {
         //查找数据
-        List<StudentVo.StudentOrder> studentOrderList = studentDao.queryExportOrder(param);
+//        List<StudentVo.StudentOrder> studentOrderList = studentDao.queryExportOrder(param);
+        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+        param.setPageSize(0);
+        PageInfo<StudentVo.StudentOrder> studentOrderPageInfo = backQueryStuOrder(userId, param);
+
+        if(ObjectUtil.isNotNull(studentOrderPageInfo)){
+            if(CollectionUtil.isNotEmpty(studentOrderPageInfo.getList())){
+                //生成excel数据
+                generateCellList(studentOrderPageInfo.getList(),list);
+            }
+        }
+
         //生成导入的数据
-        List<List<PoiUtil.PoiUtilCell>> list = generateCellList(studentOrderList);
         XSSFWorkbook wb = new XSSFWorkbook();
         PoiUtil.exportWB("学员药品订单表", list, wb);
         log.info("学员药品订单表");
         //生成文件
-        //山西大学在校学生急需药品登记表_20220409090411
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-        String fileName = "exportExcel/" + DateUtil.today() + "/山西大学在校学生急需药品登记表_" + System.currentTimeMillis() + ".xlsx";
+        String fileName = "exportExcel/" + DateUtil.today() + "/山西大学在校学生急需药品登记表_" + sdf.format(new Date()) + ".xlsx";
         String path = PropUtil.path + fileName;
         File tmpFile = new File(path);
         if (!tmpFile.getParentFile().exists()) {
@@ -218,103 +228,199 @@ public class StudentService implements IStudentService {
      * @param studentOrderList 查询的订单信息
      * @return 返回导入表和
      */
-    private List<List<PoiUtil.PoiUtilCell>> generateCellList(List<StudentVo.StudentOrder> studentOrderList) {
+    private List<List<PoiUtil.PoiUtilCell>> generateCellList(List<StudentVo.StudentOrder> studentOrderList,List<List<PoiUtil.PoiUtilCell>> list) {
-        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         //添加表头
         List<PoiUtil.PoiUtilCell> header = new ArrayList<>();
         header.add(new PoiUtil.PoiUtilCell("序号"));
         header.add(new PoiUtil.PoiUtilCell("姓名"));
         header.add(new PoiUtil.PoiUtilCell("学号"));
         header.add(new PoiUtil.PoiUtilCell("手机号"));
-//        header.add(new PoiUtil.PoiUtilCell("身份证号"));
+        header.add(new PoiUtil.PoiUtilCell("学院"));
-        header.add(new PoiUtil.PoiUtilCell("所在学院名"));
+        header.add(new PoiUtil.PoiUtilCell("年级"));
-        header.add(new PoiUtil.PoiUtilCell("所在宿舍名"));
+        header.add(new PoiUtil.PoiUtilCell("班级"));
+        header.add(new PoiUtil.PoiUtilCell("所在宿舍"));
         header.add(new PoiUtil.PoiUtilCell("详细地址"));
-//        header.add(new PoiUtil.PoiUtilCell("症状描述"));
+        header.add(new PoiUtil.PoiUtilCell("症状描述"));
-//        header.add(new PoiUtil.PoiUtilCell("是否断药"));
-//        header.add(new PoiUtil.PoiUtilCell("备注"));
-//        header.add(new PoiUtil.PoiUtilCell("希望配送时间"));
-//        header.add(new PoiUtil.PoiUtilCell("配送状态"));
-//        header.add(new PoiUtil.PoiUtilCell("实际配送时间"));
         header.add(new PoiUtil.PoiUtilCell("药品名称"));
-        header.add(new PoiUtil.PoiUtilCell("药品规格"));
         header.add(new PoiUtil.PoiUtilCell("数量"));
-//        header.add(new PoiUtil.PoiUtilCell("订单提交时间"));
+        header.add(new PoiUtil.PoiUtilCell("药品规格"));
+        header.add(new PoiUtil.PoiUtilCell("是否断药"));
+        header.add(new PoiUtil.PoiUtilCell("希望配送时间"));
+        header.add(new PoiUtil.PoiUtilCell("备注"));
+        header.add(new PoiUtil.PoiUtilCell("需求状态"));
         list.add(header);
-        //时间格式
+
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         //序号
-        int sort = 1;
+        int sequence = 1;
-        if(CollectionUtil.isNotEmpty(studentOrderList)){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         for (StudentVo.StudentOrder studentOrder : studentOrderList) {
             if (CollectionUtil.isNotEmpty(studentOrder.getOrderItemList())) {
                 int size = studentOrder.getOrderItemList().size();
                 for (int j = 0; j < size; j++) {
-                        List<PoiUtil.PoiUtilCell> order = new ArrayList<>();
                     StudentVo.StudentOrderItem studentOrderItem = studentOrder.getOrderItemList().get(j);
+                    List<PoiUtil.PoiUtilCell> details = new ArrayList<>();
                     if (j == 0) {
-                            order.add(new PoiUtil.PoiUtilCell((sort++) + "", 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(sequence + "", 1, size));
-                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getName(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getName(), 1, size));
-                            order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber(), 1, size));
-                            order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone(), 1, size));
-//                            order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getIdCard(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName(), 1, size));
-                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getGrade(), 1, size));
-                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getStuClassName(), 1, size));
-                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName(), 1, size));
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getSymptom(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress(), 1, size));
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getBroken() == 0 ? "否" : "是", 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getSymptom(), 1, size));
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getRemark(), 1, size));
+                    } else {
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getPlanTime() == null || studentOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(studentOrder.getPlanTime())), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell());
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getStatus() == 0 ? "未配送" : (studentOrder.getStatus() == 1 ? "已送达" : "无药 "), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell());
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getRealTime() == null || studentOrder.getRealTime() == 0 ? "" : sdf.format(new Date(studentOrder.getRealTime())), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                    }
+                    details.add(new PoiUtil.PoiUtilCell(studentOrderItem.getName()));
+                    details.add(new PoiUtil.PoiUtilCell(studentOrderItem.getNum() + ""));
+                    details.add(new PoiUtil.PoiUtilCell(studentOrderItem.getSpecification()));
+                    if (j == 0) {
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getBroken() == 0 ? "否" : "是", 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getPlanTime() == null || studentOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(studentOrder.getPlanTime())), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getRemark(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getExcelStatus(), 1, size));
+                    }else {
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                    }
+                    list.add(details);
+                }
             } else {
-                            order.add(new PoiUtil.PoiUtilCell());
+                //如果没有药品信息，直接添加一行学生信息
-                            order.add(new PoiUtil.PoiUtilCell());
+                List<PoiUtil.PoiUtilCell> details = new ArrayList<>();
-                            order.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell(sequence + ""));
-                            order.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getName()));
+                details.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber()));
+                details.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getGrade()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getStuClassName()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getSymptom()));
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getBroken() == 0 ? "否" : "是"));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getPlanTime() == null || studentOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(studentOrder.getPlanTime()))));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getRemark()));
+                details.add(new PoiUtil.PoiUtilCell(studentOrder.getExcelStatus()));
+                list.add(details);
+            }
+            sequence++;
+        }
+        return list;
+    }
+//    private List<List<PoiUtil.PoiUtilCell>> generateCellList(List<StudentVo.StudentOrder> studentOrderList) {
+//        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+//        //添加表头
+//        List<PoiUtil.PoiUtilCell> header = new ArrayList<>();
+//        header.add(new PoiUtil.PoiUtilCell("序号"));
+//        header.add(new PoiUtil.PoiUtilCell("姓名"));
+//        header.add(new PoiUtil.PoiUtilCell("学号"));
+//        header.add(new PoiUtil.PoiUtilCell("手机号"));
+////        header.add(new PoiUtil.PoiUtilCell("身份证号"));
+//        header.add(new PoiUtil.PoiUtilCell("所在学院名"));
+//        header.add(new PoiUtil.PoiUtilCell("所在宿舍名"));
+//        header.add(new PoiUtil.PoiUtilCell("详细地址"));
+////        header.add(new PoiUtil.PoiUtilCell("症状描述"));
+////        header.add(new PoiUtil.PoiUtilCell("是否断药"));
+////        header.add(new PoiUtil.PoiUtilCell("备注"));
+////        header.add(new PoiUtil.PoiUtilCell("希望配送时间"));
+////        header.add(new PoiUtil.PoiUtilCell("配送状态"));
+////        header.add(new PoiUtil.PoiUtilCell("实际配送时间"));
+//        header.add(new PoiUtil.PoiUtilCell("药品名称"));
+//        header.add(new PoiUtil.PoiUtilCell("药品规格"));
+//        header.add(new PoiUtil.PoiUtilCell("数量"));
+////        header.add(new PoiUtil.PoiUtilCell("订单提交时间"));
+//        list.add(header);
+//        //时间格式
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+//        //序号
+//        int sort = 1;
+//        if(CollectionUtil.isNotEmpty(studentOrderList)){
+//            for (StudentVo.StudentOrder studentOrder : studentOrderList) {
+//                if (CollectionUtil.isNotEmpty(studentOrder.getOrderItemList())) {
+//                    int size = studentOrder.getOrderItemList().size();
+//                    for (int j = 0; j < size; j++) {
+//                        List<PoiUtil.PoiUtilCell> order = new ArrayList<>();
+//                        StudentVo.StudentOrderItem studentOrderItem = studentOrder.getOrderItemList().get(j);
+//                        if (j == 0) {
+//                            order.add(new PoiUtil.PoiUtilCell((sort++) + "", 1, size));
+//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getName(), 1, size));
+//                            order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber(), 1, size));
+//                            order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone(), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getIdCard(), 1, size));
+//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName(), 1, size));
+//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName(), 1, size));
+//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress(), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getSymptom(), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getBroken() == 0 ? "否" : "是", 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getRemark(), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getPlanTime() == null || studentOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(studentOrder.getPlanTime())), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getStatus() == 0 ? "未配送" : (studentOrder.getStatus() == 1 ? "已送达" : "无药 "), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getRealTime() == null || studentOrder.getRealTime() == 0 ? "" : sdf.format(new Date(studentOrder.getRealTime())), 1, size));
+//                        } else {
 //                            order.add(new PoiUtil.PoiUtilCell());
-                            order.add(new PoiUtil.PoiUtilCell());
-                            order.add(new PoiUtil.PoiUtilCell());
-                            order.add(new PoiUtil.PoiUtilCell());
 //                            order.add(new PoiUtil.PoiUtilCell());
 //                            order.add(new PoiUtil.PoiUtilCell());
 //                            order.add(new PoiUtil.PoiUtilCell());
+////                            order.add(new PoiUtil.PoiUtilCell());
 //                            order.add(new PoiUtil.PoiUtilCell());
 //                            order.add(new PoiUtil.PoiUtilCell());
 //                            order.add(new PoiUtil.PoiUtilCell());
-                        }
+////                            order.add(new PoiUtil.PoiUtilCell());
-                        order.add(new PoiUtil.PoiUtilCell(studentOrderItem.getName()));
+////                            order.add(new PoiUtil.PoiUtilCell());
-                        order.add(new PoiUtil.PoiUtilCell(studentOrderItem.getSpecification()));
+////                            order.add(new PoiUtil.PoiUtilCell());
-                        order.add(new PoiUtil.PoiUtilCell(studentOrderItem.getNum() + ""));
+////                            order.add(new PoiUtil.PoiUtilCell());
-//                        if (j == 0) {
+////                            order.add(new PoiUtil.PoiUtilCell());
-//                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getSubmitTime() == null || studentOrder.getSubmitTime() == 0 ? "" : sdf.format(new Date(studentOrder.getSubmitTime())), 1, size));
+////                            order.add(new PoiUtil.PoiUtilCell());
+//                        }
+//                        order.add(new PoiUtil.PoiUtilCell(studentOrderItem.getName()));
+//                        order.add(new PoiUtil.PoiUtilCell(studentOrderItem.getSpecification()));
+//                        order.add(new PoiUtil.PoiUtilCell(studentOrderItem.getNum() + ""));
+////                        if (j == 0) {
+////                            order.add(new PoiUtil.PoiUtilCell(studentOrder.getSubmitTime() == null || studentOrder.getSubmitTime() == 0 ? "" : sdf.format(new Date(studentOrder.getSubmitTime())), 1, size));
+////                        }else {
+////                            order.add(new PoiUtil.PoiUtilCell());
+////                        }
+//                        list.add(order);
+//                    }
 //                } else {
-//                            order.add(new PoiUtil.PoiUtilCell());
+//                    //如果没有药品信息，直接添加一行学生信息
+//                    List<PoiUtil.PoiUtilCell> order = new ArrayList<>();
+//                    order.add(new PoiUtil.PoiUtilCell((sort++) + ""));
+//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getName()));
+//                    order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber()));
+//                    order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone()));
+////                    order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getIdCard()));
+//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName()));
+//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName()));
+//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress()));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getSymptom()));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getBroken() == 0 ? "否" : "是"));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getRemark()));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getPlanTime() == null || studentOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(studentOrder.getPlanTime()))));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getStatus() == 0 ? "未配送" : (studentOrder.getStatus() == 1 ? "已送达" : "无药 ")));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getRealTime() == null || studentOrder.getRealTime() == 0 ? "" : sdf.format(new Date(studentOrder.getRealTime()))));
+////                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getSubmitTime() == null || studentOrder.getSubmitTime() == 0 ? "" : sdf.format(new Date(studentOrder.getSubmitTime()))));
+//                    list.add(order);
+//                }
+//            }
+//        }
+//        return list;
 //    }
-                        list.add(order);
-                    }
-                } else {
-                    //如果没有药品信息，直接添加一行学生信息
-                    List<PoiUtil.PoiUtilCell> order = new ArrayList<>();
-                    order.add(new PoiUtil.PoiUtilCell((sort++) + ""));
-                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getName()));
-                    order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber()));
-                    order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone()));
-//                    order.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getIdCard()));
-                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName()));
-                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName()));
-                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress()));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getSymptom()));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getBroken() == 0 ? "否" : "是"));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getRemark()));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getPlanTime() == null || studentOrder.getPlanTime() == 0 ? "" : sdf.format(new Date(studentOrder.getPlanTime()))));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getStatus() == 0 ? "未配送" : (studentOrder.getStatus() == 1 ? "已送达" : "无药 ")));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getRealTime() == null || studentOrder.getRealTime() == 0 ? "" : sdf.format(new Date(studentOrder.getRealTime()))));
-//                    order.add(new PoiUtil.PoiUtilCell(studentOrder.getSubmitTime() == null || studentOrder.getSubmitTime() == 0 ? "" : sdf.format(new Date(studentOrder.getSubmitTime()))));
-                    list.add(order);
-                }
-            }
-        }
-        return list;
-    }
 }

src/main/java/com/ccsens/delivery/service/TrailsService.java

@@ -1,12 +1,14 @@
 package com.ccsens.delivery.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.delivery.bean.dto.TrailsDto;
 import com.ccsens.delivery.bean.po.RecordHealth;
 import com.ccsens.delivery.bean.po.RecordTrails;
 import com.ccsens.delivery.bean.po.RecordTrailsDetail;
+import com.ccsens.delivery.bean.vo.MaterialVo;
 import com.ccsens.delivery.bean.vo.TrailsVo;
 import com.ccsens.delivery.persist.dao.RecordTrailsDao;
 import com.ccsens.delivery.persist.mapper.RecordHealthMapper;
@@ -14,16 +16,26 @@ import com.ccsens.delivery.persist.mapper.RecordTrailsDetailMapper;
 import com.ccsens.delivery.persist.mapper.RecordTrailsMapper;
 import com.ccsens.delivery.util.DeliveryCodeError;
 import com.ccsens.delivery.util.DeliveryConstant;
+import com.ccsens.util.PoiUtil;
+import com.ccsens.util.PropUtil;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -103,4 +115,127 @@ public class TrailsService implements ITrailsService {
         }
         return new PageInfo<>(backQueryTrailsVos);
     }
+
+    @Override
+    public String exportExcel(Long userId, TrailsDto.BackQueryTrails param) throws IOException {
+        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+        param.setPageSize(0);
+        //查找数据
+        PageInfo<TrailsVo.BackQueryTrailsVo> trailsVoPageInfo = backQueryTrails(param,userId);
+        if(ObjectUtil.isNotNull(trailsVoPageInfo)){
+            if(CollectionUtil.isNotEmpty(trailsVoPageInfo.getList())){
+                //生成excel数据
+                generateCellList(trailsVoPageInfo.getList(),list);
+            }
+        }
+
+        XSSFWorkbook wb = new XSSFWorkbook();
+        PoiUtil.exportWB("活动轨迹表", list, wb);
+        log.info("活动轨迹表");
+        //生成文件
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String fileName = "exportExcel/" + DateUtil.today() + "/山西大学人员活动轨迹表登记表_" + sdf.format(new Date()) + ".xlsx";
+        String path = PropUtil.path + fileName;
+        File tmpFile = new File(path);
+        if (!tmpFile.getParentFile().exists()) {
+            tmpFile.getParentFile().mkdirs();
+        }
+        log.info("生成流");
+        OutputStream stream = new FileOutputStream(tmpFile);
+        log.info("写入wbs");
+        wb.write(stream);
+        stream.close();
+        wb.close();
+        return PropUtil.imgDomain + "/" + fileName;
+    }
+
+    private void generateCellList(List<TrailsVo.BackQueryTrailsVo> trailsVoList, List<List<PoiUtil.PoiUtilCell>> list) {
+        List<PoiUtil.PoiUtilCell> title = new ArrayList<>();
+        title.add(new PoiUtil.PoiUtilCell("序号"));
+        title.add(new PoiUtil.PoiUtilCell("姓名"));
+        title.add(new PoiUtil.PoiUtilCell("学号"));
+        title.add(new PoiUtil.PoiUtilCell("学院"));
+        title.add(new PoiUtil.PoiUtilCell("年级"));
+        title.add(new PoiUtil.PoiUtilCell("班级"));
+        title.add(new PoiUtil.PoiUtilCell("所在楼栋"));
+        title.add(new PoiUtil.PoiUtilCell("详细地址"));
+        title.add(new PoiUtil.PoiUtilCell("联系电话"));
+        title.add(new PoiUtil.PoiUtilCell("日期"));
+        title.add(new PoiUtil.PoiUtilCell("时间段"));
+        title.add(new PoiUtil.PoiUtilCell("活动轨迹"));
+        title.add(new PoiUtil.PoiUtilCell("交通工具"));
+        title.add(new PoiUtil.PoiUtilCell("交通工具备注"));
+        title.add(new PoiUtil.PoiUtilCell("防护手段"));
+        title.add(new PoiUtil.PoiUtilCell("防护手段备注"));
+        title.add(new PoiUtil.PoiUtilCell("提交状态"));
+        list.add(title);
+
+        int sequence = 1;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        for (TrailsVo.BackQueryTrailsVo trailsVo : trailsVoList) {
+            if(CollectionUtil.isNotEmpty(trailsVo.getTrailsDetailVoList())){
+                int size = trailsVo.getTrailsDetailVoList().size();
+                for (int i = 0; i < size; i++) {
+                    TrailsVo.TrailsDetailVo trailsDetailVo = trailsVo.getTrailsDetailVoList().get(i);
+                    List<PoiUtil.PoiUtilCell> details = new ArrayList<>();
+                    if(i == 0){
+                        details.add(new PoiUtil.PoiUtilCell(sequence + "",1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell("'" + trailsVo.getNumber(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getCollegeName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getGrade(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getStuClassName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getDormitoryName(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getAddress(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell("'" + trailsVo.getPhone(),1,size));
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getTrailsDate() == null ? "" : sdf.format(trailsVo.getTrailsDate()),1,size));
+                    }else {
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                        details.add(new PoiUtil.PoiUtilCell());
+                    }
+                    details.add(new PoiUtil.PoiUtilCell(trailsDetailVo.getTime()));
+                    details.add(new PoiUtil.PoiUtilCell(trailsDetailVo.getTrailsDetail()));
+                    details.add(new PoiUtil.PoiUtilCell(trailsDetailVo.getVehicle()));
+                    details.add(new PoiUtil.PoiUtilCell(trailsDetailVo.getVehicleRemark()));
+                    details.add(new PoiUtil.PoiUtilCell(trailsDetailVo.getMask()));
+                    details.add(new PoiUtil.PoiUtilCell(trailsDetailVo.getOtherMask()));
+                    if(i == 0){
+                        details.add(new PoiUtil.PoiUtilCell(trailsVo.getStatus() == 0 ? "未上报" : "已上报",1,size));
+                    }else {
+                        details.add(new PoiUtil.PoiUtilCell());
+                    }
+                    list.add(details);
+                }
+            }else {
+                List<PoiUtil.PoiUtilCell> details = new ArrayList<>();
+                details.add(new PoiUtil.PoiUtilCell(sequence + ""));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getName()));
+                details.add(new PoiUtil.PoiUtilCell("'" + trailsVo.getNumber()));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getCollegeName()));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getGrade()));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getStuClassName()));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getDormitoryName()));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getAddress()));
+                details.add(new PoiUtil.PoiUtilCell("'" + trailsVo.getPhone()));
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getTrailsDate() == null ? "" : sdf.format(trailsVo.getTrailsDate())));
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell());
+                details.add(new PoiUtil.PoiUtilCell(trailsVo.getStatus() == 0 ? "未上报" : "已上报"));
+                list.add(details);
+            }
+        }
+
+    }
 }

src/main/java/com/ccsens/delivery/service/UserService.java

@@ -13,6 +13,7 @@ import com.ccsens.delivery.bean.vo.UserVo;
 import com.ccsens.delivery.persist.dao.SysAuthDao;
 import com.ccsens.delivery.persist.dao.SysUserDao;
 import com.ccsens.delivery.persist.mapper.SysUserInfoMapper;
+import com.ccsens.delivery.persist.mapper.SysUserPositionMapper;
 import com.ccsens.delivery.util.DeliveryCodeError;
 import com.ccsens.delivery.util.DeliveryConstant;
 import com.ccsens.util.*;
@@ -49,6 +50,8 @@ public class UserService implements IUserService {
     private Snowflake snowflake;
     @Resource
     private SysUserInfoMapper sysUserInfoMapper;
+    @Resource
+    private SysUserPositionMapper userPositionMapper;
 
     @Override
     public UserVo.TokenBean userSignin(UserDto.SigninDto params, String deviceId, String clientIp) throws Exception {
@@ -734,8 +737,18 @@ public class UserService implements IUserService {
             SysUserInfo sysUserInfo = sysUserInfos.get(0);
             userInfo = new UserVo.UserInfo();
             BeanUtil.copyProperties(sysUserInfo,userInfo);
+            //查找用户权限信息
+            SysUserPositionExample positionExample = new SysUserPositionExample();
+            positionExample.createCriteria().andUserIdEqualTo(userId);
+            List<SysUserPosition> sysUserPositions = userPositionMapper.selectByExample(positionExample);
+            if(CollectionUtil.isNotEmpty(sysUserPositions)){
+                SysUserPosition sysUserPosition = sysUserPositions.get(0);
+                UserVo.UserPower userPower = new UserVo.UserPower();
+                userPower.setPosition(sysUserPosition.getPosition());
+                userPower.setPower(sysUserPosition.getPower());
+                userInfo.setUserPower(userPower);
+            }
         }
-
         return userInfo;
     }
 

src/main/resources/mapper_dao/FormRecordDao.xml

@@ -237,4 +237,30 @@
         and submit_time >= #{params.startTime}
         and submit_time < #{params.endTime}
     </select>
+    <select id="queryOrganization" resultType="com.ccsens.delivery.bean.vo.CommonVo$OrganizationInfo">
+        SELECT
+        id,
+        `name`
+        FROM
+        `t_sys_organization`
+        WHERE
+        rec_status = 0
+        <if test="param.name != null and param.name != ''">
+            and `name` like CONCAT('%',#{param.name},'%')
+        </if>
+        <if test="param.parentId != null">
+            and parent_id = #{param.parentId}
+        </if>
+        <if test="param.type != null">
+            and `type` = #{param.type}
+        </if>
+        <if test="param.post != null">
+            <if test="param.post == 0">
+                and power in (0,1)
+            </if>
+            <if test="param.post == 1">
+                and power in (0,2)
+            </if>
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper_dao/RecordHealthDao.xml

@@ -96,8 +96,8 @@
                 </if>
             </where>
         )h
-        LEFT JOIN t_sys_area a1 on h.collegeId = a1.id and a1.rec_status = 0
+        LEFT JOIN t_sys_organization a1 on h.collegeId = a1.id and a1.rec_status = 0
-        LEFT JOIN t_sys_area a3 on h.stuClassId = a3.id and a3.rec_status = 0
+        LEFT JOIN t_sys_organization a3 on h.stuClassId = a3.id and a3.rec_status = 0
         order by h.submitTime desc
     </select>
 </mapper>

src/main/resources/mapper_dao/RecordTrailsDao.xml

@@ -87,9 +87,9 @@
             GROUP BY a.user_id,a.trails_date
             )t on u.user_id = t.user_id
         )t
-        LEFT JOIN t_sys_area a1 on t.collegeId = a1.id and a1.rec_status = 0
+        LEFT JOIN t_sys_organization a1 on t.collegeId = a1.id and a1.rec_status = 0
-        LEFT JOIN t_sys_area a2 on t.dormitoryId = a2.id and a2.rec_status = 0
+        LEFT JOIN t_sys_organization a2 on t.dormitoryId = a2.id and a2.rec_status = 0
-        LEFT JOIN t_sys_area a3 on t.stuClassId = a3.id and a3.rec_status = 0
+        LEFT JOIN t_sys_organization a3 on t.stuClassId = a3.id and a3.rec_status = 0
         order by t.trailsDate desc, t.submit_time desc
     </select>
 

src/main/resources/mapper_dao/StudentDao.xml

@@ -34,7 +34,7 @@
 	<resultMap id="stuOrder" type="com.ccsens.delivery.bean.vo.StudentVo$StudentOrder">
 		<id column="id" property="id"/>
 		<result column="name" property="name"/>
-		<result column="stu_num" property="stuNum"/>
+		<result column="stu_num" property="number"/>
 		<result column="phone" property="phone"/>
 		<result column="id_card" property="idCard"/>
 		<result column="college_id" property="collegeId"/>
@@ -83,8 +83,8 @@
 		FROM
 		t_stu_order o
 		LEFT JOIN t_stu_order_item i on o.id = i.order_id and i.rec_status = 0
-		LEFT JOIN t_sys_area a1 on o.college_id = a1.id and a1.rec_status = 0
+		LEFT JOIN t_sys_organization a1 on o.college_id = a1.id and a1.rec_status = 0
-		LEFT JOIN t_sys_area a2 on o.dormitory_id = a2.id and a2.rec_status = 0
+		LEFT JOIN t_sys_organization a2 on o.dormitory_id = a2.id and a2.rec_status = 0
 		WHERE
 		o.rec_status = 0
 		and o.user_id = #{userId}
@@ -120,8 +120,8 @@
 		FROM
 		t_stu_order o
 		LEFT JOIN t_stu_order_item i on o.id = i.order_id and i.rec_status = 0
-		LEFT JOIN t_sys_area a1 on o.college_id = a1.id and a1.rec_status = 0
+		LEFT JOIN t_sys_organization a1 on o.college_id = a1.id and a1.rec_status = 0
-		LEFT JOIN t_sys_area a2 on o.dormitory_id = a2.id and a2.rec_status = 0
+		LEFT JOIN t_sys_organization a2 on o.dormitory_id = a2.id and a2.rec_status = 0
 		WHERE
 		o.rec_status = 0
 		and o.user_id = #{userId}
@@ -155,8 +155,8 @@
 		FROM
 		t_stu_order o
 		LEFT JOIN t_stu_order_item i on o.id = i.order_id and i.rec_status = 0
-		LEFT JOIN t_sys_area a1 on o.college_id = a1.id and a1.rec_status = 0
+		LEFT JOIN t_sys_organization a1 on o.college_id = a1.id and a1.rec_status = 0
-		LEFT JOIN t_sys_area a2 on o.dormitory_id = a2.id and a2.rec_status = 0
+		LEFT JOIN t_sys_organization a2 on o.dormitory_id = a2.id and a2.rec_status = 0
 		WHERE
 		o.rec_status = 0
 		and o.id = #{orderId}
@@ -253,9 +253,9 @@
 			and o.plan_time &lt;= #{param.endTime}
 		</if>
 		)m
-		LEFT JOIN t_sys_area a1 on m.collegeId = a1.id and a1.rec_status = 0
+		LEFT JOIN t_sys_organization a1 on m.collegeId = a1.id and a1.rec_status = 0
-		LEFT JOIN t_sys_area a2 on m.dormitoryId = a2.id and a2.rec_status = 0
+		LEFT JOIN t_sys_organization a2 on m.dormitoryId = a2.id and a2.rec_status = 0
-		LEFT JOIN t_sys_area a3 on m.stuClassId = a2.id and a3.rec_status = 0
+		LEFT JOIN t_sys_organization a3 on m.stuClassId = a2.id and a3.rec_status = 0
 		order by m.submitTime desc
 	</select>
 	<select id="queryItemByOrderId" resultType="com.ccsens.delivery.bean.vo.StudentVo$StudentOrderItem">
@@ -296,8 +296,8 @@
 		FROM
 		t_stu_order o
 		LEFT JOIN t_stu_order_item i on o.id = i.order_id and i.rec_status = 0
-		LEFT JOIN t_sys_area a1 on o.college_id = a1.id and a1.rec_status = 0
+		LEFT JOIN t_sys_organization a1 on o.college_id = a1.id and a1.rec_status = 0
-		LEFT JOIN t_sys_area a2 on o.dormitory_id = a2.id and a2.rec_status = 0
+		LEFT JOIN t_sys_organization a2 on o.dormitory_id = a2.id and a2.rec_status = 0
 		WHERE
 		o.rec_status = 0
 		and o.status != 3

src/main/resources/mapper_dao/SysMaterialDao.xml

@@ -94,9 +94,9 @@
             </if>
             group by rm.id
         )m
-        LEFT JOIN t_sys_area a1 on m.collegeId = a1.id and a1.rec_status = 0
+        LEFT JOIN t_sys_organization a1 on m.collegeId = a1.id and a1.rec_status = 0
-        LEFT JOIN t_sys_area a2 on m.dormitoryId = a2.id and a2.rec_status = 0
+        LEFT JOIN t_sys_organization a2 on m.dormitoryId = a2.id and a2.rec_status = 0
-        LEFT JOIN t_sys_area a3 on m.stuClassId = a3.id and a3.rec_status = 0
+        LEFT JOIN t_sys_organization a3 on m.stuClassId = a3.id and a3.rec_status = 0
         order by m.submitTime desc
     </select>
     <select id="queryItemByOrderId" resultType="com.ccsens.delivery.bean.vo.MaterialVo$MaterialOrderDetail">

src/main/resources/mapper_raw/SysOrganizationMapper.xml

@@ -0,0 +1,275 @@
+<?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.ccsens.delivery.persist.mapper.SysOrganizationMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.delivery.bean.po.SysOrganization">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+    <result column="power" jdbcType="TINYINT" property="power" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, name, parent_id, power, type, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.delivery.bean.po.SysOrganizationExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_sys_organization
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_sys_organization
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_sys_organization
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.delivery.bean.po.SysOrganizationExample">
+    delete from t_sys_organization
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.delivery.bean.po.SysOrganization">
+    insert into t_sys_organization (id, name, parent_id, 
+      power, type, operator, 
+      created_at, updated_at, rec_status
+      )
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, 
+      #{power,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.delivery.bean.po.SysOrganization">
+    insert into t_sys_organization
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="power != null">
+        power,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="power != null">
+        #{power,jdbcType=TINYINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.delivery.bean.po.SysOrganizationExample" resultType="java.lang.Long">
+    select count(*) from t_sys_organization
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_sys_organization
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parentId != null">
+        parent_id = #{record.parentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.power != null">
+        power = #{record.power,jdbcType=TINYINT},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_sys_organization
+    set id = #{record.id,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      parent_id = #{record.parentId,jdbcType=BIGINT},
+      power = #{record.power,jdbcType=TINYINT},
+      type = #{record.type,jdbcType=TINYINT},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.delivery.bean.po.SysOrganization">
+    update t_sys_organization
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="power != null">
+        power = #{power,jdbcType=TINYINT},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.delivery.bean.po.SysOrganization">
+    update t_sys_organization
+    set name = #{name,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=BIGINT},
+      power = #{power,jdbcType=TINYINT},
+      type = #{type,jdbcType=TINYINT},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mapper_raw/SysUserPositionMapper.xml

@@ -0,0 +1,258 @@
+<?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.ccsens.delivery.persist.mapper.SysUserPositionMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.delivery.bean.po.SysUserPosition">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="position" jdbcType="TINYINT" property="position" />
+    <result column="power" jdbcType="TINYINT" property="power" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, user_id, position, power, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.delivery.bean.po.SysUserPositionExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_sys_user_position
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_sys_user_position
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_sys_user_position
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.delivery.bean.po.SysUserPositionExample">
+    delete from t_sys_user_position
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.delivery.bean.po.SysUserPosition">
+    insert into t_sys_user_position (id, user_id, position, 
+      power, operator, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{position,jdbcType=TINYINT}, 
+      #{power,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.delivery.bean.po.SysUserPosition">
+    insert into t_sys_user_position
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="position != null">
+        position,
+      </if>
+      <if test="power != null">
+        power,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="position != null">
+        #{position,jdbcType=TINYINT},
+      </if>
+      <if test="power != null">
+        #{power,jdbcType=TINYINT},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.delivery.bean.po.SysUserPositionExample" resultType="java.lang.Long">
+    select count(*) from t_sys_user_position
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_sys_user_position
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
+      <if test="record.position != null">
+        position = #{record.position,jdbcType=TINYINT},
+      </if>
+      <if test="record.power != null">
+        power = #{record.power,jdbcType=TINYINT},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_sys_user_position
+    set id = #{record.id,jdbcType=BIGINT},
+      user_id = #{record.userId,jdbcType=BIGINT},
+      position = #{record.position,jdbcType=TINYINT},
+      power = #{record.power,jdbcType=TINYINT},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.delivery.bean.po.SysUserPosition">
+    update t_sys_user_position
+    <set>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="position != null">
+        position = #{position,jdbcType=TINYINT},
+      </if>
+      <if test="power != null">
+        power = #{power,jdbcType=TINYINT},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.delivery.bean.po.SysUserPosition">
+    update t_sys_user_position
+    set user_id = #{userId,jdbcType=BIGINT},
+      position = #{position,jdbcType=TINYINT},
+      power = #{power,jdbcType=TINYINT},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mbg.xml

@@ -64,11 +64,13 @@
 <!--        <table tableName="t_sys_user_info" domainObjectName="SysUserInfo"/>-->
 <!--        <table tableName="t_record_health" domainObjectName="RecordHealth"/>-->
 <!--        <table tableName="t_record_trails" domainObjectName="RecordTrails"/>-->
-        <table tableName="t_record_trails_detail" domainObjectName="RecordTrailsDetail"/>
+<!--        <table tableName="t_record_trails_detail" domainObjectName="RecordTrailsDetail"/>-->
 <!--        <table tableName="t_record_material" domainObjectName="RecordMaterial"/>-->
 <!--        <table tableName="t_record_material_detail" domainObjectName="RecordMaterialDetail"/>-->
 <!--        <table tableName="t_sys_material" domainObjectName="SysMaterial"/>-->
 <!--        <table tableName="t_file_commit" domainObjectName="FileCommit"/>-->
+<!--        <table tableName="t_sys_organization" domainObjectName="SysOrganization"/>-->
+        <table tableName="t_sys_user_position" domainObjectName="SysUserPosition"/>
     </context>
 
 </generatorConfiguration>