Skip to content

8
8timerapiv200
Commit e682011e by dengshichuan
Options

Merge branch 'tzq' into 'develop' 

Tzq

See merge request 8timerv2/8timerapiv200!61
parents 0a58c443 cdf82c88
Showing with 74 additions and 4125 deletions
pom.xml
...@@ -442,7 +442,6 @@ ...@@ -442,7 +442,6 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.mybatis.generator</groupId> <groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId> <artifactId>mybatis-generator-maven-plugin</artifactId>
......
src/main/java/cn/timer/api/bean/spmk/SpmkClr.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-27
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_clr")
@ApiModel("处理人")
public class SpmkClr extends Model<SpmkClr> {
private static final long serialVersionUID = 2999549121813628489L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号 编号",example="101")
private Integer id;
@ApiModelProperty(value="流程节点id 流程节点id",example="101")
private Integer lcjdId;
@ApiModelProperty(value="审批操作id 审批操作id",example="101")
private Integer spczId;
@ApiModelProperty(value="员工工号 员工工号",example="101")
private Integer empNum;
@ApiModelProperty(value="类型 0审批人 1抄送人",example="101")
private Integer type;
@ApiModelProperty(value="操作 0同意 1拒绝",example="101")
private Integer operation;
@ApiModelProperty(value="状态 0待审批 1审批中 2已审批",example="101")
private Integer sts;
@ApiModelProperty(value="审批意见 ",example="审批意见")
private String spyj;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkInitiatorConfig.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -12,42 +16,35 @@ import lombok.Data; ...@@ -12,42 +16,35 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* 审批发起人配置 * @author Tang 2020-04-28
*
* @author Tang 2020-04-17
*/ */
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Table(name = "spmk_approve_execute_record") @Table(name = "spmk_initiator_config")
@ApiModel("审批执行记录") @ApiModel("审批发起人配置")
public class SpmkInitiatorConfig extends Model<SpmkInitiatorConfig> { public class SpmkInitiatorConfig extends Model<SpmkInitiatorConfig> {
private static final long serialVersionUID = 1L;
/** /**
* 编号 *
*/ */
@ApiModelProperty(value = "编号 ", example = "1") private static final long serialVersionUID = 1L;
@Id
@GeneratedValue
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "编号 编号", example = "101")
private Integer id; private Integer id;
/** @ApiModelProperty(value = "自定义审批id 自定义审批id", example = "101")
* 自定义审批id
*/
@ApiModelProperty(value = "自定义审批id", example = "100")
private Integer customApprovalId; private Integer customApprovalId;
/** @ApiModelProperty(value = "关联id 关联id", example = "101")
* 关联id
*/
@ApiModelProperty(value = "关联id", example = "100")
private Integer assoId; private Integer assoId;
/** @ApiModelProperty(value = "类型 1员工 2部门 3岗位", example = "101")
* 类型
*/
@ApiModelProperty(value = "类型", example = "100")
private Integer type; private Integer type;
} }
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkJqgz.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
import java.util.Date;
import javax.persistence.*;
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 Tang 2019-12-09
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_jqgz")
@ApiModel("假勤规则")
public class SpmkJqgz extends Model<SpmkJqgz> {
private static final long serialVersionUID = 3806274737897793795L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号 编号",example="101")
private Integer id;
@ApiModelProperty(value="员工状态请假规则",example="101")
private Integer ygztqjgz;
@ApiModelProperty(value="假期名称 ",example="假期名称")
private String name;
@ApiModelProperty(value="组织代码",example="101")
private Integer orgCode;
@ApiModelProperty(value="最小请假单位 0按天请假 1按半天请假 2按小时请假",example="101")
private Integer zxqjdwType;
@ApiModelProperty(value="请假时长核算方式 0按工作日算请假时长 1按自然日计算请假时长",example="101")
private Integer qjschsfsType;
@ApiModelProperty(value="适用范围 适用范围",example="101")
private Integer syfw;
@ApiModelProperty(value="计入薪酬 0是 1否",example="101")
private Integer isJrxc;
@ApiModelProperty(value="创建时间 ",example="创建时间")
private Date createTime;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkKj.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_kj")
@ApiModel("控件")
public class SpmkKj extends Model<SpmkKj> {
private static final long serialVersionUID = -1463389256002459795L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="名称",example="101")
private String name;
@ApiModelProperty(value="类型",example="101")
private Integer type;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkKjMk.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_kj_mk")
@ApiModel("控件模版关联")
public class SpmkKjMk extends Model<SpmkKjMk> {
private static final long serialVersionUID = 7826285133719947956L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="控件配置id",example="101")
private Integer kjpzId;
@ApiModelProperty(value="模版id",example="101")
private Integer mbId;
@ApiModelProperty(value="排序",example="101")
private Integer sort;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkKjpz.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_kjpz")
@ApiModel("控件配置")
public class SpmkKjpz extends Model<SpmkKjpz> {
private static final long serialVersionUID = 4471227872317103666L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="控件id",example="101")
private Integer kjId;
@ApiModelProperty(value="控件标题",example="控件标题")
private String title;
@ApiModelProperty(value="控件标题2",example="控件标题2")
private String titletwo;
@ApiModelProperty(value="类型 1 2 3 4 5 6",example="101")
private Integer type;
@ApiModelProperty(value="提示文字",example="提示文字")
private String tswz;
@ApiModelProperty(value="动作名称",example="动作名称")
private String dzmc;
@ApiModelProperty(value="验证 0是 1否",example="101")
private Integer isYz;
@ApiModelProperty(value="打印 0是 1否",example="101")
private Integer isDy;
@ApiModelProperty(value="日期类型 0年-月-日 时:分 1年-月-日",example="101")
private Integer timeType;
@ApiModelProperty(value="水印照片 0是 1否",example="101")
private Integer isSyzp;
@ApiModelProperty(value="打印格式 0横向打印 1纵向打印",example="101")
private Integer dygsType;
@ApiModelProperty(value="显示 0是 1否 在审批页显示",example="101")
private Integer isShow;
@ApiModelProperty(value="链接跳转地址 ",example="链接跳转地址")
private String ljtzUrl;
@ApiModelProperty(value="显示大写 0是 1否",example="101")
private Integer isShowup;
@ApiModelProperty(value="选项 0只能选择一 1可同时选择多",example="101")
private Integer xxType;
@ApiModelProperty(value="计算公式 ",example="计算公式")
private String jsgs;
@ApiModelProperty(value="关联审批单类型id 关联审批单类型id",example="101")
private Integer glspdId;
@ApiModelProperty(value="说明 ",example="说明")
private String description;
@Transient
@TableField(exist = false)
private List<SpmkXzx> spmkXzxs;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkLcjd.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_lcjd")
@ApiModel("流程节点")
public class SpmkLcjd extends Model<SpmkLcjd> {
private static final long serialVersionUID = -7718951890425087486L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="审批管理id",example="101")
private Integer spglId;
@ApiModelProperty(value="名称 ",example="名称")
private String name;
@ApiModelProperty(value="类型 0发起人 1审批人 2抄送人 3 条件",example="101")
private Integer type;
@ApiModelProperty(value="上级节点",example="101")
private Integer upId;
@ApiModelProperty(value="下级节点",example="101")
private Integer dowmId;
@ApiModelProperty(value="优先级 1 2 3 4 5",example="101")
private Integer yxj;
@ApiModelProperty(value="审批人设置类型 0指定成员 1主管 2角色 3发起人自选 4发起人自己 5表单里的联系人 6连续多级主管",example="101")
private Integer sprszType;
@ApiModelProperty(value="是否 代审批 找不到主管时，由上级主管代审批",example="101")
private Integer isDsp;
@ApiModelProperty(value="审批方式 0依次审批 1会签（须所有审批人同意）2或签（一名审批人同意或拒绝即可）",example="101")
private Integer spfsType;
@ApiModelProperty(value="审批人为空时 0自动通过 1自动转交管理员",example="101")
private Integer sprwkType;
@Transient
@TableField(exist = false)
private List<SpmkSxpz> spmkSxpzs;
@Transient
@TableField(exist = false)
private List<SpmkLcjdEmpAsso> spmkLcjdEmpAssos;
@Transient
@TableField(exist = false)
private List<SpmkLcjd> SpmkLcjds;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkLcjdEmpAsso.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_lcjd_emp_asso")
@ApiModel("流程节点员工关联")
public class SpmkLcjdEmpAsso extends Model<SpmkLcjdEmpAsso> {
private static final long serialVersionUID = -781283259033327552L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="流程节点id",example="101")
private Integer lcjdId;
@ApiModelProperty(value="员工工号",example="101")
private Integer empNum;
@ApiModelProperty(value="部门岗位id",example="101")
private Integer bmgwId;
@ApiModelProperty(value="是否可编辑 0是 1否",example="101")
private Integer isEditable;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkMb.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_mb")
@ApiModel("审批模版")
public class SpmkMb extends Model<SpmkMb> {
private static final long serialVersionUID = -3347983303738594498L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="名称",example="名称")
private String name;
@ApiModelProperty(value="类型",example="101")
private Integer type;
@ApiModelProperty(value="控件",example="101")
private byte[] kj;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkSpcz.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
import java.util.Date;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
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 Tang 2019-11-26
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_spcz")
@ApiModel("审批操作")
public class SpmkSpcz extends Model<SpmkSpcz> {
private static final long serialVersionUID = 3566026137671837723L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="审批管理id",example="101")
private Integer spglId;
@ApiModelProperty(value="标题",example="标题")
private String title;
@ApiModelProperty(value="摘要",example="摘要")
private String digest;
@ApiModelProperty(value="当前审批人",example="101")
private Integer sprEmpNum;
@ApiModelProperty(value="当前状态 0审批中 1已撤回 2已拒绝 3已审批 4草稿箱",example="101")
private Integer sts;
@ApiModelProperty(value="流程名称 ",example="流程名称")
private String lcmc;
@ApiModelProperty(value="发起时间 ",example="2019-10-10 10:10:10")
private Date createTime;
@ApiModelProperty(value="结束时间 ",example="2019-10-10 10:10:10")
private Date endTime;
@ApiModelProperty(value="内容 ",example="")
private byte[] nr;
/**
* 审批内容
*/
@Transient
@TableField(exist = false)
private List<SpmkSpnr> spmkSpnrs;
/**
* 处理人
*/
@Transient
@TableField(exist = false)
private List<SpmkClr> spmkClrs;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkSpgl.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
import java.util.Date;
import javax.persistence.*;
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.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 Tang 2019-11-22
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_spgl")
@ApiModel("审批管理")
public class SpmkSpgl extends Model<SpmkSpgl> {
private static final long serialVersionUID = -4266670348589252169L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="审批组id",example="10")
private Integer spzId;
@ApiModelProperty(value="企业id",example="10")
private Integer orgCode;
@ApiModelProperty(value="审批模版_id",example="10")
private Integer mbId;
@ApiModelProperty(value="审批图标地址 ",example="审批图标地址")
private String iconAddress;
@ApiModelProperty(value="审批名称 ",example="审批名称")
private String name;
@ApiModelProperty(value="审批说明 ",example="审批说明")
private String description;
@ApiModelProperty(value="审批开关 0启用 1停用",example="0")
private Integer isOpen;
@ApiModelProperty(value="排序 排序",example="1")
private Integer sort;
@ApiModelProperty(value="审批人去重 0不启用自动去重 1同一个审批人在流程中出现多次时，仅保留第一个 2同一个审批人仅在连续出现时，自动去重",example="0")
private Integer sprqcType;
@ApiModelProperty(value="填写提示 ",example="填写提示")
private String txts;
@ApiModelProperty(value="审批意见 ",example="1,2,3")
private String spyj;
@ApiModelProperty(value="自动通过 发起人审批时自动通过 0是 1否",example="0")
private Integer isZdtg;
@ApiModelProperty(value="打印模板 0默认模版 1自定义模版",example="0")
private Integer dymbType;
@ApiModelProperty(value="必须签名 是否 同意时必须签名 0是 1否",example="0")
private Integer isBxqm;
@ApiModelProperty(value="使用上次签名 0是 1否",example="0")
private Integer isSyscqm;
@ApiModelProperty(value="每次重新签名 0是 1否",example="0")
private Integer isMccxqm;
@ApiModelProperty(value="流程节点",example="0")
private byte[] lcjd;
@TableField(fill = FieldFill.UPDATE)
@ApiModelProperty(value="更新时间 ",example="更新时间")
private Date updateTime;
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value="创建时间 ",example="创建时间")
private Date createTime;
@Transient
@TableField(exist = false)
private SpmkMb spmkMb;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkSpnr.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-26
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_spnr")
@ApiModel("审批内容")
public class SpmkSpnr extends Model<SpmkSpnr> {
private static final long serialVersionUID = -1940496608397785345L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="审批操作id",example="101")
private Integer spczId;
@ApiModelProperty(value="控件配置id",example="101")
private Integer kjpzId;
@ApiModelProperty(value="输入值1",example="输入值1")
private String srz1;
@ApiModelProperty(value="输入值2",example="输入值2")
private String srz2;
@ApiModelProperty(value="输入值3",example="输入值3")
private String srz3;
@ApiModelProperty(value="输入值4",example="输入值4")
private String srz4;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkSpz.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-22
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_spz")
@ApiModel("审批组")
public class SpmkSpz extends Model<SpmkSpz> {
private static final long serialVersionUID = 3386197134163815550L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="企业id",example="10")
private Integer orgCode;
@ApiModelProperty(value="组名",example="人事")
private String name;
@ApiModelProperty(value="排序",example="1")
private Integer sort;
@ApiModelProperty(value="是否可编辑 0是 1否",example="0")
private Integer isEditable;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkSxpz.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_sxpz")
@ApiModel("属性配置")
public class SpmkSxpz extends Model<SpmkSxpz> {
private static final long serialVersionUID = 1780544983489999335L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="流程节点id",example="101")
private Integer lcjdId;
@ApiModelProperty(value="控件配置id",example="101")
private Integer kjpzId;
@ApiModelProperty(value="键",example="键")
private String keyz;
@ApiModelProperty(value="运算符 0 小于 1大于 2小于等于 3等于 4 大于等于 5介于（）",example="101")
private Integer ysfType;
@ApiModelProperty(value="值 ",example="值")
private String val;
@ApiModelProperty(value="名称 ",example="名称")
private String name;
@ApiModelProperty(value="有效 0是 1否",example="101")
private Integer isValid;
@ApiModelProperty(value="类型 ",example="10")
private Integer type;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/spmk/SpmkXzx.java deleted 100644 → 0
package cn.timer.api.bean.spmk;
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 Tang 2019-11-25
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="spmk_xzx")
@ApiModel("选择项")
public class SpmkXzx extends Model<SpmkXzx> {
private static final long serialVersionUID = 4721522728897877974L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="控件配置id",example="101")
private Integer kjpzId;
@ApiModelProperty(value="值",example="值")
private String value;
@ApiModelProperty(value="排序",example="排序")
private String sort;
}
\ No newline at end of file
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -6,6 +6,7 @@ import java.util.Date; ...@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
...@@ -565,11 +566,24 @@ public class LoginController { ...@@ -565,11 +566,24 @@ public class LoginController {
qyzxEmpLogin1.setQys(qys); qyzxEmpLogin1.setQys(qys);
QysDto ctrl = qys.get(0); QysDto ctrl = qys.get(0);
if (qyzxEmpLogin1.getOrgId() != null) { if (qyzxEmpLogin1.getOrgId() != null) {
Stream<QysDto> s = qys.stream()
.filter(item -> item.getStatus() == 1 && qyzxEmpLogin1.getOrgId().equals(item.getId())); // for (QysDto qysDto : qys) {
if (s != null) { // if (qyzxEmpLogin1.getOrgId().equals(qysDto.getId()) && qysDto.getStatus() == 1) {
ctrl = s.findFirst().get(); // ctrl = qysDto;
// }
// System.out.println(qyzxEmpLogin1.getOrgId());
// System.out.println(qysDto);
// }
Optional<QysDto> s = qys.parallelStream()
.filter(item -> item.getStatus() == 1 && qyzxEmpLogin1.getOrgId().equals(item.getId())).findFirst();
System.out.println(s.isPresent());
if (s != null && s.isPresent()) {
ctrl = s.get();
} }
} }
if (ctrl.getStatus() == null || ctrl.getStatus().equals(0)) { if (ctrl.getStatus() == null || ctrl.getStatus().equals(0)) {
return ResultUtil.error("帐号被禁用"); return ResultUtil.error("帐号被禁用");
......
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
...@@ -13,12 +13,9 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -13,12 +13,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
...@@ -26,11 +23,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; ...@@ -26,11 +23,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.bean.dzht.DzhtAssoHtmb;
import cn.timer.api.bean.spmk.SpmkApprovalG; import cn.timer.api.bean.spmk.SpmkApprovalG;
import cn.timer.api.bean.spmk.SpmkApprovalTemplate; import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
import cn.timer.api.bean.spmk.SpmkApprovalTemplateG; import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
...@@ -41,18 +35,9 @@ import cn.timer.api.bean.spmk.SpmkCustomApproval; ...@@ -41,18 +35,9 @@ import cn.timer.api.bean.spmk.SpmkCustomApproval;
import cn.timer.api.bean.spmk.SpmkExecutor; import cn.timer.api.bean.spmk.SpmkExecutor;
import cn.timer.api.bean.spmk.SpmkIcon; import cn.timer.api.bean.spmk.SpmkIcon;
import cn.timer.api.bean.spmk.SpmkInitiatorConfig; import cn.timer.api.bean.spmk.SpmkInitiatorConfig;
import cn.timer.api.bean.spmk.SpmkJqgz;
import cn.timer.api.bean.spmk.SpmkLcjd;
import cn.timer.api.bean.spmk.SpmkLcjdEmpAsso;
import cn.timer.api.bean.spmk.SpmkMb;
import cn.timer.api.bean.spmk.SpmkSpcz;
import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpz;
import cn.timer.api.bean.spmk.SpmkSxpz;
import cn.timer.api.bean.yggl.YgglMainEmp; import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.config.annotation.CurrentUser; import cn.timer.api.config.annotation.CurrentUser;
import cn.timer.api.config.annotation.UserBean; import cn.timer.api.config.annotation.UserBean;
import cn.timer.api.config.enums.CommonEnum;
import cn.timer.api.dao.spmk.SpmkApprovalGMapper; import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper; import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper; import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper;
...@@ -62,25 +47,15 @@ import cn.timer.api.dao.spmk.SpmkApproveSummaryMapper; ...@@ -62,25 +47,15 @@ import cn.timer.api.dao.spmk.SpmkApproveSummaryMapper;
import cn.timer.api.dao.spmk.SpmkCustomApprovalMapper; import cn.timer.api.dao.spmk.SpmkCustomApprovalMapper;
import cn.timer.api.dao.spmk.SpmkExecutorMapper; import cn.timer.api.dao.spmk.SpmkExecutorMapper;
import cn.timer.api.dao.spmk.SpmkInitiatorConfigMapper; import cn.timer.api.dao.spmk.SpmkInitiatorConfigMapper;
import cn.timer.api.dao.spmk.SpmkSpglMapper;
import cn.timer.api.dao.spmk.SpmkSpzMapper;
import cn.timer.api.dto.spmk.ApprovingDto; import cn.timer.api.dto.spmk.ApprovingDto;
import cn.timer.api.dto.spmk.FlowChildren; import cn.timer.api.dto.spmk.FlowChildren;
import cn.timer.api.dto.spmk.FromData; import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.spmk.MySummaryQueryDto; import cn.timer.api.dto.spmk.MySummaryQueryDto;
import cn.timer.api.dto.spmk.Router; import cn.timer.api.dto.spmk.Router;
import cn.timer.api.dto.spmk.Spmk;
import cn.timer.api.dto.spmk.SpmkApprovalTemplateDto; import cn.timer.api.dto.spmk.SpmkApprovalTemplateDto;
import cn.timer.api.dto.spmk.SpmkApproveDetailDto; import cn.timer.api.dto.spmk.SpmkApproveDetailDto;
import cn.timer.api.dto.spmk.SpmkApproveSummaryDto; import cn.timer.api.dto.spmk.SpmkApproveSummaryDto;
import cn.timer.api.dto.spmk.SpmkCustomApprovalDto; import cn.timer.api.dto.spmk.SpmkCustomApprovalDto;
import cn.timer.api.dto.spmk.SpmkMbKjDto;
import cn.timer.api.dto.spmk.SpmkSpglDto;
import cn.timer.api.dto.spmk.SpmkSpglMoveDto;
import cn.timer.api.dto.spmk.SpmkSpglSortDto;
import cn.timer.api.dto.spmk.SpmkSpzDto;
import cn.timer.api.dto.spmk.SpmkSpzSortDto;
import cn.timer.api.dto.spmk.SpmkSpzSpglDto;
import cn.timer.api.dto.spmk.SummaryQueryDto; import cn.timer.api.dto.spmk.SummaryQueryDto;
import cn.timer.api.utils.Result; import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil; import cn.timer.api.utils.ResultUtil;
...@@ -96,369 +71,6 @@ produces = { "application/json","multipart/form-data" }) ...@@ -96,369 +71,6 @@ produces = { "application/json","multipart/form-data" })
public class SpmkServiceImpl { public class SpmkServiceImpl {
@Autowired @Autowired
private SpmkSpglMapper spmkSpglMapper;
@Autowired
private SpmkSpzMapper spmkSpzMapper;
/**
* 审批组-列表
*/
@GetMapping(value = "/spzs")
@ApiOperation(value = "审批组-列表",httpMethod = "GET")
public Result<List<SpmkSpzSpglDto>> selectListspz(@CurrentUser UserBean userBean) {
Integer orgCode = userBean.getOrgCode();
List<SpmkSpzSpglDto> spmkSpzSpglDtos = spmkSpzMapper.selectSpglListByOrgCode(orgCode);
return ResultUtil.data(spmkSpzSpglDtos, "获取审批组列表成功");
}
/**
* 审批组-新增
*/
@PostMapping(value = "/spzs")
@ApiOperation(value = "审批组-新建",httpMethod = "POST")
public Result<SpmkSpz> addspz(@CurrentUser UserBean userBean ,@RequestBody SpmkSpz spmkSpz) {
Integer orgCode = userBean.getOrgCode();
if (spmkSpz == null || spmkSpz.getName() == null) return ResultUtil.error("请填入审批组名");
SpmkSpz one = spmkSpz.selectOne(new QueryWrapper<SpmkSpz>().eq("org_code", orgCode).eq("name", spmkSpz.getName()));
if (one != null) return ResultUtil.error("新增失败，换个审批组名试一试~");
List<SpmkSpz> spmkSpzs = SpmkSpz.builder().build().selectList(new QueryWrapper<SpmkSpz>().eq("org_code", orgCode));
Integer maxSort = 0;
if (spmkSpzs != null && spmkSpzs.size() > 0) {
for (SpmkSpz spz : spmkSpzs) {
Integer i = spz.getSort() == null ? 0 : spz.getSort();
// 999999 是 【其他】 审批组 ,固定排最后
if (maxSort < i && i < CommonEnum.SPZ_OTHER.getType()) maxSort = i;
}
}
spmkSpz.setOrgCode(orgCode);
spmkSpz.setIsEditable(0);
spmkSpz.setSort(maxSort+1);
spmkSpz.insert();
return ResultUtil.data(spmkSpz, "审批组-新建成功");
}
/**
* 审批组-删除
*/
@DeleteMapping(value = "/spzs/{id}")
@ApiOperation(value = "审批组-删除",httpMethod = "DELETE")
public Result<SpmkSpz> delspz(@CurrentUser UserBean userBean ,@PathVariable("id") Integer id){
Integer orgCode = userBean.getOrgCode();
SpmkSpz spmkSpz = SpmkSpz.builder().build();
SpmkSpz thisSpz = spmkSpz.selectById(id);
if ("其他".equals(thisSpz.getName())) return ResultUtil.error("该审批组无法删除");
SpmkSpz otherSpz = spmkSpz.selectOne((new QueryWrapper<SpmkSpz>().eq("org_code", orgCode).eq("sort", CommonEnum.SPZ_OTHER.getType())));
SpmkSpgl one = SpmkSpgl.builder().build().selectOne(new QueryWrapper<SpmkSpgl>().eq("spz_id", "").orderByDesc("sort").last("limit 1"));
Integer max = (one == null || one.getSort() == null) ? 1 : one.getSort();
List<SpmkSpgl> spmkSpgls = SpmkSpgl.builder().build().selectList(new QueryWrapper<SpmkSpgl>().eq("spz_id", id));
if (spmkSpgls != null && spmkSpgls.size() > 0) {
for (SpmkSpgl spmkSpgl : spmkSpgls) {
spmkSpgl.setSort(max);
spmkSpgl.setSpzId(otherSpz.getId());
spmkSpgl.updateById();
max++;
}
}
boolean b = spmkSpz.deleteById(id);
if(b) return ResultUtil.success("审批组-删除成功");
return ResultUtil.error("审批组-删除失败");
}
/**
* 审批管理-编辑
*/
@PutMapping(value = "/spgl")
@ApiOperation(value = "审批管理-编辑", httpMethod = "PUT", notes = "接口发布说明")
public Result<SpmkSpgl> updateSpgl(@CurrentUser UserBean userBean,@RequestBody SpmkSpglDto spmkSpglDto){
@SuppressWarnings("unused")
Integer orgCode = userBean.getOrgCode();
SpmkSpgl spmkSpgl = SpmkSpgl.builder().build();
BeanUtil.copyProperties(spmkSpglDto, spmkSpgl, "lcjd","spyj");
spmkSpgl.setMbId(null);
spmkSpgl.setSpzId(null);
spmkSpgl.setOrgCode(null);
spmkSpgl.setSpyj(ArrayUtil.join(spmkSpglDto.getSpyj(),","));
spmkSpgl.setLcjd(ObjectUtil.serialize(spmkSpglDto.getLcjd()));
boolean b = spmkSpgl.updateById();
if (!b) return ResultUtil.error("编辑管理员列失败");
return ResultUtil.success("编辑管理员列成功");
}
/**
* 审批模版-新增/编辑
*/
@PutMapping(value = "/mb")
@ApiOperation(value = "审批模版-新增/编辑", httpMethod = "PUT", notes = "接口发布说明")
public Result<SpmkSpgl> updateMb(@CurrentUser UserBean userBean,@RequestBody SpmkMbKjDto spmkMbKjDto) {
// TODO Auto-generated method stub
SpmkMb spmkMb = SpmkMb.builder().build();
BeanUtil.copyProperties(spmkMbKjDto, spmkMb, "kj");
spmkMb.setKj(ObjectUtil.serialize(spmkMbKjDto.getKj()));
boolean b = spmkMb.insertOrUpdate();
if (!b) return ResultUtil.error("审批模版-新增/编辑失败");
return ResultUtil.success("审批模版-新增/编辑成功");
}
/**
* 审批组-重命名
*/
@PutMapping(value = "/updatespz")
@ApiOperation(value = "审批组-重命名", httpMethod = "PUT", notes = "接口发布说明")
public Result<SpmkSpzDto> updatespz(@CurrentUser UserBean userBean,@RequestBody SpmkSpzDto spmkSpzDto) {
// TODO Auto-generated method stub
Integer orgCode = userBean.getOrgCode();
if (spmkSpzDto == null || spmkSpzDto.getName() == null) return ResultUtil.error("请填入审批组名");
SpmkSpz one = SpmkSpz.builder().build().selectOne(new QueryWrapper<SpmkSpz>().eq("org_code", orgCode).eq("name", spmkSpzDto.getName()));
if (one != null) return ResultUtil.error("新增失败，换个审批组名试一试~");
Integer id = spmkSpzDto.getId();
String name = spmkSpzDto.getName();
SpmkSpz.builder().id(id).name(name).build().updateById();
return ResultUtil.data(spmkSpzDto, "审批组重命名成功");
}
/**
* 审批组-批量排序
*/
@PutMapping(value = "/updatespzsort")
@ApiOperation(value = "审批组-排序", httpMethod = "PUT", notes = "接口发布说明")
public Result<Void> updatespzsort(@CurrentUser UserBean userBean,@RequestBody List<SpmkSpzSortDto> spmkSpzSortDtos) {
Integer orgCode = userBean.getOrgCode();
SpmkSpz.builder().sort(CommonEnum.SPZ_OTHER.getType()).build().update(new UpdateWrapper<SpmkSpz>().eq("org_code", orgCode).eq("name", "其他"));
Integer count = spmkSpzMapper.updateListSortById(spmkSpzSortDtos);
System.out.println(count);
return ResultUtil.success("审批组批量排序成功");
}
/**
* 审批管理-批量排序
*/
@PutMapping(value = "/updatespglsort")
@ApiOperation(value = "审批管理-排序", httpMethod = "PUT", notes = "接口发布说明")
public Result<Void> updatespglsort(@CurrentUser UserBean userBean,@RequestBody List<SpmkSpglSortDto> spmkSpglSortDtos) {
Integer count = spmkSpglMapper.updateListSortById(spmkSpglSortDtos);
System.out.println(count);
return ResultUtil.success("审批管理批量排序成功");
}
/**
* 审批管理-查询
*/
@GetMapping(value = "/spgl/{id}")
@ApiOperation(value = "审批管理-查询", httpMethod = "GET", notes = "接口发布说明")
public Result<SpmkSpglDto> selectspgl(@CurrentUser UserBean userBean,@PathVariable("id") Integer id) {
SpmkSpgl spmkSpgl = spmkSpglMapper.selectSpglById2(id);
if (spmkSpgl == null) {
return ResultUtil.success();
}
SpmkSpglDto spmkSpglDto = SpmkSpglDto.builder().build();
SpmkMbKjDto spmkMbKjDto = SpmkMbKjDto.builder().build();
BeanUtil.copyProperties(spmkSpgl,spmkSpglDto, "lcjd","spmkMb");
if (spmkSpgl.getLcjd() != null && spmkSpgl.getLcjd().length > 0) {
spmkSpglDto.setSpyj(StrUtil.splitToInt(spmkSpgl.getSpyj(), ","));
spmkSpglDto.setLcjd(ObjectUtil.unserialize(spmkSpgl.getLcjd()));
}
BeanUtil.copyProperties(spmkSpgl.getSpmkMb(),spmkMbKjDto, "kj");
if (spmkSpgl.getSpmkMb() != null && spmkSpgl.getSpmkMb().getKj() != null && spmkSpgl.getSpmkMb().getKj().length > 0) {
System.out.println(spmkSpgl.getSpmkMb().getKj());
spmkMbKjDto.setKj(ObjectUtil.unserialize(spmkSpgl.getSpmkMb().getKj()));
}
spmkSpglDto.setSpmkMbKjDto(spmkMbKjDto);
return ResultUtil.data(spmkSpglDto, "审批管理查询成功");
}
public void addlcjd(SpmkLcjd spmkLcjd, Integer upId) {
if (spmkLcjd != null) {
spmkLcjd.setUpId(upId);
spmkLcjd.insert();
System.out.println("spmkLcjdId" + spmkLcjd);
List<SpmkSxpz> spmkSxpzs = spmkLcjd.getSpmkSxpzs();
Integer spmkLcjdId = spmkLcjd.getId();
if (spmkSxpzs != null && spmkSxpzs.size() > 0) {
for (SpmkSxpz spmkSxpz : spmkSxpzs) {
spmkSxpz.setLcjdId(spmkLcjdId);
spmkSxpz.insert();
}
}
List<SpmkLcjdEmpAsso> spmkLcjdEmpAssos = spmkLcjd.getSpmkLcjdEmpAssos();
if (spmkLcjdEmpAssos != null && spmkLcjdEmpAssos.size() > 0) {
for (SpmkLcjdEmpAsso spmkLcjdEmpAsso : spmkLcjdEmpAssos) {
spmkLcjdEmpAsso.setLcjdId(spmkLcjdId);
spmkLcjdEmpAsso.insert();
}
}
List<SpmkLcjd> spmkLcjds = spmkLcjd.getSpmkLcjds();
if (spmkLcjds != null && spmkLcjds.size() > 0) {
for (SpmkLcjd spmkLcjd2 : spmkLcjds) {
this.addlcjd(spmkLcjd2, spmkLcjdId);
}
}
}
}
/**
* 审批管理-流程节点-批量添加/更新
*/
@Transactional
@PostMapping(value = "/lcjd")
@ApiOperation(value = "流程节点-批量添加/更新", httpMethod = "POST", notes = "接口发布说明")
public Result<Void> addlistlcjd(@CurrentUser UserBean userBean,@RequestBody SpmkLcjd spmkLcjd) {
return null;
}
/**
* 审批操作-发起审批
*/
@PostMapping(value = "/spcz")
@ApiOperation(value = "审批操作-发起审批", httpMethod = "POST", notes = "接口发布说明")
public Result<Void> addspcz(@CurrentUser UserBean userBean,@RequestBody SpmkSpcz spmkSpcz) {
return ResultUtil.success("审批操作-发起审批成功");
}
/**
* 审批总汇-流程
*/
@PostMapping(value = "/sphz")
@ApiOperation(value = "审批汇总-流程", httpMethod = "POST", notes = "接口发布说明")
public Result<Void> sphz(@CurrentUser UserBean userBean) {
return null;
}
/**
* 移动到
*/
@PutMapping(value = "/movespgl")
@ApiOperation(value = "移动到", httpMethod = "PUT", notes = "接口发布说明")
public Result<SpmkSpgl> moveSpgl(@CurrentUser UserBean userBean,@RequestBody SpmkSpglMoveDto spmkSpglMoveDto) {
Integer id = spmkSpglMoveDto.getId();
Integer spzId = spmkSpglMoveDto.getSpzId();
List<SpmkSpgl> spgls = SpmkSpgl.builder().build().selectList(new QueryWrapper<SpmkSpgl>().eq("spz_id", spzId));
Integer maxSort = 0;
if (spgls != null && spgls.size() > 0) {
for (SpmkSpgl spmkSpgl : spgls) {
Integer i = spmkSpgl.getSort() == null ? 0 : spmkSpgl.getSort();
if (maxSort < i)
maxSort = i;
}
}
boolean b = SpmkSpgl.builder().id(id).spzId(spzId).sort(maxSort + 1).build().updateById();
if (!b)
return ResultUtil.error("移动审批失败");
return ResultUtil.success("移动审批成功");
}
/**
* 假期规则列表
*/
@GetMapping(value = "/jqgz")
@ApiOperation(value = "假期规则列表", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> selectListjqgz(
@RequestParam(defaultValue = "1") Integer currentPage,
@RequestParam(defaultValue = "10") Integer totalPage, @RequestParam Integer id,
@CurrentUser UserBean userBean){
Page<SpmkJqgz> p = new Page<SpmkJqgz>(currentPage, totalPage);
Integer orgCode = userBean.getOrgCode();
IPage<SpmkJqgz> sPage = SpmkJqgz.builder().build().selectPage(p, new QueryWrapper<SpmkJqgz>().eq("org_code",orgCode));
List<SpmkJqgz> spmkJqgzs = sPage.getRecords();
return ResultUtil.data(sPage, spmkJqgzs, "获取假期规则列表成功");
}
/**
* 流程节点解析
*/
// @PostMapping(value = "/jsonparse")
// @ApiOperation(value = "流程节点解析", httpMethod = "POST", notes = "流程节点解析")
// @ApiOperationSupport(order = 1)
// public Result<Object> jsonToObj(@RequestBody Object jsonObj){
//
// JSONObject obj = JSONUtil.parseObj(jsonObj, false, true);
//
// Router Router = obj.get("router", Router.class);
//
// Console.log("obj:" + obj.toStringPretty());
// Console.log("Router:" + Router.toPrettyString());
// Console.log("Router:" + Router.toJSONString());
//
// return ResultUtil.success("解析成功!");
// }
/**
* 部门id 查询 员工
*/
@PostMapping(value = "/deptSelectEmp")
@ApiOperation(value = "部门id 查询 员工", httpMethod = "POST", notes = "流程节点解析_plus")
public Result<Object> selectEmpBydept(@RequestParam Integer id){
List<YgglMainEmp> ygglMainEmp = RouterUtils.selectOtherlistent(117,id);
return ResultUtil.data(ygglMainEmp, "解析成功!");
}
/**
* 流程节点解析123
*/
@PostMapping(value = "/jsonparse_plus_plus")
@ApiOperation(value = "jsonparse_plus_plus", httpMethod = "POST", notes = "流程节点解析_plus")
public Result<Object> jsonToObj123(@CurrentUser UserBean userBean, @RequestBody Spmk spmk){
List<Router> listRouter = new ArrayList<Router>();
listRouter.add(spmk.getRouter());
JSONObject jSONObject = spmk.getData();
jSONObject.put("orgCode", userBean.getOrgCode());
return ResultUtil.data(RouterUtils.NextNode(listRouter, jSONObject, ISNOTFIRST), "解析成功!");
}
@Autowired
private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper; private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
@Autowired @Autowired
...@@ -470,22 +82,7 @@ public class SpmkServiceImpl { ...@@ -470,22 +82,7 @@ public class SpmkServiceImpl {
@Autowired @Autowired
private SpmkCustomApprovalMapper spmkCustomApprovalMapper; private SpmkCustomApprovalMapper spmkCustomApprovalMapper;
/** //TODO 新增或编辑-审批模板组
* 图标列表
*/
@GetMapping(value = "/icon")
@ApiOperation(value = "99.图标列表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 99)
public Result<List<SpmkIcon>> selectListIcon(@CurrentUser UserBean userBean){
List<SpmkIcon> spmkIcons = SpmkIcon.builder().build().selectAll();
return ResultUtil.data(spmkIcons,"获取图标列表成功");
}
//TODO 审批模板组
/** /**
* 新增或编辑-审批模板组 * 新增或编辑-审批模板组
*/ */
...@@ -737,13 +334,12 @@ public class SpmkServiceImpl { ...@@ -737,13 +334,12 @@ public class SpmkServiceImpl {
public Result<Object> selectCaById(@PathVariable int id){ public Result<Object> selectCaById(@PathVariable int id){
SpmkCustomApproval ca = SpmkCustomApproval.builder().id(id).build().selectById(); SpmkCustomApproval ca = SpmkCustomApproval.builder().id(id).build().selectById();
SpmkCustomApprovalDto caD = SpmkCustomApprovalDto.builder() SpmkCustomApprovalDto caD = SpmkCustomApprovalDto.builder()
.froms((List<JSONObject>)ObjectUtil.unserialize(ca.getFroms())) .froms(ObjectUtil.unserialize(ca.getFroms()))
.router(ObjectUtil.unserialize(ca.getRouter())) .router(ObjectUtil.unserialize(ca.getRouter()))
.build(); .build();
BeanUtil.copyProperties(ca, caD,"froms","router"); BeanUtil.copyProperties(ca, caD,"froms","router");
return ResultUtil.data(caD,"操作成功!"); return ResultUtil.data(caD,"操作成功!");
} }
/** /**
...@@ -753,9 +349,7 @@ public class SpmkServiceImpl { ...@@ -753,9 +349,7 @@ public class SpmkServiceImpl {
@ApiOperation(value = "16.排序-自定义审批", httpMethod = "PUT", notes = "排序-自定义审批") @ApiOperation(value = "16.排序-自定义审批", httpMethod = "PUT", notes = "排序-自定义审批")
@ApiOperationSupport(order = 16) @ApiOperationSupport(order = 16)
public Result<Object> ranksCa(@RequestBody List<SpmkCustomApproval> list){ public Result<Object> ranksCa(@RequestBody List<SpmkCustomApproval> list){
return spmkCustomApprovalMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!"); return spmkCustomApprovalMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
} }
@Autowired @Autowired
...@@ -770,7 +364,6 @@ public class SpmkServiceImpl { ...@@ -770,7 +364,6 @@ public class SpmkServiceImpl {
private SpmkInitiatorConfigMapper spmkInitiatorConfigMapper; private SpmkInitiatorConfigMapper spmkInitiatorConfigMapper;
private boolean ISFIRST = true; // 第一次启动审批流程 private boolean ISFIRST = true; // 第一次启动审批流程
private boolean ISNOTFIRST = false;
// TODO 审批汇总(发起审批) // TODO 审批汇总(发起审批)
/** /**
...@@ -792,10 +385,6 @@ public class SpmkServiceImpl { ...@@ -792,10 +385,6 @@ public class SpmkServiceImpl {
List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>(); List<FlowChildren> listFlowChildren = new ArrayList<FlowChildren>();
RouterUtils.getIsFlowChildren(listRouter,listFlowChildren); RouterUtils.getIsFlowChildren(listRouter,listFlowChildren);
// System.out.println(jSONObject);
// System.out.println(listRouter);
// System.out.println(listFlowChildren);
// 当前审批人 // 当前审批人
String currentApprover = jSONObject.getStr("current_approver"); String currentApprover = jSONObject.getStr("current_approver");
// 封装 审批汇总 // 封装 审批汇总
...@@ -834,9 +423,6 @@ public class SpmkServiceImpl { ...@@ -834,9 +423,6 @@ public class SpmkServiceImpl {
} }
//TODO 审批汇总 //TODO 审批汇总
/**
* 审批汇总
*/
@PostMapping(value = "/select_approve_summary") @PostMapping(value = "/select_approve_summary")
@ApiOperation(value = "18.审批汇总", httpMethod = "POST", notes = "审批汇总") @ApiOperation(value = "18.审批汇总", httpMethod = "POST", notes = "审批汇总")
@ApiOperationSupport(order = 18) @ApiOperationSupport(order = 18)
...@@ -849,7 +435,7 @@ public class SpmkServiceImpl { ...@@ -849,7 +435,7 @@ public class SpmkServiceImpl {
Integer deptId = summaryQueryDto.getDeptId(); Integer deptId = summaryQueryDto.getDeptId();
List<YgglMainEmp> listYgglMainEmp = RouterUtils.selectOtherlistent(userBean.getOrgCode(), deptId); List<YgglMainEmp> listYgglMainEmp = RouterUtils.selectOtherlistent(userBean.getOrgCode(), deptId);
Console.log("listYgglMainEmp:"+ listYgglMainEmp);
if (deptId != null && (listYgglMainEmp == null || listYgglMainEmp.size() == 0)) { if (deptId != null && (listYgglMainEmp == null || listYgglMainEmp.size() == 0)) {
return ResultUtil.data(new ArrayList<SpmkApproveSummary>(), "操作成功!"); return ResultUtil.data(new ArrayList<SpmkApproveSummary>(), "操作成功!");
} }
...@@ -875,18 +461,17 @@ public class SpmkServiceImpl { ...@@ -875,18 +461,17 @@ public class SpmkServiceImpl {
@GetMapping(value = "/select_approve_detail/{id}") @GetMapping(value = "/select_approve_detail/{id}")
@ApiOperation(value = "19.审批详情", httpMethod = "GET", notes = "审批详情") @ApiOperation(value = "19.审批详情", httpMethod = "GET", notes = "审批详情")
@ApiOperationSupport(order = 19) @ApiOperationSupport(order = 19)
public Result<Object> selectAd(@PathVariable Integer id) { public Result<Object> selectAd(@PathVariable(required = true) Integer id) {
SpmkApproveDetail ad = spmkApproveDetailMapper.selectOne(new QueryWrapper<SpmkApproveDetail>().lambda().eq(SpmkApproveDetail::getApproveSummaryId, id)); SpmkApproveDetail ad = spmkApproveDetailMapper.selectOne(new QueryWrapper<SpmkApproveDetail>().lambda().eq(SpmkApproveDetail::getApproveSummaryId, id));
SpmkApproveDetailDto adD = SpmkApproveDetailDto.builder().build(); SpmkApproveDetailDto adD = SpmkApproveDetailDto.builder().build();
List<SpmkApproveExecuteRecord> listAer = spmkApproveExecuteRecordMapper.selectListByAsId(id); List<SpmkApproveExecuteRecord> listAer = spmkApproveExecuteRecordMapper.selectListByAsId(id);
BeanUtil.copyProperties(ad, adD, "requestData","froms","router","spmkApproveExecuteRecord"); BeanUtil.copyProperties(ad, adD, "requestData","froms","router","spmkApproveExecuteRecord");
adD.setRequestData(ObjectUtil.unserialize(ad.getRequestData())); adD.setRequestData(ObjectUtil.unserialize(ad.getRequestData()));
adD.setFroms((List<JSONObject>)ObjectUtil.unserialize(ad.getFroms())); adD.setFroms(ObjectUtil.unserialize(ad.getFroms()));
adD.setRouter((Router)ObjectUtil.unserialize(ad.getRouter())); adD.setRouter(ObjectUtil.unserialize(ad.getRouter()));
adD.setFlowChildren((List<FlowChildren>)ObjectUtil.unserialize(ad.getFlowChildren())); adD.setFlowChildren(ObjectUtil.unserialize(ad.getFlowChildren()));
adD.setApproveExecuteRecord(listAer); adD.setApproveExecuteRecord(listAer);
return ResultUtil.data(adD, "操作成功!"); return ResultUtil.data(adD, "操作成功!");
...@@ -898,8 +483,9 @@ public class SpmkServiceImpl { ...@@ -898,8 +483,9 @@ public class SpmkServiceImpl {
*/ */
@PostMapping(value = "/approving") @PostMapping(value = "/approving")
@ApiOperation(value = "20.审批人审批", httpMethod = "POST", notes = "审批人审批") @ApiOperation(value = "20.审批人审批", httpMethod = "POST", notes = "审批人审批")
@ApiOperationSupport(order = 19) @Transactional(rollbackFor = Exception.class)
public Result<Object> approving(@RequestBody ApprovingDto approvingDto) { @ApiOperationSupport(order = 20)
public Result<Object> approving(@RequestBody ApprovingDto approvingDto) throws Exception {
SpmkApproveDetail ad = SpmkApproveDetail.builder().build() SpmkApproveDetail ad = SpmkApproveDetail.builder().build()
.selectOne(new QueryWrapper<SpmkApproveDetail>() .selectOne(new QueryWrapper<SpmkApproveDetail>()
.lambda() .lambda()
...@@ -924,7 +510,7 @@ public class SpmkServiceImpl { ...@@ -924,7 +510,7 @@ public class SpmkServiceImpl {
} }
if (aSummary.getSts() == 0) { if (aSummary.getSts() == 0) {
List<FlowChildren> listFlowChildren = (List<FlowChildren>)ObjectUtil.unserialize(ad.getFlowChildren()); List<FlowChildren> listFlowChildren = ObjectUtil.unserialize(ad.getFlowChildren());
RouterUtils.approving( RouterUtils.approving(
listFlowChildren, listFlowChildren,
approvingDto.getAsId(), approvingDto.getAsId(),
...@@ -959,9 +545,8 @@ public class SpmkServiceImpl { ...@@ -959,9 +545,8 @@ public class SpmkServiceImpl {
*/ */
@PostMapping(value = "/select_my_approve") @PostMapping(value = "/select_my_approve")
@ApiOperation(value = "21.查询列表-我审批的/抄送我的-分页", httpMethod = "POST", notes = "查询列表-我审批的-关键字、审批状态、发起时间-分页") @ApiOperation(value = "21.查询列表-我审批的/抄送我的-分页", httpMethod = "POST", notes = "查询列表-我审批的-关键字、审批状态、发起时间-分页")
@ApiOperationSupport(order = 18) @ApiOperationSupport(order = 21)
public Result<Object> selectMyAs(@CurrentUser UserBean userBean, @RequestBody MySummaryQueryDto mySummaryQueryDto) { public Result<Object> selectMyAs(@CurrentUser UserBean userBean, @RequestBody MySummaryQueryDto mySummaryQueryDto) {
IPage<SpmkApproveSummary> page = new Page<SpmkApproveSummary>( IPage<SpmkApproveSummary> page = new Page<SpmkApproveSummary>(
mySummaryQueryDto.getCurrentPage() == null ? 1 : mySummaryQueryDto.getCurrentPage(), mySummaryQueryDto.getCurrentPage() == null ? 1 : mySummaryQueryDto.getCurrentPage(),
mySummaryQueryDto.getTotalPage() == null ? 10 : mySummaryQueryDto.getTotalPage()); mySummaryQueryDto.getTotalPage() == null ? 10 : mySummaryQueryDto.getTotalPage());
...@@ -980,16 +565,27 @@ public class SpmkServiceImpl { ...@@ -980,16 +565,27 @@ public class SpmkServiceImpl {
*/ */
@DeleteMapping(value = "/delete_approval_data") @DeleteMapping(value = "/delete_approval_data")
@ApiOperation(value = "90.(开发使用)删除-审批数据", httpMethod = "DELETE", notes = "审批汇总、审批详情、审批执行记录、审批执行人记录 所有数据") @ApiOperation(value = "90.(开发使用)删除-审批数据", httpMethod = "DELETE", notes = "审批汇总、审批详情、审批执行记录、审批执行人记录 所有数据")
@ApiOperationSupport(order = 10) @ApiOperationSupport(order = 90)
public Result<Object> deleteApprovalData(@CurrentUser UserBean userBean){ public Result<Object> deleteApprovalData(@CurrentUser UserBean userBean){
spmkApproveSummaryMapper.delete(null); spmkApproveSummaryMapper.delete(null);
spmkApproveDetailMapper.delete(null); spmkApproveDetailMapper.delete(null);
spmkApproveExecuteRecordMapper.delete(null); spmkApproveExecuteRecordMapper.delete(null);
spmkExecutorMapper.delete(null); spmkExecutorMapper.delete(null);
System.out.println("删除-审批汇总、审批详情、审批执行记录、审批执行人记录 所有数据 完成！");
return ResultUtil.data(null, "操作成功!"); return ResultUtil.data(null, "操作成功!");
} }
//TODO 审批图标列表
@GetMapping(value = "/icon")
@ApiOperation(value = "99.图标列表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 99)
public Result<List<SpmkIcon>> selectListIcon(@CurrentUser UserBean userBean){
List<SpmkIcon> spmkIcons = SpmkIcon.builder().build().selectAll();
return ResultUtil.data(spmkIcons,"获取图标列表成功");
}
} }
src/main/java/cn/timer/api/dao/spmk/SpmkClrMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkClr;
/**
* 处理人
* @author Tang 2019-11-26
*/
@Repository
public interface SpmkClrMapper extends BaseMapper<SpmkClr> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkJqgzMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkJqgz;
/**
* 假勤规则
* @author Tang 2019-12-09
*/
@Repository
public interface SpmkJqgzMapper extends BaseMapper<SpmkJqgz> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkKjMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkKj;
/**
* 控件
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkKjMapper extends BaseMapper<SpmkKj> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkKjMkMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkKjMk;
/**
* 控件模版关联
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkKjMkMapper extends BaseMapper<SpmkKjMk> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkKjpzMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkKjpz;
/**
* 控件配置
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkKjpzMapper extends BaseMapper<SpmkKjpz> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkLcjdEmpAssoMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkLcjdEmpAsso;
/**
* 流程节点员工关联
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkLcjdEmpAssoMapper extends BaseMapper<SpmkLcjdEmpAsso> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkLcjdMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkLcjd;
/**
* 流程节点
* @author Tang 2019-11-22
*/
@Repository
public interface SpmkLcjdMapper extends BaseMapper<SpmkLcjd> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkMbMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkMb;
/**
* 审批模版
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkMbMapper extends BaseMapper<SpmkMb> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkSpczMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkSpcz;
/**
* 审批操作
* @author Tang 2019-11-26
*/
@Repository
public interface SpmkSpczMapper extends BaseMapper<SpmkSpcz> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkSpglMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.dto.spmk.SpmkSpglSortDto;
/**
* 审批管理
* @author Tang 2019-11-22
*/
@Repository
public interface SpmkSpglMapper extends BaseMapper<SpmkSpgl> {
Integer updateListSortById(List<SpmkSpglSortDto> spmkSpglSortDtos);
/* SpmkSpglDto selectSpglById(Integer id); */
SpmkSpgl selectSpglById2(Integer id);
}
src/main/java/cn/timer/api/dao/spmk/SpmkSpnrMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkSpnr;
/**
* 审批内容
* @author Tang 2019-11-26
*/
@Repository
public interface SpmkSpnrMapper extends BaseMapper<SpmkSpnr> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkSpzMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkSpz;
import cn.timer.api.dto.spmk.SpmkSpzSortDto;
import cn.timer.api.dto.spmk.SpmkSpzSpglDto;
/**
* 审批组
* @author Tang 2019-11-22
*/
@Repository
public interface SpmkSpzMapper extends BaseMapper<SpmkSpz> {
List<SpmkSpzSpglDto> selectSpglListByOrgCode(Integer orgCode);
Integer updateListSortById(List<SpmkSpzSortDto> spmkSpzSortDtos);
}
src/main/java/cn/timer/api/dao/spmk/SpmkSxpzMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkSxpz;
/**
* 属性配置
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkSxpzMapper extends BaseMapper<SpmkSxpz> {
}
src/main/java/cn/timer/api/dao/spmk/SpmkXzxMapper.java deleted 100644 → 0
package cn.timer.api.dao.spmk;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkXzx;
/**
* 选择项
* @author Tang 2019-11-25
*/
@Repository
public interface SpmkXzxMapper extends BaseMapper<SpmkXzx> {
}
src/main/java/cn/timer/api/dto/spmk/ApprovingDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import java.util.Date;
import java.util.List;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import cn.hutool.json.JSONObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -19,19 +12,19 @@ import lombok.NoArgsConstructor; ...@@ -19,19 +12,19 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class ApprovingDto { public class ApprovingDto {
@ApiModelProperty(value = "审批汇总id", example = "2") @ApiModelProperty(value = "审批汇总id", example = "2", required = true)
private Integer asId; private Integer asId;
@ApiModelProperty(value = "审批执行记录id", example = "10") @ApiModelProperty(value = "审批执行记录id", example = "10", required = true)
private Integer executeRecordId; private Integer executeRecordId;
@ApiModelProperty(value = "执行人记录id", example = "10") @ApiModelProperty(value = "执行人记录id", example = "10", required = true)
private Integer executorId; private Integer executorId;
@ApiModelProperty(value = "意见", example = "MMMMMMMM") @ApiModelProperty(value = "意见", example = "MMMMMMMM")
private String opinion; private String opinion;
@ApiModelProperty(value = "状态 2同意 3拒绝", example = "2") @ApiModelProperty(value = "状态 2同意 3拒绝", example = "2", required = true)
private Integer sts; private Integer sts;
} }
src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java
...@@ -24,27 +24,25 @@ public class SpmkApproveSummaryDto{ ...@@ -24,27 +24,25 @@ public class SpmkApproveSummaryDto{
/* /*
* 审批汇总 * 审批汇总
*/ */
@ApiModelProperty(value = "标题 ", example = "标题") @ApiModelProperty(value = "标题 ", example = "标题", required = true)
private String title; private String title;
@ApiModelProperty(value = "审批名称 ", example = "审批名称") @ApiModelProperty(value = "审批名称 ", example = "审批名称", required = true)
private String approveName; private String approveName;
@ApiModelProperty(value = "发起人名称 ", example = "发起人名称") @ApiModelProperty(value = "发起人名称 ", example = "发起人名称", required = true)
private String initiator; private String initiator;
@ApiModelProperty(value = "关联类型 1转正 2离职 3调薪 4调岗 5加班 6请假 7出差 8外出 9补卡", example = "5") @ApiModelProperty(value = "关联类型 1转正 2离职 3调薪 4调岗 5加班 6请假 7出差 8外出 9补卡 ", example = "5")
private Integer assoType; private Integer assoType;
@ApiModelProperty(value = "申请数据 ", example = "申请数据") @ApiModelProperty(value = "申请数据 ", example = "申请数据", required = true)
private JSONObject requestData; private JSONObject requestData;
@ApiModelProperty(value = "审批表单 ", example = "数组") @ApiModelProperty(value = "审批表单 ", example = "数组", required = true)
private List<JSONObject> froms; private List<JSONObject> froms;
@ApiModelProperty(value = "审批流程 ", example = "审批流程") @ApiModelProperty(value = "审批流程 ", example = "审批流程", required = true)
private Router router; private Router router;
} }
src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java
...@@ -59,7 +59,7 @@ public class SpmkCustomApprovalDto { ...@@ -59,7 +59,7 @@ public class SpmkCustomApprovalDto {
@ApiModelProperty(value = "审批流程 ", example = "审批流程") @ApiModelProperty(value = "审批流程 ", example = "审批流程")
private Router router; private Router router;
@ApiModelProperty(value = "可见发起人配置 ", example = "可见发起人配置 ") @ApiModelProperty(value = "可见发起人配置 ", example = "数组类型")
private List<SpmkInitiatorConfig> initiatorConfigs; private List<SpmkInitiatorConfig> initiatorConfigs;
} }
src/main/java/cn/timer/api/dto/spmk/SpmkMbKjDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkMbKjDto {
@ApiModelProperty(value="编号",example="101")
private Integer id;
@ApiModelProperty(value="名称",example="名称")
private String name;
@ApiModelProperty(value="类型",example="101")
private Integer type;
@ApiModelProperty(value="控件",example="101")
private Object kj;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpglDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import java.util.Date;
import javax.persistence.Transient;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpglDto {
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="审批组id",example="10")
private Integer spzId;
@ApiModelProperty(value="企业id",example="10")
private Integer orgCode;
@ApiModelProperty(value="审批模版_id",example="10")
private Integer mbId;
@ApiModelProperty(value="审批图标地址 ",example="审批图标地址")
private String iconAddress;
@ApiModelProperty(value="审批名称 ",example="审批名称")
private String name;
@ApiModelProperty(value="审批说明 ",example="审批说明")
private String description;
@ApiModelProperty(value="审批开关 0启用 1停用",example="0")
private Integer isOpen;
@ApiModelProperty(value="排序 排序",example="1")
private Integer sort;
@ApiModelProperty(value="审批人去重 0不启用自动去重 1同一个审批人在流程中出现多次时，仅保留第一个 2同一个审批人仅在连续出现时，自动去重",example="0")
private Integer sprqcType;
@ApiModelProperty(value="填写提示 ",example="填写提示")
private String txts;
@ApiModelProperty(value="审批意见 ",example="审批意见")
private int[] spyj;
@ApiModelProperty(value="自动通过 发起人审批时自动通过 0是 1否",example="0")
private Integer isZdtg;
@ApiModelProperty(value="打印模板 0默认模版 1自定义模版",example="0")
private Integer dymbType;
@ApiModelProperty(value="必须签名 是否 同意时必须签名 0是 1否",example="0")
private Integer isBxqm;
@ApiModelProperty(value="使用上次签名 0是 1否",example="0")
private Integer isSyscqm;
@ApiModelProperty(value="每次重新签名 0是 1否",example="0")
private Integer isMccxqm;
@ApiModelProperty(value="流程节点",example="0")
private Object lcjd;
@TableField(fill = FieldFill.UPDATE)
@ApiModelProperty(value="更新时间 ",example="更新时间")
private Date updateTime;
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value="创建时间 ",example="创建时间")
private Date createTime;
@Transient
@TableField(exist = false)
private SpmkMbKjDto spmkMbKjDto;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpglLcjdDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpglLcjdDto {
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="审批组id",example="10")
private Integer spzId;
@ApiModelProperty(value="企业id",example="10")
private Integer orgCode;
@ApiModelProperty(value="审批模版_id",example="10")
private Integer mbId;
@ApiModelProperty(value="审批图标地址 ",example="审批图标地址")
private String iconAddress;
@ApiModelProperty(value="审批名称 ",example="审批名称")
private String name;
@ApiModelProperty(value="审批说明 ",example="审批说明")
private String description;
@ApiModelProperty(value="审批开关 0启用 1停用",example="0")
private Integer isOpen;
@ApiModelProperty(value="排序 排序",example="1")
private Integer sort;
@ApiModelProperty(value="审批人去重 0不启用自动去重 1同一个审批人在流程中出现多次时，仅保留第一个 2同一个审批人仅在连续出现时，自动去重",example="0")
private Integer sprqcType;
@ApiModelProperty(value="填写提示 ",example="填写提示")
private String txts;
@ApiModelProperty(value="审批意见 ",example="1,2,3")
private String spyj;
@ApiModelProperty(value="自动通过 发起人审批时自动通过 0是 1否",example="0")
private Integer isZdtg;
@ApiModelProperty(value="打印模板 0默认模版 1自定义模版",example="0")
private Integer dymbType;
@ApiModelProperty(value="必须签名 是否 同意时必须签名 0是 1否",example="0")
private Integer isBxqm;
@ApiModelProperty(value="使用上次签名 0是 1否",example="0")
private Integer isSyscqm;
@ApiModelProperty(value="每次重新签名 0是 1否",example="0")
private Integer isMccxqm;
@ApiModelProperty(value="流程节点",example="0")
private Object lcjd;
@TableField(fill = FieldFill.UPDATE)
@ApiModelProperty(value="更新时间 ",example="更新时间")
private Date updateTime;
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value="创建时间 ",example="创建时间")
private Date createTime;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpglMoveDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpglMoveDto {
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="审批组id",example="10")
private Integer spzId;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpglSortDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpglSortDto {
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="排序",example="1")
private Integer sort;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpzDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpzDto {
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="组名",example="人事")
private String name;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpzSortDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpzSortDto {
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="排序",example="1")
private Integer sort;
}
src/main/java/cn/timer/api/dto/spmk/SpmkSpzSpglDto.java deleted 100644 → 0
package cn.timer.api.dto.spmk;
import java.util.List;
import cn.timer.api.bean.spmk.SpmkSpgl;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SpmkSpzSpglDto {
@ApiModelProperty(value="编号 编号",example="1")
private Integer id;
@ApiModelProperty(value="企业id",example="117")
private Integer orgCode;
@ApiModelProperty(value="组名 ",example="人事")
private String name;
@ApiModelProperty(value="排序 排序",example="1")
private Integer sort;
@ApiModelProperty(value="是否可编辑 0是 1否",example="0")
private Integer isEditable;
private List<SpmkSpgl> spmkSpgls;
}
src/main/java/cn/timer/api/utils/router/RouterUtils.java
...@@ -418,8 +418,6 @@ public class RouterUtils { ...@@ -418,8 +418,6 @@ public class RouterUtils {
}else if (EXECUTING.equals(listFlowChildren.get(i).getExecute())) { }else if (EXECUTING.equals(listFlowChildren.get(i).getExecute())) {
// 新增 执行人
// listUser = flowChildren.getRelation().get(0).getUsers();
for (int i_user = 0, n_user = listUser.size(); i_user < n_user; i_user++) { for (int i_user = 0, n_user = listUser.size(); i_user < n_user; i_user++) {
if (EXECUTED.equals(listUser.get(i_user).getExecute())) { if (EXECUTED.equals(listUser.get(i_user).getExecute())) {
...@@ -518,8 +516,6 @@ public class RouterUtils { ...@@ -518,8 +516,6 @@ public class RouterUtils {
// 新增 审批执行记录 // 新增 审批执行记录
aer2.insert(); aer2.insert();
// 新增 执行人
// listUser = flowChildren.getRelation().get(0).getUsers();
for (int i_user2 = 0,n_user2 = listUser.size(); i_user2 < n_user2; i_user2++) { for (int i_user2 = 0,n_user2 = listUser.size(); i_user2 < n_user2; i_user2++) {
User u = listUser.get(i_user2); User u = listUser.get(i_user2);
SpmkExecutor executor = SpmkExecutor.builder() SpmkExecutor executor = SpmkExecutor.builder()
......
src/main/resources/mapping/spmk/SpmkClrMapper.xml deleted 100644 → 0
<?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.spmk.SpmkClrMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkClr" >
<result column="Id" property="id" />
<result column="lcjd_id" property="lcjdId" />
<result column="spcz_id" property="spczId" />
<result column="emp_num" property="empNum" />
<result column="type" property="type" />
<result column="operation" property="operation" />
<result column="sts" property="sts" />
<result column="spyj" property="spyj" />
</resultMap>
<sql id="Base_Column_List">
Id,
lcjd_id,
spcz_id,
emp_num,
type,
operation,
sts,
spyj
</sql>
<sql id="Base_Column_List_Alias">
Id SpmkClr_Id,
lcjd_id SpmkClr_lcjd_id,
spcz_id SpmkClr_spcz_id,
emp_num SpmkClr_emp_num,
type SpmkClr_type,
operation SpmkClr_operation,
sts SpmkClr_sts,
spyj SpmkClr_spyj
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkClr">
INSERT INTO spmk_clr
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != id'>
Id,
</if>
<if test ='null != lcjdId'>
lcjd_id,
</if>
<if test ='null != spczId'>
spcz_id,
</if>
<if test ='null != empNum'>
emp_num,
</if>
<if test ='null != type'>
type,
</if>
<if test ='null != operation'>
operation,
</if>
<if test ='null != sts'>
sts,
</if>
<if test ='null != spyj'>
spyj
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != id'>
#{id},
</if>
<if test ='null != lcjdId'>
#{lcjdId},
</if>
<if test ='null != spczId'>
#{spczId},
</if>
<if test ='null != empNum'>
#{empNum},
</if>
<if test ='null != type'>
#{type},
</if>
<if test ='null != operation'>
#{operation},
</if>
<if test ='null != sts'>
#{sts},
</if>
<if test ='null != spyj'>
#{spyj}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_clr
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkClr">
UPDATE spmk_clr
<set>
<if test ='null != id'>Id = #{id},</if>
<if test ='null != lcjdId'>lcjd_id = #{lcjdId},</if>
<if test ='null != spczId'>spcz_id = #{spczId},</if>
<if test ='null != empNum'>emp_num = #{empNum},</if>
<if test ='null != type'>type = #{type},</if>
<if test ='null != operation'>operation = #{operation},</if>
<if test ='null != sts'>sts = #{sts},</if>
<if test ='null != spyj'>spyj = #{spyj}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_clr
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_clr
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_clr
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkJqgzMapper.xml deleted 100644 → 0
<?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.spmk.SpmkJqgzMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkJqgz" >
<id column="id" property="id" />
<result column="org_code" property="orgCode" />
<result column="name" property="name" />
<result column="ygztqjgz" property="ygztqjgz" />
<result column="zxqjdw_type" property="zxqjdwType" />
<result column="qjschsfs_type" property="qjschsfsType" />
<result column="syfw" property="syfw" />
<result column="is_jrxc" property="isJrxc" />
<result column="create_time" property="createTime" />
</resultMap>
<sql id="Base_Column_List">
id,
org_code,
name,
ygztqjgz,
zxqjdw_type,
qjschsfs_type,
syfw,
is_jrxc,
create_time
</sql>
<sql id="Base_Column_List_Alias">
id SpmkJqgz_id,
org_code SpmkJqgz_org_code,
name SpmkJqgz_name,
ygztqjgz SpmkJqgz_ygztqjgz,
zxqjdw_type SpmkJqgz_zxqjdw_type,
qjschsfs_type SpmkJqgz_qjschsfs_type,
syfw SpmkJqgz_syfw,
is_jrxc SpmkJqgz_is_jrxc,
create_time SpmkJqgz_create_time
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkJqgz">
INSERT INTO spmk_jqgz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'>
org_code,
</if>
<if test ='null != name'>
name,
</if>
<if test ='null != ygztqjgz'>
ygztqjgz,
</if>
<if test ='null != zxqjdwType'>
zxqjdw_type,
</if>
<if test ='null != qjschsfsType'>
qjschsfs_type,
</if>
<if test ='null != syfw'>
syfw,
</if>
<if test ='null != isJrxc'>
is_jrxc,
</if>
<if test ='null != createTime'>
create_time
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'>
#{orgCode},
</if>
<if test ='null != name'>
#{name},
</if>
<if test ='null != ygztqjgz'>
#{ygztqjgz},
</if>
<if test ='null != zxqjdwType'>
#{zxqjdwType},
</if>
<if test ='null != qjschsfsType'>
#{qjschsfsType},
</if>
<if test ='null != syfw'>
#{syfw},
</if>
<if test ='null != isJrxc'>
#{isJrxc},
</if>
<if test ='null != createTime'>
#{createTime}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_jqgz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkJqgz">
UPDATE spmk_jqgz
<set>
<if test ='null != orgCode'>org_code = #{orgCode},</if>
<if test ='null != name'>name = #{name},</if>
<if test ='null != ygztqjgz'>ygztqjgz = #{ygztqjgz},</if>
<if test ='null != zxqjdwType'>zxqjdw_type = #{zxqjdwType},</if>
<if test ='null != qjschsfsType'>qjschsfs_type = #{qjschsfsType},</if>
<if test ='null != syfw'>syfw = #{syfw},</if>
<if test ='null != isJrxc'>is_jrxc = #{isJrxc},</if>
<if test ='null != createTime'>create_time = #{createTime}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_jqgz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_jqgz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_jqgz
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkKjMapper.xml deleted 100644 → 0
<?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.spmk.SpmkKjMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkKj" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="type" property="type" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
type
</sql>
<sql id="Base_Column_List_Alias">
id SpmkKj_id,
name SpmkKj_name,
type SpmkKj_type
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkKj">
INSERT INTO spmk_kj
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != name'>
name,
</if>
<if test ='null != type'>
type
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != name'>
#{name},
</if>
<if test ='null != type'>
#{type}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_kj
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkKj">
UPDATE spmk_kj
<set>
<if test ='null != name'>name = #{name},</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 spmk_kj
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_kj
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_kj
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkKjMkMapper.xml deleted 100644 → 0
<?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.spmk.SpmkKjMkMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkKjMk" >
<id column="id" property="id" />
<result column="kjpz_id" property="kjpzId" />
<result column="mb_id" property="mbId" />
<result column="sort" property="sort" />
</resultMap>
<sql id="Base_Column_List">
id,
kjpz_id,
mb_id,
sort
</sql>
<sql id="Base_Column_List_Alias">
id SpmkKjMk_id,
kjpz_id SpmkKjMk_kjpz_id,
mb_id SpmkKjMk_mb_id,
sort SpmkKjMk_sort
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkKjMk">
INSERT INTO spmk_kj_mk
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != kjpzId'>
kjpz_id,
</if>
<if test ='null != mbId'>
mb_id,
</if>
<if test ='null != sort'>
sort
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != kjpzId'>
#{kjpzId},
</if>
<if test ='null != mbId'>
#{mbId},
</if>
<if test ='null != sort'>
#{sort}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_kj_mk
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkKjMk">
UPDATE spmk_kj_mk
<set>
<if test ='null != kjpzId'>kjpz_id = #{kjpzId},</if>
<if test ='null != mbId'>mb_id = #{mbId},</if>
<if test ='null != sort'>sort = #{sort}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_kj_mk
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_kj_mk
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_kj_mk
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkKjpzMapper.xml deleted 100644 → 0
<?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.spmk.SpmkKjpzMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkKjpz" >
<id column="id" property="id" />
<result column="kj_id" property="kjId" />
<result column="title" property="title" />
<result column="titletwo" property="titletwo" />
<result column="type" property="type" />
<result column="tswz" property="tswz" />
<result column="dzmc" property="dzmc" />
<result column="is_yz" property="isYz" />
<result column="is_dy" property="isDy" />
<result column="time_type" property="timeType" />
<result column="is_syzp" property="isSyzp" />
<result column="dygs_type" property="dygsType" />
<result column="is_show" property="isShow" />
<result column="ljtz_url" property="ljtzUrl" />
<result column="is_showup" property="isShowup" />
<result column="xx_type" property="xxType" />
<result column="jsgs" property="jsgs" />
<result column="glspd_id" property="glspdId" />
<result column="description" property="description" />
</resultMap>
<sql id="Base_Column_List">
id,
kj_id,
title,
titletwo,
type,
tswz,
dzmc,
is_yz,
is_dy,
time_type,
is_syzp,
dygs_type,
is_show,
ljtz_url,
is_showup,
xx_type,
jsgs,
glspd_id,
description
</sql>
<sql id="Base_Column_List_Alias">
id SpmkKjpz_id,
kj_id SpmkKjpz_kj_id,
title SpmkKjpz_title,
titletwo SpmkKjpz_titletwo,
type SpmkKjpz_type,
tswz SpmkKjpz_tswz,
dzmc SpmkKjpz_dzmc,
is_yz SpmkKjpz_is_yz,
is_dy SpmkKjpz_is_dy,
time_type SpmkKjpz_time_type,
is_syzp SpmkKjpz_is_syzp,
dygs_type SpmkKjpz_dygs_type,
is_show SpmkKjpz_is_show,
ljtz_url SpmkKjpz_ljtz_url,
is_showup SpmkKjpz_is_showup,
xx_type SpmkKjpz_xx_type,
jsgs SpmkKjpz_jsgs,
glspd_id SpmkKjpz_glspd_id,
description SpmkKjpz_description
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkKjpz">
INSERT INTO spmk_kjpz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != kjId'>
kj_id,
</if>
<if test ='null != title'>
title,
</if>
<if test ='null != titletwo'>
titletwo,
</if>
<if test ='null != type'>
type,
</if>
<if test ='null != tswz'>
tswz,
</if>
<if test ='null != dzmc'>
dzmc,
</if>
<if test ='null != isYz'>
is_yz,
</if>
<if test ='null != isDy'>
is_dy,
</if>
<if test ='null != timeType'>
time_type,
</if>
<if test ='null != isSyzp'>
is_syzp,
</if>
<if test ='null != dygsType'>
dygs_type,
</if>
<if test ='null != isShow'>
is_show,
</if>
<if test ='null != ljtzUrl'>
ljtz_url,
</if>
<if test ='null != isShowup'>
is_showup,
</if>
<if test ='null != xxType'>
xx_type,
</if>
<if test ='null != jsgs'>
jsgs,
</if>
<if test ='null != glspdId'>
glspd_id,
</if>
<if test ='null != description'>
description
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != kjId'>
#{kjId},
</if>
<if test ='null != title'>
#{title},
</if>
<if test ='null != titletwo'>
#{titletwo},
</if>
<if test ='null != type'>
#{type},
</if>
<if test ='null != tswz'>
#{tswz},
</if>
<if test ='null != dzmc'>
#{dzmc},
</if>
<if test ='null != isYz'>
#{isYz},
</if>
<if test ='null != isDy'>
#{isDy},
</if>
<if test ='null != timeType'>
#{timeType},
</if>
<if test ='null != isSyzp'>
#{isSyzp},
</if>
<if test ='null != dygsType'>
#{dygsType},
</if>
<if test ='null != isShow'>
#{isShow},
</if>
<if test ='null != ljtzUrl'>
#{ljtzUrl},
</if>
<if test ='null != isShowup'>
#{isShowup},
</if>
<if test ='null != xxType'>
#{xxType},
</if>
<if test ='null != jsgs'>
#{jsgs},
</if>
<if test ='null != glspdId'>
#{glspdId},
</if>
<if test ='null != description'>
#{description}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_kjpz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkKjpz">
UPDATE spmk_kjpz
<set>
<if test ='null != kjId'>kj_id = #{kjId},</if>
<if test ='null != title'>title = #{title},</if>
<if test ='null != titletwo'>titletwo = #{titletwo},</if>
<if test ='null != type'>type = #{type},</if>
<if test ='null != tswz'>tswz = #{tswz},</if>
<if test ='null != dzmc'>dzmc = #{dzmc},</if>
<if test ='null != isYz'>is_yz = #{isYz},</if>
<if test ='null != isDy'>is_dy = #{isDy},</if>
<if test ='null != timeType'>time_type = #{timeType},</if>
<if test ='null != isSyzp'>is_syzp = #{isSyzp},</if>
<if test ='null != dygsType'>dygs_type = #{dygsType},</if>
<if test ='null != isShow'>is_show = #{isShow},</if>
<if test ='null != ljtzUrl'>ljtz_url = #{ljtzUrl},</if>
<if test ='null != isShowup'>is_showup = #{isShowup},</if>
<if test ='null != xxType'>xx_type = #{xxType},</if>
<if test ='null != jsgs'>jsgs = #{jsgs},</if>
<if test ='null != glspdId'>glspd_id = #{glspdId},</if>
<if test ='null != description'>description = #{description}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_kjpz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_kjpz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_kjpz
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkLcjdEmpAssoMapper.xml deleted 100644 → 0
<?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.spmk.SpmkLcjdEmpAssoMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkLcjdEmpAsso" >
<id column="id" property="id" />
<result column="lcjd_id" property="lcjdId" />
<result column="emp_num" property="empNum" />
<result column="bmgw_id" property="bmgwId" />
<result column="is_editable" property="isEditable" />
</resultMap>
<sql id="Base_Column_List">
id,
lcjd_id,
emp_num,
bmgw_id,
is_editable
</sql>
<sql id="Base_Column_List_Alias">
id SpmkLcjdEmpAsso_id,
lcjd_id SpmkLcjdEmpAsso_lcjd_id,
emp_num SpmkLcjdEmpAsso_emp_num,
bmgw_id SpmkLcjdEmpAsso_bmgw_id,
is_editable SpmkLcjdEmpAsso_is_editable
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkLcjdEmpAsso">
INSERT INTO spmk_lcjd_emp_asso
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != lcjdId'>
lcjd_id,
</if>
<if test ='null != empNum'>
emp_num,
</if>
<if test ='null != bmgwId'>
bmgw_id,
</if>
<if test ='null != isEditable'>
is_editable
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != lcjdId'>
#{lcjdId},
</if>
<if test ='null != empNum'>
#{empNum},
</if>
<if test ='null != bmgwId'>
#{bmgwId},
</if>
<if test ='null != isEditable'>
#{isEditable}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_lcjd_emp_asso
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkLcjdEmpAsso">
UPDATE spmk_lcjd_emp_asso
<set>
<if test ='null != lcjdId'>lcjd_id = #{lcjdId},</if>
<if test ='null != empNum'>emp_num = #{empNum},</if>
<if test ='null != bmgwId'>bmgw_id = #{bmgwId},</if>
<if test ='null != isEditable'>is_editable = #{isEditable}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_lcjd_emp_asso
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_lcjd_emp_asso
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_lcjd_emp_asso
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkLcjdMapper.xml deleted 100644 → 0
<?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.spmk.SpmkLcjdMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkLcjd" >
<id column="id" property="id" />
<result column="spgl_id" property="spglId" />
<result column="name" property="name" />
<result column="type" property="type" />
<result column="up_id" property="upId" />
<result column="dowm_id" property="dowmId" />
<result column="yxj" property="yxj" />
<result column="sprsz_type" property="sprszType" />
<result column="is_dsp" property="isDsp" />
<result column="spfs_type" property="spfsType" />
<result column="sprwk_type" property="sprwkType" />
</resultMap>
<sql id="Base_Column_List">
id,
spgl_id,
name,
type,
up_id,
dowm_id,
yxj,
sprsz_type,
is_dsp,
spfs_type,
sprwk_type
</sql>
<sql id="Base_Column_List_Alias">
id SpmkLcjd_id,
spgl_id SpmkLcjd_spgl_id,
name SpmkLcjd_name,
type SpmkLcjd_type,
up_id SpmkLcjd_up_id,
dowm_id SpmkLcjd_dowm_id,
yxj SpmkLcjd_yxj,
sprsz_type SpmkLcjd_sprsz_type,
is_dsp SpmkLcjd_is_dsp,
spfs_type SpmkLcjd_spfs_type,
sprwk_type SpmkLcjd_sprwk_type
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkLcjd">
INSERT INTO spmk_lcjd
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != spglId'>
spgl_id,
</if>
<if test ='null != name'>
name,
</if>
<if test ='null != type'>
type,
</if>
<if test ='null != upId'>
up_id,
</if>
<if test ='null != dowmId'>
dowm_id,
</if>
<if test ='null != yxj'>
yxj,
</if>
<if test ='null != sprszType'>
sprsz_type,
</if>
<if test ='null != isDsp'>
is_dsp,
</if>
<if test ='null != spfsType'>
spfs_type,
</if>
<if test ='null != sprwkType'>
sprwk_type
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != spglId'>
#{spglId},
</if>
<if test ='null != name'>
#{name},
</if>
<if test ='null != type'>
#{type},
</if>
<if test ='null != upId'>
#{upId},
</if>
<if test ='null != dowmId'>
#{dowmId},
</if>
<if test ='null != yxj'>
#{yxj},
</if>
<if test ='null != sprszType'>
#{sprszType},
</if>
<if test ='null != isDsp'>
#{isDsp},
</if>
<if test ='null != spfsType'>
#{spfsType},
</if>
<if test ='null != sprwkType'>
#{sprwkType}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_lcjd
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkLcjd">
UPDATE spmk_lcjd
<set>
<if test ='null != spglId'>spgl_id = #{spglId},</if>
<if test ='null != name'>name = #{name},</if>
<if test ='null != type'>type = #{type},</if>
<if test ='null != upId'>up_id = #{upId},</if>
<if test ='null != dowmId'>dowm_id = #{dowmId},</if>
<if test ='null != yxj'>yxj = #{yxj},</if>
<if test ='null != sprszType'>sprsz_type = #{sprszType},</if>
<if test ='null != isDsp'>is_dsp = #{isDsp},</if>
<if test ='null != spfsType'>spfs_type = #{spfsType},</if>
<if test ='null != sprwkType'>sprwk_type = #{sprwkType}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_lcjd
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_lcjd
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_lcjd
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkMbMapper.xml deleted 100644 → 0
<?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.spmk.SpmkMbMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkMb" >
<id column="id" property="id" />
<result column="name" property="name" />
<result column="type" property="type" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
type
</sql>
<sql id="Base_Column_List_Alias">
id SpmkMb_id,
name SpmkMb_name,
type SpmkMb_type
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkMb">
INSERT INTO spmk_mb
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != name'>
name,
</if>
<if test ='null != type'>
type
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != name'>
#{name},
</if>
<if test ='null != type'>
#{type}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_mb
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkMb">
UPDATE spmk_mb
<set>
<if test ='null != name'>name = #{name},</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 spmk_mb
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_mb
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_mb
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkSpczMapper.xml deleted 100644 → 0
<?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.spmk.SpmkSpczMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkSpcz" >
<id column="id" property="id" />
<result column="spgl_id" property="spglId" />
<result column="title" property="title" />
<result column="digest" property="digest" />
<result column="spr_emp_num" property="sprEmpNum" />
<result column="sts" property="sts" />
<result column="lcmc" property="lcmc" />
<result column="create_time" property="createTime" />
<result column="end_time" property="endTime" />
<result column="nr" property="nr" />
</resultMap>
<sql id="Base_Column_List">
id,
spgl_id,
title,
digest,
spr_emp_num,
sts,
lcmc,
create_time,
end_time,
nr
</sql>
<sql id="Base_Column_List_Alias">
id SpmkSpcz_id,
spgl_id SpmkSpcz_spgl_id,
title SpmkSpcz_title,
digest SpmkSpcz_digest,
spr_emp_num SpmkSpcz_spr_emp_num,
sts SpmkSpcz_sts,
lcmc SpmkSpcz_lcmc,
create_time SpmkSpcz_create_time,
end_time SpmkSpcz_end_time,
nr SpmkSpcz_nr
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkSpcz">
INSERT INTO spmk_spcz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != spglId'>
spgl_id,
</if>
<if test ='null != title'>
title,
</if>
<if test ='null != digest'>
digest,
</if>
<if test ='null != sprEmpNum'>
spr_emp_num,
</if>
<if test ='null != sts'>
sts,
</if>
<if test ='null != lcmc'>
lcmc,
</if>
<if test ='null != createTime'>
create_time,
</if>
<if test ='null != endTime'>
end_time
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != spglId'>
#{spglId},
</if>
<if test ='null != title'>
#{title},
</if>
<if test ='null != digest'>
#{digest},
</if>
<if test ='null != sprEmpNum'>
#{sprEmpNum},
</if>
<if test ='null != sts'>
#{sts},
</if>
<if test ='null != lcmc'>
#{lcmc},
</if>
<if test ='null != createTime'>
#{createTime},
</if>
<if test ='null != endTime'>
#{endTime}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_spcz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkSpcz">
UPDATE spmk_spcz
<set>
<if test ='null != spglId'>spgl_id = #{spglId},</if>
<if test ='null != title'>title = #{title},</if>
<if test ='null != digest'>digest = #{digest},</if>
<if test ='null != sprEmpNum'>spr_emp_num = #{sprEmpNum},</if>
<if test ='null != sts'>sts = #{sts},</if>
<if test ='null != lcmc'>lcmc = #{lcmc},</if>
<if test ='null != createTime'>create_time = #{createTime},</if>
<if test ='null != endTime'>end_time = #{endTime}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spcz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spcz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_spcz
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkSpglMapper.xml deleted 100644 → 0
<?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.spmk.SpmkSpglMapper">
<!--
<resultMap id="SpmkSpglDto" type="cn.timer.api.dto.spmk.SpmkSpglDto" >
<id column="id" property="id" />
<result column="org_code" property="orgCode" />
<result column="spz_id" property="spzId" />
<result column="mb_id" property="mbId" />
<result column="icon_address" property="iconAddress" />
<result column="name" property="name" />
<result column="description" property="description" />
<result column="is_open" property="isOpen" />
<result column="sort" property="sort" />
<result column="sprqc_type" property="sprqcType" />
<result column="txts" property="txts" />
<result column="spyj" property="spyj" />
<result column="is_zdtg" property="isZdtg" />
<result column="dymb_type" property="dymbType" />
<result column="is_bxqm" property="isBxqm" />
<result column="is_syscqm" property="isSyscqm" />
<result column="is_mccxqm" property="isMccxqm" />
<result column="update_time" property="updateTime" />
<result column="create_time" property="createTime" />
<collection column="SpmkKjpz_id" property="spmkKjpzs" ofType="cn.timer.api.bean.spmk.SpmkKjpz" javaType="java.util.ArrayList">
<id column="SpmkKjpz_id" property="id" />
<result column="SpmkKjpz_kj_id" property="kjId" />
<result column="SpmkKjpz_title" property="title" />
<result column="SpmkKjpz_titletwo" property="titletwo" />
<result column="SpmkKjpz_type" property="type" />
<result column="SpmkKjpz_tswz" property="tswz" />
<result column="SpmkKjpz_dzmc" property="dzmc" />
<result column="SpmkKjpz_is_yz" property="isYz" />
<result column="SpmkKjpz_is_dy" property="isDy" />
<result column="SpmkKjpz_time_type" property="timeType" />
<result column="SpmkKjpz_is_syzp" property="isSyzp" />
<result column="SpmkKjpz_dygs_type" property="dygsType" />
<result column="SpmkKjpz_is_show" property="isShow" />
<result column="SpmkKjpz_ljtz_url" property="ljtzUrl" />
<result column="SpmkKjpz_is_showup" property="isShowup" />
<result column="SpmkKjpz_xx_type" property="xxType" />
<result column="SpmkKjpz_jsgs" property="jsgs" />
<result column="SpmkKjpz_glspd_id" property="glspdId" />
<result column="SpmkKjpz_description" property="description" />
<collection column="SpmkXzx_id" property="spmkXzxs" ofType="cn.timer.api.bean.spmk.SpmkXzx"
javaType="java.util.ArrayList" columnPrefix="SpmkXzx_" >
<id column="id" property="id" />
<result column="kjpz_id" property="kjpzId" />
<result column="value" property="value" />
<result column="sort" property="sort" />
</collection>
</collection>
<collection column="SpmkLcjd_id" property="spmkLcjds" ofType="cn.timer.api.bean.spmk.SpmkLcjd" javaType="java.util.ArrayList">
<id column="SpmkLcjd_id" property="id" />
<result column="SpmkLcjd_spgl_id" property="spglId" />
<result column="SpmkLcjd_name" property="name" />
<result column="SpmkLcjd_type" property="type" />
<result column="SpmkLcjd_up_id" property="upId" />
<result column="SpmkLcjd_dowm_id" property="dowmId" />
<result column="SpmkLcjd_yxj" property="yxj" />
<result column="SpmkLcjd_sprsz_type" property="sprszType" />
<result column="SpmkLcjd_is_dsp" property="isDsp" />
<result column="SpmkLcjd_spfs_type" property="spfsType" />
<result column="SpmkLcjd_sprwk_type" property="sprwkType" />
<collection column="SpmkSxpz_id" property="spmkSxpzs" ofType="cn.timer.api.bean.spmk.SpmkSxpz"
javaType="java.util.ArrayList" columnPrefix="SpmkSxpz_" resultMap="cn.timer.api.dao.spmk.SpmkSxpzMapper.BaseResultMap">
</collection>
<collection column="SpmkLcjdEmpAsso_id" property="spmkLcjdEmpAssos" ofType="cn.timer.api.bean.spmk.SpmkLcjdEmpAsso"
javaType="java.util.ArrayList" columnPrefix="SpmkLcjdEmpAsso_" resultMap="cn.timer.api.dao.spmk.SpmkLcjdEmpAssoMapper.BaseResultMap">
</collection>
</collection>
</resultMap>
-->
<resultMap id="SpmkSpglMbDto" type="cn.timer.api.bean.spmk.SpmkSpgl" >
<id column="id" property="id" />
<result column="org_code" property="orgCode" />
<result column="spz_id" property="spzId" />
<result column="mb_id" property="mbId" />
<result column="icon_address" property="iconAddress" />
<result column="name" property="name" />
<result column="description" property="description" />
<result column="is_open" property="isOpen" />
<result column="sort" property="sort" />
<result column="sprqc_type" property="sprqcType" />
<result column="txts" property="txts" />
<result column="spyj" property="spyj" />
<result column="is_zdtg" property="isZdtg" />
<result column="dymb_type" property="dymbType" />
<result column="is_bxqm" property="isBxqm" />
<result column="is_syscqm" property="isSyscqm" />
<result column="is_mccxqm" property="isMccxqm" />
<result column="update_time" property="updateTime" />
<result column="create_time" property="createTime" />
<result column="lcjd" property="lcjd" />
<association property="spmkMb" javaType="cn.timer.api.bean.spmk.SpmkMb">
<id column="SpmkMb_id" property="id" />
<result column="SpmkMb_name" property="name" />
<result column="SpmkMb_type" property="type" />
<result column="SpmkMb_kj" property="kj" />
</association>
</resultMap>
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkSpgl" >
<id column="id" property="id" />
<result column="org_code" property="orgCode" />
<result column="spz_id" property="spzId" />
<result column="mb_id" property="mbId" />
<result column="icon_address" property="iconAddress" />
<result column="name" property="name" />
<result column="description" property="description" />
<result column="is_open" property="isOpen" />
<result column="sort" property="sort" />
<result column="sprqc_type" property="sprqcType" />
<result column="txts" property="txts" />
<result column="spyj" property="spyj" />
<result column="is_zdtg" property="isZdtg" />
<result column="dymb_type" property="dymbType" />
<result column="is_bxqm" property="isBxqm" />
<result column="is_syscqm" property="isSyscqm" />
<result column="is_mccxqm" property="isMccxqm" />
<result column="update_time" property="updateTime" />
<result column="create_time" property="createTime" />
</resultMap>
<sql id="Base_Column_List">
a.id,
a.org_code,
a.spz_id,
a.mb_id,
a.icon_address,
a.name,
a.description,
a.is_open,
a.sort,
a.sprqc_type,
a.txts,
a.spyj,
a.is_zdtg,
a.dymb_type,
a.is_bxqm,
a.is_syscqm,
a.is_mccxqm,
a.lcjd,
a.update_time,
a.create_time
</sql>
<sql id="Base_Column_List_Alias">
id SpmkSpgl_id,
org_code SpmkSpgl_org_code,
spz_id SpmkSpgl_spz_id,
mb_id SpmkSpgl_mb_id,
icon_address SpmkSpgl_icon_address,
name SpmkSpgl_name,
description SpmkSpgl_description,
is_open SpmkSpgl_is_open,
sort SpmkSpgl_sort,
sprqc_type SpmkSpgl_sprqc_type,
txts SpmkSpgl_txts,
spyj SpmkSpgl_spyj,
is_zdtg SpmkSpgl_is_zdtg,
dymb_type SpmkSpgl_dymb_type,
is_bxqm SpmkSpgl_is_bxqm,
is_syscqm SpmkSpgl_is_syscqm,
is_mccxqm SpmkSpgl_is_mccxqm,
update_time SpmkSpgl_update_time,
create_time SpmkSpgl_create_time
</sql>
<sql id="SpmkKjpz_Alias">
c.id SpmkKjpz_id,
c.kj_id SpmkKjpz_kj_id,
c.title SpmkKjpz_title,
c.titletwo SpmkKjpz_titletwo,
c.type SpmkKjpz_type,
c.tswz SpmkKjpz_tswz,
c.dzmc SpmkKjpz_dzmc,
c.is_yz SpmkKjpz_is_yz,
c.is_dy SpmkKjpz_is_dy,
c.time_type SpmkKjpz_time_type,
c.is_syzp SpmkKjpz_is_syzp,
c.dygs_type SpmkKjpz_dygs_type,
c.is_show SpmkKjpz_is_show,
c.ljtz_url SpmkKjpz_ljtz_url,
c.is_showup SpmkKjpz_is_showup,
c.xx_type SpmkKjpz_xx_type,
c.jsgs SpmkKjpz_jsgs,
c.glspd_id SpmkKjpz_glspd_id,
c.description SpmkKjpz_description
</sql>
<sql id="SpmkXzx_Alias">
d.id SpmkXzx_id,
d.kjpz_id SpmkXzx_kjpz_id,
d.value SpmkXzx_value,
d.sort SpmkXzx_sort
</sql>
<sql id="SpmkLcjd_Alias">
e.id SpmkLcjd_id,
e.spgl_id SpmkLcjd_spgl_id,
e.name SpmkLcjd_name,
e.type SpmkLcjd_type,
e.up_id SpmkLcjd_up_id,
e.dowm_id SpmkLcjd_dowm_id,
e.yxj SpmkLcjd_yxj,
e.sprsz_type SpmkLcjd_sprsz_type,
e.is_dsp SpmkLcjd_is_dsp,
e.spfs_type SpmkLcjd_spfs_type,
e.sprwk_type SpmkLcjd_sprwk_type
</sql>
<sql id="SpmkSxpz_Alias">
f.id SpmkSxpz_id,
f.lcjd_id SpmkSxpz_lcjd_id,
f.kjpz_id SpmkSxpz_kjpz_id,
f.keyz SpmkSxpz_keyz,
f.ysf_type SpmkSxpz_ysf_type,
f.val SpmkSxpz_val,
f.name SpmkSxpz_name,
f.is_valid SpmkSxpz_is_valid,
f.type SpmkSxpz_type
</sql>
<sql id="SpmkMb_Alias">
b.id SpmkMb_id,
b.name SpmkMb_name,
b.type SpmkMb_type,
b.kj SpmkMb_kj
</sql>
<sql id="SpmkLcjdEmpAsso_Alias">
g.id SpmkLcjdEmpAsso_id,
g.lcjd_id SpmkLcjdEmpAsso_lcjd_id,
g.emp_num SpmkLcjdEmpAsso_emp_num,
g.bmgw_id SpmkLcjdEmpAsso_bmgw_id,
g.is_editable SpmkLcjdEmpAsso_is_editable
</sql>
<select id="selectSpglById2" resultMap="SpmkSpglMbDto">
SELECT
<include refid="Base_Column_List" />,
<include refid="SpmkMb_Alias" />
FROM
spmk_spgl a
LEFT JOIN spmk_mb b ON a.mb_id = b.id
WHERE
a.id = #{id}
</select>
<!--
<select id="selectSpglById" resultMap="SpmkSpglDto">
SELECT
<include refid="Base_Column_List" />,
<include refid="SpmkKjpz_Alias" />,
<include refid="SpmkXzx_Alias" />,
<include refid="SpmkLcjd_Alias" />,
<include refid="SpmkLcjdEmpAsso_Alias" />,
<include refid="SpmkSxpz_Alias" />
FROM
spmk_spgl a
LEFT JOIN spmk_kj_mk b ON a.mb_id = b.mb_id
LEFT JOIN spmk_kjpz c ON c.id = b.kjpz_id
LEFT JOIN spmk_xzx d ON c.id = d.kjpz_id
LEFT JOIN spmk_lcjd e ON a.id = e.spgl_id
LEFT JOIN spmk_sxpz f ON e.id = f.lcjd_id
LEFT JOIN spmk_lcjd_emp_asso g ON e.id = g.lcjd_id
WHERE
a.id = #{id}
</select>
-->
<update id="updateListSortById" parameterType="list">
<foreach item="item" index="index" collection="list" open="" separator=";" close="">
UPDATE spmk_spgl
<set>
<if test ='null != item.sort'>sort = #{item.sort},</if>
</set>
WHERE id = #{item.id}
</foreach>
</update>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkSpgl">
INSERT INTO spmk_spgl
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'>
org_code,
</if>
<if test ='null != spzId'>
spz_id,
</if>
<if test ='null != mbId'>
mb_id,
</if>
<if test ='null != iconAddress'>
icon_address,
</if>
<if test ='null != name'>
name,
</if>
<if test ='null != description'>
description,
</if>
<if test ='null != isOpen'>
is_open,
</if>
<if test ='null != sort'>
sort,
</if>
<if test ='null != sprqcType'>
sprqc_type,
</if>
<if test ='null != txts'>
txts,
</if>
<if test ='null != spyj'>
spyj,
</if>
<if test ='null != isZdtg'>
is_zdtg,
</if>
<if test ='null != dymbType'>
dymb_type,
</if>
<if test ='null != isBxqm'>
is_bxqm,
</if>
<if test ='null != isSyscqm'>
is_syscqm,
</if>
<if test ='null != isMccxqm'>
is_mccxqm,
</if>
<if test ='null != updateTime'>
update_time,
</if>
<if test ='null != createTime'>
create_time
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'>
#{orgCode},
</if>
<if test ='null != spzId'>
#{spzId},
</if>
<if test ='null != mbId'>
#{mbId},
</if>
<if test ='null != iconAddress'>
#{iconAddress},
</if>
<if test ='null != name'>
#{name},
</if>
<if test ='null != description'>
#{description},
</if>
<if test ='null != isOpen'>
#{isOpen},
</if>
<if test ='null != sort'>
#{sort},
</if>
<if test ='null != sprqcType'>
#{sprqcType},
</if>
<if test ='null != txts'>
#{txts},
</if>
<if test ='null != spyj'>
#{spyj},
</if>
<if test ='null != isZdtg'>
#{isZdtg},
</if>
<if test ='null != dymbType'>
#{dymbType},
</if>
<if test ='null != isBxqm'>
#{isBxqm},
</if>
<if test ='null != isSyscqm'>
#{isSyscqm},
</if>
<if test ='null != isMccxqm'>
#{isMccxqm},
</if>
<if test ='null != updateTime'>
#{updateTime},
</if>
<if test ='null != createTime'>
#{createTime}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_spgl
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkSpgl">
UPDATE spmk_spgl
<set>
<if test ='null != spzId'>spz_id = #{spzId},</if>
<if test ='null != orgCode'>org_code = #{orgCode},</if>
<if test ='null != mbId'>mb_id = #{mbId},</if>
<if test ='null != iconAddress'>icon_address = #{iconAddress},</if>
<if test ='null != name'>name = #{name},</if>
<if test ='null != description'>description = #{description},</if>
<if test ='null != isOpen'>is_open = #{isOpen},</if>
<if test ='null != sort'>sort = #{sort},</if>
<if test ='null != sprqcType'>sprqc_type = #{sprqcType},</if>
<if test ='null != txts'>txts = #{txts},</if>
<if test ='null != spyj'>spyj = #{spyj},</if>
<if test ='null != isZdtg'>is_zdtg = #{isZdtg},</if>
<if test ='null != dymbType'>dymb_type = #{dymbType},</if>
<if test ='null != isBxqm'>is_bxqm = #{isBxqm},</if>
<if test ='null != isSyscqm'>is_syscqm = #{isSyscqm},</if>
<if test ='null != isMccxqm'>is_mccxqm = #{isMccxqm},</if>
<if test ='null != updateTime'>update_time = #{updateTime},</if>
<if test ='null != createTime'>create_time = #{createTime}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spgl
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spgl
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_spgl
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkSpnrMapper.xml deleted 100644 → 0
<?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.spmk.SpmkSpnrMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkSpnr" >
<id column="id" property="id" />
<result column="spcz_id" property="spczId" />
<result column="kjpz_id" property="kjpzId" />
<result column="srz1" property="srz1" />
<result column="srz2" property="srz2" />
<result column="srz3" property="srz3" />
<result column="srz4" property="srz4" />
</resultMap>
<sql id="Base_Column_List">
id,
spcz_id,
kjpz_id,
srz1,
srz2,
srz3,
srz4
</sql>
<sql id="Base_Column_List_Alias">
id SpmkSpnr_id,
spcz_id SpmkSpnr_spcz_id,
kjpz_id SpmkSpnr_kjpz_id,
srz1 SpmkSpnr_srz1,
srz2 SpmkSpnr_srz2,
srz3 SpmkSpnr_srz3,
srz4 SpmkSpnr_srz4
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkSpnr">
INSERT INTO spmk_spnr
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != spczId'>
spcz_id,
</if>
<if test ='null != kjpzId'>
kjpz_id,
</if>
<if test ='null != srz1'>
srz1,
</if>
<if test ='null != srz2'>
srz2,
</if>
<if test ='null != srz3'>
srz3,
</if>
<if test ='null != srz4'>
srz4
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != spczId'>
#{spczId},
</if>
<if test ='null != kjpzId'>
#{kjpzId},
</if>
<if test ='null != srz1'>
#{srz1},
</if>
<if test ='null != srz2'>
#{srz2},
</if>
<if test ='null != srz3'>
#{srz3},
</if>
<if test ='null != srz4'>
#{srz4}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_spnr
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkSpnr">
UPDATE spmk_spnr
<set>
<if test ='null != spczId'>spcz_id = #{spczId},</if>
<if test ='null != kjpzId'>kjpz_id = #{kjpzId},</if>
<if test ='null != srz1'>srz1 = #{srz1},</if>
<if test ='null != srz2'>srz2 = #{srz2},</if>
<if test ='null != srz3'>srz3 = #{srz3},</if>
<if test ='null != srz4'>srz4 = #{srz4}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spnr
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spnr
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_spnr
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkSpzMapper.xml deleted 100644 → 0
<?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.spmk.SpmkSpzMapper">
<resultMap id="SpmkSpzSpglDto" type="cn.timer.api.dto.spmk.SpmkSpzSpglDto" >
<id column="id" property="id" />
<result column="org_code" property="orgCode" />
<result column="name" property="name" />
<result column="sort" property="sort" />
<result column="is_editable" property="isEditable" />
<collection column="SpmkSpgl_id" property="spmkSpgls" ofType="cn.timer.api.bean.spmk.SpmkSpgl"
resultMap="cn.timer.api.dao.spmk.SpmkSpglMapper.BaseResultMap" columnPrefix="SpmkSpgl_">
</collection>
</resultMap>
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkSpz" >
<id column="id" property="id" />
<result column="org_code" property="orgCode" />
<result column="name" property="name" />
<result column="sort" property="sort" />
<result column="is_editable" property="isEditable" />
</resultMap>
<sql id="Base_Column_List">
a.id,
a.org_code,
a.name,
a.sort,
a.is_editable
</sql>
<sql id="Base_Column_List_Alias">
id SpmkSpz_id,
org_code SpmkSpz_org_code,
name SpmkSpz_name,
sort SpmkSpz_sort,
is_editable SpmkSpz_is_editable
</sql>
<sql id="Base_Column_List_SpmkSpgl_Alias">
b.id SpmkSpgl_id,
b.org_code SpmkSpgl_org_code,
b.spz_id SpmkSpgl_spz_id,
b.mb_id SpmkSpgl_mb_id,
b.icon_address SpmkSpgl_icon_address,
b.name SpmkSpgl_name,
b.description SpmkSpgl_description,
b.is_open SpmkSpgl_is_open,
b.sort SpmkSpgl_sort,
b.sprqc_type SpmkSpgl_sprqc_type,
b.txts SpmkSpgl_txts,
b.spyj SpmkSpgl_spyj,
b.is_zdtg SpmkSpgl_is_zdtg,
b.dymb_type SpmkSpgl_dymb_type,
b.is_bxqm SpmkSpgl_is_bxqm,
b.is_syscqm SpmkSpgl_is_syscqm,
b.is_mccxqm SpmkSpgl_is_mccxqm,
b.update_time SpmkSpgl_update_time,
b.create_time SpmkSpgl_create_time
</sql>
<select id="selectSpglListByOrgCode" resultMap="SpmkSpzSpglDto">
SELECT
<include refid="Base_Column_List" />,
<include refid="Base_Column_List_SpmkSpgl_Alias" />
FROM
spmk_spz a
LEFT JOIN
spmk_spgl b ON a.id = b.spz_id
WHERE
a.org_code = #{orgCode}
ORDER BY a.sort ASC,b.sort ASC
</select>
<update id="updateListSortById" parameterType="list">
<foreach item="item" index="index" collection="list" open="" separator=";" close="">
UPDATE spmk_spz
<set>
<if test ='null != item.sort'>sort = #{item.sort},</if>
</set>
WHERE id = #{item.id}
</foreach>
</update>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkSpz">
INSERT INTO spmk_spz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'>
org_code,
</if>
<if test ='null != name'>
name,
</if>
<if test ='null != sort'>
sort,
</if>
<if test ='null != isEditable'>
is_editable
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != orgCode'>
#{orgCode},
</if>
<if test ='null != name'>
#{name},
</if>
<if test ='null != sort'>
#{sort},
</if>
<if test ='null != isEditable'>
#{isEditable}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_spz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkSpz">
UPDATE spmk_spz
<set>
<if test ='null != orgCode'>org_code = #{orgCode},</if>
<if test ='null != name'>name = #{name},</if>
<if test ='null != sort'>sort = #{sort},</if>
<if test ='null != isEditable'>is_editable = #{isEditable}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_spz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_spz
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkSxpzMapper.xml deleted 100644 → 0
<?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.spmk.SpmkSxpzMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkSxpz" >
<id column="id" property="id" />
<result column="lcjd_id" property="lcjdId" />
<result column="kjpz_id" property="kjpzId" />
<result column="keyz" property="keyz" />
<result column="ysf_type" property="ysfType" />
<result column="val" property="val" />
<result column="name" property="name" />
<result column="is_valid" property="isValid" />
<result column="type" property="type" />
</resultMap>
<sql id="Base_Column_List">
id,
lcjd_id,
kjpz_id,
keyz,
ysf_type,
val,
name,
is_valid,
type
</sql>
<sql id="Base_Column_List_Alias">
id SpmkSxpz_id,
lcjd_id SpmkSxpz_lcjd_id,
kjpz_id SpmkSxpz_kjpz_id,
keyz SpmkSxpz_keyz,
ysf_type SpmkSxpz_ysf_type,
val SpmkSxpz_val,
name SpmkSxpz_name,
is_valid SpmkSxpz_is_valid,
type SpmkSxpz_type
</sql>
<!--
<insert id="insert" useGeneratedkeyss="true" keysColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkSxpz">
INSERT INTO spmk_sxpz
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != lcjdId'>
lcjd_id,
</if>
<if test ='null != kjpzId'>
kjpz_id,
</if>
<if test ='null != keyz'>
keyz,
</if>
<if test ='null != ysfType'>
ysf_type,
</if>
<if test ='null != val'>
val,
</if>
<if test ='null != name'>
name,
</if>
<if test ='null != isValid'>
is_valid,
</if>
<if test ='null != type'>
type
</if>
</trim>
<trim prefix="vals (" suffix=")" suffixOverrides=",">
<if test ='null != lcjdId'>
#{lcjdId},
</if>
<if test ='null != kjpzId'>
#{kjpzId},
</if>
<if test ='null != keyz'>
#{keyz},
</if>
<if test ='null != ysfType'>
#{ysfType},
</if>
<if test ='null != val'>
#{val},
</if>
<if test ='null != name'>
#{name},
</if>
<if test ='null != isValid'>
#{isValid},
</if>
<if test ='null != type'>
#{type}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_sxpz
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkSxpz">
UPDATE spmk_sxpz
<set>
<if test ='null != lcjdId'>lcjd_id = #{lcjdId},</if>
<if test ='null != kjpzId'>kjpz_id = #{kjpzId},</if>
<if test ='null != keyz'>keyz = #{keyz},</if>
<if test ='null != ysfType'>ysf_type = #{ysfType},</if>
<if test ='null != val'>val = #{val},</if>
<if test ='null != name'>name = #{name},</if>
<if test ='null != isValid'>is_valid = #{isValid},</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 spmk_sxpz
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_sxpz
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_sxpz
</select>
-->
</mapper>
\ No newline at end of file
src/main/resources/mapping/spmk/SpmkXzxMapper.xml deleted 100644 → 0
<?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.spmk.SpmkXzxMapper">
<resultMap id="BaseResultMap" type="cn.timer.api.bean.spmk.SpmkXzx" >
<id column="id" property="id" />
<result column="kjpz_id" property="kjpzId" />
<result column="value" property="value" />
<result column="sort" property="sort" />
</resultMap>
<sql id="Base_Column_List">
id,
kjpz_id,
value,
sort
</sql>
<sql id="Base_Column_List_Alias">
id SpmkXzx_id,
kjpz_id SpmkXzx_kjpz_id,
value SpmkXzx_value,
sort SpmkXzx_sort
</sql>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.spmk.SpmkXzx">
INSERT INTO spmk_xzx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != kjpzId'>
kjpz_id,
</if>
<if test ='null != value'>
value,
</if>
<if test ='null != sort'>
sort
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != kjpzId'>
#{kjpzId},
</if>
<if test ='null != value'>
#{value},
</if>
<if test ='null != sort'>
#{sort}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM spmk_xzx
WHERE id = #{id}
</delete>
<update id="update" parameterType="cn.timer.api.bean.spmk.SpmkXzx">
UPDATE spmk_xzx
<set>
<if test ='null != kjpzId'>kjpz_id = #{kjpzId},</if>
<if test ='null != value'>value = #{value},</if>
<if test ='null != sort'>sort = #{sort}</if>
</set>
WHERE id = #{id}
</update>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_xzx
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM spmk_xzx
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM spmk_xzx
</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