Commit 7f7fe763 authored by 夏敏伟's avatar 夏敏伟

修改备注

parent cb2d7d05
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.PageInfo;
import com.zksy.szpt.domain.bo.SzptClockInBO;
import com.zksy.szpt.domain.dto.CommonDelIntDTO;
import com.zksy.szpt.domain.dto.SzptClockInDTO;
import com.zksy.szpt.domain.dto.SzptClockInQueryDTO;
import com.zksy.szpt.service.SzptClockInService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -10,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Api(tags = "考勤")
@Api(tags = "边缘性场所、娱乐场所、旅馆酒店从业人员打卡")
@RequestMapping("/rest/index")
@RestController
@Validated
......@@ -20,19 +22,25 @@ public class SzptClockInController {
this.szptClockInService = szptClockInService;
}
@ApiOperation(value="新增szpt_clock_in数据")
@ApiOperation(value="查询边缘性场所、娱乐场所、旅馆酒店从业人员打卡数据")
@PostMapping("/querySzptClockIn")
public PageInfo<SzptClockInBO> querySzptClockIn(@RequestBody @Validated SzptClockInQueryDTO szptClockInQueryDTO){
return szptClockInService.querySzptClockIn(szptClockInQueryDTO);
}
@ApiOperation(value="新增边缘性场所、娱乐场所、旅馆酒店从业人员打卡数据")
@PostMapping("/addSzptClockIn")
public Integer addSzptClockIn(@RequestBody @Validated SzptClockInDTO szptClockInDTO){
return szptClockInService.addSzptClockIn(szptClockInDTO);
}
@ApiOperation(value="编辑szpt_clock_in数据")
@ApiOperation(value="编辑边缘性场所、娱乐场所、旅馆酒店从业人员打卡数据")
@PostMapping("/updateSzptClockIn")
public Integer updateSzptClockIn(@RequestBody @Validated SzptClockInDTO szptClockInDTO){
return szptClockInService.updateSzptClockIn(szptClockInDTO);
}
@ApiOperation(value = "删除szpt_clock_in数据")
@ApiOperation(value = "删除边缘性场所、娱乐场所、旅馆酒店从业人员打卡数据")
@PostMapping("/deleteSzptClockIn")
public Integer deleteSzptClockIn(@RequestBody CommonDelIntDTO commonDelIntDTO) {
return szptClockInService.deleteSzptClockIn(commonDelIntDTO);
......
package com.zksy.szpt.controller;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.CommonDelIntDTO;
import com.zksy.szpt.domain.dto.SzptClockInRulesDTO;
import com.zksy.szpt.domain.PageInfo;
import com.zksy.szpt.domain.bo.SzptClockInRulesBO;
import com.zksy.szpt.domain.dto.*;
import com.zksy.szpt.service.SzptClockInRulesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Api(tags = "考勤规则")
@Api(tags = "边缘性场所、娱乐场所、旅馆酒店从业人员打卡规则")
@RequestMapping("/rest/index")
@RestController
@Validated
......@@ -20,19 +20,25 @@ public class SzptClockInRulesController {
this.szptClockInRulesService = szptClockInRulesService;
}
@ApiOperation(value="新增szpt_clock_in_rules数据")
@ApiOperation(value="查询边缘性场所、娱乐场所、旅馆酒店从业人员打卡规则数据")
@PostMapping("/querySzptClockInRules")
public PageInfo<SzptClockInRulesBO> querySzptClockInRules(@RequestBody @Validated SzptClockInRulesQueryDTO szptClockInRulesQueryDTO){
return szptClockInRulesService.querySzptClockInRules(szptClockInRulesQueryDTO);
}
@ApiOperation(value="新增边缘性场所、娱乐场所、旅馆酒店从业人员打卡规则数据")
@PostMapping("/addSzptClockInRules")
public Integer addSzptClockInRules(@RequestBody @Validated SzptClockInRulesDTO szptClockInRulesDTO){
return szptClockInRulesService.addSzptClockInRules(szptClockInRulesDTO);
}
@ApiOperation(value="编辑szpt_clock_in_rules数据")
@ApiOperation(value="编辑边缘性场所、娱乐场所、旅馆酒店从业人员打卡规则数据")
@PostMapping("/updateSzptClockInRules")
public Integer updateSzptClockInRules(@RequestBody @Validated SzptClockInRulesDTO szptClockInRulesDTO){
return szptClockInRulesService.updateSzptClockInRules(szptClockInRulesDTO);
}
@ApiOperation(value = "删除SzptClockInRules数据")
@ApiOperation(value = "删除边缘性场所、娱乐场所、旅馆酒店从业人员打卡规则数据")
@PostMapping("/deleteSzptClockInRules")
public Integer deleteSzptClockInRules(@RequestBody @Validated CommonDelIntDTO commonDelIntDTO) {
return szptClockInRulesService.deleteSzptClockInRules(commonDelIntDTO);
......
package com.zksy.szpt.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
public class SzptClockInBO {
/**
* ID
*/
@ApiModelProperty(value = "ID")
private Integer id;
/**
* 场所编号
*/
@ApiModelProperty(value = "场所编号")
private String csid;
/**
* 上班签到
*/
@ApiModelProperty(value = "上班签到")
private String sbqd;
/**
* 下班签退
*/
@ApiModelProperty(value = "下班签退")
private String xbqt;
/**
* 现场情况上报
*/
@ApiModelProperty(value = "现场情况上报")
private String xcqk;
/**
* 上报时间
*/
@ApiModelProperty(value = "上报时间")
private String sbsj;
/**
* 上报人
*/
@ApiModelProperty(value = "上报人")
private String sbr;
/**
*
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
*
*/
@ApiModelProperty(value = "修改时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 签到人
*/
@ApiModelProperty(value = "签到人")
private String qdr;
/**
* 签到人联系电话
*/
@ApiModelProperty(value = "签到人联系电话")
private String qdrlxdh;
/**
* 签到打卡地点
*/
@ApiModelProperty(value = "签到打卡地点")
private String qddkdd;
/**
* 签到打卡照片
*/
@ApiModelProperty(value = "签到打卡照片")
private String qddkzp;
/**
* 签退打卡地点
*/
@ApiModelProperty(value = "签退打卡地点")
private String qtdkdd;
/**
* 签退打卡地点
*/
@ApiModelProperty(value = "签退打卡地点")
private String qtdkzp;
/**
* 管控等级
*/
@ApiModelProperty(value = "管控等级")
private String gkdj;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getCsid() {
return csid;
}
public void setCsid(String csid) {
this.csid = csid == null ? null : csid.trim();
}
public String getSbqd() {
return sbqd;
}
public void setSbqd(String sbqd) {
this.sbqd = sbqd == null ? null : sbqd.trim();
}
public String getXbqt() {
return xbqt;
}
public void setXbqt(String xbqt) {
this.xbqt = xbqt == null ? null : xbqt.trim();
}
public String getXcqk() {
return xcqk;
}
public void setXcqk(String xcqk) {
this.xcqk = xcqk == null ? null : xcqk.trim();
}
public String getSbsj() {
return sbsj;
}
public void setSbsj(String sbsj) {
this.sbsj = sbsj == null ? null : sbsj.trim();
}
public String getSbr() {
return sbr;
}
public void setSbr(String sbr) {
this.sbr = sbr == null ? null : sbr.trim();
}
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;
}
public String getQdr() {
return qdr;
}
public void setQdr(String qdr) {
this.qdr = qdr == null ? null : qdr.trim();
}
public String getQdrlxdh() {
return qdrlxdh;
}
public void setQdrlxdh(String qdrlxdh) {
this.qdrlxdh = qdrlxdh == null ? null : qdrlxdh.trim();
}
public String getQddkdd() {
return qddkdd;
}
public void setQddkdd(String qddkdd) {
this.qddkdd = qddkdd == null ? null : qddkdd.trim();
}
public String getQddkzp() {
return qddkzp;
}
public void setQddkzp(String qddkzp) {
this.qddkzp = qddkzp == null ? null : qddkzp.trim();
}
public String getQtdkdd() {
return qtdkdd;
}
public void setQtdkdd(String qtdkdd) {
this.qtdkdd = qtdkdd == null ? null : qtdkdd.trim();
}
public String getQtdkzp() {
return qtdkzp;
}
public void setQtdkzp(String qtdkzp) {
this.qtdkzp = qtdkzp == null ? null : qtdkzp.trim();
}
public String getGkdj() {
return gkdj;
}
public void setGkdj(String gkdj) {
this.gkdj = gkdj == null ? null : gkdj.trim();
}
}
package com.zksy.szpt.domain.bo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
public class SzptClockInRulesBO {
/**
*
*/
@ApiModelProperty(value = "ID")
private Integer id;
/**
* 签到场所名称
*/
@ApiModelProperty(value = "签到场所名称")
private String name;
/**
* 关联场所id
*/
@ApiModelProperty(value = "关联场所id")
private String csid;
/**
* 打卡时间
*/
@ApiModelProperty(value = "打卡时间")
private String chockInTime;
/**
* 签到范围
*/
@ApiModelProperty(value = "签到范围")
private String clockInScope;
/**
* 签到/签退二维码
*/
@ApiModelProperty(value = "签到/签退二维码")
private String qrCode;
/**
* 学校类型
*/
@ApiModelProperty(value = "学校类型")
private String cslx;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String bz;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
public String getCsid() {
return csid;
}
public void setCsid(String csid) {
this.csid = csid == null ? null : csid.trim();
}
public String getChockInTime() {
return chockInTime;
}
public void setChockInTime(String chockInTime) {
this.chockInTime = chockInTime == null ? null : chockInTime.trim();
}
public String getClockInScope() {
return clockInScope;
}
public void setClockInScope(String clockInScope) {
this.clockInScope = clockInScope == null ? null : clockInScope.trim();
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode == null ? null : qrCode.trim();
}
public String getCslx() {
return cslx;
}
public void setCslx(String cslx) {
this.cslx = cslx == null ? null : cslx.trim();
}
public String getBz() {
return bz;
}
public void setBz(String bz) {
this.bz = bz == null ? null : bz.trim();
}
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;
}
}
package com.zksy.szpt.domain.dto;
import javax.validation.constraints.Min;
public class SzptClockInQueryDTO {
@Min(value = 1, message = "每页数据量不能小于1")
private Integer pageSize = 10;
@Min(value = 1, message = "页码不能小于1")
private Integer pageNum = 1;
private String csid;
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public String getCsid() {
return csid;
}
public void setCsid(String csid) {
this.csid = csid;
}
}
package com.zksy.szpt.domain.dto;
import javax.validation.constraints.Min;
public class SzptClockInRulesQueryDTO {
@Min(value = 1, message = "每页数据量不能小于1")
private Integer pageSize = 10;
@Min(value = 1, message = "页码不能小于1")
private Integer pageNum = 1;
private String name;
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
......@@ -2,21 +2,42 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.CommonDelIntDTO;
import com.zksy.szpt.domain.dto.SzptClockInRulesDTO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zksy.szpt.domain.PageInfo;
import com.zksy.szpt.domain.bo.SzptClockInRulesBO;
import com.zksy.szpt.domain.dto.*;
import com.zksy.szpt.domain.po.SzptClockInRules;
import com.zksy.szpt.mapper.SzptClockInRulesMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import com.zksy.szpt.util.UserContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class SzptClockInRulesService {
@Resource
private SzptClockInRulesMapper szptClockInRulesMapper;
public PageInfo<SzptClockInRulesBO> querySzptClockInRules(SzptClockInRulesQueryDTO szptClockInRulesQueryDTO) {
String deptCode = UserContextHolder.get().getDeptCode();
if(deptCode==null){
throw new IllegalArgumentException("所属单位为空");
}
LambdaQueryWrapper<SzptClockInRules> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(SzptClockIn::getSjgsdwdm, deptCode);
if (szptClockInRulesQueryDTO.getName() != null) {
wrapper.eq(SzptClockInRules::getName, szptClockInRulesQueryDTO.getName());
}
Page<SzptClockInRules> page = new Page<>(szptClockInRulesQueryDTO.getPageNum(),szptClockInRulesQueryDTO.getPageSize());
Page<SzptClockInRules> resultPage = szptClockInRulesMapper.selectPage(page,wrapper);
List<SzptClockInRulesBO> list = BeanMapperUtil.mapList(resultPage.getRecords(), SzptClockInRulesBO.class);
return new PageInfo<>(resultPage.getTotal(),list,resultPage.getCurrent(),resultPage.getSize());
}
public Integer addSzptClockInRules(SzptClockInRulesDTO szptClockInRulesDTO) {
SzptClockInRules szptClockInRules = BeanMapperUtil.map(szptClockInRulesDTO, SzptClockInRules.class);
return szptClockInRulesMapper.insert(szptClockInRules);
......
......@@ -2,21 +2,43 @@ package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.CommonDelIntDTO;
import com.zksy.szpt.domain.dto.SzptClockInDTO;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zksy.szpt.domain.PageInfo;
import com.zksy.szpt.domain.bo.SzptClockInBO;
import com.zksy.szpt.domain.bo.SzptFwxxBO;
import com.zksy.szpt.domain.dto.*;
import com.zksy.szpt.domain.po.SzptClockIn;
import com.zksy.szpt.domain.po.SzptFwxx;
import com.zksy.szpt.mapper.SzptClockInMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import com.zksy.szpt.util.UserContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class SzptClockInService {
@Resource
private SzptClockInMapper szptClockInMapper;
public PageInfo<SzptClockInBO> querySzptClockIn(SzptClockInQueryDTO szptClockInQueryDTO) {
String deptCode = UserContextHolder.get().getDeptCode();
if(deptCode==null){
throw new IllegalArgumentException("所属单位为空");
}
LambdaQueryWrapper<SzptClockIn> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(SzptClockIn::getSjgsdwdm, deptCode);
if (szptClockInQueryDTO.getCsid() != null) {
wrapper.eq(SzptClockIn::getCsid, szptClockInQueryDTO.getCsid());
}
Page<SzptClockIn> page = new Page<>(szptClockInQueryDTO.getPageNum(),szptClockInQueryDTO.getPageSize());
Page<SzptClockIn> resultPage = szptClockInMapper.selectPage(page,wrapper);
List<SzptClockInBO> list = BeanMapperUtil.mapList(resultPage.getRecords(), SzptClockInBO.class);
return new PageInfo<>(resultPage.getTotal(),list,resultPage.getCurrent(),resultPage.getSize());
}
public Integer addSzptClockIn(SzptClockInDTO szptClockInDTO) {
SzptClockIn szptClockIn = BeanMapperUtil.map(szptClockInDTO, SzptClockIn.class);
return szptClockInMapper.insert(szptClockIn);
......
package com.zksy.szpt.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zksy.szpt.domain.PageInfo;
......@@ -34,14 +33,10 @@ public class SzptFwxxService {
if (szptFwxxQueryDTO.getQyid() != null) {
wrapper.eq(SzptFwxx::getQyid, szptFwxxQueryDTO.getQyid());
}
Page<SzptFwxx> page = new Page<>(szptFwxxQueryDTO.getPageNum(),szptFwxxQueryDTO.getPageSize());
Page<SzptFwxx> resultPage = szptFwxxMapper.selectPage(page,wrapper);
List<SzptFwxxBO> list = BeanMapperUtil.mapList(resultPage.getRecords(), SzptFwxxBO.class);
PageInfo<SzptFwxxBO> pageInfoBo = new PageInfo<>(resultPage.getTotal(),list,resultPage.getCurrent(),resultPage.getSize());
return pageInfoBo;
return new PageInfo<>(resultPage.getTotal(),list,resultPage.getCurrent(),resultPage.getSize());
}
public Integer addSzptFwxx(SzptFwxxDTO szptFwxxDTO) {
......
......@@ -17,6 +17,15 @@ public class MainTestX {
/**
* ===================================================考勤===================================================
*/
@Test
@DisplayName("房屋信息--查询")
public void szptClockInQueryTest() {
SzptClockInQueryDTO szptClockInQueryDTO = new SzptClockInQueryDTO();
szptClockInQueryDTO.setPageSize(10);
szptClockInQueryDTO.setPageSize(1);
TestHttpUtil.signatureAndRequest("/rest/index/querySzptClockIn", szptClockInQueryDTO, SzptClockInQueryDTO.class);
}
@Test
@DisplayName("考勤--新增")
public void szptClockInAddTest() {
......@@ -86,6 +95,15 @@ public class MainTestX {
/**
* ===================================================考勤规则===================================================
*/
@Test
@DisplayName("房屋信息--查询")
public void szptClockInRulesQueryTest() {
SzptClockInRulesQueryDTO szptClockInRulesQueryDTO = new SzptClockInRulesQueryDTO();
szptClockInRulesQueryDTO.setPageSize(10);
szptClockInRulesQueryDTO.setPageSize(1);
TestHttpUtil.signatureAndRequest("/rest/index/querySzptClockInRules", szptClockInRulesQueryDTO, SzptClockInRulesQueryDTO.class);
}
@Test
@DisplayName("考勤规则--新增")
public void szptClockInRulesAddTest() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment