+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +@Data +@TableName("biz_business_outsource_assess_sample_relation") +public class BizBusinessOutsourceAssessSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 分包评审表id + */ + @TableField("access_id") + private Long accessId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 分包设备状态（1检测中，2检测完成） + */ + @ApiModelProperty(value = "分包设备状态（1检测中，2检测完成）", dataType = "Integer") + @TableField("measure_status") + private Integer measureStatus; + + @ApiModelProperty(value = "检定结论", dataType = "Integer") + @TableField("conclusion") + private String conclusion; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) + private String updateTime; + + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index c5c31d0..9d74fd3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -75,6 +75,8 @@ CLIENT_ID_EMPTY(2433, "用户id不能为空"), URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办"), + SUBCONTRACT_EQUIPMENT_NOT_EXIST(2631, "未找到分包设备列表"), + /** * 表单生成及打印 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MessageTypeEnum.java new file mode 100644 index 0000000..bcab0bf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MessageTypeEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.enums.business; + +public enum MessageTypeEnum { + + STAFF_CERT("1", "检定员证书到期提醒"), + EQUIPMENT("2", "设备有效期提醒"), + STANDARD_EQUIPMENT("3", "装置有效期提醒"), + OVERTIME_MEASURE("4", "受检设备检定超期提醒"), + CHECK("5", "核查提醒"), + WEEK_MAINTAIN("6", "周维护"), + MONTH_MAINTAIN("7", "月保养"), + TRAINING_NOTICE("8", "培训签到通知"), + WORKBENCH_REMIND_ORDER("9", "工作台任务单设备超期提醒"), + WORKBENCH_REMIND_EQUIPMENT("10", "工作台设备超期提醒"), + WORKBENCH_REMIND_STANDARD("11", "工作台标准装置超期提醒"), + WORKBENCH_REMIND_STAFF("12", "工作台人员证书超期提醒"), + WORKBENCH_REMIND_CONSUMER("13", "工作台委托方意见登记提醒"), + STANDARD_BUILD_APPROVAL("14", "建标审批通过提醒"), + WORKBENCH_REMIND_NOVELTY_SEARCH("15", "测试校准检定方法查新提醒"), + WORKBENCH_REMIND_FILE_GRANT("16", "文件发放通知提醒"), + WORKBENCH_CUSTOMER_QUESTIONNAIRE("17", "委托方满意度调查表"); + + + private String code; + private String value; + + MessageTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessSampleRelationMapper.java new file mode 100644 index 0000000..475ee1d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessSampleRelationMapper.java @@ -0,0 +1,22 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.outsource.OutsourceAssessEquipmentDTO; +import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +@Data +@TableName("biz_business_outsource_assess_sample_relation") +public class BizBusinessOutsourceAssessSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 分包评审表id + */ + @TableField("access_id") + private Long accessId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 分包设备状态（1检测中，2检测完成） + */ + @ApiModelProperty(value = "分包设备状态（1检测中，2检测完成）", dataType = "Integer") + @TableField("measure_status") + private Integer measureStatus; + + @ApiModelProperty(value = "检定结论", dataType = "Integer") + @TableField("conclusion") + private String conclusion; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java index 1004bdf..ad89779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,10 +17,12 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Objects; /** *@@ -81,6 +84,14 @@ @TableField(exist = false) private String groupCodeName; + @ApiModelProperty(value = "分包评审表id", dataType = "Long") + @TableField("access_id") + private Long accessId; + + @ApiModelProperty(value = "分包项目", dataType = "String") + @TableField("item") + private String item; + @NotNull(message = "受检单位(委托方)id不能为空") @ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long") @TableField("customer_id") @@ -91,18 +102,15 @@ @TableField("customer_name") private String customerName; - /** - * 分包方名称 - */ + @ApiModelProperty(value = "分包方名称", dataType = "String") + @TableField("outsourcer_id") + private String outsourcerId; + @ExcelProperty(value = "分包方名称", order = 4) @ApiModelProperty(value = "分包方名称", dataType = "String") @TableField("outsourcer_name") private String outsourcerName; - @ExcelProperty(value = "分包项目", order = 5) - @ApiModelProperty(value = "分包项目", dataType = "String") - @TableField("outsource_itme") - private String outsourceItem; /** * 分包设备名字 */ @@ -120,7 +128,7 @@ /** * 申请人名字(后台自动填为创建人) */ - @ExcelProperty(value = "申请人", order = 6) + @ExcelProperty(value = "申请人", order = 5) @ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String") @TableField("create_user_name") private String createUserName; @@ -160,6 +168,41 @@ @TableField("notice_user_name") private String noticeUserName; + @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer") + @TableField("agree_or_refuse") + private Integer agreeOrRefuse; + + public String getAgreeOrRefuseDesc() { + if (Objects.isNull(agreeOrRefuse)) { + return null; + } + if (1 == agreeOrRefuse) { + return "同意"; + } else if (2 == agreeOrRefuse) { + return "拒绝"; + } + return null; + } + + @ApiModelProperty(value = "委托方意见", dataType = "String") + @TableField(exist = false) + private String agreeOrRefuseDesc; + + @ApiModelProperty(value = "意见时间", dataType = "Integer") + @TableField("agree_or_refuse_time") + private String agreeOrRefuseTime; + + @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String") + @TableField(exist = false) + private String noticeSendStatus; + + public String getNoticeSendStatus() { + if (StringUtils.isNotEmpty(this.noticeUserId)) { + return "已发送"; + } + return "未发送"; + } + @ApiModelProperty(value = "审批状态", dataType = "String") @DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS) @TableField("approval_status") @@ -172,7 +215,7 @@ /** * 创建时间(申请时间) */ - @ExcelProperty(value = "申请时间", order = 7) + @ExcelProperty(value = "申请时间", order = 6) @ApiModelProperty(value = "申请时间", dataType = "String") @TableField("create_time") private String createTime; @@ -181,9 +224,12 @@ * 更新时间 */ @ApiModelProperty(hidden = true) - @TableField("update_time") + @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) private String updateTime; + @ApiModelProperty(value = "分包项目", dataType = "String") + @TableField("outsource_itme") + private String outsourceItem; @ApiModelProperty(value = "审批状态类型-字典value", dataType = "String") @TableField(exist = false) diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index c5c31d0..9d74fd3 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -75,6 +75,8 @@ CLIENT_ID_EMPTY(2433, "用户id不能为空"), URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办"), + SUBCONTRACT_EQUIPMENT_NOT_EXIST(2631, "未找到分包设备列表"), + /** * 表单生成及打印 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MessageTypeEnum.java new file mode 100644 index 0000000..bcab0bf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MessageTypeEnum.java @@ -0,0 +1,39 @@ +package com.casic.missiles.enums.business; + +public enum MessageTypeEnum { + + STAFF_CERT("1", "检定员证书到期提醒"), + EQUIPMENT("2", "设备有效期提醒"), + STANDARD_EQUIPMENT("3", "装置有效期提醒"), + OVERTIME_MEASURE("4", "受检设备检定超期提醒"), + CHECK("5", "核查提醒"), + WEEK_MAINTAIN("6", "周维护"), + MONTH_MAINTAIN("7", "月保养"), + TRAINING_NOTICE("8", "培训签到通知"), + WORKBENCH_REMIND_ORDER("9", "工作台任务单设备超期提醒"), + WORKBENCH_REMIND_EQUIPMENT("10", "工作台设备超期提醒"), + WORKBENCH_REMIND_STANDARD("11", "工作台标准装置超期提醒"), + WORKBENCH_REMIND_STAFF("12", "工作台人员证书超期提醒"), + WORKBENCH_REMIND_CONSUMER("13", "工作台委托方意见登记提醒"), + STANDARD_BUILD_APPROVAL("14", "建标审批通过提醒"), + WORKBENCH_REMIND_NOVELTY_SEARCH("15", "测试校准检定方法查新提醒"), + WORKBENCH_REMIND_FILE_GRANT("16", "文件发放通知提醒"), + WORKBENCH_CUSTOMER_QUESTIONNAIRE("17", "委托方满意度调查表"); + + + private String code; + private String value; + + MessageTypeEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessSampleRelationMapper.java new file mode 100644 index 0000000..475ee1d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOutsourceAssessSampleRelationMapper.java @@ -0,0 +1,22 @@ +package com.casic.missiles.mapper.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.dto.business.outsource.OutsourceAssessEquipmentDTO; +import com.casic.missiles.model.business.BizBusinessOutsourceAssessSampleRelation; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +public interface BizBusinessOutsourceAssessSampleRelationMapper extends BaseMapper+ * 业务编码关联组织机构 Mapper 接口 + *
+ * + * @author lwh + * @date 2023-10-21 + */ +public interface BizLabRelDeptMapper extends BaseMapper+ * 所有业务消息提醒 Mapper 接口 + *
+ * + * @author wangpeng + * @since 2023-02-23 + */ +public interface WorkbenchRemindMessageMapper extends BaseMapper+ * 计量检定业务-分包管理-分包评审表-样品关联表 + *
+ * + * @author wangpeng + * @since 2023-08-16 + */ +@Data +@TableName("biz_business_outsource_assess_sample_relation") +public class BizBusinessOutsourceAssessSampleRelation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 分包评审表id + */ + @TableField("access_id") + private Long accessId; + + /** + * 样品id + */ + @TableField("sample_id") + private Long sampleId; + + /** + * 委托书id + */ + @TableField("order_id") + private Long orderId; + + /** + * 分包设备状态（1检测中，2检测完成） + */ + @ApiModelProperty(value = "分包设备状态（1检测中，2检测完成）", dataType = "Integer") + @TableField("measure_status") + private Integer measureStatus; + + @ApiModelProperty(value = "检定结论", dataType = "Integer") + @TableField("conclusion") + private String conclusion; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER) + private String updateTime; + + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java index 1004bdf..ad89779 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourceNotice.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,10 +17,12 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Objects; /** *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务实现类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务实现类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务实现类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 Mapper 接口
+ *
+ * 业务编码关联组织机构 Mapper 接口
+ *
+ * 所有业务消息提醒 Mapper 接口
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表
+ *
@@ -81,6 +84,14 @@
@TableField(exist = false)
private String groupCodeName;
+ @ApiModelProperty(value = "分包评审表id", dataType = "Long")
+ @TableField("access_id")
+ private Long accessId;
+
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("item")
+ private String item;
+
@NotNull(message = "受检单位(委托方)id不能为空")
@ApiModelProperty(value = "受检单位(委托方)id", dataType = "Long")
@TableField("customer_id")
@@ -91,18 +102,15 @@
@TableField("customer_name")
private String customerName;
- /**
- * 分包方名称
- */
+ @ApiModelProperty(value = "分包方名称", dataType = "String")
+ @TableField("outsourcer_id")
+ private String outsourcerId;
+
@ExcelProperty(value = "分包方名称", order = 4)
@ApiModelProperty(value = "分包方名称", dataType = "String")
@TableField("outsourcer_name")
private String outsourcerName;
- @ExcelProperty(value = "分包项目", order = 5)
- @ApiModelProperty(value = "分包项目", dataType = "String")
- @TableField("outsource_itme")
- private String outsourceItem;
/**
* 分包设备名字
*/
@@ -120,7 +128,7 @@
/**
* 申请人名字(后台自动填为创建人)
*/
- @ExcelProperty(value = "申请人", order = 6)
+ @ExcelProperty(value = "申请人", order = 5)
@ApiModelProperty(value = "申请人名字(后台自动填为创建人)", dataType = "String")
@TableField("create_user_name")
private String createUserName;
@@ -160,6 +168,41 @@
@TableField("notice_user_name")
private String noticeUserName;
+ @ApiModelProperty(value = "同意或拒绝(1同意2拒绝)", dataType = "Integer")
+ @TableField("agree_or_refuse")
+ private Integer agreeOrRefuse;
+
+ public String getAgreeOrRefuseDesc() {
+ if (Objects.isNull(agreeOrRefuse)) {
+ return null;
+ }
+ if (1 == agreeOrRefuse) {
+ return "同意";
+ } else if (2 == agreeOrRefuse) {
+ return "拒绝";
+ }
+ return null;
+ }
+
+ @ApiModelProperty(value = "委托方意见", dataType = "String")
+ @TableField(exist = false)
+ private String agreeOrRefuseDesc;
+
+ @ApiModelProperty(value = "意见时间", dataType = "Integer")
+ @TableField("agree_or_refuse_time")
+ private String agreeOrRefuseTime;
+
+ @ApiModelProperty(value = "通知发送状态（已发送/未发送）", dataType = "String")
+ @TableField(exist = false)
+ private String noticeSendStatus;
+
+ public String getNoticeSendStatus() {
+ if (StringUtils.isNotEmpty(this.noticeUserId)) {
+ return "已发送";
+ }
+ return "未发送";
+ }
+
@ApiModelProperty(value = "审批状态", dataType = "String")
@DictCodeField(message = "审批状态描述不合法", cacheName = MeterDictCode.APPROVAL_STATUS)
@TableField("approval_status")
@@ -172,7 +215,7 @@
/**
* 创建时间(申请时间)
*/
- @ExcelProperty(value = "申请时间", order = 7)
+ @ExcelProperty(value = "申请时间", order = 6)
@ApiModelProperty(value = "申请时间", dataType = "String")
@TableField("create_time")
private String createTime;
@@ -181,9 +224,12 @@
* 更新时间
*/
@ApiModelProperty(hidden = true)
- @TableField("update_time")
+ @TableField(value = "update_time", insertStrategy =FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
private String updateTime;
+ @ApiModelProperty(value = "分包项目", dataType = "String")
+ @TableField("outsource_itme")
+ private String outsourceItem;
@ApiModelProperty(value = "审批状态类型-字典value", dataType = "String")
@TableField(exist = false)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
new file mode 100644
index 0000000..45d3a1e
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizLabRelDept.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.model.business;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 业务编码关联组织机构对象 biz_lab_rel_dept
+ *
+ * @author lwh
+ * @date 2023-10-21
+ */
+@Data
+@TableName("biz_lab_rel_dept")
+public class BizLabRelDept extends Model
+ * 所有业务消息提醒
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务类
+ *
+ * 计量检定业务-分包管理-分包评审表-样品关联表 服务实现类
+ *