添加资产编号

pcbms/src/main/java/com/hssx/pcbms/controller/DepartmentController.java

@@ -0,0 +1,21 @@
+package com.hssx.pcbms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-06
+ */
+@RestController
+@RequestMapping("/department")
+public class DepartmentController {
+
+}
+

pcbms/src/main/java/com/hssx/pcbms/entity/Department.java

@@ -0,0 +1,210 @@
+package com.hssx.pcbms.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-06
+ */
+public class Department extends Model<Department> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 部门guid
+     */
+    @TableField("department_guid")
+    private String departmentGuid;
+
+    /**
+     * 父部门guid
+     */
+    @TableField("superior_guid")
+    private String superiorGuid;
+
+    /**
+     * 部门简称
+     */
+    @TableField("department_name")
+    private String departmentName;
+
+    /**
+     * 部门名称
+     */
+    @TableField("department_fullname")
+    private String departmentFullname;
+
+    /**
+     * 描述
+     */
+    @TableField("department_desc")
+    private String departmentDesc;
+
+    /**
+     * 地址
+     */
+    @TableField("department_address")
+    private String departmentAddress;
+
+    /**
+     * 部门电话
+     */
+    @TableField("department_phone")
+    private String departmentPhone;
+
+    /**
+     * 部门排序
+     */
+    @TableField("showorder")
+    private Integer showorder;
+
+    /**
+     * 删除标示 0：正常 1：删除
+     */
+    @TableField("department_isdeleted")
+    private Integer departmentIsdeleted;
+
+    /**
+     * 部门类型 0：科室 1：部门
+     */
+    @TableField("department_xingzhi")
+    private Integer departmentXingzhi;
+
+    /**
+     * 机构编号
+     */
+    @TableField("department_deptcode")
+    private String departmentDeptcode;
+
+    /**
+     * 单位 KEY 码
+     */
+    @TableField("department_keycode")
+    private String departmentKeycode;
+
+
+    public String getDepartmentGuid() {
+        return departmentGuid;
+    }
+
+    public void setDepartmentGuid(String departmentGuid) {
+        this.departmentGuid = departmentGuid;
+    }
+
+    public String getSuperiorGuid() {
+        return superiorGuid;
+    }
+
+    public void setSuperiorGuid(String superiorGuid) {
+        this.superiorGuid = superiorGuid;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getDepartmentFullname() {
+        return departmentFullname;
+    }
+
+    public void setDepartmentFullname(String departmentFullname) {
+        this.departmentFullname = departmentFullname;
+    }
+
+    public String getDepartmentDesc() {
+        return departmentDesc;
+    }
+
+    public void setDepartmentDesc(String departmentDesc) {
+        this.departmentDesc = departmentDesc;
+    }
+
+    public String getDepartmentAddress() {
+        return departmentAddress;
+    }
+
+    public void setDepartmentAddress(String departmentAddress) {
+        this.departmentAddress = departmentAddress;
+    }
+
+    public String getDepartmentPhone() {
+        return departmentPhone;
+    }
+
+    public void setDepartmentPhone(String departmentPhone) {
+        this.departmentPhone = departmentPhone;
+    }
+
+    public Integer getShoworder() {
+        return showorder;
+    }
+
+    public void setShoworder(Integer showorder) {
+        this.showorder = showorder;
+    }
+
+    public Integer getDepartmentIsdeleted() {
+        return departmentIsdeleted;
+    }
+
+    public void setDepartmentIsdeleted(Integer departmentIsdeleted) {
+        this.departmentIsdeleted = departmentIsdeleted;
+    }
+
+    public Integer getDepartmentXingzhi() {
+        return departmentXingzhi;
+    }
+
+    public void setDepartmentXingzhi(Integer departmentXingzhi) {
+        this.departmentXingzhi = departmentXingzhi;
+    }
+
+    public String getDepartmentDeptcode() {
+        return departmentDeptcode;
+    }
+
+    public void setDepartmentDeptcode(String departmentDeptcode) {
+        this.departmentDeptcode = departmentDeptcode;
+    }
+
+    public String getDepartmentKeycode() {
+        return departmentKeycode;
+    }
+
+    public void setDepartmentKeycode(String departmentKeycode) {
+        this.departmentKeycode = departmentKeycode;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "Department{" +
+        "departmentGuid=" + departmentGuid +
+        ", superiorGuid=" + superiorGuid +
+        ", departmentName=" + departmentName +
+        ", departmentFullname=" + departmentFullname +
+        ", departmentDesc=" + departmentDesc +
+        ", departmentAddress=" + departmentAddress +
+        ", departmentPhone=" + departmentPhone +
+        ", showorder=" + showorder +
+        ", departmentIsdeleted=" + departmentIsdeleted +
+        ", departmentXingzhi=" + departmentXingzhi +
+        ", departmentDeptcode=" + departmentDeptcode +
+        ", departmentKeycode=" + departmentKeycode +
+        "}";
+    }
+}

