清除cookie登录失效后刷新验证码请求无法显示的问题

src/main/java/net/chenlin/dp/modules/basics/controller/BasicsPersonnelController.java

@@ -0,0 +1,85 @@
+package net.chenlin.dp.modules.basics.controller;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import net.chenlin.dp.common.annotation.SysLog;
+import net.chenlin.dp.modules.sys.controller.AbstractController;
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import net.chenlin.dp.modules.basics.service.BasicsPersonnelService;
+
+/**
+ * 基础人员档案
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@RestController
+@RequestMapping("/basics/personnel")
+public class BasicsPersonnelController extends AbstractController {
+	
+	@Autowired
+	private BasicsPersonnelService basicsPersonnelService;
+	
+	/**
+	 * 列表
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public Page<BasicsPersonnelEntity> list(@RequestBody Map<String, Object> params) {
+		return basicsPersonnelService.listBasicsPersonnel(params);
+	}
+		
+	/**
+	 * 新增
+	 * @param basicsPersonnel
+	 * @return
+	 */
+	@SysLog("新增基础人员档案")
+	@RequestMapping("/save")
+	public R save(@RequestBody BasicsPersonnelEntity basicsPersonnel) {
+		basicsPersonnel.setUserIdCreate(getUserId());
+		basicsPersonnel.setGmtCreate(new Date());
+		return basicsPersonnelService.saveBasicsPersonnel(basicsPersonnel);
+	}
+	
+	/**
+	 * 根据id查询详情
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping("/info")
+	public R getById(@RequestBody Long id) {
+		return basicsPersonnelService.getBasicsPersonnelById(id);
+	}
+	
+	/**
+	 * 修改
+	 * @param basicsPersonnel
+	 * @return
+	 */
+	@SysLog("修改基础人员档案")
+	@RequestMapping("/update")
+	public R update(@RequestBody BasicsPersonnelEntity basicsPersonnel) {
+		basicsPersonnel.setGmtModified(new Date());
+		return basicsPersonnelService.updateBasicsPersonnel(basicsPersonnel);
+	}
+	
+	/**
+	 * 删除
+	 * @param id
+	 * @return
+	 */
+	@SysLog("删除基础人员档案")
+	@RequestMapping("/remove")
+	public R batchRemove(@RequestBody Long[] id) {
+		return basicsPersonnelService.batchRemove(id);
+	}
+	
+}

src/main/java/net/chenlin/dp/modules/basics/controller/BasicsPersonnelFillinController.java

@@ -0,0 +1,84 @@
+package net.chenlin.dp.modules.basics.controller;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.chenlin.dp.common.annotation.RestAnon;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import net.chenlin.dp.common.annotation.SysLog;
+import net.chenlin.dp.modules.sys.controller.AbstractController;
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity;
+import net.chenlin.dp.modules.basics.service.BasicsPersonnelFillinService;
+
+/**
+ * 人员每日填报温度信息
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@RestController
+@RequestMapping("/basics/personnel/fillin")
+public class BasicsPersonnelFillinController extends AbstractController {
+	
+	@Autowired
+	private BasicsPersonnelFillinService basicsPersonnelFillinService;
+	
+	/**
+	 * 列表
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public Page<BasicsPersonnelFillinEntity> list(@RequestBody Map<String, Object> params) {
+		return basicsPersonnelFillinService.listBasicsPersonnelFillin(params);
+	}
+		
+	/**
+	 * 新增
+	 * @param basicsPersonnelFillin
+	 * @return
+	 */
+	@RestAnon
+	@SysLog("新增人员每日填报温度信息")
+	@RequestMapping(value="save",method = RequestMethod.POST)
+	public R save(@RequestBody BasicsPersonnelFillinEntity basicsPersonnelFillin) {
+		basicsPersonnelFillin.setGmtCreate(new Date());
+		return basicsPersonnelFillinService.saveBasicsPersonnelFillin(basicsPersonnelFillin);
+	}
+	
+	/**
+	 * 根据id查询详情
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping("/info")
+	public R getById(@RequestBody Long id) {
+		return basicsPersonnelFillinService.getBasicsPersonnelFillinById(id);
+	}
+
+	/**
+	 * 修改
+	 * @param basicsPersonnelFillin
+	 * @return
+	 */
+	@SysLog("修改人员每日填报温度信息")
+	@RequestMapping("/update")
+	public R update(@RequestBody BasicsPersonnelFillinEntity basicsPersonnelFillin) {
+		return basicsPersonnelFillinService.updateBasicsPersonnelFillin(basicsPersonnelFillin);
+	}
+	
+	/**
+	 * 删除
+	 * @param id
+	 * @return
+	 */
+	@SysLog("删除人员每日填报温度信息")
+	@RequestMapping("/remove")
+	public R batchRemove(@RequestBody Long[] id) {
+		return basicsPersonnelFillinService.batchRemove(id);
+	}
+	
+}

