职工公寓来访人员，车辆 值班巡视 增删改查 permission 布尔类型 实体 重写set方法

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.service.satff.ComeCarService;
+import com.tianbo.warehouse.service.satff.MaintainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/come_car")
+public class ComeCarController {
+
+    @Autowired
+    ComeCarService comeCarService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffApartmentComeCar> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                                @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                                @RequestParam(value = "cometovisitname", required = false)
+                                                  String comeToVisitName){
+        return comeCarService.findAll(pageNum,pageSize,comeToVisitName);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffApartmentComeCar staffApartmentComeCar){
+
+        int i =comeCarService.insertSelective(staffApartmentComeCar);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffApartmentComeCar staffApartmentComeCar){
+
+        int i =comeCarService.updateByPrimaryKeySelective(staffApartmentComeCar);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffApartmentComeCar staffApartmentComeCar, HttpServletRequest request, HttpServletResponse response){
+
+        int i =comeCarService.deleteByPrimaryKey(staffApartmentComeCar.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (comeCarService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+import com.tianbo.warehouse.service.satff.MaintainService;
+import com.tianbo.warehouse.service.satff.OnDutyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/on_duty")
+public class OnDutyController {
+
+    @Autowired
+    OnDutyService onDutyService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffApartmentOnduty> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                               @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                               @RequestParam(value = "warchkeeper", required = false)
+                                                  String warchkeeper){
+        return onDutyService.findAll(pageNum,pageSize,warchkeeper);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffApartmentOnduty staffApartmentOnduty){
+
+        int i =onDutyService.insertSelective(staffApartmentOnduty);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffApartmentOnduty staffApartmentOnduty){
+
+        int i =onDutyService.updateByPrimaryKeySelective(staffApartmentOnduty);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffApartmentOnduty staffApartmentOnduty, HttpServletRequest request, HttpServletResponse response){
+
+        int i =onDutyService.deleteByPrimaryKey(staffApartmentOnduty.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (onDutyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffApartmentComeCarMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(StaffApartmentComeCar record);
+
+    int insertSelective(StaffApartmentComeCar record);
+
+    StaffApartmentComeCar selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(StaffApartmentComeCar record);
+
+    int updateByPrimaryKey(StaffApartmentComeCar record);
+
+    List<StaffApartmentComeCar> findAll(@Param("comeToVisitName") String comeToVisitName);
+}
\ No newline at end of file

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffApartmentOndutyMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(StaffApartmentOnduty record);
+
+    int insertSelective(StaffApartmentOnduty record);
+
+    StaffApartmentOnduty selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(StaffApartmentOnduty record);
+
+    int updateByPrimaryKey(StaffApartmentOnduty record);
+
+    List<StaffApartmentOnduty> findAll(@Param("warchkeeper") String warchkeeper);
+}
\ No newline at end of file

@@ -61,8 +61,8 @@ public class PERMISSION {
         return ismenu;
     }
 
-    public void setIsmenu(Boolean ismenu) {
-        this.ismenu = ismenu;
+    public void setIsmenu(String ismenu) {
+        this.ismenu = "0".equals(ismenu)?false:true ;
     }
 
     public Integer getParentId() {

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffApartmentComeCar {
+    private String id;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date datetime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cometovisitdate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date leavedate;
+
+    private String cometovisitname;
+
+    private String carnumber;
+
+    private String phone;
+
+    private String comematter;
+
+    private String warchkeeper;
+
+    private String remark1;
+
+    private String remark2;
+
+    private String remark3;
+
+    private Integer userid;
+
+    private Date createtime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public Date getDatetime() {
+        return datetime;
+    }
+
+    public void setDatetime(Date datetime) {
+        this.datetime = datetime;
+    }
+
+    public Date getCometovisitdate() {
+        return cometovisitdate;
+    }
+
+    public void setCometovisitdate(Date cometovisitdate) {
+        this.cometovisitdate = cometovisitdate;
+    }
+
+    public Date getLeavedate() {
+        return leavedate;
+    }
+
+    public void setLeavedate(Date leavedate) {
+        this.leavedate = leavedate;
+    }
+
+    public String getCometovisitname() {
+        return cometovisitname;
+    }
+
+    public void setCometovisitname(String cometovisitname) {
+        this.cometovisitname = cometovisitname == null ? null : cometovisitname.trim();
+    }
+
+    public String getCarnumber() {
+        return carnumber;
+    }
+
+    public void setCarnumber(String carnumber) {
+        this.carnumber = carnumber == null ? null : carnumber.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getComematter() {
+        return comematter;
+    }
+
+    public void setComematter(String comematter) {
+        this.comematter = comematter == null ? null : comematter.trim();
+    }
+
+    public String getWarchkeeper() {
+        return warchkeeper;
+    }
+
+    public void setWarchkeeper(String warchkeeper) {
+        this.warchkeeper = warchkeeper == null ? null : warchkeeper.trim();
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1 == null ? null : remark1.trim();
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2 == null ? null : remark2.trim();
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3 == null ? null : remark3.trim();
+    }
+
+    public Integer getUserid() {
+        return userid;
+    }
+
+    public void setUserid(Integer userid) {
+        this.userid = userid;
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+}
\ No newline at end of file

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffApartmentOnduty {
+    private String id;
+
+    private String warchkeeper;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date handovershifttime;
+
+    private String publiclighting;
+
+    private String carpark;
+
+    private String campusafforestation;
+
+    private String firefightingequipment;
+
+    private String equipmentfacilities;
+
+    private String publicsanitation;
+
+    private String property;
+
+    private String securitydanger;
+
+    private String rests;
+
+    private String handovermatters;
+
+    private Date creatime;
+
+    private Integer userid;
+
+    private String remberk1;
+
+    private String remberk2;
+
+    private String remberk3;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getWarchkeeper() {
+        return warchkeeper;
+    }
+
+    public void setWarchkeeper(String warchkeeper) {
+        this.warchkeeper = warchkeeper == null ? null : warchkeeper.trim();
+    }
+
+    public Date getHandovershifttime() {
+        return handovershifttime;
+    }
+
+    public void setHandovershifttime(Date handovershifttime) {
+        this.handovershifttime = handovershifttime;
+    }
+
+    public String getPubliclighting() {
+        return publiclighting;
+    }
+
+    public void setPubliclighting(String publiclighting) {
+        this.publiclighting = publiclighting == null ? null : publiclighting.trim();
+    }
+
+    public String getCarpark() {
+        return carpark;
+    }
+
+    public void setCarpark(String carpark) {
+        this.carpark = carpark == null ? null : carpark.trim();
+    }
+
+    public String getCampusafforestation() {
+        return campusafforestation;
+    }
+
+    public void setCampusafforestation(String campusafforestation) {
+        this.campusafforestation = campusafforestation == null ? null : campusafforestation.trim();
+    }
+
+    public String getFirefightingequipment() {
+        return firefightingequipment;
+    }
+
+    public void setFirefightingequipment(String firefightingequipment) {
+        this.firefightingequipment = firefightingequipment == null ? null : firefightingequipment.trim();
+    }
+
+    public String getEquipmentfacilities() {
+        return equipmentfacilities;
+    }
+
+    public void setEquipmentfacilities(String equipmentfacilities) {
+        this.equipmentfacilities = equipmentfacilities == null ? null : equipmentfacilities.trim();
+    }
+
+    public String getPublicsanitation() {
+        return publicsanitation;
+    }
+
+    public void setPublicsanitation(String publicsanitation) {
+        this.publicsanitation = publicsanitation == null ? null : publicsanitation.trim();
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property == null ? null : property.trim();
+    }
+
+    public String getSecuritydanger() {
+        return securitydanger;
+    }
+
+    public void setSecuritydanger(String securitydanger) {
+        this.securitydanger = securitydanger == null ? null : securitydanger.trim();
+    }
+
+    public String getRests() {
+        return rests;
+    }
+
+    public void setRests(String rests) {
+        this.rests = rests == null ? null : rests.trim();
+    }
+
+    public String getHandovermatters() {
+        return handovermatters;
+    }
+
+    public void setHandovermatters(String handovermatters) {
+        this.handovermatters = handovermatters == null ? null : handovermatters.trim();
+    }
+
+    public Date getCreatime() {
+        return creatime;
+    }
+
+    public void setCreatime(Date creatime) {
+        this.creatime = creatime;
+    }
+
+    public Integer getUserid() {
+        return userid;
+    }
+
+    public void setUserid(Integer userid) {
+        this.userid = userid;
+    }
+
+    public String getRemberk1() {
+        return remberk1;
+    }
+
+    public void setRemberk1(String remberk1) {
+        this.remberk1 = remberk1 == null ? null : remberk1.trim();
+    }
+
+    public String getRemberk2() {
+        return remberk2;
+    }
+
+    public void setRemberk2(String remberk2) {
+        this.remberk2 = remberk2 == null ? null : remberk2.trim();
+    }
+
+    public String getRemberk3() {
+        return remberk3;
+    }
+
+    public void setRemberk3(String remberk3) {
+        this.remberk3 = remberk3 == null ? null : remberk3.trim();
+    }
+}
\ No newline at end of file

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+
+public interface ComeCarService {
+
+    PageInfo<StaffApartmentComeCar> findAll(int pageNum, int pageSize, String company);
+
+    int insertSelective(StaffApartmentComeCar staffApartmentComeCar);
+
+    int updateByPrimaryKeySelective(StaffApartmentComeCar staffApartmentComeCar);
+
+    int deleteByPrimaryKey(String id);
+
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
+import com.tianbo.warehouse.dao.StaffApartmentComeCarMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.satff.ComeCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class ComeCayServiceImp implements ComeCarService {
+
+    @Autowired
+    StaffApartmentComeCarMapper staffApartmentComeCarMapper;
+
+    @Override
+    public PageInfo<StaffApartmentComeCar> findAll(int pageNum, int pageSize, String companyName) {
+        Page<StaffApartmentComeCar> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffApartmentComeCar> list = staffApartmentComeCarMapper.findAll(companyName);
+
+        PageInfo<StaffApartmentComeCar> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffApartmentComeCar staffApartmentComeCar) {
+        staffApartmentComeCar.setId(UUID.randomUUID().toString());
+        staffApartmentComeCar.setCreatetime(new Date());
+        return staffApartmentComeCarMapper.insertSelective(staffApartmentComeCar);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffApartmentComeCar staffApartmentComeCar) {
+        staffApartmentComeCar.setCreatetime(new Date());
+        return staffApartmentComeCarMapper.updateByPrimaryKeySelective(staffApartmentComeCar);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffApartmentComeCarMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return staffApartmentComeCarMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.StaffApartmentOndutyMapper;
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+import com.tianbo.warehouse.service.satff.OnDutyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class OnDutyServiceImp implements OnDutyService {
+
+    @Autowired
+    StaffApartmentOndutyMapper staffApartmentOndutyMapper;
+
+    @Override
+    public PageInfo<StaffApartmentOnduty> findAll(int pageNum, int pageSize, String name) {
+        Page<StaffApartmentOnduty> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffApartmentOnduty> list = staffApartmentOndutyMapper.findAll(name);
+
+
+        PageInfo<StaffApartmentOnduty> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffApartmentOnduty staffApartmentOnduty) {
+        staffApartmentOnduty.setId(UUID.randomUUID().toString());
+        staffApartmentOnduty.setCreatime(new Date());
+        return staffApartmentOndutyMapper.insertSelective(staffApartmentOnduty);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffApartmentOnduty staffApartmentOnduty) {
+        staffApartmentOnduty.setCreatime(new Date());
+        return staffApartmentOndutyMapper.updateByPrimaryKeySelective(staffApartmentOnduty);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffApartmentOndutyMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return staffApartmentOndutyMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+
+}

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+
+import java.util.List;
+
+public interface OnDutyService {
+
+    PageInfo<StaffApartmentOnduty> findAll(int pageNum, int pageSize, String name);
+
+    int insertSelective(StaffApartmentOnduty company);
+
+    int updateByPrimaryKeySelective(StaffApartmentOnduty company);
+
+    int deleteByPrimaryKey(String companyId);
+
+}

+<?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.tianbo.warehouse.dao.StaffApartmentComeCarMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="dateTime" property="datetime" jdbcType="TIMESTAMP" />
+    <result column="comeToVisitDate" property="cometovisitdate" jdbcType="TIMESTAMP" />
+    <result column="leaveDate" property="leavedate" jdbcType="TIMESTAMP" />
+    <result column="comeToVisitName" property="cometovisitname" jdbcType="VARCHAR" />
+    <result column="carNumber" property="carnumber" jdbcType="VARCHAR" />
+    <result column="phone" property="phone" jdbcType="VARCHAR" />
+    <result column="comeMatter" property="comematter" jdbcType="VARCHAR" />
+    <result column="warchkeeper" property="warchkeeper" jdbcType="VARCHAR" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
+    <result column="remark2" property="remark2" jdbcType="VARCHAR" />
+    <result column="remark3" property="remark3" jdbcType="VARCHAR" />
+    <result column="userId" property="userid" jdbcType="INTEGER" />
+    <result column="createTime" property="createtime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, dateTime, comeToVisitDate, leaveDate, comeToVisitName, carNumber, phone, comeMatter, 
+    warchkeeper, remark1, remark2, remark3, userId, createTime
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_aparment_come_car
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_aparment_come_car
+    <if test="comeToVisitName != null and comeToVisitName!=''" >
+      where comeToVisitName = #{comeToVisitName, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_aparment_come_car
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    insert into staff_aparment_come_car (id, dateTime, comeToVisitDate, 
+      leaveDate, comeToVisitName, carNumber, 
+      phone, comeMatter, warchkeeper, 
+      remark1, remark2, remark3, 
+      userId, createTime)
+    values (#{id,jdbcType=VARCHAR}, #{datetime,jdbcType=TIMESTAMP}, #{cometovisitdate,jdbcType=TIMESTAMP}, 
+      #{leavedate,jdbcType=TIMESTAMP}, #{cometovisitname,jdbcType=VARCHAR}, #{carnumber,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{comematter,jdbcType=VARCHAR}, #{warchkeeper,jdbcType=VARCHAR}, 
+      #{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, 
+      #{userid,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    insert into staff_aparment_come_car
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="datetime != null" >
+        dateTime,
+      </if>
+      <if test="cometovisitdate != null" >
+        comeToVisitDate,
+      </if>
+      <if test="leavedate != null" >
+        leaveDate,
+      </if>
+      <if test="cometovisitname != null" >
+        comeToVisitName,
+      </if>
+      <if test="carnumber != null" >
+        carNumber,
+      </if>
+      <if test="phone != null" >
+        phone,
+      </if>
+      <if test="comematter != null" >
+        comeMatter,
+      </if>
+      <if test="warchkeeper != null" >
+        warchkeeper,
+      </if>
+      <if test="remark1 != null" >
+        remark1,
+      </if>
+      <if test="remark2 != null" >
+        remark2,
+      </if>
+      <if test="remark3 != null" >
+        remark3,
+      </if>
+      <if test="userid != null" >
+        userId,
+      </if>
+      <if test="createtime != null" >
+        createTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="datetime != null" >
+        #{datetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitdate != null" >
+        #{cometovisitdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="leavedate != null" >
+        #{leavedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitname != null" >
+        #{cometovisitname,jdbcType=VARCHAR},
+      </if>
+      <if test="carnumber != null" >
+        #{carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="comematter != null" >
+        #{comematter,jdbcType=VARCHAR},
+      </if>
+      <if test="warchkeeper != null" >
+        #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="remark1 != null" >
+        #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    update staff_aparment_come_car
+    <set >
+      <if test="datetime != null" >
+        dateTime = #{datetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitdate != null" >
+        comeToVisitDate = #{cometovisitdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="leavedate != null" >
+        leaveDate = #{leavedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitname != null" >
+        comeToVisitName = #{cometovisitname,jdbcType=VARCHAR},
+      </if>
+      <if test="carnumber != null" >
+        carNumber = #{carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="comematter != null" >
+        comeMatter = #{comematter,jdbcType=VARCHAR},
+      </if>
+      <if test="warchkeeper != null" >
+        warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="remark1 != null" >
+        remark1 = #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        remark2 = #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        remark3 = #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        userId = #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    update staff_aparment_come_car
+    set dateTime = #{datetime,jdbcType=TIMESTAMP},
+      comeToVisitDate = #{cometovisitdate,jdbcType=TIMESTAMP},
+      leaveDate = #{leavedate,jdbcType=TIMESTAMP},
+      comeToVisitName = #{cometovisitname,jdbcType=VARCHAR},
+      carNumber = #{carnumber,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      comeMatter = #{comematter,jdbcType=VARCHAR},
+      warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      remark1 = #{remark1,jdbcType=VARCHAR},
+      remark2 = #{remark2,jdbcType=VARCHAR},
+      remark3 = #{remark3,jdbcType=VARCHAR},
+      userId = #{userid,jdbcType=INTEGER},
+      createTime = #{createtime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file

+<?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.tianbo.warehouse.dao.StaffApartmentOndutyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="warchkeeper" property="warchkeeper" jdbcType="VARCHAR" />
+    <result column="handOverShiftTime" property="handovershifttime" jdbcType="TIMESTAMP" />
+    <result column="publicLighting" property="publiclighting" jdbcType="VARCHAR" />
+    <result column="carPark" property="carpark" jdbcType="VARCHAR" />
+    <result column="campusAfforestation" property="campusafforestation" jdbcType="VARCHAR" />
+    <result column="fireFightingEquipment" property="firefightingequipment" jdbcType="VARCHAR" />
+    <result column="equipmentFacilities" property="equipmentfacilities" jdbcType="VARCHAR" />
+    <result column="publicSanitation" property="publicsanitation" jdbcType="VARCHAR" />
+    <result column="property" property="property" jdbcType="VARCHAR" />
+    <result column="securityDanger" property="securitydanger" jdbcType="VARCHAR" />
+    <result column="rests" property="rests" jdbcType="VARCHAR" />
+    <result column="handoverMatters" property="handovermatters" jdbcType="VARCHAR" />
+    <result column="creaTime" property="creatime" jdbcType="TIMESTAMP" />
+    <result column="userId" property="userid" jdbcType="INTEGER" />
+    <result column="remberk1" property="remberk1" jdbcType="VARCHAR" />
+    <result column="remberk2" property="remberk2" jdbcType="VARCHAR" />
+    <result column="remberk3" property="remberk3" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, warchkeeper, handOverShiftTime, publicLighting, carPark, campusAfforestation, 
+    fireFightingEquipment, equipmentFacilities, publicSanitation, property, securityDanger, 
+    rests, handoverMatters, creaTime, userId, remberk1, remberk2, remberk3
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_apartment_on_duty
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_apartment_on_duty
+    <if test="warchkeeper != null and warchkeeper!=''" >
+      where warchkeeper = #{warchkeeper, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_apartment_on_duty
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    insert into staff_apartment_on_duty (id, warchkeeper, handOverShiftTime, 
+      publicLighting, carPark, campusAfforestation, 
+      fireFightingEquipment, equipmentFacilities, 
+      publicSanitation, property, securityDanger, 
+      rests, handoverMatters, creaTime, 
+      userId, remberk1, remberk2, 
+      remberk3)
+    values (#{id,jdbcType=VARCHAR}, #{warchkeeper,jdbcType=VARCHAR}, #{handovershifttime,jdbcType=TIMESTAMP}, 
+      #{publiclighting,jdbcType=VARCHAR}, #{carpark,jdbcType=VARCHAR}, #{campusafforestation,jdbcType=VARCHAR}, 
+      #{firefightingequipment,jdbcType=VARCHAR}, #{equipmentfacilities,jdbcType=VARCHAR}, 
+      #{publicsanitation,jdbcType=VARCHAR}, #{property,jdbcType=VARCHAR}, #{securitydanger,jdbcType=VARCHAR}, 
+      #{rests,jdbcType=VARCHAR}, #{handovermatters,jdbcType=VARCHAR}, #{creatime,jdbcType=TIMESTAMP}, 
+      #{userid,jdbcType=INTEGER}, #{remberk1,jdbcType=VARCHAR}, #{remberk2,jdbcType=VARCHAR}, 
+      #{remberk3,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    insert into staff_apartment_on_duty
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="warchkeeper != null" >
+        warchkeeper,
+      </if>
+      <if test="handovershifttime != null" >
+        handOverShiftTime,
+      </if>
+      <if test="publiclighting != null" >
+        publicLighting,
+      </if>
+      <if test="carpark != null" >
+        carPark,
+      </if>
+      <if test="campusafforestation != null" >
+        campusAfforestation,
+      </if>
+      <if test="firefightingequipment != null" >
+        fireFightingEquipment,
+      </if>
+      <if test="equipmentfacilities != null" >
+        equipmentFacilities,
+      </if>
+      <if test="publicsanitation != null" >
+        publicSanitation,
+      </if>
+      <if test="property != null" >
+        property,
+      </if>
+      <if test="securitydanger != null" >
+        securityDanger,
+      </if>
+      <if test="rests != null" >
+        rests,
+      </if>
+      <if test="handovermatters != null" >
+        handoverMatters,
+      </if>
+      <if test="creatime != null" >
+        creaTime,
+      </if>
+      <if test="userid != null" >
+        userId,
+      </if>
+      <if test="remberk1 != null" >
+        remberk1,
+      </if>
+      <if test="remberk2 != null" >
+        remberk2,
+      </if>
+      <if test="remberk3 != null" >
+        remberk3,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="warchkeeper != null" >
+        #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handovershifttime != null" >
+        #{handovershifttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publiclighting != null" >
+        #{publiclighting,jdbcType=VARCHAR},
+      </if>
+      <if test="carpark != null" >
+        #{carpark,jdbcType=VARCHAR},
+      </if>
+      <if test="campusafforestation != null" >
+        #{campusafforestation,jdbcType=VARCHAR},
+      </if>
+      <if test="firefightingequipment != null" >
+        #{firefightingequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentfacilities != null" >
+        #{equipmentfacilities,jdbcType=VARCHAR},
+      </if>
+      <if test="publicsanitation != null" >
+        #{publicsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="property != null" >
+        #{property,jdbcType=VARCHAR},
+      </if>
+      <if test="securitydanger != null" >
+        #{securitydanger,jdbcType=VARCHAR},
+      </if>
+      <if test="rests != null" >
+        #{rests,jdbcType=VARCHAR},
+      </if>
+      <if test="handovermatters != null" >
+        #{handovermatters,jdbcType=VARCHAR},
+      </if>
+      <if test="creatime != null" >
+        #{creatime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userid != null" >
+        #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="remberk1 != null" >
+        #{remberk1,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk2 != null" >
+        #{remberk2,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk3 != null" >
+        #{remberk3,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    update staff_apartment_on_duty
+    <set >
+      <if test="warchkeeper != null" >
+        warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handovershifttime != null" >
+        handOverShiftTime = #{handovershifttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publiclighting != null" >
+        publicLighting = #{publiclighting,jdbcType=VARCHAR},
+      </if>
+      <if test="carpark != null" >
+        carPark = #{carpark,jdbcType=VARCHAR},
+      </if>
+      <if test="campusafforestation != null" >
+        campusAfforestation = #{campusafforestation,jdbcType=VARCHAR},
+      </if>
+      <if test="firefightingequipment != null" >
+        fireFightingEquipment = #{firefightingequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentfacilities != null" >
+        equipmentFacilities = #{equipmentfacilities,jdbcType=VARCHAR},
+      </if>
+      <if test="publicsanitation != null" >
+        publicSanitation = #{publicsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="property != null" >
+        property = #{property,jdbcType=VARCHAR},
+      </if>
+      <if test="securitydanger != null" >
+        securityDanger = #{securitydanger,jdbcType=VARCHAR},
+      </if>
+      <if test="rests != null" >
+        rests = #{rests,jdbcType=VARCHAR},
+      </if>
+      <if test="handovermatters != null" >
+        handoverMatters = #{handovermatters,jdbcType=VARCHAR},
+      </if>
+      <if test="creatime != null" >
+        creaTime = #{creatime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userid != null" >
+        userId = #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="remberk1 != null" >
+        remberk1 = #{remberk1,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk2 != null" >
+        remberk2 = #{remberk2,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk3 != null" >
+        remberk3 = #{remberk3,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    update staff_apartment_on_duty
+    set warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      handOverShiftTime = #{handovershifttime,jdbcType=TIMESTAMP},
+      publicLighting = #{publiclighting,jdbcType=VARCHAR},
+      carPark = #{carpark,jdbcType=VARCHAR},
+      campusAfforestation = #{campusafforestation,jdbcType=VARCHAR},
+      fireFightingEquipment = #{firefightingequipment,jdbcType=VARCHAR},
+      equipmentFacilities = #{equipmentfacilities,jdbcType=VARCHAR},
+      publicSanitation = #{publicsanitation,jdbcType=VARCHAR},
+      property = #{property,jdbcType=VARCHAR},
+      securityDanger = #{securitydanger,jdbcType=VARCHAR},
+      rests = #{rests,jdbcType=VARCHAR},
+      handoverMatters = #{handovermatters,jdbcType=VARCHAR},
+      creaTime = #{creatime,jdbcType=TIMESTAMP},
+      userId = #{userid,jdbcType=INTEGER},
+      remberk1 = #{remberk1,jdbcType=VARCHAR},
+      remberk2 = #{remberk2,jdbcType=VARCHAR},
+      remberk3 = #{remberk3,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file