Merge remote-tracking branch 'origin/dev' into dev

db/attendance.sql

@@ -42,13 +42,14 @@ COMMENT = '班次表';
 -- -----------------------------------------------------
 DROP TABLE IF EXISTS `aroad`.`attendance` ;
 
-CREATE TABLE IF NOT EXISTS `aroad`.`attendance` (
-  `attendance_id` INT NOT NULL AUTO_INCREMENT COMMENT '排班id',
-  `shift_id` INT NOT NULL COMMENT '班次表主键',
+CREATE TABLE `attendance` (
+  `attendance_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '排班id',
+  `shift_id` int(11) NOT NULL COMMENT '班次表主键',
+  `time` date NOT NULL COMMENT '排班日期',
+  `unit_id` int(11) NOT NULL COMMENT '排班部门id',
   PRIMARY KEY (`attendance_id`),
-  INDEX `shift_id_index` (`shift_id` ASC) VISIBLE)
-ENGINE = InnoDB
-COMMENT = '排班表';
+  KEY `shift_id_index` (`shift_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='排班表';
 
 
 -- -----------------------------------------------------
@@ -56,31 +57,15 @@ COMMENT = '排班表';
 -- -----------------------------------------------------
 DROP TABLE IF EXISTS `aroad`.`attendance_members` ;
 
-CREATE TABLE IF NOT EXISTS `aroad`.`attendance_members` (
-  `id` INT NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `attendance_id` INT NOT NULL,
-  `name` VARCHAR(10) NOT NULL COMMENT '值班人员姓名',
+CREATE TABLE `attendance_members` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `attendance_id` int(11) NOT NULL,
+  `name` varchar(10) NOT NULL COMMENT '值班人员姓名',
+  `phone` varchar(15) NOT NULL COMMENT '手机号',
   PRIMARY KEY (`id`),
-  INDEX `attendance_id_index` (`attendance_id` ASC) INVISIBLE)
-ENGINE = InnoDB
-COMMENT = '值班人员表';
+  KEY `attendance_id_index` (`attendance_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='值班人员表';
 
--- -----------------------------------------------------
--- Table `aroad`.`attendance_records`
--- -----------------------------------------------------
-DROP TABLE IF EXISTS `aroad`.`attendance_records` ;
-
-CREATE TABLE IF NOT EXISTS `aroad`.`attendance_records` (
-  `record_id` INT NOT NULL AUTO_INCREMENT COMMENT '通讯录id',
-  `unit` VARCHAR(30) NOT NULL,
-  `department` VARCHAR(30) NOT NULL COMMENT '部门id',
-  `position` VARCHAR(30) NULL,
-  `name` VARCHAR(10) NOT NULL,
-  `telphone` VARCHAR(15) NULL,
-  `remark` VARCHAR(100) NULL,
-  PRIMARY KEY (`record_id`))
-ENGINE = InnoDB
-COMMENT = '值班通讯录';
 
 
 SET SQL_MODE=@OLD_SQL_MODE;

pom.xml

@@ -179,11 +179,6 @@
             <artifactId>gson</artifactId>
             <version>2.8.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.47</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/controller/AttendanceController.java

@@ -46,6 +46,18 @@ public class AttendanceController extends BaseController  {
     return new R<>(attendanceService.getById(attendanceId));
   }
 
+  /** 
+  * @Description: 查询部门下的排班计划
+  * @Param: [deptId] 
+  * @return: com.elephant.framework.galaxy.aroad.response.R 
+  * @Author: songwenjie 
+  * @Date: 2019/4/17
+  */ 
+  @GetMapping("/list/{deptId}")
+  public R getAttance(@PathVariable("deptId") Integer deptId){
+    return new R<>(attendanceService.getAttendance(deptId));
+  }
+
   /**
    * 新增排班表
    * @param attendance 排班表

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/controller/AttendanceMembersController.java

@@ -46,6 +46,20 @@ public class AttendanceMembersController extends BaseController  {
     return new R<>(attendanceMembersService.getById(id));
   }
 
+
+  /** 
+  * @Description:  获取一次排班中的值班人员信息
+  * @Param: [attendanceId] 
+  * @return: com.elephant.framework.galaxy.aroad.response.R 
+  * @Author: songwenjie 
+  * @Date: 2019/4/17 
+  */ 
+  @GetMapping("/byattendance/{attendanceId}")
+  public R getMembers(@PathVariable("attendanceId") int attendanceId){
+    return new  R<>(attendanceMembersService.getMembers(attendanceId));
+  }
+
+
   /**
    * 新增值班人员表
    * @param attendanceMembers 值班人员表

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/AttendanceDto.java

+package com.elephant.framework.galaxy.aroad.module.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-04-16 16:37
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AttendanceDto {
+    /**
+     * 排班id
+     */
+    private int attendanceId;
+
+    /**
+    部门id
+     */
+    private int unitId;
+
+    /**
+     * 班次id
+     */
+    private int shiftId;
+
+    /**
+     * 班次名称
+     */
+    private String shiftName;
+
+    /**
+     * 值班人数
+     */
+    private int count;
+
+    /**
+     * 值班时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date time;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/MemberDto.java

+package com.elephant.framework.galaxy.aroad.module.attendance.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @program:
+ * @description:
+ * @author: songwenjie
+ * @create: 2019-04-17 15:51
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MemberDto {
+    /**
+     * 值班人员姓名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 模板名称
+     */
+    private String shiftName;
+    /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date date;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "HH:mm:00",timezone="GMT+8")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "HH:mm:00",timezone="GMT+8")
+    private Date endTime;
+
+    /**
+     * 是否跨日
+      */
+    private String isCrossDay;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/mapper/AttendanceMapper.java

 package com.elephant.framework.galaxy.aroad.module.attendance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
 
+import java.util.List;
+
 /**
  * 排班表
  *
@@ -11,4 +14,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
  */
 public interface AttendanceMapper extends BaseMapper<Attendance> {
 
+    /** 
+    * @Description: 查询部门下的排班计划
+    * @Param: [deptId] 
+    * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto> 
+    * @Author: songwenjie 
+    * @Date: 2019/4/16 
+    */ 
+    List<AttendanceDto> getAttendance(int deptId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/mapper/AttendanceMembersMapper.java

 package com.elephant.framework.galaxy.aroad.module.attendance.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 
+import java.util.List;
+
 /**
  * 值班人员表
  *
@@ -11,4 +14,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMe
  */
 public interface AttendanceMembersMapper extends BaseMapper<AttendanceMembers> {
 
+    /** 
+    * @Description: 获取一次排班中的值班人员信息
+    * @Param: [attendanceId] 
+    * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto> 
+    * @Author: songwenjie 
+    * @Date: 2019/4/17 
+    */ 
+    List<MemberDto> getMembers(int attendanceId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/AttendanceMembersService.java

 package com.elephant.framework.galaxy.aroad.module.attendance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 
+import java.util.List;
+
 /**
  * 值班人员表
  *
@@ -11,4 +14,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMe
  */
 public interface AttendanceMembersService extends IService<AttendanceMembers> {
 
+    /**
+     * @Description: 获取一次排班中的值班人员信息
+     * @Param: [attendanceId]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/17
+     */
+    List<MemberDto> getMembers(int attendanceId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/AttendanceService.java

 package com.elephant.framework.galaxy.aroad.module.attendance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
 
+import java.util.List;
+
 /**
  * 排班表
  *
@@ -11,4 +14,12 @@ import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
  */
 public interface AttendanceService extends IService<Attendance> {
 
+    /**
+     * @Description: 查询部门下的排班计划
+     * @Param: [deptId]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/16
+     */
+    List<AttendanceDto> getAttendance(int deptId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/impl/AttendanceMembersServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.attendance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.AttendanceMembers;
 import com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceMembersMapper;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceMembersService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 值班人员表
  *
@@ -15,4 +18,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class AttendanceMembersServiceImpl extends ServiceImpl<AttendanceMembersMapper, AttendanceMembers> implements AttendanceMembersService {
 
+    /**
+     * @Description: 获取一次排班中的值班人员信息
+     * @Param: [attendanceId]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/17
+     */
+    public List<MemberDto> getMembers(int attendanceId){
+        return baseMapper.getMembers(attendanceId);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/service/impl/AttendanceServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.attendance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto;
 import com.elephant.framework.galaxy.aroad.module.attendance.entity.Attendance;
 import com.elephant.framework.galaxy.aroad.module.attendance.mapper.AttendanceMapper;
 import com.elephant.framework.galaxy.aroad.module.attendance.service.AttendanceService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 排班表
  *
@@ -15,4 +18,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attendance> implements AttendanceService {
 
+    /**
+     * @Description: 查询部门下的排班计划
+     * @Param: [deptId]
+     * @return: java.util.List<com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto>
+     * @Author: songwenjie
+     * @Date: 2019/4/16
+     */
+    public List<AttendanceDto> getAttendance(int deptId){
+        return baseMapper.getAttendance(deptId);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljbxxXxctdqkController.java

@@ -32,10 +32,12 @@ public class ZhtjGljbxxXxctdqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGljbxxXxctdqkPage(Page page, ZhtjGljbxxXxctdqk zhtjGljbxxXxctdqk) {
+    if(zhtjGljbxxXxctdqk.getYear() == null){
+      zhtjGljbxxXxctdqk.setYear("2018");
+    }
     return  new R<>(zhtjGljbxxXxctdqkService.page(page,Wrappers.query(zhtjGljbxxXxctdqk)));
   }
 
-
   /**
    * 通过id查询县乡村通达情况
    * @param id id

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljszkpdController.java

@@ -32,6 +32,10 @@ public class ZhtjGljszkpdController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGljszkpdPage(Page page, ZhtjGljszkpd zhtjGljszkpd) {
+    if(zhtjGljszkpd.getYear() == null || "".equals(zhtjGljszkpd.getYear())){
+      // 获取最新的时间
+      zhtjGljszkpd.setYear(zhtjGljszkpdService.newYear(zhtjGljszkpd.getType()));
+    }
     return  new R<>(zhtjGljszkpdService.page(page,Wrappers.query(zhtjGljszkpd)));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGllmqkController.java

@@ -33,6 +33,10 @@ public class ZhtjGllmqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGllmqkPage(Page page, ZhtjGllmqk zhtjGllmqk) {
+    if(zhtjGllmqk.getYear() == null || "".equals(zhtjGllmqk.getYear())){
+      // 获取最新的时间
+      zhtjGllmqk.setYear(zhtjGllmqkService.newYear(zhtjGllmqk.getType()));
+    }
     return  new R<>(zhtjGllmqkService.page(page,Wrappers.query(zhtjGllmqk)));
   }
   /**

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkQlqkController.java

@@ -32,6 +32,10 @@ public class ZhtjGlqsqkQlqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGlqsqkQlqkPage(Page page, ZhtjGlqsqkQlqk zhtjGlqsqkQlqk) {
+    if(zhtjGlqsqkQlqk.getYear() == null || "".equals(zhtjGlqsqkQlqk.getYear())){
+      // 获取最新的时间
+      zhtjGlqsqkQlqk.setYear(zhtjGlqsqkQlqkService.newYear());
+    }
     return  new R<>(zhtjGlqsqkQlqkService.page(page,Wrappers.query(zhtjGlqsqkQlqk)));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkSdqkController.java

@@ -32,6 +32,10 @@ public class ZhtjGlqsqkSdqkController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhtjGlqsqkSdqkPage(Page page, ZhtjGlqsqkSdqk zhtjGlqsqkSdqk) {
+    if(zhtjGlqsqkSdqk.getYear() == null || "".equals(zhtjGlqsqkSdqk.getYear())){
+      // 获取最新的时间
+      zhtjGlqsqkSdqk.setYear(zhtjGlqsqkSdqkService.newYear());
+    }
     return  new R<>(zhtjGlqsqkSdqkService.page(page,Wrappers.query(zhtjGlqsqkSdqk)));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjZhzsLnsjController.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj;
+import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjZhzsLnsjService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 历年数据
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 17:23:38
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhtj/zhtjzhzslnsj")
+public class ZhtjZhzsLnsjController extends BaseController  {
+
+  private final  ZhtjZhzsLnsjService zhtjZhzsLnsjService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhtjZhzsLnsj 历年数据
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhtjZhzsLnsjPage(Page page, ZhtjZhzsLnsj zhtjZhzsLnsj) {
+    return  new R<>(zhtjZhzsLnsjService.page(page,Wrappers.query(zhtjZhzsLnsj)));
+  }
+
+  /**
+   * 分页查询
+   * @param year 年份
+   * @return
+   */
+  @GetMapping("/getInfoByYear")
+  public R getListByYear(String year) {
+    return  new R<>(zhtjZhzsLnsjService.getListByYear(year));
+  }
+
+  /**
+   * 通过id查询历年数据
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") Integer id){
+    return new R<>(zhtjZhzsLnsjService.getById(id));
+  }
+
+  /**
+   * 新增历年数据
+   * @param zhtjZhzsLnsj 历年数据
+   * @return R
+   */
+  @SysLog("新增历年数据")
+  @PostMapping
+  public R save(@RequestBody ZhtjZhzsLnsj zhtjZhzsLnsj){
+    return new R<>(zhtjZhzsLnsjService.save(zhtjZhzsLnsj));
+  }
+
+  /**
+   * 修改历年数据
+   * @param zhtjZhzsLnsj 历年数据
+   * @return R
+   */
+  @SysLog("修改历年数据")
+  @PutMapping
+  public R updateById(@RequestBody ZhtjZhzsLnsj zhtjZhzsLnsj){
+    return new R<>(zhtjZhzsLnsjService.updateById(zhtjZhzsLnsj));
+  }
+
+  /**
+   * 通过id删除历年数据
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除历年数据")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable Integer id){
+    return new R<>(zhtjZhzsLnsjService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjZhzsZtqkController.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsZtqk;
+import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjZhzsZtqkService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 综合展示总体情况
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 23:17:57
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhtj/zhtjzhzsztqk")
+public class ZhtjZhzsZtqkController extends BaseController  {
+
+  private final  ZhtjZhzsZtqkService zhtjZhzsZtqkService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhtjZhzsZtqk 综合展示总体情况
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhtjZhzsZtqkPage(Page page, ZhtjZhzsZtqk zhtjZhzsZtqk) {
+    return  new R<>(zhtjZhzsZtqkService.page(page,Wrappers.query(zhtjZhzsZtqk)));
+  }
+
+
+  /**
+   * 通过id查询综合展示总体情况
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") Integer id){
+    return new R<>(zhtjZhzsZtqkService.getById(id));
+  }
+
+  /**
+   * 新增综合展示总体情况
+   * @param zhtjZhzsZtqk 综合展示总体情况
+   * @return R
+   */
+  @SysLog("新增综合展示总体情况")
+  @PostMapping
+  public R save(@RequestBody ZhtjZhzsZtqk zhtjZhzsZtqk){
+    return new R<>(zhtjZhzsZtqkService.save(zhtjZhzsZtqk));
+  }
+
+  /**
+   * 修改综合展示总体情况
+   * @param zhtjZhzsZtqk 综合展示总体情况
+   * @return R
+   */
+  @SysLog("修改综合展示总体情况")
+  @PutMapping
+  public R updateById(@RequestBody ZhtjZhzsZtqk zhtjZhzsZtqk){
+    return new R<>(zhtjZhzsZtqkService.updateById(zhtjZhzsZtqk));
+  }
+
+  /**
+   * 通过id删除综合展示总体情况
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除综合展示总体情况")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable Integer id){
+    return new R<>(zhtjZhzsZtqkService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGljszkpd.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-11 17:58:58
  */
 @Data
-@TableName("T_ZHTJ_GLJSZKPD")
+@TableName("t_zhtj_gljszkpd")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGljszkpd extends Model<ZhtjGljszkpd> {
 private static final long serialVersionUID = 1L;

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGllmqk.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-12 11:04:15
  */
 @Data
-@TableName("T_ZHTJ_GLLMQK")
+@TableName("t_zhtj_gllmqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGllmqk extends Model<ZhtjGllmqk> {
 private static final long serialVersionUID = 1L;

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkQlqk.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-12 08:57:24
  */
 @Data
-@TableName("T_ZHTJ_GLQSQK_QLQK")
+@TableName("t_zhtj_glqsqk_qlqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGlqsqkQlqk extends Model<ZhtjGlqsqkQlqk> {
 private static final long serialVersionUID = 1L;

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkSdqk.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-11 20:53:25
  */
 @Data
-@TableName("T_ZHTJ_GLQSQK_SDQK")
+@TableName("t_zhtj_glqsqk_sdqk")
 @EqualsAndHashCode(callSuper = true)
 public class ZhtjGlqsqkSdqk extends Model<ZhtjGlqsqkSdqk> {
 private static final long serialVersionUID = 1L;

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjZhzsLnsj.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 历年数据
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 17:23:38
+ */
+@Data
+@TableName("t_zhtj_zhzs_lnsj")
+@EqualsAndHashCode(callSuper = true)
+public class ZhtjZhzsLnsj extends Model<ZhtjZhzsLnsj> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @TableId
+  private Integer id;
+  /**
+   * 年份
+   */
+  private String year;
+  /**
+   * 公里
+   */
+  private String unit;
+  /**
+   * 通车里程（单位：公里）
+   */
+  private Double gsgl;
+  /**
+   * 高速公路（单位：公里）
+   */
+  private Double tclc;
+  /**
+   * 一级公路（单位：公里）
+   */
+  private Double yjgl;
+  /**
+   * 二级公路（单位：公里）
+   */
+  private Double ejgl;
+  /**
+   * 二级及以上（单位：公里）
+   */
+  private Double ejjys;
+  /**
+   * 排序
+   */
+  private Integer sort;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjZhzsZtqk.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 综合展示总体情况
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 23:17:57
+ */
+@Data
+@TableName("t_zhtj_zhzs_ztqk")
+@EqualsAndHashCode(callSuper = true)
+public class ZhtjZhzsZtqk extends Model<ZhtjZhzsZtqk> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 
+   */
+  @TableId
+  private Integer id;
+  /**
+   * 年份
+   */
+  private String year;
+  /**
+   * 标题
+   */
+  private String title;
+  /**
+   * 总体情况描述
+   */
+  private String content;
+  /**
+   * 其他
+   */
+  private Double other;
+  /**
+   * 排序
+   */
+  private Integer sort;
+  /**
+   * 创建人
+   */
+  private String creator;
+  /**
+   * 创建时间
+   */
+  private LocalDateTime createTime;
+  /**
+   * 更新人
+   */
+  private String updatePerson;
+  /**
+   * 更新时间
+   */
+  private LocalDateTime updateTime;
+  /**
+   * 状态：根据具体需求定义
+   */
+  private String status;
+  /**
+   * 是否删除  -1：已删除  0：正常
+   */
+  private String delFlag;
+  /**
+   * 备注信息
+   */
+  private String remarks;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface ZhtjGljsdjqkMapper extends BaseMapper<ZhtjGljsdjqk> {
    //查詢普通公路覆蓋情況
    List<ZhtjGljsdjqk> selectZhtjGljsdjqk(String area,String type);
+   // 查询最新年份
+   String newYear(@Param("type")String type);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljszkpdMapper.java

@@ -2,6 +2,7 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 综合统计_公路技术状况评定
@@ -10,5 +11,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
  * @date 2019-03-11 17:58:58
  */
 public interface ZhtjGljszkpdMapper extends BaseMapper<ZhtjGljszkpd> {
-
+    String newYear(@Param("type") String type);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGllmqkMapper.java

@@ -2,6 +2,8 @@ package com.elephant.framework.galaxy.aroad.module.zhtj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGllmqk;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -15,5 +17,6 @@ public interface ZhtjGllmqkMapper extends BaseMapper<ZhtjGllmqk> {
 // 根据年份、类型查询各地市路面情况
     List<ZhtjGllmqk> electZhtjGllmqks(String year, String type,String area);
     Map<String, Object> selectOrdinary(String type, String year, String area);
-
+// 查询数据最新年份
+    String newYear(@Param("type") String type);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkQlqkMapper.java

@@ -10,5 +10,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
  * @date 2019-03-12 08:57:24
  */
 public interface ZhtjGlqsqkQlqkMapper extends BaseMapper<ZhtjGlqsqkQlqk> {
-
+    // 查询最新的年份
+    String newYear();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkSdqkMapper.java

@@ -10,5 +10,6 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
  * @date 2019-03-11 20:53:25
  */
 public interface ZhtjGlqsqkSdqkMapper extends BaseMapper<ZhtjGlqsqkSdqk> {
-
+    // 查询最新年份
+    String newYear();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjZhzsLnsjMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 历年数据
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 17:23:38
+ */
+public interface ZhtjZhzsLnsjMapper extends BaseMapper<ZhtjZhzsLnsj> {
+    List<ZhtjZhzsLnsj> getListByYear(@Param("year") String year);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjZhzsZtqkMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsZtqk;
+
+/**
+ * 综合展示总体情况
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 23:17:57
+ */
+public interface ZhtjZhzsZtqkMapper extends BaseMapper<ZhtjZhzsZtqk> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljszkpdService.java

@@ -10,5 +10,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
  * @date 2019-03-11 17:58:58
  */
 public interface ZhtjGljszkpdService extends IService<ZhtjGljszkpd> {
-
+    String newYear(String type);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGllmqkService.java

@@ -19,4 +19,5 @@ public interface ZhtjGllmqkService extends IService<ZhtjGllmqk> {
      */
     Map<String,Object> getGlfgqktj();
     Map<String, Object> getOrdinary(String type, String year, String area);
+    String newYear(String type);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkQlqkService.java

@@ -10,5 +10,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
  * @date 2019-03-12 08:57:24
  */
 public interface ZhtjGlqsqkQlqkService extends IService<ZhtjGlqsqkQlqk> {
-
+    String newYear();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkSdqkService.java

@@ -10,5 +10,5 @@ import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
  * @date 2019-03-11 20:53:25
  */
 public interface ZhtjGlqsqkSdqkService extends IService<ZhtjGlqsqkSdqk> {
-
+    String newYear();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjZhzsLnsjService.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+
+/**
+ * 历年数据
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 17:23:38
+ */
+public interface ZhtjZhzsLnsjService extends IService<ZhtjZhzsLnsj> {
+    public List<ZhtjZhzsLnsj> getListByYear(String year);
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjZhzsZtqkService.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsZtqk;
+
+/**
+ * 综合展示总体情况
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 23:17:57
+ */
+public interface ZhtjZhzsZtqkService extends IService<ZhtjZhzsZtqk> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java

@@ -100,13 +100,21 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         return ipage;
     }
 
+    /**
+     * 全省公路技术等级划分Echarts、全省公路行政等级划分Echarts
+     * @return
+     */
     @Override
     public Map<String, Object> getQsgljsxz() {
         Map<String,Object> resultMap = new HashMap<>();
+        // 获取省道最新年份
+        String sdnewYear = zgtjgljsdjqkMapper.newYear("'省道'");
         // 获取全省公路技术等级划分
-        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道"));
+        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道").eq(ZhtjGljsdjqk::getYear,sdnewYear));
+        // 获取全省行政等级最新年份
+        String sdxznewYear = zgtjgljsdjqkMapper.newYear("'国道','省道','县道','乡道','村道','专用公路','总计'");
         // 获取全省行政等级划分
-        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计"));
+        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计").eq(ZhtjGljsdjqk::getYear,sdxznewYear));
         // 存储行政等级处理结果
         List<Map<String,Object>> withinList = new ArrayList<>();
         List<Map<String,Object>> abroadData = new ArrayList<>();
@@ -131,6 +139,7 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         resultMap.put("glxzdjhf",new HashMap<String,Object>(){{
             put("withinList",withinList);
             put("abroadData",abroadData);
+            put("glxzdjhfYear",sdxznewYear);
         }});
         return resultMap;
     }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljszkpdServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGljszkpd;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGljszkpdMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGljszkpdService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
  * @date 2019-03-11 17:58:58
  */
 @Service
+@AllArgsConstructor
 public class ZhtjGljszkpdServiceImpl extends ServiceImpl<ZhtjGljszkpdMapper, ZhtjGljszkpd> implements ZhtjGljszkpdService {
-
+    private final ZhtjGljszkpdMapper zhtjGljszkpdMapper;
+    @Override
+    public String newYear(String type) {
+        return zhtjGljszkpdMapper.newYear(type);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGllmqkServiceImpl.java

@@ -155,4 +155,9 @@ public class ZhtjGllmqkServiceImpl extends ServiceImpl<ZhtjGllmqkMapper, ZhtjGll
         Map<String, Object> mapOrdinary =  zhtjGllmqkMapper.selectOrdinary(type,year,area);
         return mapOrdinary;
     }
+
+    @Override
+    public String newYear(String type) {
+        return zhtjGllmqkMapper.newYear(type);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkQlqkServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkQlqk;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGlqsqkQlqkMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGlqsqkQlqkService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
  * @date 2019-03-12 08:57:24
  */
 @Service
+@AllArgsConstructor
 public class ZhtjGlqsqkQlqkServiceImpl extends ServiceImpl<ZhtjGlqsqkQlqkMapper, ZhtjGlqsqkQlqk> implements ZhtjGlqsqkQlqkService {
-
+    private final ZhtjGlqsqkQlqkMapper zhtjGlqsqkQlqkMapper;
+    @Override
+    public String newYear() {
+        return zhtjGlqsqkQlqkMapper.newYear();
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkSdqkServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjGlqsqkSdqk;
 import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjGlqsqkSdqkMapper;
 import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjGlqsqkSdqkService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
  * @date 2019-03-11 20:53:25
  */
 @Service
+@AllArgsConstructor
 public class ZhtjGlqsqkSdqkServiceImpl extends ServiceImpl<ZhtjGlqsqkSdqkMapper, ZhtjGlqsqkSdqk> implements ZhtjGlqsqkSdqkService {
-
+    private final ZhtjGlqsqkSdqkMapper zhtjGlqsqkSdqkMapper;
+    @Override
+    public String newYear() {
+        return zhtjGlqsqkSdqkMapper.newYear();
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjZhzsLnsjServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj;
+import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjZhzsLnsjMapper;
+import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjZhzsLnsjService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 历年数据
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 17:23:38
+ */
+@Service
+@AllArgsConstructor
+public class ZhtjZhzsLnsjServiceImpl extends ServiceImpl<ZhtjZhzsLnsjMapper, ZhtjZhzsLnsj> implements ZhtjZhzsLnsjService {
+
+    private final ZhtjZhzsLnsjMapper zhtjZhzsLnsjMapper;
+
+    @Override
+    public List<ZhtjZhzsLnsj> getListByYear(String year) {
+        List<ZhtjZhzsLnsj> aaa =  zhtjZhzsLnsjMapper.getListByYear(year);
+        return aaa;
+    }
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjZhzsZtqkServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhtj.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsZtqk;
+import com.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjZhzsZtqkMapper;
+import com.elephant.framework.galaxy.aroad.module.zhtj.service.ZhtjZhzsZtqkService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 综合展示总体情况
+ *
+ * @author xuzhitu
+ * @date 2019-04-16 23:17:57
+ */
+@Service
+public class ZhtjZhzsZtqkServiceImpl extends ServiceImpl<ZhtjZhzsZtqkMapper, ZhtjZhzsZtqk> implements ZhtjZhzsZtqkService {
+
+}

src/main/resources/mapper/ZhtjZhzsZtqkMapper.xml

+<?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.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjZhzsZtqkMapper">
+
+  <resultMap id="zhtjZhzsZtqkMap" type="com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsZtqk">
+        <id property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="other" column="other"/>
+        <result property="sort" column="sort"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/attendance/AttendanceMapper.xml

@@ -8,4 +8,25 @@
         <id property="attendanceId" column="attendance_id"/>
         <result property="shiftId" column="shift_id"/>
   </resultMap>
+
+  <resultMap id="attendanceDtoMap" type="com.elephant.framework.galaxy.aroad.module.attendance.dto.AttendanceDto">
+      <result property="attendanceId" column="attendance_id"/>
+      <result property="shiftId" column="shift_id"/>
+      <result property="unitId" column="unit_id"/>
+      <result property="time" column="time"/>
+      <result property="shiftName" column="shift_name"/>
+      <result property="count" column="count"/>
+  </resultMap>
+
+  <select id="getAttendance" resultMap="attendanceDtoMap">
+      SELECT
+        a.attendance_id,a.unit_id,a.time,t.shift_id,t.shift_name,COUNT(m.id) as count
+      FROM `attendance` a
+      INNER JOIN attendance_templates  t
+      ON a.shift_id = t.shift_id
+      INNER JOIN attendance_members m
+      ON a.attendance_id = m.attendance_id
+      WHERE a.unit_id = #{unitId}
+      GROUP BY a.time,a.shift_id
+  </select>
 </mapper>

src/main/resources/mapper/attendance/AttendanceMembersMapper.xml

@@ -9,4 +9,28 @@
         <result property="attendanceId" column="attendance_id"/>
         <result property="name" column="name"/>
   </resultMap>
+
+  <resultMap id="memberDtoMap" type="com.elephant.framework.galaxy.aroad.module.attendance.dto.MemberDto">
+      <result property="name" column="name"/>
+      <result property="phone" column="phone"/>
+      <result property="shiftName" column="shift_name"/>
+      <result property="date" column="time"/>
+      <result property="startTime" column="start_time"/>
+      <result property="endTime" column="end_time"/>
+  </resultMap>
+
+  <select id="getMembers" resultMap="memberDtoMap">
+      SELECT
+        a.time,
+        t.shift_name,t.start_time,t.end_time,t.is_cross_day,
+        m.name,m.phone
+      FROM `attendance` a
+      INNER JOIN attendance_templates  t
+      ON a.shift_id = t.shift_id
+      INNER JOIN attendance_members m
+      ON a.attendance_id = m.attendance_id
+      WHERE a.attendance_id = #{attendanceId}
+  </select>
+
 </mapper>
+

src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml

@@ -27,10 +27,18 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+    <sql id="maxYear">
+        select max(year) maxyear from `t_zhtj_gljsdjqk`
+    </sql>
     <select id="selectZhtjGljsdjqk" resultMap="zhtjGljsdjqkMap">
           SELECT * FROM `t_zhtj_gljsdjqk` as tsd where area=#{area} and type in (${type}) and year = (
-          select max(year) maxyear from `t_zhtj_gljsdjqk`
+          <include refid="maxYear"/>
        )
-
+    </select>
+    <select id="newYear" resultType="string">
+        <include refid="maxYear"/>
+        <if test="type != null and type != ''">
+            where type in (${type})
+        </if>
     </select>
 </mapper>

src/main/resources/mapper/zhtj/ZhtjGljszkpdMapper.xml

@@ -25,4 +25,10 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="newYear" resultType="string">
+            select max(year) from t_zhtj_gljszkpd
+            <if test="type != null and type != ''">
+                  where type = #{type}
+            </if>
+      </select>
 </mapper>

src/main/resources/mapper/zhtj/ZhtjGllmqkMapper.xml

@@ -25,11 +25,14 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <sql id="maxYear">
+            select max(year) maxyear from `t_zhtj_gllmqk`
+      </sql>
       <select id="electZhtjGllmqks" resultMap="zhtjGllmqkMap">
             SELECT * FROM `t_zhtj_gllmqk` where type = #{type}
              <if test="year==null or year==''">
                    and year=(
-                   select max(year) maxyear from `t_zhtj_gllmqk`
+                    <include refid="maxYear"/>
                    )
              </if>
             <if test="year!=null and year!=''">
@@ -43,7 +46,7 @@
             SELECT sum(ypzlm_lqhnt) as ypzlm_lqhnt,sum(ypzlm_snhnt) as ypzlm_snhnt,sum(jypzlm) as jypzlm,sum(wpzlm) as wpzlm FROM `t_zhtj_gllmqk` where type in (${type})
             <if test="year==null or year==''">
                   and year=(
-                  select max(year) maxyear from `t_zhtj_gllmqk`
+                     <include refid="maxYear"/>
                   )
             </if>
             <if test="year!=null and year!=''">
@@ -53,4 +56,10 @@
                   and area=#{area}
             </if>
       </select>
+      <select id="newYear" resultType="string">
+            <include refid="maxYear"/>
+            <if test="type!=null and type!=''">
+                where type=#{type}
+            </if>
+      </select>
 </mapper>

src/main/resources/mapper/zhtj/ZhtjGlqsqkQlqkMapper.xml

@@ -27,4 +27,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="newYear" resultType="string">
+            select max(year) from t_zhtj_glqsqk_qlqk
+      </select>
 </mapper>

src/main/resources/mapper/zhtj/ZhtjGlqsqkSdqkMapper.xml

@@ -27,4 +27,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+      <select id="newYear" resultType="string">
+            select max(year) from t_zhtj_glqsqk_sdqk
+      </select>
 </mapper>

src/main/resources/mapper/zhtj/ZhtjZhzsLnsjMapper.xml

+<?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.elephant.framework.galaxy.aroad.module.zhtj.mapper.ZhtjZhzsLnsjMapper">
+
+  <resultMap id="zhtjZhzsLnsjMap" type="com.elephant.framework.galaxy.aroad.module.zhtj.entity.ZhtjZhzsLnsj">
+        <id property="id" column="id"/>
+        <result property="year" column="year"/>
+        <result property="unit" column="unit"/>
+        <result property="gsgl" column="gsgl"/>
+        <result property="tclc" column="tclc"/>
+        <result property="yjgl" column="yjgl"/>
+        <result property="ejgl" column="ejgl"/>
+        <result property="ejjys" column="ejjys"/>
+        <result property="sort" column="sort"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+
+  <select id="getListByYear" resultMap="zhtjZhzsLnsjMap">
+        SELECT * FROM `t_zhtj_zhzs_lnsj`
+        <where>
+              <if test="year != null and year != ''">
+                    year >= #{year}
+              </if>
+        </where>
+  </select>
+
+</mapper>