pcbms/src/main/java/com/hssx/pcbms/mapper/DepartmentMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.mapper;
+
+import com.hssx.pcbms.entity.Department;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-06
+ */
+public interface DepartmentMapper extends BaseMapper<Department> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/DepartmentService.java

@@ -0,0 +1,16 @@
+package com.hssx.pcbms.service;
+
+import com.hssx.pcbms.entity.Department;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-06
+ */
+public interface DepartmentService extends IService<Department> {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/DepartmentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.Department;
+import com.hssx.pcbms.mapper.DepartmentMapper;
+import com.hssx.pcbms.service.DepartmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-11-06
+ */
+@Service
+public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
+
+}

pcbms/src/main/java/com/hssx/pcbms/util/ExcelUtil.java

@@ -130,9 +130,11 @@ public class ExcelUtil {
                     start++;
                 }
             }
+            //用于非传统ajax;
             String headStr = "attachment; filename=\"" + fileName + "\"";
             response.setContentType("APPLICATION/OCTET-STREAM");//返回格式为流
             response.setHeader("Content-Disposition", headStr);
+            //普通下载不需要以上三行，注掉即可
             OutputStream os = response.getOutputStream();//在线下载
             File dir = null;
             dir = new File(downloadPath);

pcbms/src/main/resources/mapper/DepartmentMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.pcbms.mapper.DepartmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.Department">
+        <result column="department_guid" property="departmentGuid" />
+        <result column="superior_guid" property="superiorGuid" />
+        <result column="department_name" property="departmentName" />
+        <result column="department_fullname" property="departmentFullname" />
+        <result column="department_desc" property="departmentDesc" />
+        <result column="department_address" property="departmentAddress" />
+        <result column="department_phone" property="departmentPhone" />
+        <result column="showorder" property="showorder" />
+        <result column="department_isdeleted" property="departmentIsdeleted" />
+        <result column="department_xingzhi" property="departmentXingzhi" />
+        <result column="department_deptcode" property="departmentDeptcode" />
+        <result column="department_keycode" property="departmentKeycode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        department_guid, superior_guid, department_name, department_fullname, department_desc, department_address, department_phone, showorder, department_isdeleted, department_xingzhi, department_deptcode, department_keycode
+    </sql>
+
+</mapper>

pcbms/src/main/resources/mapper/UserMapper.xml

@@ -35,8 +35,8 @@
     <resultMap id="BaseResultMapDeptVO" type="com.hssx.pcbms.entity.vo.DepartmentVO">
         <result column="department_guid" property="departmentGuid" />
         <result column="department_name" property="departmentName" />
-        <association property="score" resultMap="BaseResultMapScore">
-        </association>
+        <collection property="userVOS">
+        </collection>
     </resultMap>
 
     <resultMap id="BaseResultMapScore" type="com.hssx.pcbms.entity.Score">
@@ -55,7 +55,7 @@
     <sql id="Base_Column_List">
         id, head_url, name, phone, dept_id, is_pass, indate, password, role_name, email, sex, birthday, office_phone, job_title, login_name, login_password, xing_zhi, key_code
     </sql>
-    <select id="selectListByCondition" resultMap="BaseResultMapVO">
+    <select id="selectListByCondition" resultMap="BaseResultMapDeptVO">
         SELECT
             u.id,  u.name, u.phone, u.dept_id,sr.rolename role_name,(SELECT total FROM score  WHERE uid = u.id AND scoring_year_month = DATE_FORMAT(NOW(),'%Y-%m')) total
         FROM