Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/InspectionDao.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.Inspection;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface InspectionDao extends BaseDAO<Long, Inspection> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/InspectionItemDao.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.InspectionItem;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface InspectionItemDao extends BaseDAO<Long,InspectionItem> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/InspectionItemPlanConclusionDao.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface InspectionItemPlanConclusionDao extends BaseDAO<Long,InspectionItemPlanConclusion> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/InspectionItemPlanDao.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.InspectionItemPlan;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface InspectionItemPlanDao extends BaseDAO<Long, InspectionItemPlan> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Inspection.java

@@ -0,0 +1,120 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value = "com-ym-mec-biz-dal-entity-Inspection")
+public class Inspection {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 分部id
+     */
+    @ApiModelProperty(value = "分部id")
+    private Integer organId;
+
+    /**
+     * 主管userId
+     */
+    @ApiModelProperty(value = "主管userId")
+    private Integer userId;
+
+    /**
+     * 月份
+     */
+    @ApiModelProperty(value = "月份")
+    private Date month;
+
+    /**
+     * 处理意见
+     */
+    @ApiModelProperty(value = "处理意见")
+    private String memo;
+
+    /**
+     * 操作人
+     */
+    @ApiModelProperty(value = "操作人")
+    private Integer operation;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Date getMonth() {
+        return month;
+    }
+
+    public void setMonth(Date month) {
+        this.month = month;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Integer getOperation() {
+        return operation;
+    }
+
+    public void setOperation(Integer operation) {
+        this.operation = operation;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItem.java

@@ -0,0 +1,176 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value = "com-ym-mec-biz-dal-entity-InspectionItem")
+public class InspectionItem {
+    /**
+     * 巡查任务项id
+     */
+    @ApiModelProperty(value = "巡查任务项id")
+    private Long id;
+
+    /**
+     * 巡查任务id
+     */
+    @ApiModelProperty(value = "巡查任务id")
+    private Long inspectionId;
+
+    /**
+     * 分部id
+     */
+    @ApiModelProperty(value = "分部id")
+    private Integer organId;
+
+    /**
+     * 乐团主管id
+     */
+    @ApiModelProperty(value = "乐团主管id")
+    private Integer userId;
+
+    /**
+     * 任务项
+     */
+    @ApiModelProperty(value = "任务项")
+    private String item;
+
+    /**
+     * 任务次数
+     */
+    @ApiModelProperty(value = "任务次数")
+    private Integer times;
+
+    /**
+     * 已安排日程次数
+     */
+    @ApiModelProperty(value = "已安排日程次数")
+    private Integer plannedTimes;
+
+    /**
+     * 已提交任务数
+     */
+    @ApiModelProperty(value = "已提交任务数")
+    private Integer submittedTimes;
+
+    /**
+     * 处理意见
+     */
+    @ApiModelProperty(value = "处理意见")
+    private String memo;
+
+    /**
+     * 操作人
+     */
+    @ApiModelProperty(value = "操作人")
+    private Integer operation;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getInspectionId() {
+        return inspectionId;
+    }
+
+    public void setInspectionId(Long inspectionId) {
+        this.inspectionId = inspectionId;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+    public Integer getTimes() {
+        return times;
+    }
+
+    public void setTimes(Integer times) {
+        this.times = times;
+    }
+
+    public Integer getPlannedTimes() {
+        return plannedTimes;
+    }
+
+    public void setPlannedTimes(Integer plannedTimes) {
+        this.plannedTimes = plannedTimes;
+    }
+
+    public Integer getSubmittedTimes() {
+        return submittedTimes;
+    }
+
+    public void setSubmittedTimes(Integer submittedTimes) {
+        this.submittedTimes = submittedTimes;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Integer getOperation() {
+        return operation;
+    }
+
+    public void setOperation(Integer operation) {
+        this.operation = operation;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -0,0 +1,218 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value = "com-ym-mec-biz-dal-entity-InspectionItemPlan")
+public class InspectionItemPlan {
+    /**
+     * 计划id
+     */
+    @ApiModelProperty(value = "计划id")
+    private Long id;
+
+    /**
+     * 巡查任务id
+     */
+    @ApiModelProperty(value = "巡查任务id")
+    private Long inspectionId;
+
+    /**
+     * 巡查任务id
+     */
+    @ApiModelProperty(value = "巡查任务id")
+    private Long itemId;
+
+    /**
+     * 乐团主管user_id_
+     */
+    @ApiModelProperty(value = "乐团主管user_id_")
+    private Integer userId;
+
+    /**
+     * 日程开始时间
+     */
+    @ApiModelProperty(value = "日程开始时间")
+    private Date planStart;
+
+    /**
+     * 日程结束时间
+     */
+    @ApiModelProperty(value = "日程结束时间")
+    private Date planEnd;
+
+    /**
+     * 合作单位id
+     */
+    @ApiModelProperty(value = "合作单位id")
+    private Integer cooperationOrganId;
+
+    /**
+     * 乐团id
+     */
+    @ApiModelProperty(value = "乐团id")
+    private String musicGroupId;
+
+    /**
+     * 教学点gps
+     */
+    @ApiModelProperty(value = "教学点gps")
+    private String schoolGps;
+
+    /**
+     * 提交时gps
+     */
+    @ApiModelProperty(value = "提交时gps")
+    private String submitedGps;
+
+    /**
+     * 提交时间
+     */
+    @ApiModelProperty(value = "提交时间")
+    private Date submitedTime;
+
+    /**
+     * 处理方式
+     */
+    @ApiModelProperty(value = "处理方式")
+    private String memo;
+
+    /**
+     * 0 -未提交 1-正常 2-异常
+     */
+    @ApiModelProperty(value = "0 -未提交 1-正常 2-异常")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getInspectionId() {
+        return inspectionId;
+    }
+
+    public void setInspectionId(Long inspectionId) {
+        this.inspectionId = inspectionId;
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Date getPlanStart() {
+        return planStart;
+    }
+
+    public void setPlanStart(Date planStart) {
+        this.planStart = planStart;
+    }
+
+    public Date getPlanEnd() {
+        return planEnd;
+    }
+
+    public void setPlanEnd(Date planEnd) {
+        this.planEnd = planEnd;
+    }
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
+    public String getSchoolGps() {
+        return schoolGps;
+    }
+
+    public void setSchoolGps(String schoolGps) {
+        this.schoolGps = schoolGps;
+    }
+
+    public String getSubmitedGps() {
+        return submitedGps;
+    }
+
+    public void setSubmitedGps(String submitedGps) {
+        this.submitedGps = submitedGps;
+    }
+
+    public Date getSubmitedTime() {
+        return submitedTime;
+    }
+
+    public void setSubmitedTime(Date submitedTime) {
+        this.submitedTime = submitedTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlanConclusion.java

@@ -0,0 +1,285 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value = "com-ym-mec-biz-dal-entity-InspectionItemPlanConclusion")
+public class InspectionItemPlanConclusion {
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    /**
+     * 计划id
+     */
+    @ApiModelProperty(value = "计划id")
+    private Long planId;
+
+    /**
+     * 老师id
+     */
+    @ApiModelProperty(value = "老师id")
+    private Integer teacherId;
+
+    /**
+     * 老师是否提前准备板书（本课内容、作业）
+     */
+    @ApiModelProperty(value = "老师是否提前准备板书（本课内容、作业）")
+    private Integer checkItem1;
+
+    /**
+     * 老师是否佩戴工牌
+     */
+    @ApiModelProperty(value = "老师是否佩戴工牌")
+    private Integer checkItem2;
+
+    /**
+     * 老师是否仪容仪表整洁
+     */
+    @ApiModelProperty(value = "老师是否仪容仪表整洁")
+    private Integer checkItem3;
+
+    /**
+     * 老师是否携带乐器
+     */
+    @ApiModelProperty(value = "老师是否携带乐器")
+    private Integer checkItem4;
+
+    /**
+     * 老师是否携带教学资料、设备
+     */
+    @ApiModelProperty(value = "老师是否携带教学资料、设备")
+    private Integer checkItem5;
+
+    /**
+     * 老师是否合理安排学员座位
+     */
+    @ApiModelProperty(value = "老师是否合理安排学员座位")
+    private Integer checkItem6;
+
+    /**
+     * 乐器箱包、书包是否摆放整齐
+     */
+    @ApiModelProperty(value = "乐器箱包、书包是否摆放整齐")
+    private Integer checkItem7;
+
+    /**
+     * 课堂纪律是否保持良好
+     */
+    @ApiModelProperty(value = "课堂纪律是否保持良好")
+    private Integer checkItem8;
+
+    /**
+     * 老师是否全程站立教学
+     */
+    @ApiModelProperty(value = "老师是否全程站立教学")
+    private Integer checkItem9;
+
+    /**
+     * 老师是否全程使用节拍器或教学音频
+     */
+    @ApiModelProperty(value = "老师是否全程使用节拍器或教学音频")
+    private Integer checkItem10;
+
+    /**
+     * 是否发现学员需要更换新乐器
+     */
+    @ApiModelProperty(value = "是否发现学员需要更换新乐器")
+    private Integer checkItem11;
+
+    /**
+     * 老师是否将上课照片/视频发送到声部群
+     */
+    @ApiModelProperty(value = "老师是否将上课照片/视频发送到声部群")
+    private Integer checkItem12;
+
+    /**
+     * 老师是否保持教室环境卫生
+     */
+    @ApiModelProperty(value = "老师是否保持教室环境卫生")
+    private Integer checkItem13;
+
+    /**
+     * 老师是否关好所有电源、门窗
+     */
+    @ApiModelProperty(value = "老师是否关好所有电源、门窗")
+    private Integer checkItem14;
+
+    /**
+     * 老师是否有序组织学员放学
+     */
+    @ApiModelProperty(value = "老师是否有序组织学员放学")
+    private Integer checkItem15;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPlanId() {
+        return planId;
+    }
+
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Integer getCheckItem1() {
+        return checkItem1;
+    }
+
+    public void setCheckItem1(Integer checkItem1) {
+        this.checkItem1 = checkItem1;
+    }
+
+    public Integer getCheckItem2() {
+        return checkItem2;
+    }
+
+    public void setCheckItem2(Integer checkItem2) {
+        this.checkItem2 = checkItem2;
+    }
+
+    public Integer getCheckItem3() {
+        return checkItem3;
+    }
+
+    public void setCheckItem3(Integer checkItem3) {
+        this.checkItem3 = checkItem3;
+    }
+
+    public Integer getCheckItem4() {
+        return checkItem4;
+    }
+
+    public void setCheckItem4(Integer checkItem4) {
+        this.checkItem4 = checkItem4;
+    }
+
+    public Integer getCheckItem5() {
+        return checkItem5;
+    }
+
+    public void setCheckItem5(Integer checkItem5) {
+        this.checkItem5 = checkItem5;
+    }
+
+    public Integer getCheckItem6() {
+        return checkItem6;
+    }
+
+    public void setCheckItem6(Integer checkItem6) {
+        this.checkItem6 = checkItem6;
+    }
+
+    public Integer getCheckItem7() {
+        return checkItem7;
+    }
+
+    public void setCheckItem7(Integer checkItem7) {
+        this.checkItem7 = checkItem7;
+    }
+
+    public Integer getCheckItem8() {
+        return checkItem8;
+    }
+
+    public void setCheckItem8(Integer checkItem8) {
+        this.checkItem8 = checkItem8;
+    }
+
+    public Integer getCheckItem9() {
+        return checkItem9;
+    }
+
+    public void setCheckItem9(Integer checkItem9) {
+        this.checkItem9 = checkItem9;
+    }
+
+    public Integer getCheckItem10() {
+        return checkItem10;
+    }
+
+    public void setCheckItem10(Integer checkItem10) {
+        this.checkItem10 = checkItem10;
+    }
+
+    public Integer getCheckItem11() {
+        return checkItem11;
+    }
+
+    public void setCheckItem11(Integer checkItem11) {
+        this.checkItem11 = checkItem11;
+    }
+
+    public Integer getCheckItem12() {
+        return checkItem12;
+    }
+
+    public void setCheckItem12(Integer checkItem12) {
+        this.checkItem12 = checkItem12;
+    }
+
+    public Integer getCheckItem13() {
+        return checkItem13;
+    }
+
+    public void setCheckItem13(Integer checkItem13) {
+        this.checkItem13 = checkItem13;
+    }
+
+    public Integer getCheckItem14() {
+        return checkItem14;
+    }
+
+    public void setCheckItem14(Integer checkItem14) {
+        this.checkItem14 = checkItem14;
+    }
+
+    public Integer getCheckItem15() {
+        return checkItem15;
+    }
+
+    public void setCheckItem15(Integer checkItem15) {
+        this.checkItem15 = checkItem15;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/InspectionItemPlanConclusionService.java

@@ -0,0 +1,11 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
+import com.ym.mec.common.service.BaseService;
+
+public interface InspectionItemPlanConclusionService extends BaseService<Long, InspectionItemPlanConclusion> {
+
+}
+
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/InspectionItemPlanService.java

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.InspectionItemPlan;
+import com.ym.mec.common.service.BaseService;
+
+public interface InspectionItemPlanService extends BaseService<Long, InspectionItemPlan> {
+
+}
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/InspectionItemService.java

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.InspectionItem;
+import com.ym.mec.common.service.BaseService;
+
+public interface InspectionItemService extends BaseService<Long, InspectionItem> {
+
+}
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/InspectionService.java

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.Inspection;
+import com.ym.mec.common.service.BaseService;
+
+public interface InspectionService extends BaseService<Long, Inspection> {
+
+}
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionItemPlanConclusionServiceImpl.java

@@ -0,0 +1,25 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.InspectionItemPlanConclusionDao;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion;
+import com.ym.mec.biz.service.InspectionItemPlanConclusionService;
+
+@Service
+public class InspectionItemPlanConclusionServiceImpl extends BaseServiceImpl<Long, InspectionItemPlanConclusion> implements InspectionItemPlanConclusionService {
+
+    @Autowired
+    private InspectionItemPlanConclusionDao inspectionItemPlanConclusionDao;
+
+    @Override
+    public BaseDAO<Long, InspectionItemPlanConclusion> getDAO() {
+        return inspectionItemPlanConclusionDao;
+    }
+
+}
+
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionItemPlanServiceImpl.java

@@ -0,0 +1,26 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ym.mec.biz.dal.dao.InspectionItemPlanDao;
+import com.ym.mec.biz.dal.entity.InspectionItemPlan;
+import com.ym.mec.biz.service.InspectionItemPlanService;
+
+@Service
+public class InspectionItemPlanServiceImpl extends BaseServiceImpl<Long,InspectionItemPlan> implements InspectionItemPlanService {
+
+    @Autowired
+    private InspectionItemPlanDao inspectionItemPlanDao;
+
+    @Override
+    public BaseDAO<Long, InspectionItemPlan> getDAO() {
+        return inspectionItemPlanDao;
+    }
+
+
+
+}
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionItemServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.InspectionItemDao;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ym.mec.biz.dal.entity.InspectionItem;
+import com.ym.mec.biz.service.InspectionItemService;
+
+@Service
+public class InspectionItemServiceImpl extends BaseServiceImpl<Long, InspectionItem> implements InspectionItemService {
+
+    @Autowired
+    private InspectionItemDao inspectionItemDao;
+
+    @Override
+    public BaseDAO<Long, InspectionItem> getDAO() {
+        return inspectionItemDao;
+    }
+
+}
+
+

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ym.mec.biz.dal.entity.Inspection;
+import com.ym.mec.biz.dal.dao.InspectionDao;
+import com.ym.mec.biz.service.InspectionService;
+
+@Service
+public class InspectionServiceImpl extends BaseServiceImpl<Long,Inspection> implements InspectionService {
+
+    @Autowired
+    private InspectionDao inspectionDao;
+
+    @Override
+    public BaseDAO<Long, Inspection> getDAO() {
+        return inspectionDao;
+    }
+
+}
+
+

mec-biz/src/main/resources/config/mybatis/InspectionItemMapper.xml

@@ -0,0 +1,84 @@
+<?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.ym.mec.biz.dal.dao.InspectionItemDao">
+  <resultMap id="InspectionItem" type="com.ym.mec.biz.dal.entity.InspectionItem">
+    <!--@mbg.generated-->
+    <!--@Table inspection_item-->
+    <id column="id_" property="id" />
+    <result column="inspection_id_" property="inspectionId" />
+    <result column="organ_id_" property="organId" />
+    <result column="user_id_" property="userId" />
+    <result column="item_" property="item" />
+    <result column="times_" property="times" />
+    <result column="planned_times_" property="plannedTimes" />
+    <result column="submitted_times" property="submittedTimes" />
+    <result column="memo_" property="memo" />
+    <result column="operation_" property="operation" />
+    <result column="create_time_" property="createTime" />
+    <result column="update_time_" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id_, inspection_id_, organ_id_, user_id_, item_, times_, planned_times_, submitted_times, 
+    memo_, operation_, create_time_, update_time_
+  </sql>
+  <select id="get" parameterType="java.lang.Long" resultMap="InspectionItem">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from inspection_item
+    where id_ = #{id}
+  </select>
+  <delete id="delete" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from inspection_item
+    where id_ = #{id}
+  </delete>
+  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItem" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into inspection_item (inspection_id_, organ_id_, user_id_, item_, times_, planned_times_, 
+      submitted_times, memo_, operation_, create_time_, update_time_)
+    values (#{inspectionId}, #{organId}, #{userId}, #{item}, #{times}, #{plannedTimes}, 
+      #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime})
+  </insert>
+  <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItem">
+    <!--@mbg.generated-->
+    update inspection_item
+    <set>
+      <if test="inspectionId != null">
+        inspection_id_ = #{inspectionId},
+      </if>
+      <if test="organId != null">
+        organ_id_ = #{organId},
+      </if>
+      <if test="userId != null">
+        user_id_ = #{userId},
+      </if>
+      <if test="item != null">
+        item_ = #{item},
+      </if>
+      <if test="times != null">
+        times_ = #{times},
+      </if>
+      <if test="plannedTimes != null">
+        planned_times_ = #{plannedTimes},
+      </if>
+      <if test="submittedTimes != null">
+        submitted_times = #{submittedTimes},
+      </if>
+      <if test="memo != null">
+        memo_ = #{memo},
+      </if>
+      <if test="operation != null">
+        operation_ = #{operation},
+      </if>
+      <if test="createTime != null">
+        create_time_ = #{createTime},
+      </if>
+      <if test="updateTime != null">
+        update_time_ = #{updateTime},
+      </if>
+    </set>
+    where id_ = #{id}
+  </update>
+</mapper>

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanConclusionMapper.xml

@@ -0,0 +1,122 @@
+<?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.ym.mec.biz.dal.dao.InspectionItemPlanConclusionDao">
+  <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
+    <!--@mbg.generated-->
+    <!--@Table inspection_item_plan_conclusion-->
+    <id column="id_" property="id" />
+    <result column="plan_id_" property="planId" />
+    <result column="teacher_id_" property="teacherId" />
+    <result column="check item1" property="checkItem1" />
+    <result column="check item2" property="checkItem2" />
+    <result column="check item3" property="checkItem3" />
+    <result column="check item4" property="checkItem4" />
+    <result column="check item5" property="checkItem5" />
+    <result column="check item6" property="checkItem6" />
+    <result column="check item7" property="checkItem7" />
+    <result column="check item8" property="checkItem8" />
+    <result column="check item9" property="checkItem9" />
+    <result column="check item10" property="checkItem10" />
+    <result column="check item11" property="checkItem11" />
+    <result column="check item12" property="checkItem12" />
+    <result column="check item13" property="checkItem13" />
+    <result column="check item14" property="checkItem14" />
+    <result column="check item15" property="checkItem15" />
+    <result column="create_time_" property="createTime" />
+    <result column="update_time_" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id_, plan_id_, teacher_id_, `check item1`, `check item2`, `check item3`, `check item4`, 
+    `check item5`, `check item6`, `check item7`, `check item8`, `check item9`, `check item10`, 
+    `check item11`, `check item12`, `check item13`, `check item14`, `check item15`, create_time_, 
+    update_time_
+  </sql>
+  <select id="get" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from inspection_item_plan_conclusion
+    where id_ = #{id}
+  </select>
+  <delete id="delete" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from inspection_item_plan_conclusion
+    where id_ = #{id}
+  </delete>
+  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into inspection_item_plan_conclusion (plan_id_, teacher_id_, `check item1`, `check item2`, `check item3`, `check item4`, 
+      `check item5`, `check item6`, `check item7`, `check item8`, `check item9`, `check item10`, 
+      `check item11`, `check item12`, `check item13`, `check item14`, `check item15`, 
+      create_time_, update_time_)
+    values (#{planId}, #{teacherId}, #{checkItem1}, #{checkItem2}, #{checkItem3}, #{checkItem4}, 
+      #{checkItem5}, #{checkItem6}, #{checkItem7}, #{checkItem8}, #{checkItem9}, #{checkItem10}, 
+      #{checkItem11}, #{checkItem12}, #{checkItem13}, #{checkItem14}, #{checkItem15}, 
+      #{createTime}, #{updateTime})
+  </insert>
+  <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
+    <!--@mbg.generated-->
+    update inspection_item_plan_conclusion
+    <set>
+      <if test="planId != null">
+        plan_id_ = #{planId},
+      </if>
+      <if test="teacherId != null">
+        teacher_id_ = #{teacherId},
+      </if>
+      <if test="checkItem1 != null">
+        `check item1` = #{checkItem1},
+      </if>
+      <if test="checkItem2 != null">
+        `check item2` = #{checkItem2},
+      </if>
+      <if test="checkItem3 != null">
+        `check item3` = #{checkItem3},
+      </if>
+      <if test="checkItem4 != null">
+        `check item4` = #{checkItem4},
+      </if>
+      <if test="checkItem5 != null">
+        `check item5` = #{checkItem5},
+      </if>
+      <if test="checkItem6 != null">
+        `check item6` = #{checkItem6},
+      </if>
+      <if test="checkItem7 != null">
+        `check item7` = #{checkItem7},
+      </if>
+      <if test="checkItem8 != null">
+        `check item8` = #{checkItem8},
+      </if>
+      <if test="checkItem9 != null">
+        `check item9` = #{checkItem9},
+      </if>
+      <if test="checkItem10 != null">
+        `check item10` = #{checkItem10},
+      </if>
+      <if test="checkItem11 != null">
+        `check item11` = #{checkItem11},
+      </if>
+      <if test="checkItem12 != null">
+        `check item12` = #{checkItem12},
+      </if>
+      <if test="checkItem13 != null">
+        `check item13` = #{checkItem13},
+      </if>
+      <if test="checkItem14 != null">
+        `check item14` = #{checkItem14},
+      </if>
+      <if test="checkItem15 != null">
+        `check item15` = #{checkItem15},
+      </if>
+      <if test="createTime != null">
+        create_time_ = #{createTime},
+      </if>
+      <if test="updateTime != null">
+        update_time_ = #{updateTime},
+      </if>
+    </set>
+    where id_ = #{id}
+  </update>
+</mapper>

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -0,0 +1,99 @@
+<?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.ym.mec.biz.dal.dao.InspectionItemPlanDao">
+  <resultMap id="InspectionItemPlan" type="com.ym.mec.biz.dal.entity.InspectionItemPlan">
+    <!--@mbg.generated-->
+    <!--@Table inspection_item_plan-->
+    <id column="id_" property="id" />
+    <result column="inspection_id_" property="inspectionId" />
+    <result column="item_id_" property="itemId" />
+    <result column="user_id_" property="userId" />
+    <result column="plan_start_" property="planStart" />
+    <result column="plan_end_" property="planEnd" />
+    <result column="cooperation_organ_id_" property="cooperationOrganId" />
+    <result column="music_group_id_" property="musicGroupId" />
+    <result column="school_gps_" property="schoolGps" />
+    <result column="submited_gps_" property="submitedGps" />
+    <result column="submited_time_" property="submitedTime" />
+    <result column="memo_" property="memo" />
+    <result column="status_" property="status" />
+    <result column="create_time_" property="createTime" />
+    <result column="update_time_" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_, cooperation_organ_id_, 
+    music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, create_time_, 
+    update_time_
+  </sql>
+  <select id="get" parameterType="java.lang.Integer" resultMap="InspectionItemPlan">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from inspection_item_plan
+    where id_ = #{id}
+  </select>
+  <delete id="delete" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from inspection_item_plan
+    where id_ = #{id}
+  </delete>
+  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_, cooperation_organ_id_, 
+      music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, 
+      create_time_, update_time_)
+    values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{cooperationOrganId}, 
+      #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status}, 
+      #{createTime}, #{updateTime})
+  </insert>
+  <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan">
+    <!--@mbg.generated-->
+    update inspection_item_plan
+    <set>
+      <if test="inspectionId != null">
+        inspection_id_ = #{inspectionId},
+      </if>
+      <if test="itemId != null">
+        item_id_ = #{itemId},
+      </if>
+      <if test="userId != null">
+        user_id_ = #{userId},
+      </if>
+      <if test="planStart != null">
+        plan_start_ = #{planStart},
+      </if>
+      <if test="planEnd != null">
+        plan_end_ = #{planEnd},
+      </if>
+      <if test="cooperationOrganId != null">
+        cooperation_organ_id_ = #{cooperationOrganId},
+      </if>
+      <if test="musicGroupId != null">
+        music_group_id_ = #{musicGroupId},
+      </if>
+      <if test="schoolGps != null">
+        school_gps_ = #{schoolGps},
+      </if>
+      <if test="submitedGps != null">
+        submited_gps_ = #{submitedGps},
+      </if>
+      <if test="submitedTime != null">
+        submited_time_ = #{submitedTime},
+      </if>
+      <if test="memo != null">
+        memo_ = #{memo},
+      </if>
+      <if test="status != null">
+        status_ = #{status},
+      </if>
+      <if test="createTime != null">
+        create_time_ = #{createTime},
+      </if>
+      <if test="updateTime != null">
+        update_time_ = #{updateTime},
+      </if>
+    </set>
+    where id_ = #{id}
+  </update>
+</mapper>

mec-biz/src/main/resources/config/mybatis/InspectionMapper.xml

@@ -0,0 +1,77 @@
+<?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.ym.mec.biz.dal.dao.InspectionDao">
+  <resultMap id="Inspection" type="com.ym.mec.biz.dal.entity.Inspection">
+    <!--@mbg.generated-->
+    <!--@Table inspection-->
+    <id column="id_" property="id" />
+    <result column="organ_id_" property="organId" />
+    <result column="user_id_" property="userId" />
+    <result column="month_" property="month" />
+    <result column="memo_" property="memo" />
+    <result column="operation_" property="operation" />
+    <result column="create_time_" property="createTime" />
+    <result column="update_time_" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id_, organ_id_, user_id_, month_, memo_, operation_, create_time_, update_time_
+  </sql>
+  <select id="get" parameterType="java.lang.Long" resultMap="Inspection">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from inspection
+    where id_ = #{id}
+  </select>
+  <delete id="delete" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from inspection
+    where id_ = #{id}
+  </delete>
+  <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.Inspection" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into inspection (organ_id_, user_id_, month_, memo_, operation_, create_time_, update_time_
+      )
+    values (#{organId}, #{userId}, #{month}, #{memo}, #{operation}, #{createTime}, #{updateTime}
+      )
+  </insert>
+  <update id="update" parameterType="com.ym.mec.biz.dal.entity.Inspection">
+    <!--@mbg.generated-->
+    update inspection
+    <set>
+      <if test="organId != null">
+        organ_id_ = #{organId},
+      </if>
+      <if test="userId != null">
+        user_id_ = #{userId},
+      </if>
+      <if test="month != null">
+        month_ = #{month},
+      </if>
+      <if test="memo != null">
+        memo_ = #{memo},
+      </if>
+      <if test="operation != null">
+        operation_ = #{operation},
+      </if>
+      <if test="createTime != null">
+        create_time_ = #{createTime},
+      </if>
+      <if test="updateTime != null">
+        update_time_ = #{updateTime},
+      </if>
+    </set>
+    where id_ = #{id}
+  </update>
+
+  <!-- 分页查询 -->
+  <select id="queryPage" resultMap="Inspection" parameterType="map">
+    SELECT * FROM inspection ORDER BY id_ <include refid="global.limit"/>
+  </select>
+
+  <!-- 查询当前表的总记录数 -->
+  <select id="queryCount" resultType="int">
+    SELECT COUNT(*) FROM inspection
+  </select>
+</mapper>