src/main/java/net/chenlin/dp/modules/basics/dao/BasicsPersonnelFillinMapper.java

@@ -0,0 +1,20 @@
+package net.chenlin.dp.modules.basics.dao;
+
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity;
+import net.chenlin.dp.modules.sys.dao.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 人员每日填报温度信息
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@Mapper
+public interface BasicsPersonnelFillinMapper extends BaseMapper<BasicsPersonnelFillinEntity> {
+
+	public List<BasicsPersonnelEntity> getByUserCode(String id);
+
+}

src/main/java/net/chenlin/dp/modules/basics/dao/BasicsPersonnelMapper.java

@@ -0,0 +1,15 @@
+package net.chenlin.dp.modules.basics.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import net.chenlin.dp.modules.sys.dao.BaseMapper;
+
+/**
+ * 基础人员档案
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@Mapper
+public interface BasicsPersonnelMapper extends BaseMapper<BasicsPersonnelEntity> {
+	
+}

src/main/java/net/chenlin/dp/modules/basics/entity/BasicsPersonnelEntity.java

@@ -0,0 +1,361 @@
+package net.chenlin.dp.modules.basics.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 基础人员档案
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+public class BasicsPersonnelEntity implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 主键
+	 */
+	private Long id;
+	
+	/**
+	 * 创建用户id
+	 */
+	private Long userIdCreate;
+	
+	/**
+	 * 创建时间
+	 */
+	private Date gmtCreate;
+	
+	/**
+	 * 修改时间
+	 */
+	private Date gmtModified;
+	
+	/**
+	 * 工号
+	 */
+	private String jobNumber;
+	
+	/**
+	 * 姓名
+	 */
+	private String name;
+	
+	/**
+	 * 本部
+	 */
+	private String selfDepartment;
+	
+	/**
+	 * 部
+	 */
+	private String department;
+	
+	/**
+	 * 课
+	 */
+	private String course;
+	
+	/**
+	 * 系
+	 */
+	private String series;
+	
+	/**
+	 * 班次
+	 */
+	private String classes;
+	
+	/**
+	 * 提交状态（是否）
+	 */
+	private String status;
+	
+	/**
+	 * 备注
+	 */
+	private String remark;
+	
+	/**
+	 * 所属组织（暂时不需要）
+	 */
+	private String pkOrg;
+	
+	/**
+	 * 删除状态（0未删除，1已删除）
+	 */
+	private String delFlag = "0";
+	
+	/**
+	 * 微信id
+	 */
+	private String weixinId;
+
+    /**
+     * BasicsPersonnelEntity constructor
+     */
+	public BasicsPersonnelEntity() {
+		super();
+	}
+
+    /**
+     * setter for id
+     * @param id
+     */
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+    /**
+     * getter for id
+     */
+	public Long getId() {
+		return id;
+	}
+
+    /**
+     * setter for userIdCreate
+     * @param userIdCreate
+     */
+	public void setUserIdCreate(Long userIdCreate) {
+		this.userIdCreate = userIdCreate;
+	}
+
+    /**
+     * getter for userIdCreate
+     */
+	public Long getUserIdCreate() {
+		return userIdCreate;
+	}
+
+    /**
+     * setter for gmtCreate
+     * @param gmtCreate
+     */
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+    /**
+     * getter for gmtCreate
+     */
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+
+    /**
+     * setter for gmtModified
+     * @param gmtModified
+     */
+	public void setGmtModified(Date gmtModified) {
+		this.gmtModified = gmtModified;
+	}
+
+    /**
+     * getter for gmtModified
+     */
+	public Date getGmtModified() {
+		return gmtModified;
+	}
+
+    /**
+     * setter for jobNumber
+     * @param jobNumber
+     */
+	public void setJobNumber(String jobNumber) {
+		this.jobNumber = jobNumber;
+	}
+
+    /**
+     * getter for jobNumber
+     */
+	public String getJobNumber() {
+		return jobNumber;
+	}
+
+    /**
+     * setter for name
+     * @param name
+     */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+    /**
+     * getter for name
+     */
+	public String getName() {
+		return name;
+	}
+
+    /**
+     * setter for selfDepartment
+     * @param selfDepartment
+     */
+	public void setSelfDepartment(String selfDepartment) {
+		this.selfDepartment = selfDepartment;
+	}
+
+    /**
+     * getter for selfDepartment
+     */
+	public String getSelfDepartment() {
+		return selfDepartment;
+	}
+
+    /**
+     * setter for department
+     * @param department
+     */
+	public void setDepartment(String department) {
+		this.department = department;
+	}
+
+    /**
+     * getter for department
+     */
+	public String getDepartment() {
+		return department;
+	}
+
+    /**
+     * setter for course
+     * @param course
+     */
+	public void setCourse(String course) {
+		this.course = course;
+	}
+
+    /**
+     * getter for course
+     */
+	public String getCourse() {
+		return course;
+	}
+
+    /**
+     * setter for series
+     * @param series
+     */
+	public void setSeries(String series) {
+		this.series = series;
+	}
+
+    /**
+     * getter for series
+     */
+	public String getSeries() {
+		return series;
+	}
+
+    /**
+     * setter for classes
+     * @param classes
+     */
+	public void setClasses(String classes) {
+		this.classes = classes;
+	}
+
+    /**
+     * getter for classes
+     */
+	public String getClasses() {
+		return classes;
+	}
+
+    /**
+     * setter for status
+     * @param status
+     */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+    /**
+     * getter for status
+     */
+	public String getStatus() {
+		return status;
+	}
+
+    /**
+     * setter for remark
+     * @param remark
+     */
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+    /**
+     * getter for remark
+     */
+	public String getRemark() {
+		return remark;
+	}
+
+    /**
+     * setter for pkOrg
+     * @param pkOrg
+     */
+	public void setPkOrg(String pkOrg) {
+		this.pkOrg = pkOrg;
+	}
+
+    /**
+     * getter for pkOrg
+     */
+	public String getPkOrg() {
+		return pkOrg;
+	}
+
+    /**
+     * setter for delFlag
+     * @param delFlag
+     */
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+
+    /**
+     * getter for delFlag
+     */
+	public String getDelFlag() {
+		return delFlag;
+	}
+
+	public String getWeixinId() {
+		return weixinId;
+	}
+
+	public void setWeixinId(String weixinId) {
+		this.weixinId = weixinId;
+	}
+
+	/**
+     * BasicsPersonnelEntity.toString()
+     */
+    @Override
+    public String toString() {
+        return "BasicsPersonnelEntity{" +
+               "id='" + id + '\'' +
+               ", userIdCreate='" + userIdCreate + '\'' +
+               ", gmtCreate='" + gmtCreate + '\'' +
+               ", gmtModified='" + gmtModified + '\'' +
+               ", jobNumber='" + jobNumber + '\'' +
+               ", name='" + name + '\'' +
+               ", selfDepartment='" + selfDepartment + '\'' +
+               ", department='" + department + '\'' +
+               ", course='" + course + '\'' +
+               ", series='" + series + '\'' +
+               ", classes='" + classes + '\'' +
+               ", status='" + status + '\'' +
+               ", remark='" + remark + '\'' +
+               ", pkOrg='" + pkOrg + '\'' +
+               ", weixinId='" + weixinId + '\'' +
+               ", delFlag='" + delFlag + '\'' +
+               '}';
+    }
+
+}

