Skip to content

8
8timerapiv200
Commit 4f3fc3bf by ilal
Options

临时提交

parent 7f171fb8
Showing with 1843 additions and 12 deletions
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkdz.java 0 → 100644
package cn.timer.api.bean.kqmk;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author LAL 2020-05-09
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "kqgl_asso_dkdz")
@ApiModel("考勤打卡地址")
public class KqglAssoDkdz extends Model<KqglAssoDkdz> {
/**
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id id", example = "101")
private Integer id;
@ApiModelProperty(value = "打卡地址-名称 ", example = "打卡地址-名称")
private String name;
@ApiModelProperty(value = "详细地址 ", example = "详细地址")
private String address;
@ApiModelProperty(value = "打卡范围 打卡范围", example = "101")
private Integer dkfw;
@ApiModelProperty(value = "经度 ", example = "经度")
private Double lon;
@ApiModelProperty(value = "纬度 ", example = "纬度")
private Double lat;
@ApiModelProperty(value = "企业id 企业id", example = "101")
private Integer qyid;
@ApiModelProperty(value = "录入时间 录入时间", example = "101")
private Long lusjTime;
@ApiModelProperty(value = "录入人员 录入人员", example = "101")
private Integer luryid;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkwx.java 0 → 100644
package cn.timer.api.bean.kqmk;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author LAL 2020-05-09
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "kqgl_asso_dkwx")
@ApiModel("考勤打卡wifi")
public class KqglAssoDkwx extends Model<KqglAssoDkwx> {
/**
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id id", example = "101")
private Integer id;
@ApiModelProperty(value = "名称 ", example = "名称")
private String name;
@ApiModelProperty(value = "mac地址 ", example = "mac地址")
private String mac;
@ApiModelProperty(value = "企业id 企业id", example = "101")
private Integer qyid;
@ApiModelProperty(value = "录入时间 录入时间", example = "101")
private Long lusjTime;
@ApiModelProperty(value = "录入人员 录入人员", example = "101")
private Integer luryid;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/kqmk/KqglAssoKqj.java 0 → 100644
package cn.timer.api.bean.kqmk;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author LAL 2020-05-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "kqgl_asso_kqj")
@ApiModel("考勤机表")
public class KqglAssoKqj extends Model<KqglAssoKqj> {
/**
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id id", example = "1")
private Integer id;
@ApiModelProperty(value = "名称 ", example = "考勤机测试")
private String name;
@ApiModelProperty(value = "设备编码 ", example = "45654HF565HY5")
private String code;
@ApiModelProperty(value = "企业id 企业id", example = "117")
private Integer qyid;
@ApiModelProperty(value = "录入时间 录入时间", example = "1588988847000")
private Long lusjTime;
@ApiModelProperty(value = "录入人员 录入人员", example = "201")
private Integer luryid;
@ApiModelProperty(value = "类型（1：浩顺考勤机；2：中控考勤机） 类型（1：浩顺考勤机；2：中控考勤机）", example = "1")
private Integer type;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/kqmk/KqglAssoKqzdkfs.java 0 → 100644
package cn.timer.api.bean.kqmk;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Tolerate;
/**
* @author LAL 2020-05-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "kqgl_asso_kqzdkfs")
@ApiModel("考勤组绑定的打卡方式")
public class KqglAssoKqzdkfs extends Model<KqglAssoKqzdkfs> {
/**
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id id", example = "101")
private Integer id;
@ApiModelProperty(value = "打卡方式id（考勤机、WIFI、地址） 打卡方式id（考勤机、WIFI、地址）", example = "101")
private Integer dkfsid;
@ApiModelProperty(value = "考勤组ID 考勤组ID", example = "101")
private Integer kqzId;
@ApiModelProperty(value = "类型（1：考勤机；2：地址；3：WIFI） 类型（1：考勤机；2：地址；3：WIFI）", example = "101")
private Integer type;
@ApiModelProperty(value = "企业id 企业id", example = "101")
private Integer qyid;
@ApiModelProperty(value = "状态（0：停用；1：启用） 状态（0：停用；1：启用）", example = "101")
private Integer state;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/kqmk/KqglAssoYhsb.java 0 → 100644
package cn.timer.api.bean.kqmk;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author LAL 2020-05-09
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "kqgl_asso_yhsb")
@ApiModel("用户与设备关系表")
public class KqglAssoYhsb extends Model<KqglAssoYhsb> {
/**
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id id", example = "101")
private Integer id;
@ApiModelProperty(value = "用户id 用户id", example = "101")
private Integer userId;
@ApiModelProperty(value = "设备id 设备id", example = "101")
private Integer kqjid;
@ApiModelProperty(value = "类型(类型 1：考勤机)", example = "101")
private Integer type;
@ApiModelProperty(value = "是否为管理员--0：否；1：是 是否为管理员--0：否；1：是", example = "101")
private Integer isGly;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/kqmk/KqglMainKqz.java 0 → 100644
package cn.timer.api.bean.kqmk;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author LAL 2020-05-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "kqgl_main_kqz")
@ApiModel("考勤组")
public class KqglMainKqz extends Model<KqglMainKqz> {
/**
*
*/
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "id id", example = "101")
private Integer id;
@ApiModelProperty(value = "名称 ", example = "名称")
private String name;
@ApiModelProperty(value = "考勤备注 ", example = "考勤备注")
private String kqbz;
@ApiModelProperty(value = "排班方式（1：固定排班；2：自由排班；3：自由工时） 排班方式（1：固定排班；2：自由排班；3：自由工时）", example = "101")
private Integer pbfs;
@ApiModelProperty(value = "企业id 企业id", example = "101")
private Integer qyid;
@ApiModelProperty(value = "是否开启法定节假日休息 是否开启法定节假日休息", example = "101")
private Integer isFdjjr;
@ApiModelProperty(value = "考勤开始时间（自由工时专用） ", example = "考勤开始时间（自由工时专用）")
private String kqkssjTime;
@ApiModelProperty(value = "至少工作时长（自由工时专用--【已去掉】） ", example = "至少工作时长（自由工时专用--【已去掉】）")
private String zsgzsc;
@ApiModelProperty(value = "正常工作时长（自由工时专用--【已去掉】） ", example = "正常工作时长（自由工时专用--【已去掉】）")
private String zcgzsc;
@ApiModelProperty(value = "上班后多久可打下班卡（自由工时专用） ", example = "上班后多久可打下班卡（自由工时专用）")
private String jbzdsc;
@ApiModelProperty(value = "是否开启到期提醒（[排班制专用]0：否；1：是） 是否开启到期提醒（[排班制专用]0：否；1：是）", example = "101")
private Integer isDqtx;
@ApiModelProperty(value = "提醒人员（[排班制专用]员工id以[“，”]连接 ", example = "json数组）")
private String txry;
@ApiModelProperty(value = "提醒方式（[排班制专用]提前15天、7天、3天、1天） 提醒方式（[排班制专用]提前15天、7天、3天、1天）", example = "101")
private Integer txfs;
@ApiModelProperty(value = "提醒循环天数（[排班制专用]） 提醒循环天数（[排班制专用]）", example = "101")
private Integer txxhts;
@ApiModelProperty(value = "提醒时间（[排班制专用]） ", example = "提醒时间（[排班制专用]）")
private String txsjTime;
@ApiModelProperty(value = "提示方式（[排班制专用]PC端、APP客户端、短信、邮件 ", example = "以[“，”]连接 json数组）")
private String tsfs;
@ApiModelProperty(value = "是否开启未排班时打卡（[排班制专用]0：否；1：是；未排班时，员工可以选择班次打卡） 是否开启未排班时打卡（[排班制专用]0：否；1：是；未排班时，员工可以选择班次打卡）", example = "101")
private Integer isWpbsdk;
@ApiModelProperty(value = "使用班次【排班制使用】 ", example = "使用班次【排班制使用】")
private String sybc;
@ApiModelProperty(value = "是否开启未排班时，员工可选择班次打卡 是否开启未排班时，员工可选择班次打卡", example = "101")
private Integer isXzbcdk;
@ApiModelProperty(value = "外勤 外勤", example = "101")
private Integer isWq;
}
\ No newline at end of file
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
......@@ -23,8 +23,13 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Console;
import cn.timer.api.bean.kqgl.AttendanceGroup;
import cn.timer.api.bean.kqgl.PunchCardWiFi;
import cn.timer.api.bean.kqmk.KqglAssOvertimeVice;
import cn.timer.api.bean.kqmk.KqglAssoBcsz;
import cn.timer.api.bean.kqmk.KqglAssoDkdz;
import cn.timer.api.bean.kqmk.KqglAssoDkwx;
import cn.timer.api.bean.kqmk.KqglAssoKqj;
import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
import cn.timer.api.bean.kqmk.KqglAssoOvertimeRules;
......@@ -33,17 +38,25 @@ import cn.timer.api.config.annotation.CurrentUser;
import cn.timer.api.config.annotation.UserBean;
import cn.timer.api.dao.kqmk.KqglAssOvertimeViceMapper;
import cn.timer.api.dao.kqmk.KqglAssoBcszMapper;
import cn.timer.api.dao.kqmk.KqglAssoDkdzMapper;
import cn.timer.api.dao.kqmk.KqglAssoDkwxMapper;
import cn.timer.api.dao.kqmk.KqglAssoKqjMapper;
import cn.timer.api.dao.kqmk.KqglAssoLeaveRulesMapper;
import cn.timer.api.dao.kqmk.KqglAssoOvertimeRulesMapper;
import cn.timer.api.dao.kqmk.KqglAssoRulesViceMapper;
import cn.timer.api.dao.kqmk.KqglAssoYhsbMapper;
import cn.timer.api.dao.kqmk.KqglMainKqzMapper;
import cn.timer.api.dto.kqmk.AttqueryCriteriaDto;
import cn.timer.api.dto.kqmk.CompensateDto;
import cn.timer.api.dto.kqmk.IndividualOvertimeRule;
import cn.timer.api.dto.kqmk.IndividualOvertimeRuleDto;
import cn.timer.api.dto.kqmk.KqglAssoLeaveRulesDto;
import cn.timer.api.dto.kqmk.KqglAssoOvertimeRulesDto;
import cn.timer.api.dto.kqmk.KqglMainKqzDto;
import cn.timer.api.dto.kqmk.LeaveTypeDto;
import cn.timer.api.dto.kqmk.MachinememberDto;
import cn.timer.api.dto.kqmk.StartTimeRestDto;
import cn.timer.api.dto.kqmk.VacationInformation;
import cn.timer.api.dto.kqmk.VacationInformationDto;
import cn.timer.api.utils.ResponseResult;
import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil;
import io.swagger.annotations.Api;
......@@ -191,8 +204,8 @@ public class TimeCardController {
@GetMapping(value="/Overtime/{id}")
@ApiOperation(value = "8：根据加班规则id获取加班规则信息", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 8)
public Result<IndividualOvertimeRule> getOvertimeRules(@PathVariable("id") Integer id) {
IndividualOvertimeRule overrule = IndividualOvertimeRule.builder().build();
public Result<IndividualOvertimeRuleDto> getOvertimeRules(@PathVariable("id") Integer id) {
IndividualOvertimeRuleDto overrule = IndividualOvertimeRuleDto.builder().build();
KqglAssoOvertimeRules rules = KqglAssoOvertimeRules.builder().id(id).build().selectById();
overrule.setRules(rules);
List<KqglAssOvertimeVice> vice = new LambdaQueryChainWrapper<KqglAssOvertimeVice>(kqglassovertimevicemapper).eq(KqglAssOvertimeVice::getOvertimeRulesId, id).list();
......@@ -232,9 +245,7 @@ public class TimeCardController {
@Autowired
private KqglAssoLeaveRulesMapper kqglassoleaverulesmapper;
/**
* @param userBean
* @param overrules
* @return
* 初始化假期数据
*/
@PostMapping(value = "/initialization_data")
@ApiOperation(value = "11：初始化假期数据", httpMethod = "POST", notes = "接口发布说明")
......@@ -296,7 +307,7 @@ public class TimeCardController {
if(vices.size()>0){
kqglassorulesvicemapper.insertrulesviceList(vices);
}
return ResultUtil.data(null, "操作成功!");
return ResultUtil.data(learul, "操作成功!");
}
/**
......@@ -321,14 +332,223 @@ public class TimeCardController {
@GetMapping(value="/Vacation_information/{id}")
@ApiOperation(value = "14：根据假期规则id获取假期规则信息", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 14)
public Result<VacationInformation> VacationInformation(@PathVariable("id") Integer id) {
VacationInformation overrule = VacationInformation.builder().build();
public Result<VacationInformationDto> VacationInformation(@PathVariable("id") Integer id) {
VacationInformationDto overrule = VacationInformationDto.builder().build();
KqglAssoLeaveRules rules = KqglAssoLeaveRules.builder().id(id).build().selectById();
overrule.setRules(rules);
List<KqglAssoRulesVice> vice = new LambdaQueryChainWrapper<KqglAssoRulesVice>(kqglassorulesvicemapper).eq(KqglAssoRulesVice::getLeaveRulesId, id).list();
overrule.setVice(vice);
return ResultUtil.data(overrule,"操作成功!");
}
@Autowired
private KqglAssoKqjMapper kqglassokqjmapper;
@Autowired
private KqglAssoYhsbMapper kqglassoyhsbmapper;
@Autowired
private KqglMainKqzMapper kqglmainkqzmapper;
/**
* 获取考勤机数据
*/
@GetMapping(value="/AttMachine")
@ApiOperation(value = "15：获取考勤机数据-根据 组织机构代码", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 15)
public Result<Object> getAttMachineEquipment(@CurrentUser UserBean userBean){
List<KqglAssoKqj> attendanList = new LambdaQueryChainWrapper<KqglAssoKqj>(kqglassokqjmapper).eq(KqglAssoKqj::getQyid, userBean.getOrgCode()).list();
return ResultUtil.data(attendanList,"操作成功!");
}
/**
* 新增考勤机
*/
@PostMapping(value = "/Attendance_machine")
@ApiOperation(value = "16：新增考勤机", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 16)
public Result<Object> AttendanceMachine(@CurrentUser UserBean userBean,@RequestBody KqglAssoKqj kqglassokqj) {
kqglassokqj.setLuryid(userBean.getEmpNum());
kqglassokqj.setLusjTime(new Date().getTime());
kqglassokqj.setQyid(userBean.getOrgCode());
return kqglassokqj.insert() ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
}
/**
* 删除考勤机信息
*/
@DeleteMapping(value = "/attmachine/{id}")
@ApiOperation(value = "17:删除考勤机信息", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 17)
public Result<Integer> deattmachine(@PathVariable("id") Integer id) {
return KqglAssoKqj.builder().id(id).build().deleteById() ? ResultUtil.success("删除成功!") : ResultUtil.error("没有找到该对象");
}
/**
* 考勤机内成员
*/
@GetMapping(value="/aircraftmembers/{id}")
@ApiOperation(value = "18:考勤机成员", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 18)
public ResponseResult selectAircraftMembers(@CurrentUser UserBean userBean,@PathVariable("id") Integer id) {
List<MachinememberDto> kqjcys = kqglassoyhsbmapper.selectAircraftMembers(id,userBean.getOrgCode());
return new ResponseResult().success("考勤机成员", kqjcys);
}
/**
* 获取考勤机数据-根据 组织机构代码
*/
@GetMapping(value="/AttGroupMachine")
@ApiOperation(value = "19：获取考勤机数据-根据 组织机构代码", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 19)
public Result<Object> getAttGroupMachineList(@CurrentUser UserBean userBean) {
List<KqglMainKqzDto> attmacList = kqglmainkqzmapper.selectAttGroupMachineByQyid(userBean.getOrgCode());
return ResultUtil.data(attmacList);
}
/*********打卡地址***********/
@Autowired
private KqglAssoDkdzMapper kqglassodkdzmapper;
/**
* 获取打卡地址数据
*/
@PostMapping(value = "/PunchAddress")
@ApiOperation(value = "20：获取打卡地址数据-根据 组织机构代码-分页", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 20)
public Result<Object> getPunchCardAddress(@CurrentUser UserBean userBean, @RequestBody AttqueryCriteriaDto attquerycriteriadto) {
IPage<KqglAssoDkdz> page = new Page<KqglAssoDkdz>(
attquerycriteriadto.getCurrentPage() == null ? 1 : attquerycriteriadto.getCurrentPage(),
attquerycriteriadto.getTotalPage() == null ? 10 : attquerycriteriadto.getTotalPage());
attquerycriteriadto.setOrgCode(userBean.getOrgCode());
attquerycriteriadto.setEmpNum(userBean.getEmpNum());
IPage<KqglAssoDkdz> pageAs = kqglassodkdzmapper.selectPage(page, new QueryWrapper<KqglAssoDkdz>().lambda().eq(KqglAssoDkdz::getQyid, userBean.getOrgCode()));
List<KqglAssoDkdz> listAs = pageAs.getRecords();
return ResultUtil.data(pageAs, listAs, "操作成功!");
}
/**
* 根据打卡地址id获取打卡地址信息
*/
@GetMapping(value="/PuAddress/{id}")
@ApiOperation(value = "21:获取打卡地址信息-根据打卡地址id", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 21)
public Result<Object> getPunchAddressByid(@PathVariable("id") Integer id) {
return ResultUtil.data(KqglAssoDkdz.builder().id(id).build().selectById(),"操作成功!");
}
/**
* 新增/修改--打卡地址信息
*/
@PostMapping(value = "/PunchAddress_addmod")
@ApiOperation(value = "22：新增/修改--打卡地址信息", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 22)
public Result<Object> PunchCardAddress(@CurrentUser UserBean userBean,@RequestBody KqglAssoDkdz kqglassodkdz) {
kqglassodkdz.setLuryid(userBean.getEmpNum());
kqglassodkdz.setLusjTime(new Date().getTime());
kqglassodkdz.setQyid(userBean.getOrgCode());
return kqglassodkdz.insertOrUpdate() ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
}
/**
* 删除打卡地址信息
*/
@DeleteMapping(value = "/PunchAddress/{id}")
@ApiOperation(value = "23：删除打卡地址信息", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 23)
public Result<Integer> deletePunchCardAddress(@PathVariable("id") Integer id) {
return KqglAssoDkdz.builder().id(id).build().deleteById() ? ResultUtil.success("删除成功!") : ResultUtil.error("没有找到该对象");
}
/**
* 获取打卡地址所在考勤组数据*********
*/
// @GetMapping(value="/PunchAddressGroup/{id}")
// @ApiOperation(value = "获取打卡地址所在考勤组数据", httpMethod = "GET", notes = "接口发布说明")
// @ApiOperationSupport(order = 14)
// public Result<List<AttendanceGroup>> getPunchAddressGroup(@CurrentUser UserBean userBean,@PathVariable("id") Integer id) {
//
// int qyid = userBean.getOrgCode();//坏小孩【企业id】
// int userid = userBean.getEmpNum();//用户id
//
// List<AttendanceGroup> attaddressownlist = attendancegroupservice.selectByPrimaryAttAddressOwn(qyid,id);
// return ResultUtil.data(attaddressownlist);
// }
/*********打卡WIFI***********/
/**
* 获取打卡WIFI数据
*/
@Autowired
private KqglAssoDkwxMapper kqglassodkwxmapper;
@PostMapping(value = "/PunchWIFI")
@ApiOperation(value = "24：获取打卡WIFI数据-根据 组织机构代码-分页", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 24)
public Result<Object> getPunchCardWIFI(@CurrentUser UserBean userBean, @RequestBody AttqueryCriteriaDto attquerycriteriadto) {
IPage<KqglAssoDkwx> page = new Page<KqglAssoDkwx>(
attquerycriteriadto.getCurrentPage() == null ? 1 : attquerycriteriadto.getCurrentPage(),
attquerycriteriadto.getTotalPage() == null ? 10 : attquerycriteriadto.getTotalPage());
attquerycriteriadto.setOrgCode(userBean.getOrgCode());
attquerycriteriadto.setEmpNum(userBean.getEmpNum());
IPage<KqglAssoDkwx> pageAs = kqglassodkwxmapper.selectPage(page, new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()));
List<KqglAssoDkwx> listAs = pageAs.getRecords();
return ResultUtil.data(pageAs, listAs, "操作成功!");
}
/**
* 根据打卡WIFIid获取打卡WIFI信息
*/
@GetMapping(value="/PuWIFI/{id}")
@ApiOperation(value = "25:获取打卡WIFI信息-根据打卡WIFIid", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 25)
public Result<Object> getPunchWIFIByid(@PathVariable("id") Integer id) {
return ResultUtil.data(KqglAssoDkwx.builder().id(id).build().selectById(),"操作成功!");
}
/**
* 新增/修改--打卡WIFI信息
*/
@PostMapping(value = "/PunchWIFI_addmod")
@ApiOperation(value = "26：新增/修改--打卡WIFI信息", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 26)
public Result<Object> PunchCardWIFI(@CurrentUser UserBean userBean,@RequestBody KqglAssoDkwx kqglassodkwx) {
kqglassodkwx.setLuryid(userBean.getEmpNum());
kqglassodkwx.setLusjTime(new Date().getTime());
kqglassodkwx.setQyid(userBean.getOrgCode());
return kqglassodkwx.insertOrUpdate() ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
}
/**
* 删除打卡WIFI信息
*/
@DeleteMapping(value = "/PunchWIFI/{id}")
@ApiOperation(value = "27：删除打卡地址信息", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 27)
public Result<Integer> deletePunchCardWIFI(@PathVariable("id") Integer id) {
return KqglAssoDkwx.builder().id(id).build().deleteById() ? ResultUtil.success("删除成功!") : ResultUtil.error("没有找到该对象");
}
/**
* 获取打卡WIFI所在考勤组数据*****
*/
// @GetMapping(value="/PunchWIFIGroup/{id}")
// @ApiOperation(value = "获取打卡WIFI所在考勤组数据", httpMethod = "GET", notes = "接口发布说明")
// @ApiOperationSupport(order = 20)
// public Result<List<AttendanceGroup>> getPunchWIFIGroup(@CurrentUser UserBean userBean,@PathVariable("id") Integer id) {
// int qyid = userBean.getOrgCode();//坏小孩【企业id】
//
// List<AttendanceGroup> attwifiownlist = attendancegroupservice.selectByPrimaryAttWIFIOwn(qyid,id);
// return ResultUtil.data(attwifiownlist);
// }
/**********************************************测试数据********************************************************/
/**
* 查询列表-假期规则
......
src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkdzMapper.java 0 → 100644
package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import cn.timer.api.bean.kqmk.KqglAssoDkdz;
/**
* 考勤打卡地址
*
* @author LAL 2020-05-09
*/
@Repository
public interface KqglAssoDkdzMapper extends BaseMapper<KqglAssoDkdz> {
}
src/main/java/cn/timer/api/dao/kqmk/KqglAssoDkwxMapper.java 0 → 100644
package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import cn.timer.api.bean.kqmk.KqglAssoDkwx;
/**
* 考勤打卡wifi
*
* @author LAL 2020-05-09
*/
@Repository
public interface KqglAssoDkwxMapper extends BaseMapper<KqglAssoDkwx> {
}
src/main/java/cn/timer/api/dao/kqmk/KqglAssoKqjMapper.java 0 → 100644
package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import cn.timer.api.bean.kqmk.KqglAssoKqj;
/**
* 考勤机表
*
* @author LAL 2020-05-09
*/
@Repository
public interface KqglAssoKqjMapper extends BaseMapper<KqglAssoKqj> {
}
src/main/java/cn/timer/api/dao/kqmk/KqglAssoKqzdkfsMapper.java 0 → 100644
package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import cn.timer.api.bean.kqmk.KqglAssoKqzdkfs;
/**
* 考勤组绑定的打卡方式
*
* @author LAL 2020-05-09
*/
@Repository
public interface KqglAssoKqzdkfsMapper extends BaseMapper<KqglAssoKqzdkfs> {
}
src/main/java/cn/timer/api/dao/kqmk/KqglAssoYhsbMapper.java 0 → 100644
package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import org.springframework.stereotype.Repository;
import cn.timer.api.bean.kqmk.KqglAssoYhsb;
import cn.timer.api.dto.kqmk.MachinememberDto;
/**
* 用户与设备关系表
* @author LAL 2020-05-09
*/
@Repository
public interface KqglAssoYhsbMapper extends BaseMapper<KqglAssoYhsb> {
List<MachinememberDto> selectAircraftMembers(int kqjid,int orgcode);
}
src/main/java/cn/timer/api/dao/kqmk/KqglMainKqzMapper.java 0 → 100644
package cn.timer.api.dao.kqmk;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.kqmk.KqglMainKqz;
import cn.timer.api.dto.kqmk.KqglMainKqzDto;
/**
* 考勤组
*
* @author LAL 2020-05-09
*/
@Repository
public interface KqglMainKqzMapper extends BaseMapper<KqglMainKqz> {
List<KqglMainKqzDto> selectAttGroupMachineByQyid(int qyid);
}
src/main/java/cn/timer/api/dto/kqmk/AttendanceGroupDto.java 0 → 100644
package cn.timer.api.dto.kqmk;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import cn.timer.api.bean.kqgl.AttGroupBinPunchMode;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AttendanceGroupDto implements Serializable{
private static final long serialVersionUID = -5573272776427338217L;
private Integer id;
private String name;// 名称
private String kqbz;// 考勤备注
private Integer pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
private Integer qyid;// 企业id
private Integer isFdjjr;// 是否开启法定节假日休息
private String kqkssjTime;// 考勤开始时间【自由工时专用】
private String zsgzsc;// 至少工作时长【自由工时专用】
private String zcgzsc;// 正常工作时长【自由工时专用】
private String jbzdsc;// 加班最大时长【自由工时专用】
private Integer isDqtx;// 是否开启到期提醒 [排班制专用]0：否；1：是
private String txry;// 提醒人员 [排班制专用]
private Integer txfs;// 提醒天数提醒 [排班制专用]
private Integer txxhts;// 提醒循环天数 [排班制专用]
private String txsjTime;// 提醒时间 [排班制专用]
private String tsfs;// 提示方式 [排班制专用]PC端、APP客户端、短信、邮件 以[“,”]连接 json数组
private Integer isWpbsdk;// 是否开启未排班时打卡 [排班制专用]0：否；1：是；未排班时，员工可以选择班次打卡
private String sybc;// 使用班次【排班制使用】
private Integer isXzbcdk;// 是否开启未排班时，员工可选择班次打卡
private Integer kqznum;// 考勤组人员数
private String pbfsnm;// 排班方式
private String dkfs;// 打卡方式
private Integer isWq;//外勤
private Integer kqjid;
private List<AttGroupBinPunchMode> kqzdkfslist = new ArrayList<AttGroupBinPunchMode>();
}
\ No newline at end of file
src/main/java/cn/timer/api/dto/kqmk/IndividualOvertimeRule.java → src/main/java/cn/timer/api/dto/kqmk/IndividualOvertimeRuleDto.java
......@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class IndividualOvertimeRule {
public class IndividualOvertimeRuleDto {
@ApiModelProperty(value = "加班规则数据 ", example = "字段说明")
KqglAssoOvertimeRules rules;
......
src/main/java/cn/timer/api/dto/kqmk/KqglMainKqzDto.java 0 → 100644
package cn.timer.api.dto.kqmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author LAL 2020-05-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class KqglMainKqzDto {
@ApiModelProperty(value = "id id", example = "101")
private Integer id;
@ApiModelProperty(value = "名称 ", example = "名称")
private String name;
@ApiModelProperty(value = "考勤备注 ", example = "考勤备注")
private String kqbz;
@ApiModelProperty(value = "排班方式（1：固定排班；2：自由排班；3：自由工时） 排班方式（1：固定排班；2：自由排班；3：自由工时）", example = "101")
private Integer pbfs;
@ApiModelProperty(value = "企业id 企业id", example = "101")
private Integer qyid;
@ApiModelProperty(value = "是否开启法定节假日休息 是否开启法定节假日休息", example = "101")
private Integer isFdjjr;
@ApiModelProperty(value = "考勤开始时间（自由工时专用） ", example = "考勤开始时间（自由工时专用）")
private String kqkssjTime;
@ApiModelProperty(value = "至少工作时长（自由工时专用--【已去掉】） ", example = "至少工作时长（自由工时专用--【已去掉】）")
private String zsgzsc;
@ApiModelProperty(value = "正常工作时长（自由工时专用--【已去掉】） ", example = "正常工作时长（自由工时专用--【已去掉】）")
private String zcgzsc;
@ApiModelProperty(value = "上班后多久可打下班卡（自由工时专用） ", example = "上班后多久可打下班卡（自由工时专用）")
private String jbzdsc;
@ApiModelProperty(value = "是否开启到期提醒（[排班制专用]0：否；1：是） 是否开启到期提醒（[排班制专用]0：否；1：是）", example = "101")
private Integer isDqtx;
@ApiModelProperty(value = "提醒人员（[排班制专用]员工id以[“，”]连接 ", example = "json数组）")
private String txry;
@ApiModelProperty(value = "提醒方式（[排班制专用]提前15天、7天、3天、1天） 提醒方式（[排班制专用]提前15天、7天、3天、1天）", example = "101")
private Integer txfs;
@ApiModelProperty(value = "提醒循环天数（[排班制专用]） 提醒循环天数（[排班制专用]）", example = "101")
private Integer txxhts;
@ApiModelProperty(value = "提醒时间（[排班制专用]） ", example = "提醒时间（[排班制专用]）")
private String txsjTime;
@ApiModelProperty(value = "提示方式（[排班制专用]PC端、APP客户端、短信、邮件 ", example = "以[“，”]连接 json数组）")
private String tsfs;
@ApiModelProperty(value = "是否开启未排班时打卡（[排班制专用]0：否；1：是；未排班时，员工可以选择班次打卡） 是否开启未排班时打卡（[排班制专用]0：否；1：是；未排班时，员工可以选择班次打卡）", example = "101")
private Integer isWpbsdk;
@ApiModelProperty(value = "使用班次【排班制使用】 ", example = "使用班次【排班制使用】")
private String sybc;
@ApiModelProperty(value = "是否开启未排班时，员工可选择班次打卡 是否开启未排班时，员工可选择班次打卡", example = "101")
private Integer isXzbcdk;
@ApiModelProperty(value = "外勤 外勤", example = "101")
private Integer isWq;
@ApiModelProperty(value = "考勤组人员数", example = "100")
private Integer kqznum;
@ApiModelProperty(value = "排班方式", example = "1")
private String pbfsnm;
@ApiModelProperty(value = "打卡方式", example = "2")
private String dkfs;
@ApiModelProperty(value = "考勤机id", example = "3")
private Integer kqjid;
}
\ No newline at end of file
src/main/java/cn/timer/api/dto/kqmk/MachinememberDto.java 0 → 100644
package cn.timer.api.dto.kqmk;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class MachinememberDto implements Serializable {
/**
*
*/
private static final long serialVersionUID = 6595051268318648078L;
@ApiModelProperty(value = "部门 ", example = "字段说明")
private String dept;
@ApiModelProperty(value = "岗位 ", example = "字段说明")
private String post;
@ApiModelProperty(value = "姓名", example = "字段说明")
private String name;
@ApiModelProperty(value = "id", example = "字段说明")
private Integer id;
@ApiModelProperty(value = "员工ID", example = "字段说明")
private Integer userId;
@ApiModelProperty(value = "考勤机ID", example = "字段说明")
private Integer kqjid;
@ApiModelProperty(value = "类型(类型 1：考勤机) ", example = "字段说明")
private Integer type;
@ApiModelProperty(value = "是否为管理员--0：否；1：是 ", example = "字段说明")
private String isgly;
}
src/main/java/cn/timer/api/dto/kqmk/VacationInformation.java → src/main/java/cn/timer/api/dto/kqmk/VacationInformationDto.java
......@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class VacationInformation {
public class VacationInformationDto {
@ApiModelProperty(value = "假期规则数据 ", example = "字段说明")
KqglAssoLeaveRules rules;
......
src/main/resources/mapping/kqmk/KqglAssoDkdzMapper.xml 0 → 100644
<?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="cn.timer.api.dao.kqmk.KqglAssoDkdzMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoDkdz" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="address" property="address" />
<result column="dkfw" property="dkfw" />
<result column="lon" property="lon" />
<result column="lat" property="lat" />
<result column="qyid" property="qyid" />
<result column="lusj_time" property="lusjTime" />
<result column="luryid" property="luryid" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
address,
dkfw,
lon,
lat,
qyid,
lusj_time,
luryid
</sql>
<sql id="Base_Column_List_Alias">
id KqglAssoDkdz_id,
name KqglAssoDkdz_name,
address KqglAssoDkdz_address,
dkfw KqglAssoDkdz_dkfw,
lon KqglAssoDkdz_lon,
lat KqglAssoDkdz_lat,
qyid KqglAssoDkdz_qyid,
lusj_time KqglAssoDkdz_lusj_time,
luryid KqglAssoDkdz_luryid
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkdz">
INSERT INTO kqgl_asso_dkdz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != name'>
name,
</if>
<if test ='null != address'>
address,
</if>
<if test ='null != dkfw'>
dkfw,
</if>
<if test ='null != lon'>
lon,
</if>
<if test ='null != lat'>
lat,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != lusjTime'>
lusj_time,
</if>
<if test ='null != luryid'>
luryid
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != name'>
#{name},
</if>
<if test ='null != address'>
#{address},
</if>
<if test ='null != dkfw'>
#{dkfw},
</if>
<if test ='null != lon'>
#{lon},
</if>
<if test ='null != lat'>
#{lat},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != lusjTime'>
#{lusjTime},
</if>
<if test ='null != luryid'>
#{luryid}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_dkdz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkdz">
UPDATE kqgl_asso_dkdz
<set>
<if test ='null != name'>name = #{name},</if>
<if test ='null != address'>address = #{address},</if>
<if test ='null != dkfw'>dkfw = #{dkfw},</if>
<if test ='null != lon'>lon = #{lon},</if>
<if test ='null != lat'>lat = #{lat},</if>
<if test ='null != qyid'>qyid = #{qyid},</if>
<if test ='null != lusjTime'>lusj_time = #{lusjTime},</if>
<if test ='null != luryid'>luryid = #{luryid}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkdz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkdz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_dkdz
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglAssoDkwxMapper.xml 0 → 100644
<?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="cn.timer.api.dao.kqmk.KqglAssoDkwxMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoDkwx" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="mac" property="mac" />
<result column="qyid" property="qyid" />
<result column="lusj_time" property="lusjTime" />
<result column="luryid" property="luryid" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
mac,
qyid,
lusj_time,
luryid
</sql>
<sql id="Base_Column_List_Alias">
id KqglAssoDkwx_id,
name KqglAssoDkwx_name,
mac KqglAssoDkwx_mac,
qyid KqglAssoDkwx_qyid,
lusj_time KqglAssoDkwx_lusj_time,
luryid KqglAssoDkwx_luryid
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkwx">
INSERT INTO kqgl_asso_dkwx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != name'>
name,
</if>
<if test ='null != mac'>
mac,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != lusjTime'>
lusj_time,
</if>
<if test ='null != luryid'>
luryid
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != name'>
#{name},
</if>
<if test ='null != mac'>
#{mac},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != lusjTime'>
#{lusjTime},
</if>
<if test ='null != luryid'>
#{luryid}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_dkwx
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkwx">
UPDATE kqgl_asso_dkwx
<set>
<if test ='null != name'>name = #{name},</if>
<if test ='null != mac'>mac = #{mac},</if>
<if test ='null != qyid'>qyid = #{qyid},</if>
<if test ='null != lusjTime'>lusj_time = #{lusjTime},</if>
<if test ='null != luryid'>luryid = #{luryid}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkwx
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkwx
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_dkwx
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglAssoKqjMapper.xml 0 → 100644
<?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="cn.timer.api.dao.kqmk.KqglAssoKqjMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoKqj" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="code" property="code" />
<result column="qyid" property="qyid" />
<result column="lusj_time" property="lusjTime" />
<result column="luryid" property="luryid" />
<result column="type" property="type" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
code,
qyid,
lusj_time,
luryid,
type
</sql>
<sql id="Base_Column_List_Alias">
id KqglAssoKqj_id,
name KqglAssoKqj_name,
code KqglAssoKqj_code,
qyid KqglAssoKqj_qyid,
lusj_time KqglAssoKqj_lusj_time,
luryid KqglAssoKqj_luryid,
type KqglAssoKqj_type
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoKqj">
INSERT INTO kqgl_asso_kqj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != name'>
name,
</if>
<if test ='null != code'>
code,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != lusjTime'>
lusj_time,
</if>
<if test ='null != luryid'>
luryid,
</if>
<if test ='null != type'>
type
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != name'>
#{name},
</if>
<if test ='null != code'>
#{code},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != lusjTime'>
#{lusjTime},
</if>
<if test ='null != luryid'>
#{luryid},
</if>
<if test ='null != type'>
#{type}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_kqj
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoKqj">
UPDATE kqgl_asso_kqj
<set>
<if test ='null != name'>name = #{name},</if>
<if test ='null != code'>code = #{code},</if>
<if test ='null != qyid'>qyid = #{qyid},</if>
<if test ='null != lusjTime'>lusj_time = #{lusjTime},</if>
<if test ='null != luryid'>luryid = #{luryid},</if>
<if test ='null != type'>type = #{type}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_kqj
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_kqj
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_kqj
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglAssoKqzdkfsMapper.xml 0 → 100644
<?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="cn.timer.api.dao.kqmk.KqglAssoKqzdkfsMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoKqzdkfs" >
<id column="id" property="id" />
<result column="dkfsid" property="dkfsid" />
<result column="kqz_id" property="kqzId" />
<result column="type" property="type" />
<result column="qyid" property="qyid" />
<result column="state" property="state" />
</resultMap>
<sql id="Base_Column_List">
id,
dkfsid,
kqz_id,
type,
qyid,
state
</sql>
<sql id="Base_Column_List_Alias">
id KqglAssoKqzdkfs_id,
dkfsid KqglAssoKqzdkfs_dkfsid,
kqz_id KqglAssoKqzdkfs_kqz_id,
type KqglAssoKqzdkfs_type,
qyid KqglAssoKqzdkfs_qyid,
state KqglAssoKqzdkfs_state
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoKqzdkfs">
INSERT INTO kqgl_asso_kqzdkfs
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != dkfsid'>
dkfsid,
</if>
<if test ='null != kqzId'>
kqz_id,
</if>
<if test ='null != type'>
type,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != state'>
state
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != dkfsid'>
#{dkfsid},
</if>
<if test ='null != kqzId'>
#{kqzId},
</if>
<if test ='null != type'>
#{type},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != state'>
#{state}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_kqzdkfs
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoKqzdkfs">
UPDATE kqgl_asso_kqzdkfs
<set>
<if test ='null != dkfsid'>dkfsid = #{dkfsid},</if>
<if test ='null != kqzId'>kqz_id = #{kqzId},</if>
<if test ='null != type'>type = #{type},</if>
<if test ='null != qyid'>qyid = #{qyid},</if>
<if test ='null != state'>state = #{state}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_kqzdkfs
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_kqzdkfs
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_kqzdkfs
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglAssoYhsbMapper.xml 0 → 100644
<?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="cn.timer.api.dao.kqmk.KqglAssoYhsbMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglAssoYhsb" >
<id column="id" property="id" />
<result column="user_id" property="userId" />
<result column="kqjid" property="kqjid" />
<result column="type" property="type" />
<result column="is_gly" property="isGly" />
</resultMap>
<resultMap id="MachinememberMap" type="cn.timer.api.dto.kqmk.MachinememberDto" >
<result column="dept" property="dept" jdbcType="VARCHAR" />
<result column="post" property="post" jdbcType="VARCHAR" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="id" property="id" jdbcType="INTEGER" />
<result column="user_id" property="userId" jdbcType="INTEGER" />
<result column="kqjid" property="kqjid" jdbcType="INTEGER" />
<result column="type" property="type" jdbcType="INTEGER" />
<result column="isgly" property="isgly" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List">
id,
user_id,
kqjid,
type,
is_gly
</sql>
<sql id="Base_Column_List_Alias">
id KqglAssoYhsb_id,
user_id KqglAssoYhsb_user_id,
kqjid KqglAssoYhsb_kqjid,
type KqglAssoYhsb_type,
is_gly KqglAssoYhsb_is_gly
</sql>
<select id="selectAircraftMembers" resultMap="MachinememberMap">
select bmgw.dept,
bmgw.post,
emp.`name`,
yhsb.id,
yhsb.kqjid,
yhsb.type,
yhsb.user_id,
yhsb.is_gly as isgly
from kqgl_asso_yhsb yhsb
LEFT JOIN yggl_main_emp as emp on emp.emp_num = yhsb.user_id and emp.org_code = #{orgcode}
LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
from zzgl_bmgw_m m
left join zzgl_bmgw_m um on um.id = m.up_id
) as bmgw on bmgw.mid = emp.bmgw_id
where yhsb.kqjid = #{kqjid}
</select>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoYhsb">
INSERT INTO kqgl_asso_yhsb
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != userId'>
user_id,
</if>
<if test ='null != kqjid'>
kqjid,
</if>
<if test ='null != type'>
type,
</if>
<if test ='null != isGly'>
is_gly
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != userId'>
#{userId},
</if>
<if test ='null != kqjid'>
#{kqjid},
</if>
<if test ='null != type'>
#{type},
</if>
<if test ='null != isGly'>
#{isGly}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_yhsb
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.kqmk.KqglAssoYhsb">
UPDATE kqgl_asso_yhsb
<set>
<if test ='null != userId'>user_id = #{userId},</if>
<if test ='null != kqjid'>kqjid = #{kqjid},</if>
<if test ='null != type'>type = #{type},</if>
<if test ='null != isGly'>is_gly = #{isGly}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_yhsb
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_yhsb
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_yhsb
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglMainKqzMapper.xml 0 → 100644
<?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="cn.timer.api.dao.kqmk.KqglMainKqzMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.kqmk.KqglMainKqz" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="kqbz" property="kqbz" />
<result column="pbfs" property="pbfs" />
<result column="qyid" property="qyid" />
<result column="is_fdjjr" property="isFdjjr" />
<result column="kqkssj_time" property="kqkssjTime" />
<result column="zsgzsc" property="zsgzsc" />
<result column="zcgzsc" property="zcgzsc" />
<result column="jbzdsc" property="jbzdsc" />
<result column="is_dqtx" property="isDqtx" />
<result column="txry" property="txry" />
<result column="txfs" property="txfs" />
<result column="txxhts" property="txxhts" />
<result column="txsj_time" property="txsjTime" />
<result column="tsfs" property="tsfs" />
<result column="is_wpbsdk" property="isWpbsdk" />
<result column="sybc" property="sybc" />
<result column="is_xzbcdk" property="isXzbcdk" />
<result column="is_wq" property="isWq" />
</resultMap>
<resultMap id="AuxiliaryMap" type="cn.timer.api.dto.kqmk.KqglMainKqzDto" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="kqbz" property="kqbz" />
<result column="pbfs" property="pbfs" />
<result column="qyid" property="qyid" />
<result column="is_fdjjr" property="isFdjjr" />
<result column="kqkssj_time" property="kqkssjTime" />
<result column="zsgzsc" property="zsgzsc" />
<result column="zcgzsc" property="zcgzsc" />
<result column="jbzdsc" property="jbzdsc" />
<result column="is_dqtx" property="isDqtx" />
<result column="txry" property="txry" />
<result column="txfs" property="txfs" />
<result column="txxhts" property="txxhts" />
<result column="txsj_time" property="txsjTime" />
<result column="tsfs" property="tsfs" />
<result column="is_wpbsdk" property="isWpbsdk" />
<result column="sybc" property="sybc" />
<result column="is_xzbcdk" property="isXzbcdk" />
<result column="is_wq" property="isWq" />
<result column="kqznum" property="kqznum" />
<result column="pbfsnm" property="pbfsnm" />
<result column="dkfs" property="dkfs" />
<result column="kqjid" property="kqjid" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
kqbz,
pbfs,
qyid,
is_fdjjr,
kqkssj_time,
zsgzsc,
zcgzsc,
jbzdsc,
is_dqtx,
txry,
txfs,
txxhts,
txsj_time,
tsfs,
is_wpbsdk,
sybc,
is_xzbcdk,
is_wq
</sql>
<sql id="Base_Column_List_Alias">
id KqglMainKqz_id,
name KqglMainKqz_name,
kqbz KqglMainKqz_kqbz,
pbfs KqglMainKqz_pbfs,
qyid KqglMainKqz_qyid,
is_fdjjr KqglMainKqz_is_fdjjr,
kqkssj_time KqglMainKqz_kqkssj_time,
zsgzsc KqglMainKqz_zsgzsc,
zcgzsc KqglMainKqz_zcgzsc,
jbzdsc KqglMainKqz_jbzdsc,
is_dqtx KqglMainKqz_is_dqtx,
txry KqglMainKqz_txry,
txfs KqglMainKqz_txfs,
txxhts KqglMainKqz_txxhts,
txsj_time KqglMainKqz_txsj_time,
tsfs KqglMainKqz_tsfs,
is_wpbsdk KqglMainKqz_is_wpbsdk,
sybc KqglMainKqz_sybc,
is_xzbcdk KqglMainKqz_is_xzbcdk,
is_wq KqglMainKqz_is_wq
</sql>
<sql id="Base_Column_List_a">
a.id,
a.name,
a.kqbz,
a.pbfs,
a.qyid,
a.is_fdjjr,
a.kqkssj_time,
a.zsgzsc,
a.zcgzsc,
a.jbzdsc,
a.is_dqtx,
a.txry,
a.txfs,
a.txxhts,
a.txsj_time,
a.tsfs,
a.is_wpbsdk,
a.sybc,
a.is_xzbcdk,
a.is_wq
</sql>
<select id="selectAttGroupMachineByQyid" resultMap="AuxiliaryMap">
select
<include refid="Base_Column_List_a" />,
kqzdkfs.dkfsid as kqjid
from kqgl_main_kqz a
LEFT JOIN kqgl_asso_kqzdkfs as kqzdkfs on kqzdkfs.kqz_id = a.id and kqzdkfs.type = 1 and kqzdkfs.state = 1
where a.qyid = #{qyid,jdbcType=INTEGER}
</select>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglMainKqz">
INSERT INTO kqgl_main_kqz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != name'>
name,
</if>
<if test ='null != kqbz'>
kqbz,
</if>
<if test ='null != pbfs'>
pbfs,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != isFdjjr'>
is_fdjjr,
</if>
<if test ='null != kqkssjTime'>
kqkssj_time,
</if>
<if test ='null != zsgzsc'>
zsgzsc,
</if>
<if test ='null != zcgzsc'>
zcgzsc,
</if>
<if test ='null != jbzdsc'>
jbzdsc,
</if>
<if test ='null != isDqtx'>
is_dqtx,
</if>
<if test ='null != txry'>
txry,
</if>
<if test ='null != txfs'>
txfs,
</if>
<if test ='null != txxhts'>
txxhts,
</if>
<if test ='null != txsjTime'>
txsj_time,
</if>
<if test ='null != tsfs'>
tsfs,
</if>
<if test ='null != isWpbsdk'>
is_wpbsdk,
</if>
<if test ='null != sybc'>
sybc,
</if>
<if test ='null != isXzbcdk'>
is_xzbcdk,
</if>
<if test ='null != isWq'>
is_wq
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != name'>
#{name},
</if>
<if test ='null != kqbz'>
#{kqbz},
</if>
<if test ='null != pbfs'>
#{pbfs},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != isFdjjr'>
#{isFdjjr},
</if>
<if test ='null != kqkssjTime'>
#{kqkssjTime},
</if>
<if test ='null != zsgzsc'>
#{zsgzsc},
</if>
<if test ='null != zcgzsc'>
#{zcgzsc},
</if>
<if test ='null != jbzdsc'>
#{jbzdsc},
</if>
<if test ='null != isDqtx'>
#{isDqtx},
</if>
<if test ='null != txry'>
#{txry},
</if>
<if test ='null != txfs'>
#{txfs},
</if>
<if test ='null != txxhts'>
#{txxhts},
</if>
<if test ='null != txsjTime'>
#{txsjTime},
</if>
<if test ='null != tsfs'>
#{tsfs},
</if>
<if test ='null != isWpbsdk'>
#{isWpbsdk},
</if>
<if test ='null != sybc'>
#{sybc},
</if>
<if test ='null != isXzbcdk'>
#{isXzbcdk},
</if>
<if test ='null != isWq'>
#{isWq}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_main_kqz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.kqmk.KqglMainKqz">
UPDATE kqgl_main_kqz
<set>
<if test ='null != name'>name = #{name},</if>
<if test ='null != kqbz'>kqbz = #{kqbz},</if>
<if test ='null != pbfs'>pbfs = #{pbfs},</if>
<if test ='null != qyid'>qyid = #{qyid},</if>
<if test ='null != isFdjjr'>is_fdjjr = #{isFdjjr},</if>
<if test ='null != kqkssjTime'>kqkssj_time = #{kqkssjTime},</if>
<if test ='null != zsgzsc'>zsgzsc = #{zsgzsc},</if>
<if test ='null != zcgzsc'>zcgzsc = #{zcgzsc},</if>
<if test ='null != jbzdsc'>jbzdsc = #{jbzdsc},</if>
<if test ='null != isDqtx'>is_dqtx = #{isDqtx},</if>
<if test ='null != txry'>txry = #{txry},</if>
<if test ='null != txfs'>txfs = #{txfs},</if>
<if test ='null != txxhts'>txxhts = #{txxhts},</if>
<if test ='null != txsjTime'>txsj_time = #{txsjTime},</if>
<if test ='null != tsfs'>tsfs = #{tsfs},</if>
<if test ='null != isWpbsdk'>is_wpbsdk = #{isWpbsdk},</if>
<if test ='null != sybc'>sybc = #{sybc},</if>
<if test ='null != isXzbcdk'>is_xzbcdk = #{isXzbcdk},</if>
<if test ='null != isWq'>is_wq = #{isWq}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_main_kqz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_main_kqz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_main_kqz
</select>
-->
</mapper>
\ No newline at end of file
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