From a35fd1f9b3758fe2059dbdfd00b3cca1146d1664 Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Sat, 14 May 2022 19:52:22 +0800
Subject: [PATCH] =?UTF-8?q?20220514=E4=BA=8C=E6=9C=9F=E9=80=81=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/delivery/api/CommonController.java | 14 ++++
 .../ccsens/delivery/bean/po/SysUserInfo.java  | 11 +++
 .../delivery/bean/po/SysUserInfoExample.java  | 70 +++++++++++++++++++
 .../com/ccsens/delivery/bean/vo/HealthVo.java |  4 +-
 .../ccsens/delivery/bean/vo/MaterialVo.java   |  4 +-
 .../ccsens/delivery/bean/vo/StudentVo.java    |  4 +-
 .../com/ccsens/delivery/bean/vo/TrailsVo.java |  6 +-
 .../com/ccsens/delivery/bean/vo/UserVo.java   |  6 +-
 .../delivery/persist/dao/FormRecordDao.java   | 21 ++++++
 .../delivery/service/CommonService.java       | 25 ++++++-
 .../delivery/service/ICommonService.java      |  7 ++
 .../delivery/service/MaterialService.java     |  4 +-
 .../delivery/service/StudentService.java      |  4 +-
 .../delivery/service/TrailsService.java       |  4 +-
 .../ccsens/delivery/service/UserService.java  | 11 +++
 .../resources/mapper_dao/FormRecordDao.xml    | 25 +++++++
 .../resources/mapper_dao/RecordHealthDao.xml  |  5 +-
 .../resources/mapper_dao/RecordTrailsDao.xml  |  5 +-
 src/main/resources/mapper_dao/StudentDao.xml  |  8 ++-
 .../resources/mapper_dao/SysMaterialDao.xml   |  5 +-
 .../mapper_raw/SysUserInfoMapper.xml          | 33 ++++++---
 src/main/resources/mbg.xml                    |  4 +-
 22 files changed, 250 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/ccsens/delivery/api/CommonController.java b/src/main/java/com/ccsens/delivery/api/CommonController.java
index 692e337..db9c547 100644
--- a/src/main/java/com/ccsens/delivery/api/CommonController.java
+++ b/src/main/java/com/ccsens/delivery/api/CommonController.java
@@ -276,4 +276,18 @@ public class CommonController {
 
         return JsonResponse.newInstance().ok(map);
     }
+
+
+    @ApiOperation(value = "/根据类型查找上传记录的总数", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "表单类型，0健康码、1行程码、2核酸检测、3抗原检测、4活动轨迹、5物资需求、6药品需求", required = true)
+    })
+    @RequestMapping(value = "/query/totalNum", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<Integer> queryTotalNum(@RequestParam(required = true) Byte type) throws Exception {
+        log.info("根据类型查找上传记录的总数，{}",type);
+        Integer totalNum = commonService.queryTotalNum(type);
+        log.info("上传记录的总数");
+        return JsonResponse.newInstance().ok(totalNum);
+    }
+
 }