src/main/java/net/chenlin/dp/modules/basics/entity/BasicsPersonnelFillinEntity.java

@@ -0,0 +1,481 @@
+package net.chenlin.dp.modules.basics.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 人员每日填报温度信息
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+public class BasicsPersonnelFillinEntity implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 主键
+	 */
+	private Long id;
+	
+	/**
+	 * 创建用户id
+	 */
+	private String userIdCreate;
+	
+	/**
+	 * 创建时间
+	 */
+	@JsonFormat(timezone = "GMT+0",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date gmtCreate;
+	
+	/**
+	 * 修改时间
+	 */
+	private Date gmtModified;
+	
+	/**
+	 * 填报日期
+	 */
+	@JsonFormat(timezone = "GMT+0",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date fillingDate;
+	
+	/**
+	 * 工号
+	 */
+	private String jobNumber;
+	
+	/**
+	 * 姓名
+	 */
+	private String name;
+	
+	/**
+	 * 本部
+	 */
+	private String selfDepartment;
+	
+	/**
+	 * 部
+	 */
+	private String department;
+	
+	/**
+	 * 课
+	 */
+	private String course;
+	
+	/**
+	 * 系
+	 */
+	private String series;
+	
+	/**
+	 * 班次
+	 */
+	private String classes;
+	
+	/**
+	 * 体温
+	 */
+	private BigDecimal temperature;
+	
+	/**
+	 * 是否返沪人员（是/否）
+	 */
+	private String ifReturn;
+	
+	/**
+	 * 有无停留或途径中高风险地区（是/否）
+	 */
+	private String ifStop;
+	
+	/**
+	 * 有无接触史（是/否）
+	 */
+	private String ifContact;
+	
+	/**
+	 * 提交状态（是否）
+	 */
+	private String status;
+	
+	/**
+	 * 健康状态，体温是否超过37.3（是/否）
+	 */
+	private String healthStatus;
+	
+	/**
+	 * 备注
+	 */
+	private String remark;
+	
+	/**
+	 * 所属组织（暂时不需要）
+	 */
+	private String pkOrg;
+	
+	/**
+	 * 删除状态（0未删除，1已删除）
+	 */
+	private String delFlag;
+	
+    /**
+     * BasicsPersonnelFillinEntity constructor
+     */
+	public BasicsPersonnelFillinEntity() {
+		super();
+	}
+
+    /**
+     * setter for id
+     * @param id
+     */
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+    /**
+     * getter for id
+     */
+	public Long getId() {
+		return id;
+	}
+
+    /**
+     * setter for userIdCreate
+     * @param userIdCreate
+     */
+	public void setUserIdCreate(String userIdCreate) {
+		this.userIdCreate = userIdCreate;
+	}
+
+    /**
+     * getter for userIdCreate
+     */
+	public String getUserIdCreate() {
+		return userIdCreate;
+	}
+
+    /**
+     * setter for gmtCreate
+     * @param gmtCreate
+     */
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+    /**
+     * getter for gmtCreate
+     */
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+
+    /**
+     * setter for gmtModified
+     * @param gmtModified
+     */
+	public void setGmtModified(Date gmtModified) {
+		this.gmtModified = gmtModified;
+	}
+
+    /**
+     * getter for gmtModified
+     */
+	public Date getGmtModified() {
+		return gmtModified;
+	}
+
+    /**
+     * setter for fillingDate
+     * @param fillingDate
+     */
+	public void setFillingDate(Date fillingDate) {
+		this.fillingDate = fillingDate;
+	}
+
+    /**
+     * getter for fillingDate
+     */
+	public Date getFillingDate() {
+		return fillingDate;
+	}
+
+    /**
+     * setter for jobNumber
+     * @param jobNumber
+     */
+	public void setJobNumber(String jobNumber) {
+		this.jobNumber = jobNumber;
+	}
+
+    /**
+     * getter for jobNumber
+     */
+	public String getJobNumber() {
+		return jobNumber;
+	}
+
+    /**
+     * setter for name
+     * @param name
+     */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+    /**
+     * getter for name
+     */
+	public String getName() {
+		return name;
+	}
+
+    /**
+     * setter for selfDepartment
+     * @param selfDepartment
+     */
+	public void setSelfDepartment(String selfDepartment) {
+		this.selfDepartment = selfDepartment;
+	}
+
+    /**
+     * getter for selfDepartment
+     */
+	public String getSelfDepartment() {
+		return selfDepartment;
+	}
+
+    /**
+     * setter for department
+     * @param department
+     */
+	public void setDepartment(String department) {
+		this.department = department;
+	}
+
+    /**
+     * getter for department
+     */
+	public String getDepartment() {
+		return department;
+	}
+
+    /**
+     * setter for course
+     * @param course
+     */
+	public void setCourse(String course) {
+		this.course = course;
+	}
+
+    /**
+     * getter for course
+     */
+	public String getCourse() {
+		return course;
+	}
+
+    /**
+     * setter for series
+     * @param series
+     */
+	public void setSeries(String series) {
+		this.series = series;
+	}
+
+    /**
+     * getter for series
+     */
+	public String getSeries() {
+		return series;
+	}
+
+    /**
+     * setter for classes
+     * @param classes
+     */
+	public void setClasses(String classes) {
+		this.classes = classes;
+	}
+
+    /**
+     * getter for classes
+     */
+	public String getClasses() {
+		return classes;
+	}
+
+    /**
+     * setter for temperature
+     * @param temperature
+     */
+	public void setTemperature(BigDecimal temperature) {
+		this.temperature = temperature;
+	}
+
+    /**
+     * getter for temperature
+     */
+	public BigDecimal getTemperature() {
+		return temperature;
+	}
+
+    /**
+     * setter for ifReturn
+     * @param ifReturn
+     */
+	public void setIfReturn(String ifReturn) {
+		this.ifReturn = ifReturn;
+	}
+
+    /**
+     * getter for ifReturn
+     */
+	public String getIfReturn() {
+		return ifReturn;
+	}
+
+    /**
+     * setter for ifStop
+     * @param ifStop
+     */
+	public void setIfStop(String ifStop) {
+		this.ifStop = ifStop;
+	}
+
+    /**
+     * getter for ifStop
+     */
+	public String getIfStop() {
+		return ifStop;
+	}
+
+    /**
+     * setter for ifContact
+     * @param ifContact
+     */
+	public void setIfContact(String ifContact) {
+		this.ifContact = ifContact;
+	}
+
+    /**
+     * getter for ifContact
+     */
+	public String getIfContact() {
+		return ifContact;
+	}
+
+    /**
+     * setter for status
+     * @param status
+     */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+    /**
+     * getter for status
+     */
+	public String getStatus() {
+		return status;
+	}
+
+    /**
+     * setter for healthStatus
+     * @param healthStatus
+     */
+	public void setHealthStatus(String healthStatus) {
+		this.healthStatus = healthStatus;
+	}
+
+    /**
+     * getter for healthStatus
+     */
+	public String getHealthStatus() {
+		return healthStatus;
+	}
+
+    /**
+     * setter for remark
+     * @param remark
+     */
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+    /**
+     * getter for remark
+     */
+	public String getRemark() {
+		return remark;
+	}
+
+    /**
+     * setter for pkOrg
+     * @param pkOrg
+     */
+	public void setPkOrg(String pkOrg) {
+		this.pkOrg = pkOrg;
+	}
+
+    /**
+     * getter for pkOrg
+     */
+	public String getPkOrg() {
+		return pkOrg;
+	}
+
+    /**
+     * setter for delFlag
+     * @param delFlag
+     */
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+
+    /**
+     * getter for delFlag
+     */
+	public String getDelFlag() {
+		return delFlag;
+	}
+
+    /**
+     * BasicsPersonnelFillinEntity.toString()
+     */
+    @Override
+    public String toString() {
+        return "BasicsPersonnelFillinEntity{" +
+               "id='" + id + '\'' +
+               ", userIdCreate='" + userIdCreate + '\'' +
+               ", gmtCreate='" + gmtCreate + '\'' +
+               ", gmtModified='" + gmtModified + '\'' +
+               ", fillingDate='" + fillingDate + '\'' +
+               ", jobNumber='" + jobNumber + '\'' +
+               ", name='" + name + '\'' +
+               ", selfDepartment='" + selfDepartment + '\'' +
+               ", department='" + department + '\'' +
+               ", course='" + course + '\'' +
+               ", series='" + series + '\'' +
+               ", classes='" + classes + '\'' +
+               ", temperature='" + temperature + '\'' +
+               ", ifReturn='" + ifReturn + '\'' +
+               ", ifStop='" + ifStop + '\'' +
+               ", ifContact='" + ifContact + '\'' +
+               ", status='" + status + '\'' +
+               ", healthStatus='" + healthStatus + '\'' +
+               ", remark='" + remark + '\'' +
+               ", pkOrg='" + pkOrg + '\'' +
+               ", delFlag='" + delFlag + '\'' +
+               '}';
+    }
+
+}

src/main/java/net/chenlin/dp/modules/basics/mapper/BasicsPersonnelFillinMapper.xml

@@ -0,0 +1,225 @@
+<?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="net.chenlin.dp.modules.basics.dao.BasicsPersonnelFillinMapper">
+	
+	<select id="listForPage" resultType="net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity">
+	<!--	SELECT
+			`id`,
+			`user_id_create`,
+			`gmt_create`,
+			`gmt_modified`,
+			`filling_date`,
+			`job_number`,
+			`name`,
+			`self_department`,
+			`department`,
+			`course`,
+			`series`,
+			`classes`,
+			`temperature`,
+			`if_return`,
+			`if_stop`,
+			`if_contact`,
+			`status`,
+			`health_status`,
+			`remark`,
+			`pk_org`,
+			`del_flag`
+		FROM
+			basics_personnel_fillin
+		ORDER BY
+			id DESC-->
+		SELECT A.* from (
+			SELECT
+			b.`filling_date` fillingDate,
+			a.`job_number` jobNumber,
+			a.`name` name,
+			a.`self_department` selfDepartment,
+			a.`department` department,
+			a.`course` course,
+			a.`series` series,
+			a.`classes` classes,
+			b.`temperature` temperature,
+			b.`if_return` ifReturn,
+			b.`if_stop` ifStop,
+			b.`if_contact` ifContact
+			FROM
+			basics_personnel a
+			left JOIN basics_personnel_fillin b ON a.job_number = b.job_number
+			<if test="fillingDate != null and fillingDate.trim() != ''">
+				and b.filling_Date =#{fillingDate}
+			</if>
+			where a.del_flag='0'
+
+			union all
+
+			SELECT
+			b.`filling_date` fillingDate,
+			b.`job_number` jobNumber,
+			b.`name` name,
+			b.`self_department` selfDepartment,
+			b.`department` department,
+			b.`course` course,
+			b.`series` series,
+			b.`classes` classes,
+			b.`temperature` temperature,
+			b.`if_return` ifReturn,
+			b.`if_stop` ifStop,
+			b.`if_contact` ifContact
+			FROM
+			basics_personnel_fillin b
+			where
+			(b.job_number is null or b.job_number ='')
+			<if test="fillingDate != null and fillingDate.trim() != ''">
+				and filling_Date =#{fillingDate}
+			</if>
+
+		) as A
+		where 1=1
+
+		<if test="name != null and name.trim() != ''">
+			and name LIKE concat('%',#{name},'%')
+			OR jobNumber =#{name}
+			OR selfDepartment LIKE concat('%',#{name},'%')
+			OR department LIKE concat('%',#{name},'%')
+			OR course LIKE concat('%',#{name},'%')
+			OR series LIKE concat('%',#{name},'%')
+			OR classes LIKE concat('%',#{name},'%')
+			OR temperature LIKE concat('%',#{name},'%')
+		</if>
+	</select>
+	
+	<insert id="save">
+		INSERT INTO basics_personnel_fillin (
+			`id`, 
+			`user_id_create`, 
+			`gmt_create`, 
+			`gmt_modified`, 
+			`filling_date`, 
+			`job_number`, 
+			`name`, 
+			`self_department`, 
+			`department`, 
+			`course`, 
+			`series`, 
+			`classes`, 
+			`temperature`, 
+			`if_return`, 
+			`if_stop`, 
+			`if_contact`, 
+			`status`, 
+			`health_status`, 
+			`remark`, 
+			`pk_org`, 
+			`del_flag`
+		)
+		VALUES (
+			#{id}, 
+			#{userIdCreate}, 
+			#{gmtCreate}, 
+			#{gmtModified}, 
+			#{fillingDate}, 
+			#{jobNumber}, 
+			#{name}, 
+			#{selfDepartment}, 
+			#{department}, 
+			#{course}, 
+			#{series}, 
+			#{classes}, 
+			#{temperature}, 
+			#{ifReturn}, 
+			#{ifStop}, 
+			#{ifContact}, 
+			#{status}, 
+			#{healthStatus}, 
+			#{remark}, 
+			#{pkOrg}, 
+			#{delFlag}
+		)
+	</insert>
+	
+	<select id="getObjectById" resultType="net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity">
+		SELECT
+			`id`, 
+			`user_id_create`, 
+			`gmt_create`, 
+			`gmt_modified`, 
+			`filling_date`, 
+			`job_number`, 
+			`name`, 
+			`self_department`, 
+			`department`, 
+			`course`, 
+			`series`, 
+			`classes`, 
+			`temperature`, 
+			`if_return`, 
+			`if_stop`, 
+			`if_contact`, 
+			`status`, 
+			`health_status`, 
+			`remark`, 
+			`pk_org`, 
+			`del_flag`
+		FROM
+			basics_personnel_fillin
+		WHERE
+			id = #{id}
+	</select>
+
+	<select id="getByUserCode" resultType="net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity">
+		SELECT
+			`job_number`,
+			`name`,
+			`self_department`,
+			`department`,
+			`course`,
+			`series`,
+			`classes`
+		FROM
+			basics_personnel
+		WHERE del_flag ='0'
+		  and job_number = #{id}
+	</select>
+
+	<update id="update">
+		UPDATE basics_personnel_fillin
+	 	<set>
+			<if test="userIdCreate != null">`user_id_create` = #{userIdCreate}, </if>
+			<if test="gmtCreate != null">`gmt_create` = #{gmtCreate}, </if>
+			<if test="gmtModified != null">`gmt_modified` = #{gmtModified}, </if>
+			<if test="fillingDate != null">`filling_date` = #{fillingDate}, </if>
+			<if test="jobNumber != null">`job_number` = #{jobNumber}, </if>
+			<if test="name != null">`name` = #{name}, </if>
+			<if test="selfDepartment != null">`self_department` = #{selfDepartment}, </if>
+			<if test="department != null">`department` = #{department}, </if>
+			<if test="course != null">`course` = #{course}, </if>
+			<if test="series != null">`series` = #{series}, </if>
+			<if test="classes != null">`classes` = #{classes}, </if>
+			<if test="temperature != null">`temperature` = #{temperature}, </if>
+			<if test="ifReturn != null">`if_return` = #{ifReturn}, </if>
+			<if test="ifStop != null">`if_stop` = #{ifStop}, </if>
+			<if test="ifContact != null">`if_contact` = #{ifContact}, </if>
+			<if test="status != null">`status` = #{status}, </if>
+			<if test="healthStatus != null">`health_status` = #{healthStatus}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="pkOrg != null">`pk_org` = #{pkOrg}, </if>
+			<if test="delFlag != null">`del_flag` = #{delFlag}</if>
+		</set>
+		WHERE
+			id = #{id}
+	</update>
+	
+	<delete id="batchRemove">
+		DELETE
+		FROM
+			basics_personnel_fillin
+		WHERE
+			id IN
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>

src/main/java/net/chenlin/dp/modules/basics/mapper/BasicsPersonnelMapper.xml

@@ -0,0 +1,136 @@
+<?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="net.chenlin.dp.modules.basics.dao.BasicsPersonnelMapper">
+	
+	<select id="listForPage" resultType="net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity">
+		SELECT
+			`id`, 
+			`user_id_create`, 
+			`gmt_create`, 
+			`gmt_modified`, 
+			`job_number`, 
+			`name`, 
+			`self_department`, 
+			`department`, 
+			`course`, 
+			`series`, 
+			`classes`, 
+			`status`, 
+			`remark`, 
+			`pk_org`, 
+			`weixin_id`,
+			`del_flag`
+		FROM
+			basics_personnel
+		where del_flag ='0'
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+			OR job_number =#{name}
+			OR self_department LIKE concat('%',#{name},'%')
+			OR department LIKE concat('%',#{name},'%')
+			OR course LIKE concat('%',#{name},'%')
+			OR series LIKE concat('%',#{name},'%')
+			OR classes LIKE concat('%',#{name},'%')
+		</if>
+		ORDER BY
+			id DESC
+	</select>
+	
+	<insert id="save">
+		INSERT INTO basics_personnel (
+			`id`, 
+			`user_id_create`, 
+			`gmt_create`, 
+			`gmt_modified`, 
+			`job_number`, 
+			`name`, 
+			`self_department`, 
+			`department`, 
+			`course`, 
+			`series`, 
+			`classes`, 
+			`status`, 
+			`remark`, 
+			`pk_org`, 
+			`weixin_id`,
+			`del_flag`
+		)
+		VALUES (
+			#{id}, 
+			#{userIdCreate}, 
+			#{gmtCreate}, 
+			#{gmtModified}, 
+			#{jobNumber}, 
+			#{name}, 
+			#{selfDepartment}, 
+			#{department}, 
+			#{course}, 
+			#{series}, 
+			#{classes}, 
+			#{status}, 
+			#{remark}, 
+			#{pkOrg}, 
+			#{weixinId},
+			#{delFlag}
+		)
+	</insert>
+	
+	<select id="getObjectById" resultType="net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity">
+		SELECT
+			`id`, 
+			`user_id_create`, 
+			`gmt_create`, 
+			`gmt_modified`, 
+			`job_number`, 
+			`name`, 
+			`self_department`, 
+			`department`, 
+			`course`, 
+			`series`, 
+			`classes`, 
+			`status`, 
+			`remark`, 
+			`pk_org`, 
+			`weixin_id`,
+			`del_flag`
+		FROM
+			basics_personnel
+		WHERE del_flag ='0'
+			and id = #{id}
+	</select>
+	
+	<update id="update">
+		UPDATE basics_personnel
+	 	<set>
+			<if test="userIdCreate != null">`user_id_create` = #{userIdCreate}, </if>
+			<if test="gmtCreate != null">`gmt_create` = #{gmtCreate}, </if>
+			<if test="gmtModified != null">`gmt_modified` = #{gmtModified}, </if>
+			<if test="jobNumber != null">`job_number` = #{jobNumber}, </if>
+			<if test="name != null">`name` = #{name}, </if>
+			<if test="selfDepartment != null">`self_department` = #{selfDepartment}, </if>
+			<if test="department != null">`department` = #{department}, </if>
+			<if test="course != null">`course` = #{course}, </if>
+			<if test="series != null">`series` = #{series}, </if>
+			<if test="classes != null">`classes` = #{classes}, </if>
+			<if test="status != null">`status` = #{status}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="pkOrg != null">`pk_org` = #{pkOrg}, </if>
+			<if test="pkOrg != null">`weixin_id` = #{weixinId}, </if>
+			<if test="delFlag != null">`del_flag` = #{delFlag}</if>
+		</set>
+		WHERE
+			id = #{id}
+	</update>
+	
+	<delete id="batchRemove">
+		update
+			basics_personnel set del_flag='1'
+		WHERE
+			id IN
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>

src/main/java/net/chenlin/dp/modules/basics/service/BasicsPersonnelFillinService.java

@@ -0,0 +1,59 @@
+package net.chenlin.dp.modules.basics.service;
+
+import java.util.List;
+import java.util.Map;
+
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity;
+
+/**
+ * 人员每日填报温度信息
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+public interface BasicsPersonnelFillinService {
+
+    /**
+     * 分页查询
+     * @param params
+     * @return
+     */
+	Page<BasicsPersonnelFillinEntity> listBasicsPersonnelFillin(Map<String, Object> params);
+
+    /**
+     * 新增
+     * @param basicsPersonnelFillin
+     * @return
+     */
+	R saveBasicsPersonnelFillin(BasicsPersonnelFillinEntity basicsPersonnelFillin);
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+	R getBasicsPersonnelFillinById(Long id);
+
+   /**
+     * 根据id查询
+     * @param jobNumber
+     * @return
+     */
+	List<BasicsPersonnelEntity> getByUserCode(String jobNumber);
+
+    /**
+     * 修改
+     * @param basicsPersonnelFillin
+     * @return
+     */
+	R updateBasicsPersonnelFillin(BasicsPersonnelFillinEntity basicsPersonnelFillin);
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+	R batchRemove(Long[] id);
+	
+}

src/main/java/net/chenlin/dp/modules/basics/service/BasicsPersonnelService.java

@@ -0,0 +1,50 @@
+package net.chenlin.dp.modules.basics.service;
+
+import java.util.Map;
+
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+
+/**
+ * 基础人员档案
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+public interface BasicsPersonnelService {
+
+    /**
+     * 分页查询
+     * @param params
+     * @return
+     */
+	Page<BasicsPersonnelEntity> listBasicsPersonnel(Map<String, Object> params);
+
+    /**
+     * 新增
+     * @param basicsPersonnel
+     * @return
+     */
+	R saveBasicsPersonnel(BasicsPersonnelEntity basicsPersonnel);
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+	R getBasicsPersonnelById(Long id);
+
+    /**
+     * 修改
+     * @param basicsPersonnel
+     * @return
+     */
+	R updateBasicsPersonnel(BasicsPersonnelEntity basicsPersonnel);
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+	R batchRemove(Long[] id);
+	
+}

src/main/java/net/chenlin/dp/modules/basics/service/impl/BasicsPersonnelFillinServiceImpl.java

@@ -0,0 +1,96 @@
+package net.chenlin.dp.modules.basics.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.Query;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.common.utils.CommonUtils;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity;
+import net.chenlin.dp.modules.basics.dao.BasicsPersonnelFillinMapper;
+import net.chenlin.dp.modules.basics.service.BasicsPersonnelFillinService;
+
+/**
+ * 人员每日填报温度信息
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@Service("basicsPersonnelFillinService")
+public class BasicsPersonnelFillinServiceImpl implements BasicsPersonnelFillinService {
+
+	@Autowired
+    private BasicsPersonnelFillinMapper basicsPersonnelFillinMapper;
+
+    /**
+     * 分页查询
+     * @param params
+     * @return
+     */
+	@Override
+	public Page<BasicsPersonnelFillinEntity> listBasicsPersonnelFillin(Map<String, Object> params) {
+		Query query = new Query(params);
+		Page<BasicsPersonnelFillinEntity> page = new Page<>(query);
+		basicsPersonnelFillinMapper.listForPage(page, query);
+		return page;
+	}
+
+    /**
+     * 新增
+     * @param basicsPersonnelFillin
+     * @return
+     */
+	@Override
+	public R saveBasicsPersonnelFillin(BasicsPersonnelFillinEntity basicsPersonnelFillin) {
+		int count = basicsPersonnelFillinMapper.save(basicsPersonnelFillin);
+		return CommonUtils.msg(count);
+	}
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+	@Override
+	public R getBasicsPersonnelFillinById(Long id) {
+		BasicsPersonnelFillinEntity basicsPersonnelFillin = basicsPersonnelFillinMapper.getObjectById(id);
+		return CommonUtils.msg(basicsPersonnelFillin);
+	}
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+	@Override
+	public List<BasicsPersonnelEntity> getByUserCode(String id) {
+		List<BasicsPersonnelEntity> basicsPersonnelFillin = basicsPersonnelFillinMapper.getByUserCode(id);
+		return basicsPersonnelFillin;
+	}
+
+    /**
+     * 修改
+     * @param basicsPersonnelFillin
+     * @return
+     */
+	@Override
+	public R updateBasicsPersonnelFillin(BasicsPersonnelFillinEntity basicsPersonnelFillin) {
+		int count = basicsPersonnelFillinMapper.update(basicsPersonnelFillin);
+		return CommonUtils.msg(count);
+	}
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+	@Override
+	public R batchRemove(Long[] id) {
+		int count = basicsPersonnelFillinMapper.batchRemove(id);
+		return CommonUtils.msg(id, count);
+	}
+
+}

src/main/java/net/chenlin/dp/modules/basics/service/impl/BasicsPersonnelServiceImpl.java

@@ -0,0 +1,83 @@
+package net.chenlin.dp.modules.basics.service.impl;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.Query;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.common.utils.CommonUtils;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import net.chenlin.dp.modules.basics.dao.BasicsPersonnelMapper;
+import net.chenlin.dp.modules.basics.service.BasicsPersonnelService;
+
+/**
+ * 基础人员档案
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@Service("basicsPersonnelService")
+public class BasicsPersonnelServiceImpl implements BasicsPersonnelService {
+
+	@Autowired
+    private BasicsPersonnelMapper basicsPersonnelMapper;
+
+    /**
+     * 分页查询
+     * @param params
+     * @return
+     */
+	@Override
+	public Page<BasicsPersonnelEntity> listBasicsPersonnel(Map<String, Object> params) {
+		Query query = new Query(params);
+		Page<BasicsPersonnelEntity> page = new Page<>(query);
+		basicsPersonnelMapper.listForPage(page, query);
+		return page;
+	}
+
+    /**
+     * 新增
+     * @param basicsPersonnel
+     * @return
+     */
+	@Override
+	public R saveBasicsPersonnel(BasicsPersonnelEntity basicsPersonnel) {
+		int count = basicsPersonnelMapper.save(basicsPersonnel);
+		return CommonUtils.msg(count);
+	}
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+	@Override
+	public R getBasicsPersonnelById(Long id) {
+		BasicsPersonnelEntity basicsPersonnel = basicsPersonnelMapper.getObjectById(id);
+		return CommonUtils.msg(basicsPersonnel);
+	}
+
+    /**
+     * 修改
+     * @param basicsPersonnel
+     * @return
+     */
+	@Override
+	public R updateBasicsPersonnel(BasicsPersonnelEntity basicsPersonnel) {
+		int count = basicsPersonnelMapper.update(basicsPersonnel);
+		return CommonUtils.msg(count);
+	}
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+	@Override
+	public R batchRemove(Long[] id) {
+		int count = basicsPersonnelMapper.batchRemove(id);
+		return CommonUtils.msg(id, count);
+	}
+
+}