2024 6 14 号

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/EntrustInfo.java

@@ -0,0 +1,146 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 委托单信息表实体类
+ *
+ * @author BladeX
+ * @since 2024-05-08
+ */
+@Data
+@TableName("u_entrust_info")
+@EqualsAndHashCode(callSuper = true)
+public class EntrustInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 合同段id
+	*/
+	@ApiModelProperty("合同段id")
+		private String contractId;
+	/**
+	* 样品id
+	*/
+	@ApiModelProperty("样品id")
+		private Long sampleId;
+	/**
+	* 委托单位
+	*/
+	@ApiModelProperty("委托单位")
+		private String entrustInfo;
+	/**
+	* 委托单编号
+	*/
+	@ApiModelProperty("委托单编号")
+		private String entrustNo;
+	/**
+	* 委托单位名称
+	*/
+	@ApiModelProperty("委托单位名称")
+		private String entrustName;
+	/**
+	* 委托单pdf
+	*/
+	@ApiModelProperty("委托单pdf")
+		private String entrustPdf;
+	/**
+	* 电签pdf
+	*/
+	@ApiModelProperty("电签pdf")
+		private String entrustEPdf;
+	/**
+	* 试验数量
+	*/
+	@ApiModelProperty("试验数量")
+		private Integer expCount;
+
+
+	/**
+	 * 委托单位上报时间
+	 */
+	@ApiModelProperty(value = "委托单位上报时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date entrustTime;
+
+	/**
+	 * 样品入库时间
+	 */
+	@ApiModelProperty(value = "样品入库时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date sampleTime;
+
+	/**
+	 * 试验检测时间
+	 */
+	@ApiModelProperty(value = "试验检测时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date ctestTime;
+
+	/**
+	 * 废除原因
+	 */
+	@ApiModelProperty(value = "废除原因")
+	private String repealReason;
+
+	/**
+	 * 试验检测时间
+	 */
+	@ApiModelProperty(value = "处理方式")
+	private int repealType;
+
+	/**
+	 * 留样开始时间
+	 */
+	@ApiModelProperty(value = "留样开始时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date resamStartTime;
+
+	/**
+	 * 留样结束时间
+	 */
+	@ApiModelProperty(value = "留样结束时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date resamEndTime;
+
+	/**
+	 * 废除时间
+	 */
+	@ApiModelProperty(value = "废除时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date repealTime;
+
+	/**
+	 * 样品操作状态
+	 */
+	@ApiModelProperty(value = "样品操作状态")
+	private String sampleStatus;
+
+
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/EntrustInfoVO.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.business.entity.EntrustInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 委托单信息表视图实体类
+ *
+ * @author BladeX
+ * @since 2024-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EntrustInfoVO extends EntrustInfo {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 节点id
+	 */
+	@ApiModelProperty("节点id")
+	private String nodeId;
+
+	/**
+	 * 关联材料名称
+	 */
+	@ApiModelProperty("关联材料名称")
+	private String materialName;
+
+	/**
+	 * 测试单Id
+	 */
+	@ApiModelProperty("测试单Id")
+	private String testId;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/wrapper/EntrustInfoWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.business.entity.EntrustInfo;
+import org.springblade.business.vo.EntrustInfoVO;
+import java.util.Objects;
+
+/**
+ * 委托单信息表包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2024-05-08
+ */
+public class EntrustInfoWrapper extends BaseEntityWrapper<EntrustInfo, EntrustInfoVO>  {
+
+	public static EntrustInfoWrapper build() {
+		return new EntrustInfoWrapper();
+ 	}
+
+	@Override
+	public EntrustInfoVO entityVO(EntrustInfo entrustInfo) {
+		EntrustInfoVO entrustInfoVO = Objects.requireNonNull(BeanUtil.copy(entrustInfo, EntrustInfoVO.class));
+
+		//User createUser = UserCache.getUser(entrustInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(entrustInfo.getUpdateUser());
+		//entrustInfoVO.setCreateUserName(createUser.getName());
+		//entrustInfoVO.setUpdateUserName(updateUser.getName());
+
+		return entrustInfoVO;
+	}
+
+}