diff --git a/src/main/java/com/ccsens/delivery/bean/po/SysUserInfo.java b/src/main/java/com/ccsens/delivery/bean/po/SysUserInfo.java
index c243d9e..5324e40 100644
--- a/src/main/java/com/ccsens/delivery/bean/po/SysUserInfo.java
+++ b/src/main/java/com/ccsens/delivery/bean/po/SysUserInfo.java
@@ -30,6 +30,8 @@ public class SysUserInfo implements Serializable {
 
     private String grade;
 
+    private String gradeName;
+
     private String stuClassId;
 
     private String stuClassName;
@@ -150,6 +152,14 @@ public class SysUserInfo implements Serializable {
         this.grade = grade == null ? null : grade.trim();
     }
 
+    public String getGradeName() {
+        return gradeName;
+    }
+
+    public void setGradeName(String gradeName) {
+        this.gradeName = gradeName == null ? null : gradeName.trim();
+    }
+
     public String getStuClassId() {
         return stuClassId;
     }
@@ -225,6 +235,7 @@ public class SysUserInfo implements Serializable {
         sb.append(", dormitoryName=").append(dormitoryName);
         sb.append(", address=").append(address);
         sb.append(", grade=").append(grade);
+        sb.append(", gradeName=").append(gradeName);
         sb.append(", stuClassId=").append(stuClassId);
         sb.append(", stuClassName=").append(stuClassName);
         sb.append(", studentType=").append(studentType);
diff --git a/src/main/java/com/ccsens/delivery/bean/po/SysUserInfoExample.java b/src/main/java/com/ccsens/delivery/bean/po/SysUserInfoExample.java
index 71e08ba..a882363 100644
--- a/src/main/java/com/ccsens/delivery/bean/po/SysUserInfoExample.java
+++ b/src/main/java/com/ccsens/delivery/bean/po/SysUserInfoExample.java
@@ -965,6 +965,76 @@ public class SysUserInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andGradeNameIsNull() {
+            addCriterion("grade_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameIsNotNull() {
+            addCriterion("grade_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameEqualTo(String value) {
+            addCriterion("grade_name =", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameNotEqualTo(String value) {
+            addCriterion("grade_name <>", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameGreaterThan(String value) {
+            addCriterion("grade_name >", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameGreaterThanOrEqualTo(String value) {
+            addCriterion("grade_name >=", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameLessThan(String value) {
+            addCriterion("grade_name <", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameLessThanOrEqualTo(String value) {
+            addCriterion("grade_name <=", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameLike(String value) {
+            addCriterion("grade_name like", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameNotLike(String value) {
+            addCriterion("grade_name not like", value, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameIn(List<String> values) {
+            addCriterion("grade_name in", values, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameNotIn(List<String> values) {
+            addCriterion("grade_name not in", values, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameBetween(String value1, String value2) {
+            addCriterion("grade_name between", value1, value2, "gradeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNameNotBetween(String value1, String value2) {
+            addCriterion("grade_name not between", value1, value2, "gradeName");
+            return (Criteria) this;
+        }
+
         public Criteria andStuClassIdIsNull() {
             addCriterion("stu_class_id is null");
             return (Criteria) this;
diff --git a/src/main/java/com/ccsens/delivery/bean/vo/HealthVo.java b/src/main/java/com/ccsens/delivery/bean/vo/HealthVo.java
index 3186388..54db887 100644
--- a/src/main/java/com/ccsens/delivery/bean/vo/HealthVo.java
+++ b/src/main/java/com/ccsens/delivery/bean/vo/HealthVo.java
@@ -45,8 +45,10 @@ public class HealthVo {
         private Long collegeId;
         @ApiModelProperty("所在学院名称")
         private String collegeName;
+        @ApiModelProperty("所在年级Id")
+        private Long grade;
         @ApiModelProperty("所在年级")
-        private String grade;
+        private String gradeName;
         @ApiModelProperty("所在班级Id")
         private Long stuClassId;
         @ApiModelProperty("所在班级名称")
diff --git a/src/main/java/com/ccsens/delivery/bean/vo/MaterialVo.java b/src/main/java/com/ccsens/delivery/bean/vo/MaterialVo.java
index 30354bb..2150173 100644
--- a/src/main/java/com/ccsens/delivery/bean/vo/MaterialVo.java
+++ b/src/main/java/com/ccsens/delivery/bean/vo/MaterialVo.java
@@ -47,8 +47,10 @@ public class MaterialVo {
         private Long dormitoryId;
         @ApiModelProperty("所在楼栋名称")
         private String dormitoryName;
+        @ApiModelProperty("所在年级Id")
+        private Long grade;
         @ApiModelProperty("所在年级")
-        private String grade;
+        private String gradeName;
         @ApiModelProperty("所在班级Id")
         private Long stuClassId;
         @ApiModelProperty("所在班级名称")
diff --git a/src/main/java/com/ccsens/delivery/bean/vo/StudentVo.java b/src/main/java/com/ccsens/delivery/bean/vo/StudentVo.java
index da1b997..d23286c 100644
--- a/src/main/java/com/ccsens/delivery/bean/vo/StudentVo.java
+++ b/src/main/java/com/ccsens/delivery/bean/vo/StudentVo.java
@@ -33,8 +33,10 @@ public class StudentVo {
         private Long collegeId;
         @ApiModelProperty("所在学院名称")
         private String collegeName;
+        @ApiModelProperty("所在年级Id")
+        private Long grade;
         @ApiModelProperty("所在年级")
-        private String grade;
+        private String gradeName;
         @ApiModelProperty("所在班级Id")
         private Long stuClassId;
         @ApiModelProperty("所在班级名称")
diff --git a/src/main/java/com/ccsens/delivery/bean/vo/TrailsVo.java b/src/main/java/com/ccsens/delivery/bean/vo/TrailsVo.java
index 5e57012..40eab50 100644
--- a/src/main/java/com/ccsens/delivery/bean/vo/TrailsVo.java
+++ b/src/main/java/com/ccsens/delivery/bean/vo/TrailsVo.java
@@ -38,8 +38,10 @@ public class TrailsVo {
         private Long dormitoryId;
         @ApiModelProperty("所在楼栋名称")
         private String dormitoryName;
-        @ApiModelProperty("所在年级")
-        private String grade;
+        @ApiModelProperty("所在年级Id")
+        private Long grade;
+        @ApiModelProperty("所在年级名")
+        private String gradeName;
         @ApiModelProperty("所在班级Id")
         private Long stuClassId;
         @ApiModelProperty("所在班级名称")
diff --git a/src/main/java/com/ccsens/delivery/bean/vo/UserVo.java b/src/main/java/com/ccsens/delivery/bean/vo/UserVo.java
index 75a6494..84698ba 100644
--- a/src/main/java/com/ccsens/delivery/bean/vo/UserVo.java
+++ b/src/main/java/com/ccsens/delivery/bean/vo/UserVo.java
@@ -151,8 +151,10 @@ public class UserVo {
         private Long dormitoryId;
         @ApiModelProperty("所在楼栋名称")
         private String dormitoryName;
-        @ApiModelProperty("所在年级")
-        private String grade;
+        @ApiModelProperty("所在年级Id")
+        private Long grade;
+        @ApiModelProperty("所在年级名")
+        private String gradeName;
         @ApiModelProperty("所在班级Id")
         private String stuClassId;
         @ApiModelProperty("所在班级名称")
diff --git a/src/main/java/com/ccsens/delivery/persist/dao/FormRecordDao.java b/src/main/java/com/ccsens/delivery/persist/dao/FormRecordDao.java
index adc964b..f4d1a68 100644
--- a/src/main/java/com/ccsens/delivery/persist/dao/FormRecordDao.java
+++ b/src/main/java/com/ccsens/delivery/persist/dao/FormRecordDao.java
@@ -90,4 +90,25 @@ public interface FormRecordDao {
      * @return 返回信息
      */
     List<CommonVo.OrganizationInfo> queryOrganization(@Param("param") CommonDto.QueryOrganization param);
+
+    /**
+     * 查找总人数
+     * @param type
+     * @return 返回人数
+     */
+    Integer queryTotalNum(Byte type);
+
+    /**
+     * 查找提交的物资需求数量
+     * @param type
+     * @return 返回数量
+     */
+    Integer queryMaterialTotalNum(Byte type);
+
+    /**
+     * 查找提交的药品需求数量
+     * @param type
+     * @return 返回数量
+     */
+    Integer queryDrugTotalNum(Byte type);
 }
diff --git a/src/main/java/com/ccsens/delivery/service/CommonService.java b/src/main/java/com/ccsens/delivery/service/CommonService.java
index a88dfd7..e3a2ead 100644
--- a/src/main/java/com/ccsens/delivery/service/CommonService.java
+++ b/src/main/java/com/ccsens/delivery/service/CommonService.java
@@ -108,7 +108,7 @@ public class CommonService implements ICommonService {
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
         PageInfo<CommonVo.QuerySelf> querySelfPageInfo = null;
         List<CommonVo.QuerySelf> querySelfList = null;
-                switch (formType){
+        switch (formType){
             case HEALTH_CODE:
             case TOUR_CODE:
             case NUCLEIC_REPORT:
@@ -173,7 +173,28 @@ public class CommonService implements ICommonService {
 
     @Override
     public List<CommonVo.OrganizationInfo> queryOrganization(Long userId, CommonDto.QueryOrganization param) {
-
         return formRecordDao.queryOrganization(param);
     }
+
+    @Override
+    public Integer queryTotalNum(Byte type) {
+        Integer totalNum = 0;
+        DeliveryConstant.FormType formType = DeliveryConstant.FormType.valueOf(type);
+        switch (formType){
+            case HEALTH_CODE:
+            case TOUR_CODE:
+            case NUCLEIC_REPORT:
+            case ANTIGEN_DETECTION:
+            case TRACK_EVENTS:
+                totalNum = formRecordDao.queryTotalNum(type);
+                break;
+            case MATERIAL_DEMAND:
+                totalNum = formRecordDao.queryMaterialTotalNum(type);
+                break;
+            case DRUG_DEMAND:
+                totalNum = formRecordDao.queryDrugTotalNum(type);
+            default:
+        }
+        return totalNum;
+    }
 }
diff --git a/src/main/java/com/ccsens/delivery/service/ICommonService.java b/src/main/java/com/ccsens/delivery/service/ICommonService.java
index 7538592..bdea06d 100644
--- a/src/main/java/com/ccsens/delivery/service/ICommonService.java
+++ b/src/main/java/com/ccsens/delivery/service/ICommonService.java
@@ -54,4 +54,11 @@ public interface ICommonService {
      * @return 返回信息
      */
     List<CommonVo.OrganizationInfo> queryOrganization(Long userId, CommonDto.QueryOrganization param);
+
+    /**
+     * 根据类型查找上传的记录总数
+     * @param type 类型
+     * @return 返回总数
+     */
+    Integer queryTotalNum(Byte type);
 }
diff --git a/src/main/java/com/ccsens/delivery/service/MaterialService.java b/src/main/java/com/ccsens/delivery/service/MaterialService.java
index 956a0ab..4d2ea1b 100644
--- a/src/main/java/com/ccsens/delivery/service/MaterialService.java
+++ b/src/main/java/com/ccsens/delivery/service/MaterialService.java
@@ -216,7 +216,7 @@ public class MaterialService implements IMaterialService {
                         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.getGradeName(),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));
@@ -237,7 +237,7 @@ public class MaterialService implements IMaterialService {
                 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.getGradeName()));
                 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()))));
diff --git a/src/main/java/com/ccsens/delivery/service/StudentService.java b/src/main/java/com/ccsens/delivery/service/StudentService.java
index 5d02cc1..bd2df10 100644
--- a/src/main/java/com/ccsens/delivery/service/StudentService.java
+++ b/src/main/java/com/ccsens/delivery/service/StudentService.java
@@ -265,7 +265,7 @@ public class StudentService implements IStudentService {
                         details.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getNumber(), 1, size));
                         details.add(new PoiUtil.PoiUtilCell("'" + studentOrder.getPhone(), 1, size));
                         details.add(new PoiUtil.PoiUtilCell(studentOrder.getCollegeName(), 1, size));
-                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getGrade(), 1, size));
+                        details.add(new PoiUtil.PoiUtilCell(studentOrder.getGradeName(), 1, size));
                         details.add(new PoiUtil.PoiUtilCell(studentOrder.getStuClassName(), 1, size));
                         details.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName(), 1, size));
                         details.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress(), 1, size));
@@ -306,7 +306,7 @@ public class StudentService implements IStudentService {
                 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.getGradeName()));
                 details.add(new PoiUtil.PoiUtilCell(studentOrder.getStuClassName()));
                 details.add(new PoiUtil.PoiUtilCell(studentOrder.getDormitoryName()));
                 details.add(new PoiUtil.PoiUtilCell(studentOrder.getAddress()));
diff --git a/src/main/java/com/ccsens/delivery/service/TrailsService.java b/src/main/java/com/ccsens/delivery/service/TrailsService.java
index 3ae8324..f0c1dad 100644
--- a/src/main/java/com/ccsens/delivery/service/TrailsService.java
+++ b/src/main/java/com/ccsens/delivery/service/TrailsService.java
@@ -183,7 +183,7 @@ public class TrailsService implements ITrailsService {
                         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.getGradeName(),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));
@@ -220,7 +220,7 @@ public class TrailsService implements ITrailsService {
                 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.getGradeName()));
                 details.add(new PoiUtil.PoiUtilCell(trailsVo.getStuClassName()));
                 details.add(new PoiUtil.PoiUtilCell(trailsVo.getDormitoryName()));
                 details.add(new PoiUtil.PoiUtilCell(trailsVo.getAddress()));
diff --git a/src/main/java/com/ccsens/delivery/service/UserService.java b/src/main/java/com/ccsens/delivery/service/UserService.java
index 6def0e5..9d7d543 100644
--- a/src/main/java/com/ccsens/delivery/service/UserService.java
+++ b/src/main/java/com/ccsens/delivery/service/UserService.java
@@ -12,6 +12,7 @@ import com.ccsens.delivery.bean.po.*;
 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.SysOrganizationMapper;
 import com.ccsens.delivery.persist.mapper.SysUserInfoMapper;
 import com.ccsens.delivery.persist.mapper.SysUserPositionMapper;
 import com.ccsens.delivery.util.DeliveryCodeError;
@@ -52,6 +53,8 @@ public class UserService implements IUserService {
     private SysUserInfoMapper sysUserInfoMapper;
     @Resource
     private SysUserPositionMapper userPositionMapper;
+    @Resource
+    private SysOrganizationMapper organizationMapper;
 
     @Override
     public UserVo.TokenBean userSignin(UserDto.SigninDto params, String deviceId, String clientIp) throws Exception {
@@ -733,6 +736,7 @@ public class UserService implements IUserService {
         SysUserInfoExample userInfoExample = new SysUserInfoExample();
         userInfoExample.createCriteria().andUserIdEqualTo(userId);
         List<SysUserInfo> sysUserInfos = sysUserInfoMapper.selectByExample(userInfoExample);
+        //TODO 没查“其他”的信息
         if(CollectionUtil.isNotEmpty(sysUserInfos)){
             SysUserInfo sysUserInfo = sysUserInfos.get(0);
             userInfo = new UserVo.UserInfo();
@@ -761,6 +765,13 @@ public class UserService implements IUserService {
 
         SysUserInfo sysUserInfo = new SysUserInfo();
         BeanUtil.copyProperties(param,sysUserInfo);
+//        //通过年级id查找年级信息
+//        SysOrganization sysOrganization = organizationMapper.selectByPrimaryKey(Long.parseLong(param.getGrade()));
+//        if(ObjectUtil.isNotNull(sysOrganization)){
+//            sysUserInfo.setGrade(sysOrganization.getName());
+//        }else {
+//            sysUserInfo.setGrade(null);
+//        }
         sysUserInfo.setUserId(userId);
         String number = SymmetricCryptoUtil.encrypt(DeliveryConstant.ENCRYPT_KEY, param.getNumber());
         sysUserInfo.setNumber(number);
diff --git a/src/main/resources/mapper_dao/FormRecordDao.xml b/src/main/resources/mapper_dao/FormRecordDao.xml
index 4f5621e..e97b3e5 100644
--- a/src/main/resources/mapper_dao/FormRecordDao.xml
+++ b/src/main/resources/mapper_dao/FormRecordDao.xml
@@ -263,4 +263,29 @@
             </if>
         </if>
     </select>
+
+    <select id="queryTotalNum" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        t_sys_user_info
+        WHERE
+        rec_status = 0
+    </select>
+    <select id="queryMaterialTotalNum" resultType="java.lang.Integer">
+		SELECT
+        count(*)
+        FROM
+        t_sys_material
+        WHERE
+        rec_status = 0
+    </select>
+    <select id="queryDrugTotalNum" resultType="java.lang.Integer">
+		SELECT
+        count(*)
+        FROM
+        t_stu_order
+        WHERE
+        rec_status = 0
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper_dao/RecordHealthDao.xml b/src/main/resources/mapper_dao/RecordHealthDao.xml
index 95b5b60..98de493 100644
--- a/src/main/resources/mapper_dao/RecordHealthDao.xml
+++ b/src/main/resources/mapper_dao/RecordHealthDao.xml
@@ -7,7 +7,8 @@
         SELECT
         h.*,
         if(a1.`name` is null, h.college_name,a1.`name`) as collegeName,
-        if(a3.`name` is null, h.stu_class_name,a3.`name`) as stuClassName
+        if(a3.`name` is null, h.stu_class_name,a3.`name`) as stuClassName,
+        if(a4.`name` is null, h.grade_name,a4.`name`) as gradeName
         FROM
         (
             SELECT
@@ -16,6 +17,7 @@
                 u.number,
                 u.phone,
                 u.grade,
+                u.grade_name,
                 h.submit_time as submitTime,
                 if(h.id is null, 0, 1) as `status`,
                 u.college_id as collegeId,
@@ -98,6 +100,7 @@
         )h
         LEFT JOIN t_sys_organization a1 on h.collegeId = a1.id and a1.rec_status = 0
         LEFT JOIN t_sys_organization a3 on h.stuClassId = a3.id and a3.rec_status = 0
+        LEFT JOIN t_sys_organization a4 on h.grade = a4.id and a4.rec_status = 0
         order by h.submitTime desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper_dao/RecordTrailsDao.xml b/src/main/resources/mapper_dao/RecordTrailsDao.xml
index 1720a2c..8422010 100644
--- a/src/main/resources/mapper_dao/RecordTrailsDao.xml
+++ b/src/main/resources/mapper_dao/RecordTrailsDao.xml
@@ -8,7 +8,8 @@
         t.*,
         if(a1.`name` is null, t.college_name,a1.`name`) as collegeName,
         if(a2.`name` is null, t.dormitory_name,a2.`name`) as dormitoryName,
-        if(a3.`name` is null, t.stu_class_name,a3.`name`) as stuClassName
+        if(a3.`name` is null, t.stu_class_name,a3.`name`) as stuClassName,
+        if(a4.`name` is null, t.grade_name,a4.`name`) as gradeName
         FROM
         (
             SELECT
@@ -21,6 +22,7 @@
                 u.dormitory_id as dormitoryId,
                 u.dormitory_name,
                 u.grade,
+                u.grade_name,
                 u.stu_class_id as stuClassId,
                 u.stu_class_name,
                 u.address,
@@ -90,6 +92,7 @@
         LEFT JOIN t_sys_organization a1 on t.collegeId = a1.id and a1.rec_status = 0
         LEFT JOIN t_sys_organization a2 on t.dormitoryId = a2.id and a2.rec_status = 0
         LEFT JOIN t_sys_organization a3 on t.stuClassId = a3.id and a3.rec_status = 0
+        LEFT JOIN t_sys_organization a4 on t.grade = a4.id and a4.rec_status = 0
         order by t.trailsDate desc, t.submit_time desc
     </select>
 
diff --git a/src/main/resources/mapper_dao/StudentDao.xml b/src/main/resources/mapper_dao/StudentDao.xml
index da3bbeb..b29ad2d 100644
--- a/src/main/resources/mapper_dao/StudentDao.xml
+++ b/src/main/resources/mapper_dao/StudentDao.xml
@@ -168,7 +168,8 @@
 		m.*,
 		if(a1.`name` is null, m.college_name,a1.`name`) as collegeName,
 		if(a2.`name` is null, m.dormitory_name,a2.`name`) as dormitoryName,
-		if(a3.`name` is null, m.stu_class_name,a3.`name`) as stuClassName
+		if(a3.`name` is null, m.stu_class_name,a3.`name`) as stuClassName,
+		if(a4.`name` is null, m.grade_name,a4.`name`) as gradeName
 		FROM
 		(
 		SELECT
@@ -184,6 +185,7 @@
 		u.stu_class_id as stuClassId,
 		u.stu_class_name,
 		u.grade,
+		u.grade_name,
 		u.address,
 		o.symptom,
 		o.broken,
@@ -252,10 +254,12 @@
 			and o.plan_time >= #{param.startTime}
 			and o.plan_time &lt;= #{param.endTime}
 		</if>
+		GROUP BY o.id
 		)m
 		LEFT JOIN t_sys_organization a1 on m.collegeId = a1.id and a1.rec_status = 0
 		LEFT JOIN t_sys_organization a2 on m.dormitoryId = a2.id and a2.rec_status = 0
-		LEFT JOIN t_sys_organization a3 on m.stuClassId = a2.id and a3.rec_status = 0
+		LEFT JOIN t_sys_organization a3 on m.stuClassId = a3.id and a3.rec_status = 0
+		LEFT JOIN t_sys_organization a4 on m.grade = a4.id and a4.rec_status = 0
 		order by m.submitTime desc
 	</select>
 	<select id="queryItemByOrderId" resultType="com.ccsens.delivery.bean.vo.StudentVo$StudentOrderItem">
diff --git a/src/main/resources/mapper_dao/SysMaterialDao.xml b/src/main/resources/mapper_dao/SysMaterialDao.xml
index bdcabbc..ac659ea 100644
--- a/src/main/resources/mapper_dao/SysMaterialDao.xml
+++ b/src/main/resources/mapper_dao/SysMaterialDao.xml
@@ -17,7 +17,8 @@
         m.*,
         if(a1.`name` is null, m.college_name,a1.`name`) as collegeName,
         if(a2.`name` is null, m.dormitory_name,a2.`name`) as dormitoryName,
-        if(a3.`name` is null, m.stu_class_name,a3.`name`) as stuClassName
+        if(a3.`name` is null, m.stu_class_name,a3.`name`) as stuClassName,
+        if(a4.`name` is null, m.grade_name,a4.`name`) as gradeName
         FROM
         (
             SELECT
@@ -27,6 +28,7 @@
             rm.plan_time as planTime,
             u.number,
             u.grade,
+            u.grade_name,
             rm.submit_time as submitTime,
             u.address,
             u.phone,
@@ -97,6 +99,7 @@
         LEFT JOIN t_sys_organization a1 on m.collegeId = a1.id and a1.rec_status = 0
         LEFT JOIN t_sys_organization a2 on m.dormitoryId = a2.id and a2.rec_status = 0
         LEFT JOIN t_sys_organization a3 on m.stuClassId = a3.id and a3.rec_status = 0
+        LEFT JOIN t_sys_organization a4 on m.grade = a4.id and a4.rec_status = 0
         order by m.submitTime desc
     </select>
     <select id="queryItemByOrderId" resultType="com.ccsens.delivery.bean.vo.MaterialVo$MaterialOrderDetail">
diff --git a/src/main/resources/mapper_raw/SysUserInfoMapper.xml b/src/main/resources/mapper_raw/SysUserInfoMapper.xml
index 6b1773b..98b29d5 100644
--- a/src/main/resources/mapper_raw/SysUserInfoMapper.xml
+++ b/src/main/resources/mapper_raw/SysUserInfoMapper.xml
@@ -15,6 +15,7 @@
     <result column="dormitory_name" jdbcType="VARCHAR" property="dormitoryName" />
     <result column="address" jdbcType="VARCHAR" property="address" />
     <result column="grade" jdbcType="VARCHAR" property="grade" />
+    <result column="grade_name" jdbcType="VARCHAR" property="gradeName" />
     <result column="stu_class_id" jdbcType="VARCHAR" property="stuClassId" />
     <result column="stu_class_name" jdbcType="VARCHAR" property="stuClassName" />
     <result column="student_type" jdbcType="TINYINT" property="studentType" />
@@ -83,8 +84,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, user_id, post, name, number, phone, id_card, college_id, college_name, dormitory_id, 
-    dormitory_name, address, grade, stu_class_id, stu_class_name, student_type, operator, 
-    created_at, updated_at, rec_status
+    dormitory_name, address, grade, grade_name, stu_class_id, stu_class_name, student_type, 
+    operator, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.delivery.bean.po.SysUserInfoExample" resultMap="BaseResultMap">
     select
@@ -121,16 +122,18 @@
       name, number, phone, 
       id_card, college_id, college_name, 
       dormitory_id, dormitory_name, address, 
-      grade, stu_class_id, stu_class_name, 
-      student_type, operator, created_at, 
-      updated_at, rec_status)
+      grade, grade_name, stu_class_id, 
+      stu_class_name, student_type, operator, 
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{post,jdbcType=TINYINT}, 
       #{name,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
       #{idCard,jdbcType=VARCHAR}, #{collegeId,jdbcType=BIGINT}, #{collegeName,jdbcType=VARCHAR}, 
       #{dormitoryId,jdbcType=BIGINT}, #{dormitoryName,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
-      #{grade,jdbcType=VARCHAR}, #{stuClassId,jdbcType=VARCHAR}, #{stuClassName,jdbcType=VARCHAR}, 
-      #{studentType,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{grade,jdbcType=VARCHAR}, #{gradeName,jdbcType=VARCHAR}, #{stuClassId,jdbcType=VARCHAR}, 
+      #{stuClassName,jdbcType=VARCHAR}, #{studentType,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.delivery.bean.po.SysUserInfo">
     insert into t_sys_user_info
@@ -174,6 +177,9 @@
       <if test="grade != null">
         grade,
       </if>
+      <if test="gradeName != null">
+        grade_name,
+      </if>
       <if test="stuClassId != null">
         stu_class_id,
       </if>
@@ -236,6 +242,9 @@
       <if test="grade != null">
         #{grade,jdbcType=VARCHAR},
       </if>
+      <if test="gradeName != null">
+        #{gradeName,jdbcType=VARCHAR},
+      </if>
       <if test="stuClassId != null">
         #{stuClassId,jdbcType=VARCHAR},
       </if>
@@ -307,6 +316,9 @@
       <if test="record.grade != null">
         grade = #{record.grade,jdbcType=VARCHAR},
       </if>
+      <if test="record.gradeName != null">
+        grade_name = #{record.gradeName,jdbcType=VARCHAR},
+      </if>
       <if test="record.stuClassId != null">
         stu_class_id = #{record.stuClassId,jdbcType=VARCHAR},
       </if>
@@ -348,6 +360,7 @@
       dormitory_name = #{record.dormitoryName,jdbcType=VARCHAR},
       address = #{record.address,jdbcType=VARCHAR},
       grade = #{record.grade,jdbcType=VARCHAR},
+      grade_name = #{record.gradeName,jdbcType=VARCHAR},
       stu_class_id = #{record.stuClassId,jdbcType=VARCHAR},
       stu_class_name = #{record.stuClassName,jdbcType=VARCHAR},
       student_type = #{record.studentType,jdbcType=TINYINT},
@@ -398,6 +411,9 @@
       <if test="grade != null">
         grade = #{grade,jdbcType=VARCHAR},
       </if>
+      <if test="gradeName != null">
+        grade_name = #{gradeName,jdbcType=VARCHAR},
+      </if>
       <if test="stuClassId != null">
         stu_class_id = #{stuClassId,jdbcType=VARCHAR},
       </if>
@@ -436,6 +452,7 @@
       dormitory_name = #{dormitoryName,jdbcType=VARCHAR},
       address = #{address,jdbcType=VARCHAR},
       grade = #{grade,jdbcType=VARCHAR},
+      grade_name = #{gradeName,jdbcType=VARCHAR},
       stu_class_id = #{stuClassId,jdbcType=VARCHAR},
       stu_class_name = #{stuClassName,jdbcType=VARCHAR},
       student_type = #{studentType,jdbcType=TINYINT},
diff --git a/src/main/resources/mbg.xml b/src/main/resources/mbg.xml
index 7825956..e662a40 100644
--- a/src/main/resources/mbg.xml
+++ b/src/main/resources/mbg.xml
@@ -61,7 +61,7 @@
 <!--        <table tableName="t_sys_area" domainObjectName="SysArea"/>-->
 <!--        <table tableName="t_stu_order" domainObjectName="StuOrder"/>-->
 <!--        <table tableName="t_stu_order_item" domainObjectName="StuOrderItem"/>-->
-<!--        <table tableName="t_sys_user_info" domainObjectName="SysUserInfo"/>-->
+        <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"/>-->
@@ -70,7 +70,7 @@
 <!--        <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"/>
+<!--        <table tableName="t_sys_user_position" domainObjectName="SysUserPosition"/>-->
     </context>
 
 </generatorConfiguration>
\ No newline at end of file