This commit is contained in:
parent
a9ca59b733
commit
6e26b144ff
|
|
@ -0,0 +1,274 @@
|
|||
package com.bonus.material.task.domain;
|
||||
|
||||
import com.bonus.common.core.annotation.Excel;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description: 任务表tm_task
|
||||
*
|
||||
* @Author 阮世耀
|
||||
* @Create 2023/12/13 15:14
|
||||
* @Version 1.0
|
||||
*/
|
||||
|
||||
@ApiModel(description = "任务表tm_task")
|
||||
@Data
|
||||
public class TmTask implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -4135112109792782142L;
|
||||
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 任务ID
|
||||
*/
|
||||
@ApiModelProperty(value = "任务ID")
|
||||
private Long taskId;
|
||||
private Long parentId;
|
||||
private Integer outNum;
|
||||
|
||||
/**
|
||||
* 任务类型(定义数据字典)
|
||||
*/
|
||||
@ApiModelProperty(value = "任务类型(数据字典)")
|
||||
private Integer taskType;
|
||||
private List<TmTask> outboundType;
|
||||
|
||||
/**
|
||||
* 任务状态(定义数据字典)
|
||||
*/
|
||||
@ApiModelProperty(value = "任务状态(数据字典)")
|
||||
private Integer taskStatus;
|
||||
|
||||
private Integer flag;
|
||||
|
||||
/**
|
||||
* 预领料合计数
|
||||
*/
|
||||
@ApiModelProperty(value = "预领料合计数")
|
||||
private Integer preCountNum;
|
||||
/**
|
||||
* 预领料合计数
|
||||
*/
|
||||
@ApiModelProperty(value = "已出库数量")
|
||||
private Integer alNum;
|
||||
/**
|
||||
* 库存
|
||||
*/
|
||||
@ApiModelProperty(value = "库存")
|
||||
private Integer num;
|
||||
|
||||
/**
|
||||
* 费用承担方
|
||||
*/
|
||||
@ApiModelProperty(value = "费用承担方(01项目,03分包)")
|
||||
private String costBearingParty;
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@ApiModelProperty(value = "编号")
|
||||
@Excel(name = "领料单号", sort = 1)
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
@ApiModelProperty(value = "创建者")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 申请人手机号码
|
||||
*/
|
||||
@ApiModelProperty(value = "手机号")
|
||||
private String phoneNumber;
|
||||
|
||||
/**
|
||||
* 部门名称 单位名称
|
||||
*/
|
||||
@ApiModelProperty(value = "部门/单位名称")
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 工程名称
|
||||
*/
|
||||
@ApiModelProperty(value = "工程名称")
|
||||
@Excel(name = "领料工程", sort = 3)
|
||||
private String proName;
|
||||
|
||||
/**
|
||||
* 工程id
|
||||
*/
|
||||
@ApiModelProperty(value = "工程id")
|
||||
private Integer proId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@ApiModelProperty(value = "更新者")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty(value = "备注")
|
||||
@Excel(name = "备注", sort = 11)
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 数据所属组织
|
||||
*/
|
||||
@ApiModelProperty(value = "数据所属组织")
|
||||
private Integer companyId;
|
||||
|
||||
@ApiModelProperty(value = "协议id")
|
||||
private Integer agreementId;
|
||||
|
||||
@ApiModelProperty(value = "退料人")
|
||||
private String backPerson;
|
||||
@ApiModelProperty(value = "退料人联系电话")
|
||||
private String phone;
|
||||
|
||||
@ApiModelProperty(value = "退料申请时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date backTime;
|
||||
|
||||
@ApiModelProperty(value = "退料审核人 机具分公司审批人")
|
||||
private String directAuditBy;
|
||||
|
||||
@ApiModelProperty(value = "退料审核时间 机具分公司审批时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date directAuditTime;
|
||||
|
||||
@ApiModelProperty(value = "退料审核备注 机具分公司审批备注")
|
||||
private String directAuditRemark;
|
||||
|
||||
@ApiModelProperty(value = "往来单位id")
|
||||
private Long unitId;
|
||||
@ApiModelProperty(value = "往来单位")
|
||||
@Excel(name = "领料单位", sort = 2)
|
||||
private String unitName;
|
||||
|
||||
@ApiModelProperty(value = "工程id")
|
||||
private Long projectId;
|
||||
@ApiModelProperty(value = "关键字")
|
||||
private String keyWord;
|
||||
@ApiModelProperty(value = "开始时间")
|
||||
private String startTime;
|
||||
@ApiModelProperty(value = "结束时间")
|
||||
private String endTime;
|
||||
@ApiModelProperty(value = "类型")
|
||||
private Integer types;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "协议编号")
|
||||
@Excel(name = "协议号", sort = 4)
|
||||
private String agreementCode;
|
||||
|
||||
@ApiModelProperty(value = "领料人")
|
||||
@Excel(name = "领料人", sort = 5)
|
||||
private String leasePerson;
|
||||
|
||||
@ApiModelProperty(value = "领料人手机号")
|
||||
@Excel(name = "联系电话", sort = 6)
|
||||
private String leasePhone;
|
||||
|
||||
@ApiModelProperty(value = "申请人")
|
||||
@Excel(name = "申请人", sort = 7)
|
||||
private String applyFor;
|
||||
|
||||
@ApiModelProperty(value = "任务状态")
|
||||
@Excel(name = "任务状态", sort = 9)
|
||||
private String taskName;
|
||||
|
||||
@ApiModelProperty(value = "审批状态id")
|
||||
private String examineStatusId;
|
||||
|
||||
@ApiModelProperty(value = "审批状态的备注")
|
||||
@Excel(name = "审批结果", sort = 10)
|
||||
private String examineStatus;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@Excel(name = "申请时间", sort = 8)
|
||||
private String createTimes;
|
||||
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private String updateTimes;
|
||||
|
||||
@ApiModelProperty(value = "公司审批人")
|
||||
private String companyAuditBy;
|
||||
|
||||
@ApiModelProperty(value = "公司审批时间")
|
||||
private String companyAuditTime;
|
||||
|
||||
@ApiModelProperty(value = "公司审批备注")
|
||||
private String companyAuditRemark;
|
||||
|
||||
@ApiModelProperty(value = "分管审批人")
|
||||
private String deptAuditBy;
|
||||
|
||||
@ApiModelProperty(value = "分管审批时间")
|
||||
private String deptAuditTime;
|
||||
|
||||
@ApiModelProperty(value = "分管审批备注")
|
||||
private String deptAuditRemark;
|
||||
|
||||
@ApiModelProperty(value = "领用类型：0 工程租赁 1长期领用")
|
||||
@Excel(name = "领料类型", readConverterExp = "0=工程租赁,1=长期租赁")
|
||||
private String leaseType;
|
||||
|
||||
private String userId;
|
||||
private String userName;
|
||||
private String typeName;
|
||||
private String typeModelName;
|
||||
|
||||
private String manageType;
|
||||
private String maCode;
|
||||
private String maId;
|
||||
private String status;
|
||||
private String maStatus;
|
||||
private String typeId;
|
||||
private Integer partNum;
|
||||
@ApiModelProperty(value = "预计领料时间（重庆）")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date estimateLeaseTime;
|
||||
|
||||
private Integer souceByRefuse;
|
||||
private int souceBy;
|
||||
|
||||
@ApiModelProperty(value = "出厂日期")
|
||||
private Date outFacTime;
|
||||
@ApiModelProperty(value = "出厂编号")
|
||||
private String outFacCode;
|
||||
@ApiModelProperty(value = "本次检验日期")
|
||||
private Date thisCheckTime;
|
||||
@ApiModelProperty(value = "工器具编码")
|
||||
private String deviceCode; //like CSG-A101-2024061900001
|
||||
@ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码")
|
||||
private String intelligentCode;
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
package com.bonus.material.task.mapper;
|
||||
|
||||
import com.bonus.material.task.domain.TmTask;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface TmTaskMapper {
|
||||
|
||||
int insertSelective(TmTask record);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
package com.bonus.material.task.service;
|
||||
|
||||
import com.bonus.material.task.domain.TmTask;
|
||||
|
||||
public interface TmTaskService {
|
||||
|
||||
int insertSelective(TmTask record);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package com.bonus.material.task.service.impl;
|
||||
|
||||
import com.bonus.material.task.domain.TmTask;
|
||||
import com.bonus.material.task.mapper.TmTaskMapper;
|
||||
import com.bonus.material.task.service.TmTaskService;
|
||||
import javax.annotation.Resource;
|
||||
|
||||
public class TmTaskServiceImpl implements TmTaskService {
|
||||
@Resource
|
||||
private TmTaskMapper tmTaskMapper;
|
||||
|
||||
@Override
|
||||
public int insertSelective(TmTask record) {
|
||||
return tmTaskMapper.insertSelective(record);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,102 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.material.task.mapper.TmTaskMapper">
|
||||
|
||||
<resultMap id="BaseResultMap" type="com.bonus.material.task.domain.TmTask">
|
||||
<id column="task_id" jdbcType="BIGINT" property="taskId" />
|
||||
<result column="task_type" jdbcType="INTEGER" property="taskType" />
|
||||
<result column="task_status" jdbcType="INTEGER" property="taskStatus" />
|
||||
<result column="code" jdbcType="VARCHAR" property="code" />
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="company_id" jdbcType="INTEGER" property="companyId" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="ResultMap" type="com.bonus.material.task.domain.TmTask">
|
||||
<id column="task_id" jdbcType="BIGINT" property="taskId" />
|
||||
<result column="task_type" jdbcType="INTEGER" property="taskType" />
|
||||
<result column="task_status" jdbcType="INTEGER" property="taskStatus" />
|
||||
<result column="code" jdbcType="VARCHAR" property="code" />
|
||||
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="company_id" jdbcType="INTEGER" property="companyId" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
task_id, task_type, task_status, code, create_by, create_time, update_by, update_time,
|
||||
remark, company_id
|
||||
</sql>
|
||||
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from tm_task
|
||||
where task_id = #{taskId,jdbcType=BIGINT}
|
||||
</select>
|
||||
|
||||
<update id="deleteTaskByPrimaryKey" >
|
||||
update tm_task set `status` = '0',update_time = NOW()
|
||||
where task_id = #{taskId}
|
||||
</update>
|
||||
|
||||
<insert id="insertSelective" keyColumn="task_id" keyProperty="id" parameterType="com.bonus.material.task.domain.TmTask" useGeneratedKeys="true">
|
||||
insert into tm_task
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="taskType != null">
|
||||
task_type,
|
||||
</if>
|
||||
<if test="taskStatus != null">
|
||||
task_status,
|
||||
</if>
|
||||
<if test="code != null and code != ''">
|
||||
code,
|
||||
</if>
|
||||
<if test="createBy != null and createBy != ''">
|
||||
create_by,
|
||||
</if>
|
||||
create_time,
|
||||
<if test="updateBy != null and updateBy != ''">
|
||||
update_by,
|
||||
</if>
|
||||
update_time,
|
||||
<if test="remark != null and remark != ''">
|
||||
remark,
|
||||
</if>
|
||||
<if test="companyId != null">
|
||||
company_id,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="taskType != null">
|
||||
#{taskType,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="taskStatus != null">
|
||||
#{taskStatus,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="code != null and code != ''">
|
||||
#{code,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createBy != null and createBy != ''">
|
||||
#{createBy,jdbcType=VARCHAR},
|
||||
</if>
|
||||
now(),
|
||||
<if test="updateBy != null and updateBy != ''">
|
||||
#{updateBy,jdbcType=VARCHAR},
|
||||
</if>
|
||||
now(),
|
||||
<if test="remark != null and remark != ''">
|
||||
#{remark,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="companyId != null">
|
||||
#{companyId,jdbcType=INTEGER},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue