This commit is contained in:
parent
416fc2bf6c
commit
34ee953d7e
|
|
@ -42,28 +42,10 @@ public class ToDoBean extends BaseEntity {
|
|||
@ApiModelProperty(value = "代办事件")
|
||||
private String taskEvent;
|
||||
|
||||
/** 任务创建人id */
|
||||
@ApiModelProperty(value = "任务创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建人姓名
|
||||
*/
|
||||
private String createName;
|
||||
|
||||
/** 创建时间 */
|
||||
@Excel(name = "创建时间")
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
@ApiModelProperty(value = "关键字")
|
||||
private String keyWord;
|
||||
|
||||
/** 备注 */
|
||||
@Excel(name = "备注")
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
|
|
@ -73,4 +55,16 @@ public class ToDoBean extends BaseEntity {
|
|||
*/
|
||||
private String endTime;
|
||||
|
||||
@ApiModelProperty(value = "承租方公司id")
|
||||
private Integer buyerCompanyId;
|
||||
|
||||
@ApiModelProperty(value = "承租方公司名称")
|
||||
private Integer buyerCompanyName;
|
||||
|
||||
@ApiModelProperty(value = "出租方公司id")
|
||||
private Integer sellerCompanyId;
|
||||
|
||||
@ApiModelProperty(value = "出租方公司名称")
|
||||
private Integer sellerCompanyName;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,8 @@ public class OrderServiceImpl implements OrderService {
|
|||
tmTask.setCode(code);
|
||||
tmTask.setCreateBy(SecurityUtils.getLoginUser().getUsername());
|
||||
tmTask.setCreateTime(DateUtils.getNowDate());
|
||||
tmTask.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
|
||||
tmTask.setBuyerCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
|
||||
tmTask.setSellerCompanyId(Long.valueOf(orderInfoDto.getSellerCompany()));
|
||||
tmTaskMapper.insertSelective(tmTask);
|
||||
}
|
||||
return j;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.bonus.material.task.domain;
|
||||
|
||||
import com.bonus.common.core.annotation.Excel;
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
|
@ -10,36 +11,24 @@ 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 {
|
||||
public class TmTask extends BaseEntity 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;
|
||||
|
||||
/**
|
||||
* 任务状态(定义数据字典)
|
||||
|
|
@ -47,29 +36,6 @@ public class TmTask implements Serializable {
|
|||
@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;
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
|
|
@ -78,197 +44,26 @@ public class TmTask implements Serializable {
|
|||
private String code;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
* 承租方公司id
|
||||
*/
|
||||
@ApiModelProperty(value = "创建者")
|
||||
private String createBy;
|
||||
@ApiModelProperty(value = "承租方公司id")
|
||||
private Long buyerCompanyId;
|
||||
|
||||
/**
|
||||
* 申请人手机号码
|
||||
*/
|
||||
@ApiModelProperty(value = "手机号")
|
||||
private String phoneNumber;
|
||||
@ApiModelProperty(value = "出租方公司id")
|
||||
private Long sellerCompanyId;
|
||||
|
||||
/**
|
||||
* 部门名称 单位名称
|
||||
*/
|
||||
@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 Long 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;
|
||||
}
|
||||
|
|
@ -11,14 +11,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
tt.task_type as taskTypeId,
|
||||
sd2.dict_label as taskType,
|
||||
sd3.dict_label as taskEvent,
|
||||
tt.create_by as createName,
|
||||
tt.create_by as createBy,
|
||||
tt.create_time as createTime
|
||||
tt.create_time as createTime,
|
||||
tt.buyer_company_id as buyerCompanyId,
|
||||
tt.seller_company_id as sellerCompanyId,
|
||||
dept1.dept_name as buyerCompanyName,
|
||||
dept2.dept_name as sellerCompanyName
|
||||
FROM
|
||||
tm_task tt
|
||||
LEFT JOIN sys_dict_data sd2 on sd2.dict_value=tt.task_type
|
||||
LEFT JOIN sys_dict_data sd3 on sd3.dict_value=tt.task_status
|
||||
-- LEFT JOIN sys_user us on us.user_id=tt.create_by
|
||||
LEFT JOIN sys_dept dept1 on dept1.dept_id=tt.buyer_company_id
|
||||
LEFT JOIN sys_dept dept2 on dept2.dept_id=tt.seller_company_id
|
||||
WHERE
|
||||
tt.`status` = '1'
|
||||
and sd2.dict_type in ('tm_task_type')
|
||||
|
|
|
|||
Loading…
Reference in New Issue