diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java index bbe800d1..4b454984 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java @@ -78,4 +78,5 @@ public class DeviceCheckDetailController extends BaseController { } + } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 700909c8..5af5d73a 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.dev; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; @@ -17,7 +16,9 @@ import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; +import com.glxp.api.req.dev.DeviceInfoDetailQuery; +import com.glxp.api.req.dev.DeviceInfoQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceChangeLogService; import com.glxp.api.service.dev.DeviceInfoService; @@ -39,19 +40,18 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.imageio.ImageIO; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.awt.*; -import java.awt.font.LineMetrics; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.*; +import java.util.Base64; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java index f50702d3..ab4c9c31 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java @@ -9,13 +9,19 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceRepairApplyAddParam; +import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam; +import com.glxp.api.req.dev.DeviceRepairApplyHallQuery; +import com.glxp.api.req.dev.DeviceRepairApplyQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceRepairApplyService; import com.glxp.api.vo.dev.DeviceRepairApplyVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java index 0128fa63..99f7df77 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java @@ -8,13 +8,12 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; -import com.glxp.api.entity.dev.DeviceRepairApplyEntity; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam; +import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery; +import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceRepairApplyDetailService; -import com.glxp.api.service.dev.DeviceRepairApplyService; import com.glxp.api.vo.dev.DeviceRepairApplyDetailVo; -import com.glxp.api.vo.dev.DeviceRepairApplyVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java index 72a95e59..5892f54a 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java @@ -1,25 +1,19 @@ package com.glxp.api.controller.dev; -import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.entity.dev.DeviceRepairEntity; -import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceRepairQuery; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.dev.DeviceRepairApplyService; import com.glxp.api.service.dev.DeviceRepairService; -import com.glxp.api.vo.dev.DeviceRepairApplyVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java index f8c82622..848bbd2d 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceInfoEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; @@ -11,7 +10,6 @@ import com.glxp.api.vo.dev.DeviceInfoVo; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Set; /** * 针对表【device_info(设备表)】的数据库操作Mapper @@ -28,6 +26,9 @@ public interface DeviceInfoMapper extends BaseMapperPlus listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status); - List listVoByCodes(@Param("list") List deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status); + List listVoByCodes(@Param("list") List deviceCodes,@Param("deptCode") String deptCode,@Param("status") List status); } + + + diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java index 47b4fc98..bad48a49 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; -import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery; import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java new file mode 100644 index 00000000..221c9bfb --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java @@ -0,0 +1,190 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 科室设备明细表 + */ +@Data +@TableName(value = "dept_device_detail") +public class DeptDeviceDetailEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 科室编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 原始码 + */ + @TableField(value = "originCode") + private String originCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典编码 + */ + @TableField(value = "relId") + private String relId; + + /** + * 设备名称 + */ + @TableField(value = "deviceName") + private String deviceName; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 生产厂家 + */ + @TableField(value = "manufactory") + private String manufactory; + + /** + * 计量单位 + */ + @TableField(value = "measname") + private String measname; + + /** + * 注册/备案凭证号 + */ + @TableField(value = "zczbhhzbapzbh") + private String zczbhhzbapzbh; + + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + /** + * 供应商名称 + */ + @TableField(value = "supName") + private String supName; + + /** + * 状态（1：正常；2：报修；3：巡检中；4、维修中；5、报废；6、使用中；7：空闲；） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + @TableField(value = "addType") + private Integer addType; + + /** + * 添加人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 负责人 + */ + @TableField(value = "manager") + private String manager; + + /** + * 最后养护时间 + */ + @TableField(value = "maTime") + private Date maTime; + + /** + * 添加时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + + /** + * 当前使用人 + */ + @TableField(value = "curUser") + private String curUser; + + /** + * 位置 + */ + @TableField(value = "location") + private String location; + + /** + * 详细位置 + */ + @TableField(value = "detailLocation") + private String detailLocation; + + @TableField(value = "nameCode") + private String nameCode; + +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java new file mode 100644 index 00000000..8e624358 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java @@ -0,0 +1,105 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +@Data +@TableName(value = "device_asset_cert") +public class DeviceAssetCertEntity implements Serializable { + /** + * 注意要用雪花ID + */ + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 设备资产编码外键 + */ + @TableField(value = "devCodeFk") + private String devCodeFk; + + /** + * 证书名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 证书编码 + */ + @TableField(value = "code") + private String code; + + /** + * 文件路径 + */ + @TableField(value = "filePath") + private String filePath; + + /** + * 生效期 + */ + @TableField(value = "vailDate") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate vailDate; + + /** + * 失效期 + */ + @TableField(value = "expireDate") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate expireDate; + + /** + * 证书状态 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 证书类型（1：资质证书；2：技术材料） + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 备注说明 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java new file mode 100644 index 00000000..e8e808f3 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java @@ -0,0 +1,82 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 设备资产位置字典表 + */ +@Data +@TableName(value = "device_asset_loacation") +public class DeviceAssetLoacationEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 位置编码 + */ + @TableField(value = "code") + private String code; + + /** + * 位置名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 父级位置编码 + */ + @TableField(value = "parentCode") + private String parentCode; + + /** + * 经度 + */ + @TableField(value = "longitude") + private String longitude; + + /** + * 维度 + */ + @TableField(value = "latitude") + private String latitude; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java new file mode 100644 index 00000000..7db8052c --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java @@ -0,0 +1,76 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName(value = "device_asset_usage") +public class DeviceAssetUsageEntity implements Serializable { + /** + * 雪花ID + */ + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 使用记录号 + */ + @TableField(value = "code") + private String code; + + /** + * 使用人 + */ + @TableField(value = "`user`") + private String user; + + /** + * 开始时间 + */ + @TableField(value = "startTime") + private Date startTime; + + /** + * 结束时间 + */ + @TableField(value = "endTime") + private Date endTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java new file mode 100644 index 00000000..18c607a1 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java @@ -0,0 +1,79 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName(value = "device_asset_user") +public class DeviceAssetUserEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 设备资产编码 + */ + @TableField(value = "devCodeFk") + private String devCodeFk; + + /** + * 相关人员名称 + */ + @TableField(value = "userName") + private String userName; + + /** + * 联系方式1 + */ + @TableField(value = "contact1") + private String contact1; + + /** + * 联系方式2 + */ + @TableField(value = "contact2") + private String contact2; + + /** + * 备注说明 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 相关人员类别 + */ + @TableField(value = "userType") + private String userType; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java index 6414c806..34a77166 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java @@ -32,6 +32,12 @@ public class DeviceChangeOrderEntity implements Serializable { @TableId(value = "orderId") private Long orderId; + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + /** * add:新增入库，change:变更归属 */ @@ -106,4 +112,16 @@ public class DeviceChangeOrderEntity implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + + /** + * 移除类型 + */ + @TableField(value = "destroyType") + private Integer destroyType; + + /** + * 审批表主键 + */ + @TableField(value = "approvalFlowId") + private String approvalFlowId; } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java new file mode 100644 index 00000000..12526fe4 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java @@ -0,0 +1,471 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Date; + +/** + * 设备变更单明细 + * + * @TableName device_change_order_item + */ +@TableName(value = "device_change_order_item") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = true) +public class DeviceChangeOrderItemEntity implements Serializable { + /** + * 变更单号 + */ + @TableField(value = "orderId") + private Long orderId; + + /** + * 设备编码 + */ + @TableField(value = "deviceCode") + private String deviceCode; + + /** + * 产品id + */ + @TableField(value = "productId") + private Long productId; + + /** + * UDI码 + */ + @TableField(value = "udi") + private String udi; + + /** + * DI码 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 产品名称 + */ + @TableField(value = "productName") + private String productName; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private LocalDate productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private LocalDate expireDate; + + /** + * 生产厂家 + */ + @TableField(value = "manufactory") + private String manufactory; + + /** + * 计量单位 + */ + @TableField(value = "measname") + private String measname; + + /** + * 注册/备案凭证号 + */ + @TableField(value = "zczbhhzbapzbh") + private String zczbhhzbapzbh; + + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + /** + * 供应商名称 + */ + @TableField(value = "supName") + private String supName; + + /** + * 来源类型 + */ + @TableField(value = "sourceType") + private String sourceType; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + + /** + * 资产分类 + */ + @TableField(value = "assetType") + private String assetType; + + /** + * 国资分类 + */ + @TableField(value = "sasacType") + private String sasacType; + + /** + * 资产助记码 + */ + @TableField(value = "assetMnemonicCode") + private String assetMnemonicCode; + + /** + * 数量 + */ + @TableField(value = "number") + private Integer number; + + /** + * 取得方式 + */ + @TableField(value = "acquisitionMethod") + private String acquisitionMethod; + + /** + * 用途 + */ + @TableField(value = "purpose") + private String purpose; + + /** + * 折旧年 + */ + @TableField(value = "depreciationYear") + private Integer depreciationYear; + + /** + * 折旧月 + */ + @TableField(value = "depreciationMonth") + private Integer depreciationMonth; + + /** + * 存储仓库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 预计总工时 + */ + @TableField(value = "estimatedTotalHour") + private Integer estimatedTotalHour; + + /** + * 单日工时 + */ + @TableField(value = "dayHour") + private Integer dayHour; + + /** + * 单个资产价值 + */ + @TableField(value = "assetValue") + private BigDecimal assetValue; + + /** + * 自有资金 + */ + @TableField(value = "ownFund") + private BigDecimal ownFund; + + /** + * 财政拨款 + */ + @TableField(value = "financialAppropriation") + private BigDecimal financialAppropriation; + + /** + * 科教基金 + */ + @TableField(value = "educationFund") + private BigDecimal educationFund; + + /** + * 其他资金 + */ + @TableField(value = "otherFund") + private BigDecimal otherFund; + + /** + * 非同级财政拨款 + */ + @TableField(value = "nonPeerFinancialAppropriation") + private BigDecimal nonPeerFinancialAppropriation; + + /** + * 医疗器械分类编码 + */ + @TableField(value = "ybbm") + private String ybbm; + + /** + * 一级分类名称(学科，品名） + */ + @TableField(value = "catalogname1") + private String catalogname1; + + /** + * 二级分类名称(用途、品目） + */ + @TableField(value = "catalogname2") + private String catalogname2; + + /** + * 三级分类名称(部位、功能、品种） + */ + @TableField(value = "catalogname3") + private String catalogname3; + + /** + * 编码 + */ + @TableField(value = "catalogCode") + private String catalogCode; + + /** + * 编码 + */ + @TableField(value = "catalogCode1") + private Integer catalogCode1; + /** + * 编码 + */ + @TableField(value = "catalogCode2") + private Integer catalogCode2; + /** + * 编码 + */ + @TableField(value = "catalogCode3") + private Integer catalogCode3; + + /** + * 管理类别 + */ + @TableField(value = "managementCategory") + private String managementCategory; + /** + * 使用人 + */ + @TableField(value = "endUser") + private String endUser; + + /** + * 预计残值 + */ + @TableField(value = "estimatedResidualValue") + private BigDecimal estimatedResidualValue; + + /** + * 币种 + */ + @TableField(value = "currencyType") + private String currencyType; + /** + * 采购类型 + */ + @TableField(value = "purType") + private String purType; + + /** + * 购置日期 + */ + @TableField(value = "purchaseDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date purchaseDate; + /** + * 添加日期 + */ + @TableField(value = "addDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date addDate; + + /** + * 资产品名 + */ + @TableField(value = "assetName") + private String assetName; + /** + * 是否强检 + */ + @TableField(value = "isImperative") + private Boolean isImperative; + /** + * 是否保养 + */ + @TableField(value = "isMaintain") + private Boolean isMaintain; + + /** + * 检定周期(月） + */ + @TableField(value = "imperativeCycle") + private Integer imperativeCycle; + /** + * 保养周期(月） + */ + @TableField(value = "maintainCycle") + private Integer maintainCycle; + /** + * 开始检定日期 + */ + @TableField(value = "startImperativeDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startImperativeDate; + /** + * 开始保养日期 + */ + @TableField(value = "startMaintainDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startMaintainDate; + + /** + * 维修组 + */ + @TableField(value = "serviceType") + private String serviceType; + /** + * 保养组 + */ + @TableField(value = "maintainType") + private String maintainType; + /** + * 管理人 + */ + @TableField(value = "managerUser") + private String managerUser; + /** + * 审核人 + */ + @TableField(value = "approveUser") + private String approveUser; + + /** + * 对应会计科目 + */ + @TableField(value = "ledgerAccount") + private String ledgerAccount; + + /** + * 减值准备 + */ + @TableField(value = "impairmentProvision") + private String impairmentProvision; + + /** + * 预计工作量 + */ + @TableField(value = "estimatedWorkload") + private String estimatedWorkload; + + /** + * 已完成工作量 + */ + @TableField(value = "completedWorkload") + private String completedWorkload; + + /** + * 维保类型 + */ + @TableField(value = "maintenanceType") + private String maintenanceType; + + /** + * 维保周期 + */ + @TableField(value = "maintenanceCycle") + private Integer maintenanceCycle; + + /** + * 维保开始日期 + */ + @TableField(value = "startMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startMaintenancDate; + + /** + * 维保结束日期 + */ + @TableField(value = "endMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date endMaintenancDate; + + /** + * 内外网 + */ + @TableField(value = "networkType") + private Integer networkType; + /** + * 使用角色 + */ + @TableField(value = "userRole") + private Integer userRole; + /** + * 是否加域 + */ + @TableField(value = "isAddDomain") + private Boolean isAddDomain; + /** + * u盘是否禁用 + */ + @TableField(value = "isUDisc") + private Boolean isUDisc; + /** + * 设备归类 + */ + @TableField(value = "ascriptionType") + private Integer ascriptionType; + /** + * 资产备用类型 + */ + @TableField(value = "assetReserveType") + private String assetReserveType; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java index 7fc16e8e..98814ee1 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java @@ -1,20 +1,15 @@ package com.glxp.api.entity.dev; - -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 巡检任务明细 * @@ -194,5 +189,10 @@ public class DeviceCheckDetailEntity { @TableField(value = "updateTime") private LocalDateTime updateTime; -} + /** + * 报修单id + */ + @TableField(value = "applyId") + private Long applyId; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java index 8f8d8a41..e8a308dd 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java @@ -1,20 +1,15 @@ package com.glxp.api.entity.dev; - -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 设备巡检项目 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceCheckItemDictEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceCheckItemDictEntity.java index e42f799a..9718be74 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceCheckItemDictEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceCheckItemDictEntity.java @@ -43,7 +43,7 @@ public class DeviceCheckItemDictEntity { * 创建人id */ @TableField(value = "createUserId") - private String createUserId; + private Long createUserId; /** * 创建人名称 @@ -51,18 +51,15 @@ public class DeviceCheckItemDictEntity { @TableField(value = "createUserName") private String createUserName; - - /** - * 项目类型 1:巡检项目 2:保养项目 - */ - @TableField(value = "type") - private Integer type; - /** * 创建时间 */ @TableField(value = "createTime") private LocalDateTime createTime; - + /** + * 项目类型 + */ + @TableField(value = "type") + private Integer type; } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java index c49e61f3..72b39955 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java @@ -586,4 +586,30 @@ public class DeviceInfoEntity implements Serializable { */ @TableField(value = "updateTime") private LocalDateTime updateTime; + + /** + * 申购订单id外键 + */ + @TableField(value = "purApplyBillNo") + private String purApplyBillNo; + + /** + * 采购订单id外键 + */ + @TableField(value = "purOrderBillNo") + private String purOrderBillNo; + + /** + * 采购合同id外键 + */ + @TableField(value = "purContractBillNo") + private String purContractBillNo; + + /** + * 采购计划id外键 + */ + @TableField(value = "purPlanBillNo") + private String purPlanBillNo; + + } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java new file mode 100644 index 00000000..74c8913d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java @@ -0,0 +1,105 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备维保记录表 + */ +@Data +@TableName(value = "device_inspect_order") +public class DeviceInspectOrderEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 维保单号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 上级单号，计划或报修单号 + */ + @TableField(value = "lastOrderId") + private String lastOrderId; + + /** + * 维保类型（1：报修；2：计划；3：手动） + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 状态（0：新增；1：未审核；2：已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 设备状态（0：异常；1：正常） + */ + @TableField(value = "deviceStatus") + private Integer deviceStatus; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 审核时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 养护说明 + */ + @TableField(value = "remark") + private String remark; + +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java new file mode 100644 index 00000000..c3a37daf --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java @@ -0,0 +1,55 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "device_inspect_plan_delect") +public class DeviceInspectPlanDelectEntity { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 项目编号 + */ + @TableField(value = "code") + private String code; + + /** + * 项目内容 + */ + @TableField(value = "content") + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java new file mode 100644 index 00000000..c04f2673 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java @@ -0,0 +1,139 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备巡检计划表 + */ +@Data +@TableName(value = "device_inspect_plan") +public class DeviceInspectPlanEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 巡检计划单号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 计划级别（1：低级；2：中级；3：高级） + */ + @TableField(value = "`level`") + private Integer level; + + /** + * 状态（0：新增；1：未审核；2：已审核） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + + //--------------------------新增字段-------------------------------- + /** + * 计划开始时间 + */ + private Date startTime; + /** + * 计划结束时间 + */ + private Date endTime; + /** + * 时间频率 + */ + private String frequency; + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + private Integer frequencyUnit; + /** + * 计划状态(1:未启用；2：运行中；3：已结束；4：已过期 + */ + private Integer planStatus; + /** + * 巡检人 + */ + private String inspectUser; + /** + * 上次巡检时间 + */ + private Date lastTime; + /** + * 下一次巡检时间 + */ + private Date nextTime; + + + /** + * 使用频率 + */ + private Integer useFrequency; + + /** + * 已执行次数 + */ + private Integer executeCount; + +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java new file mode 100644 index 00000000..a7d0c479 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java @@ -0,0 +1,63 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备巡检设置表 + */ +@Data +@TableName(value = "device_inspect_set") +public class DeviceInspectSetEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 时间频率 + */ + @TableField(value = "frequency") + private String frequency; + + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + @TableField(value = "frequencyUnit") + private Integer frequencyUnit; + + /** + * 状态（1：启用；2：禁用） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java new file mode 100644 index 00000000..b0c276a4 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java @@ -0,0 +1,70 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName(value = "device_inspect_task_detail") +public class DeviceInspectTaskDetailEntity implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 巡检项目编码 + */ + @TableField(value = "projectCode") + private String projectCode; + + /** + * 巡检内容 + */ + @TableField(value = "projectContent") + private String projectContent; + + /** + * 状态（1：未开始；2：已检查；3：异常；4：不巡检 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 巡检结果备注 + */ + @TableField(value = "`result`") + private String result; + + /** + * 巡检图片 + */ + @TableField(value = "inspectImage") + private String inspectImage; + + /** + * 巡检人 + */ + @TableField(value = "inspectUser") + private String inspectUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 巡检任务ID外键 + */ + @TableField(value = "taskOrderIdFk") + private String taskOrderIdFk; + + @TableField(exist = false) + private String inspectName; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java new file mode 100644 index 00000000..5b3bb483 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java @@ -0,0 +1,109 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "device_inspect_task") +public class DeviceInspectTaskEntity { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 任务单号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 巡检计划单号（外键） + */ + @TableField(value = "planOrderIdFk") + private String planOrderIdFk; + + /** + * 部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 状态 0 未巡检 1 巡检中 2 巡检结束 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 巡检人 + */ + @TableField(value = "inspectUser") + private String inspectUser; + + /** + * 提醒时间 + */ + @TableField(value = "remindTime") + private Date remindTime; + + /** + * 巡检备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 任务开始时间 + */ + @TableField(value = "strartTime") + private Date strartTime; + + /** + * 任务结束时间 + */ + @TableField(value = "endTime") + private Date endTime; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + @TableField(value = "expectedTime") + private Date expectedTime; + + @TableField(value = "type") + private Integer type; + + @TableField(value = "repairType") + private Integer repairType; + + @TableField(value = "level") + private Integer level; + + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java new file mode 100644 index 00000000..49feb0fc --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java @@ -0,0 +1,137 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备养护记录详情表 + */ +@Data +@TableName(value = "device_ma_order_detail") +public class DeviceMAOrderDetailEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 设备养护记录号 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 条码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典ID + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 产品ID + */ + @TableField(value = "relId") + private Long relId; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 设备状态 0：异常 1：正常 + */ + @TableField(value = "deviceStatus") + private Integer deviceStatus; + + /** + * 养护状态 0：未养护 1：已养护 + */ + @TableField(value = "maStatus") + private Integer maStatus; + + /** + * 养护人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 养护说明 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_CODE = "code"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_RELID = "relId"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_PRODUCTIONDATE = "productionDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_SERIALNO = "serialNo"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_DEVICESTATUS = "deviceStatus"; + + public static final String COL_MASTATUS = "maStatus"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_REMARK = "remark"; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java new file mode 100644 index 00000000..b288b18d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java @@ -0,0 +1,86 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备养护记录表 + */ +@Data +@TableName(value = "device_ma_order") +public class DeviceMAOrderEntity { + + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 设备养护记录号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 设备领用单据号 + */ + @TableField(value = "receiveOrderId") + private String receiveOrderId; + + /** + * 状态 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 养护时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 养护人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 养护说明 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERID = "orderId"; + + public static final String COL_RECEIVEORDERID = "receiveOrderId"; + + public static final String COL_STATUS = "status"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_REMARK = "remark"; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java index ddfb199e..3820e021 100644 --- a/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java @@ -50,15 +50,15 @@ public class DevicePlanDetailItemEntity { @TableField(value = "name") private String name; - /** - * 项目类型 1巡检计划 2保养计划 - */ - @TableField(value = "type") - private String type; - /** * 项目内容 */ @TableField(value = "content") private String content; + + /** + * + */ + @TableField(value = "type") + private Integer type; } diff --git a/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java b/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java index f9e906f1..0ff0be48 100644 --- a/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java @@ -90,13 +90,13 @@ public class DevicePlanEntity { */ @TableField(value = "status") private Integer status; - /** - * 计划类型 1:巡检计划 2:保养计划 + * 项目类型 */ @TableField(value = "type") private Integer type; + /** * 创建时间 */ diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java b/src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java new file mode 100644 index 00000000..3d15abe2 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java @@ -0,0 +1,67 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName(value = "device_project_set") +public class DeviceProjectSet implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 项目编号 + */ + @TableField(value = "code") + private String code; + + /** + * 项目内容 + */ + @TableField(value = "content") + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 备注 + */ + @TableField(value = "remak") + private String remak; + + /** + * 更新时间 + */ + @TableField(value = "udpateTime") + private Date udpateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java new file mode 100644 index 00000000..aa20d893 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java @@ -0,0 +1,146 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "device_receive_order_detail") +public class DeviceReceiveOrderDetailEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 设备领用记录号 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 原始码 + */ + @TableField(value = "originCode") + private String originCode; + + /** + * 码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典ID + */ + @TableField(value = "relId") + private Long relId; + + /** + * 产品DI + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + /** + * 领用时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 产品名称 + */ + @TableField(exist = false) + private String productName; + + /** + * 仓库名称 + */ + @TableField(exist = false) + private String invName; + + /** + * 货位名称 + */ + @TableField(exist = false) + private String invSpaceName; + + /** + * 货位名称 + */ + @TableField(exist = false) + private String invSpaceCode; + + /** + * 注册/备案凭证号 + */ + @TableField(exist = false) + private String zczbhhzbapzbh; + + /** + * 生产厂家 + */ + @TableField(exist = false) + private String ylqxzcrbarmc; + + /** + * 规格型号 + */ + @TableField(exist = false) + private String ggxh; + + /** + * 是否可以自定义序列号 + */ + @TableField(exist = false) + private Boolean editSerialNo; + + /** + * 部门名称 + */ + @TableField(exist = false) + private String deptName; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java new file mode 100644 index 00000000..0facac45 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java @@ -0,0 +1,114 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "device_receive_order") +public class DeviceReceiveOrderEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 领用记录号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 领用部门 + */ + @TableField(value = "fromDeptCode") + private String fromDeptCode; + + /** + * 领用仓库 + */ + @TableField(value = "fromInvCode") + private String fromInvCode; + + /** + * 领用货位 + */ + @TableField(value = "fromInvSpaceCode") + private String fromInvSpaceCode; + + /** + * 接收部门 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 接收仓库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 接收货位 + */ + @TableField(value = "invSpaceCode") + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已审核 + */ + @TableField(value = "status") + private Integer status; + + /** + * 创建人 + */ + @TableField(value = "createUser") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 领用人 + */ + @TableField(value = "receiveUser") + private String receiveUser; + + /** + * 领用时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + @TableField(value = "type") + private String type; + +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java index e3443315..df3e314b 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java @@ -195,26 +195,18 @@ public class DeviceRepairApplyDetailEntity { @TableField(value = "confirmRemark") private String confirmRemark; - - /** - * 报修图片 - */ - @TableField(value = "livePath") - private String livePath; - - - /** - * 诊断图片 - */ - @TableField(value = "diagnosisLivePath") - private String diagnosisLivePath; - /** * 完成时间 */ @TableField(value = "finishTime") private LocalDateTime finishTime; + /** + * 报修人联系方式 + */ + @TableField(exist = false) + private String repairUserPhone; + /** * 完成时间 @@ -223,9 +215,14 @@ public class DeviceRepairApplyDetailEntity { private LocalDateTime updateTime; /** - * 报修人联系方式 + * 报修现场照片 */ - @TableField(exist = false) - private String repairUserPhone; + @TableField(value = "livePath") + private String livePath; + /** + * 诊断图片 + */ + @TableField(value = "diagnosisLivePath") + private String diagnosisLivePath; } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java index 3715c3d9..5ff0fb27 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java @@ -70,6 +70,13 @@ public class DeviceRepairEntity { */ @TableField(value = "repairUserName") private String repairUserName; + + /** + * 维修人姓名 + */ + @TableField(value = "repairUserId") + private Long repairUserId; + /** * 维修部门 */ @@ -256,36 +263,27 @@ public class DeviceRepairEntity { @TableField(value = "repairDescription") private String repairDescription; - /** - * 报修图片 + * 更改时间 */ - @TableField(value = "livePath") - private String livePath; - + @TableField(value = "updateTime") + private LocalDateTime updateTime; /** - * 维修后现场照片 + * 报修现场照片 */ - @TableField(value = "serviceLivePath") - private String serviceLivePath; + @TableField(value = "livePath") + private String livePath; /** - * 诊断照片 + * 诊断图片 */ @TableField(value = "diagnosisLivePath") private String diagnosisLivePath; - - /** - * 报修人id - */ - @TableField(value = "repairUserId") - private Long repairUserId; - /** - * 确认时间 + * 维修后现场图片 */ - @TableField(value = "updateTime") - private LocalDateTime updateTime; + @TableField(value = "serviceLivePath") + private String serviceLivePath; } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java new file mode 100644 index 00000000..7ad9e8ed --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java @@ -0,0 +1,55 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName(value = "device_repair_order_detail") +public class DeviceRepairOrderDetailEntity { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 项目编号 + */ + @TableField(value = "code") + private String code; + + /** + * 项目内容 + */ + @TableField(value = "content") + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + @TableField(value = "`type`") + private Integer type; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java new file mode 100644 index 00000000..931d537b --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java @@ -0,0 +1,136 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单表 + */ +@Data +@TableName(value = "device_repair_order") +public class DeviceRepairOrderEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 报修单号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 资产编码 + */ + @TableField(value = "code") + private String code; + + /** + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 报修说明 + */ + @TableField(value = "msg") + private String msg; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + +// ----------------------新增字段=------------------------------- + /** + * 维修类型 1:自行维修；2：外部维修 + */ + private Integer repairType; + /** + * 紧急类型 1,正常；2,较急；3,特急 + */ + private Integer urgencyType; + /** + * 计划完成日期 + */ + private Date planTime; + /** + * 报修图片 + */ + private String uploadImage; + private String inspectUser; + + + /** + * 维修人 + */ + private String repariName; + /** + * 维修开始时间 + */ + private Date repariStartTime; + /** + * 维修结束时间 + */ + private Date repariEndTime; + /** + * 维修说明 + */ + private String repariRemark; + /** + * 维修图片 + */ + private String repariImage; + + +} diff --git a/src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java b/src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java new file mode 100644 index 00000000..760c0377 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java @@ -0,0 +1,43 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 库存养护说明表 + */ +@Data +@TableName(value = "inv_ma_explanation") +public class InvMAExplanationEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 启用状态 0：未启用 1：启用 + */ + @TableField(value = "`status`") + private String status; + + /** + * 默认内容 + */ + @TableField(value = "`text`") + private String text; + + public static final String COL_ID = "id"; + + public static final String COL_NAME = "name"; + + public static final String COL_STATUS = "status"; + + public static final String COL_TEXT = "text"; +} diff --git a/src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java new file mode 100644 index 00000000..04302fa6 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java @@ -0,0 +1,129 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 库存养护记录详情表 + */ +@Data +@TableName(value = "inv_ma_order_detail") +public class InvMAOrderDetailEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 养护记录号 + */ + @TableField(value = "orderIdFk") + private String orderIdFk; + + /** + * 条码 + */ + @TableField(value = "code") + private String code; + + /** + * 耗材字典ID + */ + @TableField(value = "relId") + private Long relId; + + /** + * DI标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 养护数量 + */ + @TableField(value = "`count`") + private Integer count; + + /** + * 养护状态 0：未养护 1：已养护 + */ + @TableField(value = "maStatus") + private Integer maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + @TableField(value = "deviceStatus") + private Integer deviceStatus; + + /** + * 养护时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_CODE = "code"; + + public static final String COL_RELID = "relId"; + + public static final String COL_NAMECODE = "nameCode"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_PRODUCTIONDATE = "productionDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_COUNT = "count"; + + public static final String COL_MASTATUS = "maStatus"; + + public static final String COL_DEVICESTATUS = "deviceStatus"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} diff --git a/src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java new file mode 100644 index 00000000..f73ed969 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java @@ -0,0 +1,101 @@ +package com.glxp.api.entity.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 库存养护记录表 + */ +@Data +@TableName(value = "inv_ma_order") +public class InvMAOrderEntity { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 养护记录号 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 分库码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 货位码 + */ + @TableField(value = "invSpaceCode") + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已完成 + */ + @TableField(value = "`status`") + private Integer status; + + /** + * 养护日期 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 审核时间 + */ + @TableField(value = "auditTime") + private Date auditTime; + + /** + * 养护人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 审核人 + */ + @TableField(value = "auditUser") + private String auditUser; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORDERID = "orderId"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_INVSPACECODE = "invSpaceCode"; + + public static final String COL_STATUS = "status"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_AUDITTIME = "auditTime"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_AUDITUSER = "auditUser"; + + public static final String COL_REMARK = "remark"; +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java new file mode 100644 index 00000000..b85af50b --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java @@ -0,0 +1,108 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +/** + * 添加部门设备信息接口参数 + */ +@Data +public class AddDeptDeviceRequest { + + private Integer id; + + /** + * 科室编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 原始码 + */ + private String originCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 生产厂家 + */ + private String manufactory; + + /** + * 计量单位 + */ + private String measname; + + /** + * 注册/备案凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 供应商名称 + */ + private String supName; + + /** + * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废） + */ + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + private Integer addType; + + /** + * 添加人 + */ + private String createUser; + + /** + * 负责人 + */ + private String manager; + + /** + * 备注 + */ + private String remark; + +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java new file mode 100644 index 00000000..8defbe54 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java @@ -0,0 +1,51 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +/** + * 添加设备维保单参数 + */ +@Data +public class AddDeviceInspectOrderRequest { + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 上级单号，计划或报修单号 + */ + private String lastOrderId; + + /** + * 维保类型（1：报修；2：计划；3：手动） + */ + private Integer type; + + /** + * 状态（0：新增；1：未审核；2：已审核） + */ + private Integer status; + + /** + * 设备状态（0：异常；1：正常） + */ + private Integer deviceStatus; + + /** + * 养护说明 + */ + private String remark; + +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java new file mode 100644 index 00000000..8387ac27 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java @@ -0,0 +1,78 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 添加部门设备巡检计划参数 + */ +@Data +public class AddDeviceInspectPlanRequest { + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 计划级别（1：低级；2：中级；3：高级） + */ + private Integer level; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + + + /** + * 计划开始时间 + */ + private Date startTime; + /** + * 计划结束时间 + */ + private Date endTime; + /** + * 时间频率 + */ + private String frequency; + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + private Integer frequencyUnit; + /** + * 计划状态(1:未启用；2：运行中；3：已结束；4：已过期 + */ + private Integer planStatus; + /** + * 巡检人 + */ + private String inspectUser; + /** + * 上次巡检时间 + */ + private Date lastTime; + /** + * 下一次巡检时间 + */ + private Date nextTime; + + +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java new file mode 100644 index 00000000..0462ae68 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java @@ -0,0 +1,48 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 添加科室设备巡检设置参数 + */ +@Data +public class AddDeviceInspectSetRequest { + + /** + * 资产编码 + */ + private String code; + + /** + * 时间频率 + */ + private String frequency; + + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + private Integer frequencyUnit; + + /** + * 状态（1：启用；2：禁用） + */ + private Integer status; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java new file mode 100644 index 00000000..d4a5ed00 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java @@ -0,0 +1,50 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +/** + * 添加设备养护记录请求参数 + */ +@Data +public class AddDeviceMAOrderRequest { + + /** + * 设备号 + */ + private String code; + + /** + * 创建人 + */ + private String createUser; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 养护状态：0：未养护 1：已养护 + */ + private Integer maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + private Integer deviceStatus; + + /** + * 备注 + */ + private String remark; + + /** + * 设备领用记录ID + */ + private String receiveOrderId; +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java new file mode 100644 index 00000000..6d325211 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java @@ -0,0 +1,50 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +import java.util.List; + +/** + * 添加设备领用记录详情参数 + */ +@Data +public class AddDeviceReceiveOrderDetailRequest { + + /** + * 领用记录号 + */ + private String orderIdFk; + + /** + * 扫描条码内容 + */ + private String code; + + /** + * 产品库存ID集合 + */ + private List invProductIds; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 货位编码 + */ + private String invSpaceCode; + + /** + * 供应商ID + */ + private String supId; + + private Integer type; + +} diff --git a/src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java new file mode 100644 index 00000000..36e9d83c --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java @@ -0,0 +1,84 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 添加设备报修单参数 + */ +@Data +public class AddDeviceRepairOrderRequest { + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） + */ + private Integer status; + + /** + * 报修说明 + */ + private String msg; + + /** + * 备注 + */ + private String remark; + + + // ----------------------新增字段=------------------------------- + /** + * 维修类型 1:自行维修；2：外部维修 + */ + private Integer repairType; + /** + * 紧急类型 1,正常；2,较急；3,特急 + */ + private Integer urgencyType; + /** + * 计划完成日期 + */ + private Date planTime; + /** + * 报修图片 + */ + private String uploadImage; + + + /** + * 维修人 + */ + private String repariName; + /** + * 维修开始时间 + */ + private String repariStartTime; + /** + * 维修结束时间 + */ + private String repariEndTime; + /** + * 维修说明 + */ + private String repariRemark; + /** + * 维修图片 + */ + private String repariImage; + +} diff --git a/src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java new file mode 100644 index 00000000..329ce801 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java @@ -0,0 +1,23 @@ +package com.glxp.api.req.dev; + +import lombok.Data; + +import java.util.List; + +/** + * 添加库粗养护记录详情接口参数 + */ +@Data +public class AddInvMAOrderDetailRequest { + + /** + * 库存养护记录号 + */ + private String orderIdFk; + + /** + * 库存详情ID集合 + */ + List invProductIds; + +} diff --git a/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java b/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java new file mode 100644 index 00000000..3ae8301c --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java @@ -0,0 +1,12 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class CheckDetailQuery extends ListPageRequest { + + private String deviceCode; + + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderDetailQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderDetailQuery.java new file mode 100644 index 00000000..42d6794e --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderDetailQuery.java @@ -0,0 +1,19 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import javax.validation.constraints.NotNull; + + +@Data +public class DeviceChangeOrderDetailQuery extends ListPageRequest { + + @NotNull(message = "缺少必要参数") + Long orderId; + + @NotNull(message = "缺少必要参数") + DeviceChangeTypeEnum type; + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderGenerateOrderId.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderGenerateOrderId.java new file mode 100644 index 00000000..65e81f33 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderGenerateOrderId.java @@ -0,0 +1,28 @@ +package com.glxp.api.req.dev; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +public class DeviceChangeOrderGenerateOrderId { + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + @NotEmpty(message = "操作部门不能为空！") + private String deptCode; + + /** + * 部门编码 + */ + @TableField(value = "toDeptCode") + private String toDeptCode; + + @NotNull(message = "类型不能为空") + private DeviceChangeTypeEnum type; +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java new file mode 100644 index 00000000..08223a7c --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java @@ -0,0 +1,631 @@ +package com.glxp.api.req.dev; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.dev.DeviceChangeOrderEntity; +import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; +import com.glxp.api.enums.dev.DeviceChangeStatusEnum; +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; +import com.glxp.api.exception.JsonException; +import com.glxp.api.util.SnowflakeUtil; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 设备变更单 + */ +@Data +public class DeviceChangeOrderParam { + + /** + * 变更单类型 + */ + @NotNull(message = "类型不能为空") + DeviceChangeTypeEnum type; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 目标部门 + */ + String toDeptCode; + + /** + * 备注 + */ + @Length(max = 500, message = "备注最多500个字") + String remark; + + @Valid + @NotEmpty(message = "明细不能为空") + List items; + + /** + * 编码 + */ + @TableId(value = "orderId") + private Long orderId; + + + /** + * 1.待目标部门接收 ，2.完成(目标确认接收) ，3.目标部门拒收，4.取消 + */ + private DeviceChangeStatusEnum status; + + /** + * 创建部门 + */ + private String deptCode; + + + /** + * 确认人id + */ + private Long confirmUser; + + /** + * 确认人姓名 + */ + private String confirmUserName; + + /** + * 确认时间 + */ + private LocalDateTime confirmTime; + + /** + * + */ + private String confirmRemark; + + + /** + * 创建人 + */ + @TableField(value = "createUserName") + private String createUserName; + + /** + * 创建人id + */ + @TableField(value = "createUser") + private Long createUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private LocalDateTime createTime; + + /** + * 移除类型 + */ + private Integer destroyType; + + @Data + public static class Item { + /** + * 设备编码 + */ + @NotBlank(message = "设备编码不能为空") + @Pattern(regexp = "^[A-Za-z0-9]{1,20}$", message = "设备编码只能为(大小写字母、数字)组合或其中一项，最多20个字符") + private String deviceCode; + + /** + * 产品id + */ +// @NotNull(message = "产品id不能为空") + private Long productId; + + /** + * UDI码 + */ + private String udi; + + + /** + * 批次号 + */ + private String batchNo; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + private String ggxh; + private String manufactory; + private String measname; + private String nameCode; + private String productName; + private String zczbhhzbapzbh; + + /** + * 来源类型 + */ + private String sourceType; + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + /** + * 供应商名称 + */ + @TableField(value = "supName") + private String supName; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + + /** + * 资产分类 + */ + @TableField(value = "assetType") + private String assetType; + + /** + * 国资分类 + */ + @TableField(value = "sasacType") + private String sasacType; + + /** + * 资产助记码 + */ + @TableField(value = "assetMnemonicCode") + private String assetMnemonicCode; + + /** + * 数量 + */ + @TableField(value = "number") + private Integer number; + + /** + * 取得方式 + */ + @TableField(value = "acquisitionMethod") + private String acquisitionMethod; + + /** + * 用途 + */ + @TableField(value = "purpose") + private String purpose; + + /** + * 折旧年 + */ + @TableField(value = "depreciationYear") + private Integer depreciationYear; + + /** + * 折旧月 + */ + @TableField(value = "depreciationMonth") + private Integer depreciationMonth; + + /** + * 存储仓库 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 预计总工时 + */ + @TableField(value = "estimatedTotalHour") + private Integer estimatedTotalHour; + + /** + * 单日工时 + */ + @TableField(value = "dayHour") + private Integer dayHour; + + /** + * 单个资产价值 + */ + @TableField(value = "assetValue") + private BigDecimal assetValue; + + /** + * 自有资金 + */ + @TableField(value = "ownFund") + private BigDecimal ownFund; + + /** + * 财政拨款 + */ + @TableField(value = "financialAppropriation") + private BigDecimal financialAppropriation; + + /** + * 科教基金 + */ + @TableField(value = "educationFund") + private BigDecimal educationFund; + + /** + * 其他资金 + */ + @TableField(value = "otherFund") + private BigDecimal otherFund; + + /** + * 非同级财政拨款 + */ + @TableField(value = "nonPeerFinancialAppropriation") + private BigDecimal nonPeerFinancialAppropriation; + + /** + * 医疗器械分类编码 + */ + @TableField(value = "ybbm") + private String ybbm; + + /** + * 一级分类名称(学科，品名） + */ + @TableField(value = "catalogname1") + private String catalogname1; + + /** + * 二级分类名称(用途、品目） + */ + @TableField(value = "catalogname2") + private String catalogname2; + + /** + * 三级分类名称(部位、功能、品种） + */ + @TableField(value = "catalogname3") + private String catalogname3; + + /** + * 编码 + */ + @TableField(value = "catalogCode") + private String catalogCode; + + /** + * 编码 + */ + @TableField(value = "catalogCode1") + private Integer catalogCode1; + /** + * 编码 + */ + @TableField(value = "catalogCode2") + private Integer catalogCode2; + /** + * 编码 + */ + @TableField(value = "catalogCode3") + private Integer catalogCode3; + + /** + * 管理类别 + */ + @TableField(value = "managementCategory") + private String managementCategory; + /** + * 使用人 + */ + @TableField(value = "endUser") + private String endUser; + + /** + * 预计残值 + */ + @TableField(value = "estimatedResidualValue") + private BigDecimal estimatedResidualValue; + + /** + * 币种 + */ + @TableField(value = "currencyType") + private String currencyType; + /** + * 采购类型 + */ + @TableField(value = "purType") + private String purType; + + /** + * 购置日期 + */ + @TableField(value = "purchaseDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date purchaseDate; + /** + * 添加日期 + */ + @TableField(value = "addDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date addDate; + + /** + * 资产品名 + */ + @TableField(value = "assetName") + private String assetName; + /** + * 是否强检 + */ + @TableField(value = "isImperative") + private Boolean isImperative; + /** + * 是否保养 + */ + @TableField(value = "isMaintain") + private Boolean isMaintain; + + /** + * 检定周期(月） + */ + @TableField(value = "imperativeCycle") + private Integer imperativeCycle; + /** + * 保养周期(月） + */ + @TableField(value = "maintainCycle") + private Integer maintainCycle; + /** + * 开始检定日期 + */ + @TableField(value = "startImperativeDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startImperativeDate; + /** + * 开始保养日期 + */ + @TableField(value = "startMaintainDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startMaintainDate; + + /** + * 维修组 + */ + @TableField(value = "serviceType") + private String serviceType; + /** + * 保养组 + */ + @TableField(value = "maintainType") + private String maintainType; + /** + * 管理人 + */ + @TableField(value = "managerUser") + private String managerUser; + /** + * 审核人 + */ + @TableField(value = "approveUser") + private String approveUser; + + /** + * 对应会计科目 + */ + @TableField(value = "ledgerAccount") + private String ledgerAccount; + + /** + * 减值准备 + */ + @TableField(value = "impairmentProvision") + private String impairmentProvision; + + /** + * 预计工作量 + */ + @TableField(value = "estimatedWorkload") + private String estimatedWorkload; + + /** + * 已完成工作量 + */ + @TableField(value = "completedWorkload") + private String completedWorkload; + + /** + * 维保类型 + */ + @TableField(value = "maintenanceType") + private String maintenanceType; + + /** + * 维保周期 + */ + @TableField(value = "maintenanceCycle") + private Integer maintenanceCycle; + + /** + * 维保开始日期 + */ + @TableField(value = "startMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startMaintenancDate; + + /** + * 维保结束日期 + */ + @TableField(value = "endMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date endMaintenancDate; + + /** + * 内外网 + */ + @TableField(value = "networkType") + private Integer networkType; + /** + * 使用角色 + */ + @TableField(value = "userRole") + private Integer userRole; + /** + * 是否加域 + */ + @TableField(value = "isAddDomain") + private Boolean isAddDomain; + /** + * u盘是否禁用 + */ + @TableField(value = "isUDisc") + private Boolean isUDisc; + /** + * 设备归类 + */ + @TableField(value = "ascriptionType") + private Integer ascriptionType; + /** + * 资产备用类型 + */ + @TableField(value = "assetReserveType") + private String assetReserveType; + + /** + * 申购订单id外键 + */ + @TableField(value = "purApplyBillNo") + private String purApplyBillNo; + + /** + * 采购订单id外键 + */ + @TableField(value = "purOrderBillNo") + private String purOrderBillNo; + + /** + * 采购合同id外键 + */ + @TableField(value = "purContractBillNo") + private String purContractBillNo; + + /** + * 采购计划id外键 + */ + @TableField(value = "purPlanBillNo") + private String purPlanBillNo; + + } + + public void valid(AuthAdmin user) { + if (StrUtil.isBlank(this.deptCode)) { + throw new JsonException("请选择操作部门"); + } + if (this.type == DeviceChangeTypeEnum.CHANGE) { + if (StrUtil.isBlank(this.toDeptCode)) { + throw new JsonException("请选择目标部门"); + } else if (this.toDeptCode.equals(user.getLocDeptCode())) { + throw new JsonException("目标部门不能为当前部门"); + } + } else { + this.toDeptCode = user.getLocDeptCode(); + items.stream().forEach(i -> { + if (i.getProductId() == null) { + throw new JsonException("产品id不能为空"); + } + }); + } + Map> map = items.stream().collect(Collectors.groupingBy(Item::getDeviceCode)); + map.entrySet().stream().forEach(i -> { + if (i.getValue().size() > 1) { + throw new JsonException(500, String.format("设备编码[%s]重复请检查", i.getKey())); + } + }); + } + + public DeviceChangeOrderEntity getOrderEntity(AuthAdmin user) { + + if (billNo != null) { + DeviceChangeOrderEntity deviceChangeOrderEntity = new DeviceChangeOrderEntity(); + BeanUtil.copyProperties(this, deviceChangeOrderEntity); + return deviceChangeOrderEntity; + } + + DeviceChangeOrderEntity order = DeviceChangeOrderEntity.builder() + .orderId(SnowflakeUtil.getId()) + .type(type) + .status(DeviceChangeStatusEnum.WAIT_CONFIRM) + .deptCode(deptCode) + .toDeptCode(toDeptCode) + .remark(remark) + .destroyType(destroyType) + .createUser(user.getId()) + .createUserName(user.getEmployeeName()) + .createTime(LocalDateTime.now()) + .build(); + // 新增时状态直接为完成 + if (type == DeviceChangeTypeEnum.ADD || type == DeviceChangeTypeEnum.DESTROY) { + order.setStatus(DeviceChangeStatusEnum.FINISH) + .setConfirmTime(order.getCreateTime()) + .setConfirmUser(order.getCreateUser()) + .setConfirmUserName(order.getCreateUserName()) + ; + } + return order; + } + + public List getOrderItemList(Long orderId, AuthAdmin user) { + return items.stream().map(i -> { + DeviceChangeOrderItemEntity itemEntity = new DeviceChangeOrderItemEntity(); + if (type == DeviceChangeTypeEnum.ADD) { + BeanUtil.copyProperties(i, itemEntity); + } else { + itemEntity.setDeviceCode(i.getDeviceCode()); + } + itemEntity.setOrderId(orderId); + return itemEntity; + }).collect(Collectors.toList()); + } + + public List getDraftOrderItemList(Long orderId, AuthAdmin user) { + return items.stream().map(i -> { + DeviceChangeOrderItemEntity itemEntity = new DeviceChangeOrderItemEntity(); + BeanUtil.copyProperties(i, itemEntity); + itemEntity.setOrderId(orderId); + return itemEntity; + }).collect(Collectors.toList()); + } + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderQuery.java new file mode 100644 index 00000000..8b2e8f05 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderQuery.java @@ -0,0 +1,36 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class DeviceChangeOrderQuery extends ListPageRequest { + + + /** + * 单号 + */ + String changeOrderId; + + /** + * 变更单类型 + * + */ + DeviceChangeTypeEnum type; + + + String remark; + + + /** + * 目标部门编码 + */ + String toDeptCode; + + /** + * 创建部门 + */ + String deptCode; + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictParam.java b/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictParam.java index 7c1bf2e0..336548e5 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictParam.java @@ -46,7 +46,7 @@ public class DeviceCheckItemDictParam { .name(name) .content(content) .type(type) - .createUserId(user.getCustomerId()) + .createUserId(Long.valueOf(user.getCustomerId())) .createUserName(user.getEmployeeName()) .createTime(LocalDateTime.now()) .build(); diff --git a/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictQuery.java index 0bec15f8..e3577e83 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceCheckItemDictQuery.java @@ -16,4 +16,5 @@ public class DeviceCheckItemDictQuery extends ListPageRequest { */ private String name; + private Integer type; } diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java index 852c180a..f12ec053 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java @@ -4,14 +4,19 @@ import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotBlank; - @Data -public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest { +public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest { + + + /** + * 模糊设备码和UDI + */ + private String deviceCodeAndUdi; + /** * 部门编码 */ - @NotBlank(message = "缺少部门编码") +// @NotBlank(message = "缺少部门编码") private String deptCode; /** diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java index 20261851..6f44e376 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java @@ -2,10 +2,12 @@ package com.glxp.api.req.dev; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.util.page.ListPageRequest; +import com.glxp.api.vo.dev.DeviceInfoVo; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.List; @Data public class DeviceInfoDetailQuery extends ListPageRequest { @@ -68,4 +70,11 @@ public class DeviceInfoDetailQuery extends ListPageRequest { private String zczbhhzbapzbh; + private String deviceCodeAndUdi; + + private String templateId; + + private List list; + + } diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java index f143ae9d..caa9835d 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java @@ -36,6 +36,12 @@ public class DevicePlanDetailItemParam { String deviceCode; + /** + * 项目类型 + */ + Integer type; + + @NotEmpty(message = "巡检项目不能为空") Set itemCodes; @@ -55,7 +61,7 @@ public class DevicePlanDetailItemParam { public List getEntity(DeviceCheckItemDictService deviceCheckItemDictService) { List list = deviceCheckItemDictService.listByIds(itemCodes); if (CollectionUtil.isEmpty(list)) { - throw new JsonException("所有项目编码都不存在，疑似非法操作"); + throw new JsonException("项目编码不存在，请确认"); } if (list.size() != itemCodes.size()) { Map> collect = list.stream().collect(Collectors.groupingBy(DeviceCheckItemDictEntity::getCode)); @@ -71,6 +77,7 @@ public class DevicePlanDetailItemParam { DevicePlanDetailItemEntity build = DevicePlanDetailItemEntity.builder() .planId(planId) .productId(productId) + .type(type) .deviceCode(StrUtil.blankToDefault(deviceCode, "")) .itemCode(i.getCode()) .name(i.getName()) diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java index d75170cc..416b8744 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java @@ -39,7 +39,7 @@ public class DevicePlanDetailParam { public List getEntity(DeviceInfoService deviceInfoService) { List deviceList = deviceInfoService.listByIds(deviceCodes); if (CollectionUtil.isEmpty(deviceList)) { - throw new JsonException("未找到设备，疑似非法操作"); + throw new JsonException("设备编码不存在，请确认"); } List list = deviceList.stream().map(d -> { diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java index ad5c042d..ac12793b 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanParam.java @@ -58,6 +58,11 @@ public class DevicePlanParam { */ private Integer status; + /** + * 项目类型 + */ + private Integer type; + /** * 备注 */ @@ -67,7 +72,7 @@ public class DevicePlanParam { public void valid(DeptService deptService) { DeptEntity dept = deptService.selectByCode(chargeDeptCode); if (dept == null) { - throw new JsonException("负责部门不存在，疑似非法操作"); + throw new JsonException("负责部门不存在，请确认"); } if (startDate.isAfter(endDate)) { throw new JsonException("计划开始日期不能在计划结束日期之后"); @@ -88,6 +93,7 @@ public class DevicePlanParam { .frequency(frequency) .status(status == null ? 1 : status) .remark(remark) + .type(type) .build(); if (!isUpdate) { build.setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName()).setCreateTime(LocalDateTime.now()); diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanQuery.java b/src/main/java/com/glxp/api/req/dev/DevicePlanQuery.java index ddf3dceb..0be48157 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanQuery.java @@ -13,4 +13,6 @@ public class DevicePlanQuery extends ListPageRequest { */ String chargeDeptCode; + Integer type; + } diff --git a/src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java b/src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java new file mode 100644 index 00000000..a63e846b --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java @@ -0,0 +1,55 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class DeviceProjectSetRequest extends ListPageRequest { + private Integer id; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remak; + + /** + * 更新时间 + */ + private Date udpateTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; + + private String startTime; + private String endTime; + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java index 7da4abd2..245093bb 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java @@ -1,6 +1,7 @@ package com.glxp.api.req.dev; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; @@ -18,10 +19,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Data @@ -37,6 +35,8 @@ public class DeviceRepairApplyAddParam { @NotEmpty(message = "请选择至少一个设备进行报修") Set details; + Long taskId; + @Data public static class ApplyDetail { @@ -52,6 +52,12 @@ public class DeviceRepairApplyAddParam { @NotBlank(message = "问题描述不能为空") String description; + /** + * 报修现场照片 + */ + @TableField(value = "livePath") + private String livePath; + @Override public boolean equals(Object o) { if (this == o) return true; @@ -80,6 +86,7 @@ public class DeviceRepairApplyAddParam { .applyUserId(user.getId()) .applyUserName(user.getEmployeeName()) .applyUserPhone(this.applyUserPhone) + .confirmUserId(user.getId()) .applyTime(LocalDateTime.now()) .deviceCount(details.size()) .finishCount(0) @@ -88,9 +95,11 @@ public class DeviceRepairApplyAddParam { } public List getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) { - List list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), DeviceStatusEnum.NORMAL); + List enums = new ArrayList<>(); + enums.add( DeviceStatusEnum.NORMAL); + List list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), null, enums); if (list.size() != details.size()) { - throw new JsonException("设备信息不匹配，疑似非法操作"); + throw new JsonException("设备状态异常或信息不符，请确认"); } Map> deviceMap = list.stream().collect(Collectors.groupingBy(DeviceInfoEntity::getDeviceCode)); return details.stream().map(d -> { @@ -99,6 +108,7 @@ public class DeviceRepairApplyAddParam { .applyId(applyId) .description(d.getDescription()) .status(DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS) + .livePath(d.getLivePath()) .build(); BeanUtil.copyProperties(info, build,"status"); return build; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java index e7928a22..5daeb672 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java @@ -22,8 +22,12 @@ public class DeviceRepairApplyDetailDiagnosisParam { @NotBlank(message = "诊断信息不能为空") String diagnosisInfo; + String diagnosisLivePath; + Boolean innerFlag; + Long repairUserId; + String repairUserName; String repairDeptCode; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyListByIdAndCodeQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyListByIdAndCodeQuery.java index ae28b9a3..c52097fc 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyListByIdAndCodeQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyListByIdAndCodeQuery.java @@ -1,13 +1,12 @@ package com.glxp.api.req.dev; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Data -public class DeviceRepairApplyListByIdAndCodeQuery extends ListPageRequest { +public class DeviceRepairApplyListByIdAndCodeQuery { @NotNull(message = "报修单标识不能为空") Long applyId; diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java new file mode 100644 index 00000000..aa128e47 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java @@ -0,0 +1,80 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 查询部门设备明细接口参数 + */ +@Data +public class FilterDeptDeviceRequest extends ListPageRequest { + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 资产编码 + */ + private String code; + + /** + * 原始编码 + */ + private String originCode; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废） + */ + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + private Integer addType; + + private Integer id; + + private String udiCode; + + private String nameCode; + + private String manufactory; + + private String zczbhhzbapzbh; + + private String supName; + + private String productionDate; + + private String expireDate; + + private String serialNo; + + private String manager; + + + + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java new file mode 100644 index 00000000..65aa65d1 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java @@ -0,0 +1,54 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 查询部门设备维保单接口参数 + */ +@Data +public class FilterDeviceInspectOrderRequest extends ListPageRequest { + + private Integer id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 上级单号，计划或报修单号 + */ + private String lastOrderId; + + /** + * 维保类型（1：报修；2：计划） + */ + private Integer type; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + private Integer status; + + /** + * 设备状态（0：异常；1：正常） + */ + private Integer deviceStatus; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java new file mode 100644 index 00000000..7ab292cd --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java @@ -0,0 +1,66 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +/** + * 查询设备设备巡检计划接口参数 + */ +@Data +public class FilterDeviceInspectPlanRequest extends ListPageRequest { + + private Integer id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 计划级别（1：低级；2：中级；3：高级） + */ + private Integer level; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + private Integer status; + + private List statusList; + + private Integer planStatus; + + + private String ksStartDate; + + private String ksEndDate; + + private String jsStartDate; + + private String jsEndDate; + + private String auditStartDate; + + private String auditEndDate; + + + + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java new file mode 100644 index 00000000..8885a41e --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java @@ -0,0 +1,72 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 查询设备设备巡检计划接口参数 + */ +@Data +public class FilterDeviceInspectTakeRequest extends ListPageRequest { + + private Long id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 计划级别（1：低级；2：中级；3：高级） + */ + private Integer level; + + /** + * 状态（1：新增；2：未审核；3：已审核） + */ + private Integer status; + + private List statusList; + + private Date expectedTime; + + private String ksStartDate; + + private String ksEndDate; + + private String jsStartDate; + + private String jsEndDate; + + private String yjjsStartDate; + + private String yjjsEndDate; + + + private Integer repairType; + + private Integer type; + + + + + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java new file mode 100644 index 00000000..171c3ac3 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.dev; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 设备养护记录详情查询接口参数 + */ +@Data +public class FilterDeviceMAOrderDetailRequest extends ListPageRequest { + + /** + * 设备养护记录号 + */ + private String orderIdFk; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java new file mode 100644 index 00000000..e3b2e54f --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java @@ -0,0 +1,39 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterDeviceMAOrderRequest extends ListPageRequest { + + /** + * 设备养护记录ID + */ + private Integer id; + + /** + * 设备养护记录号 + */ + private String orderId; + + /** + * 设备领用记录号 + */ + private String receiveOrderId; + + /** + * 状态 0：草稿 1：已完成 + */ + private Integer status; + + /** + * 设备编号 + */ + private String code; + + /** + * 打印模板ID + */ + private String templateId; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java new file mode 100644 index 00000000..3144ca2a --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java @@ -0,0 +1,49 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 设备领用记录详情接口参数 + */ +@Data +public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest { + + /** + * 设备领用记录详情ID + */ + private Integer id; + + /** + * 设备领用记录号 + */ + private String orderIdFk; + + /** + * 码 + */ + private String code; + + /** + * DI + */ + private String nameCode; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 领用人 + */ + private String receiveUser; + + /** + * 状态 + */ + private Integer status; + + private String relId; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java new file mode 100644 index 00000000..e5f1a8ac --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java @@ -0,0 +1,62 @@ +package com.glxp.api.req.dev; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +/** + * 设备领用记录相关参数 + */ +@Data +public class FilterDeviceReceiveOrderRequest extends ListPageRequest { + + /** + * 设备领用记录ID + */ + private Integer id; + + /** + * 设备领用记录号 + */ + private String orderId; + + /** + * 状态 0：草稿 1：未审核 2：已审核 + */ + private Integer status; + + /** + * 领用部门编码 + */ + private String fromDeptCode; + + /** + * 领用仓库编码 + */ + private String fromInvCode; + + /** + * 领用货位编码 + */ + private String fromInvSpaceCode; + + private String templateId; + + /** + * 开始时间 + */ + private String startTime; + + /** + * 结束时间 + */ + private String endTime; + + private String receiveUserName; + + private List statusList; + + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java new file mode 100644 index 00000000..4a42be39 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java @@ -0,0 +1,48 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +/** + * 查询部门设备报修单接口参数 + */ +@Data +public class FilterDeviceRepairOrderDetailRequest extends ListPageRequest { + + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java new file mode 100644 index 00000000..3d4f0590 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java @@ -0,0 +1,57 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +/** + * 查询部门设备报修单接口参数 + */ +@Data +public class FilterDeviceRepairOrderRequest extends ListPageRequest { + + private Integer id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） + */ + private Integer status; + + private List statusList; + + /** + * 维修人 + */ + private String repariName; + + /** + * 维修类型 1:自行维修；2：外部维修 + */ + private Integer repairType; + /** + * 紧急类型 1,正常；2,较急；3,特急 + */ + private Integer urgencyType; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java new file mode 100644 index 00000000..74303286 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java @@ -0,0 +1,30 @@ +package com.glxp.api.req.dev; + + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 库存养护记录详情参数 + */ +@Data +public class FilterInvMAOrderDetailRequest extends ListPageRequest { + + private Integer id; + + /** + * 养护记录ID + */ + public String orderIdFk; + + /** + * 养护状态 0：未养护 1：已养护 + */ + public Integer maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + private Integer deviceStatus; + +} diff --git a/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java new file mode 100644 index 00000000..452b8b07 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java @@ -0,0 +1,35 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 养护记录查询参数 + */ +@Data +public class FilterInvMAOrderRequest extends ListPageRequest { + + + private Integer id; + + /** + * 记录ID + */ + private String orderId; + + /** + * 分库号 + */ + private String invCode; + + /** + * 货位号 + */ + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已完成 + */ + private Integer status; + +} diff --git a/src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java b/src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java new file mode 100644 index 00000000..d5c5e43b --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.entity.dev.DeviceAssetCertEntity; +import lombok.Data; + +@Data +public class PostDeviceCertRequest extends DeviceAssetCertEntity { + + + private int repeatUpload; +} diff --git a/src/main/java/com/glxp/api/res/dev/DateRequest.java b/src/main/java/com/glxp/api/res/dev/DateRequest.java new file mode 100644 index 00000000..4ab51750 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DateRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +@Data +public class DateRequest { + + private String firstDay; + private String lastDay; + private int year; + private int momth; +} diff --git a/src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java new file mode 100644 index 00000000..aba2a63b --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java @@ -0,0 +1,158 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 部门设备明细VO + */ +@Data +public class DeptDeviceDetailResponse { + + private Integer id; + + /** + * 科室编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 原始码 + */ + private String originCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 耗材字典编码 + */ + private String relId; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 生产厂家 + */ + private String manufactory; + + /** + * 计量单位 + */ + private String measname; + + /** + * 注册/备案凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 供应商ID + */ + private String supId; + + /** + * 供应商名称 + */ + private String supName; + + /** + * 状态（1：正常；2：报修；3：养护中；4：已养护；5：已报废） + */ + private Integer status; + + /** + * 添加方式（1：领用添加；2：手动添加） + */ + private Integer addType; + + /** + * 添加人 + */ + private String createUser; + + /** + * 负责人 + */ + private String manager; + + /** + * 最后养护时间 + */ + private Date maTime; + + /** + * 添加时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 添加人名称 + */ + private String createUserName; + + /** + * 管理人名称 + */ + private String managerName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + private String orderIdFk; + + private String nameCode; +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java new file mode 100644 index 00000000..2fd7e681 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java @@ -0,0 +1,120 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备维保单VO + */ +@Data +public class DeviceInspectOrderResponse { + + private Integer id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 上级单号，计划或报修单号 + */ + private String lastOrderId; + + /** + * 维保类型（1：报修；2：计划；3：手动） + */ + private Integer type; + + /** + * 状态（0：新增；1：未审核；2：已审核） + */ + private Integer status; + + /** + * 设备状态（0：异常；1：正常） + */ + private Integer deviceStatus; + + /** + * 创建人 + */ + private String createUser; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 审核时间 + */ + private Date updateTime; + + /** + * 养护说明 + */ + private String remark; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 审核人名称 + */ + private String auditUserName; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java new file mode 100644 index 00000000..51def326 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java @@ -0,0 +1,138 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备巡检计划VO + */ +@Data +public class DeviceInspectPlanResponse { + + private Integer id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 计划级别（1：低级；2：中级；3：高级） + */ + private Integer level; + + /** + * 状态（0：新增；1：未审核；2：已审核） + */ + private Integer status; + + /** + * 创建人 + */ + private String createUser; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 备注 + */ + private String remark; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 审核人名称 + */ + private String auditUserName; + + /** + * 计划开始时间 + */ + private Date startTime; + /** + * 计划结束时间 + */ + private Date endTime; + /** + * 时间频率 + */ + private String frequency; + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + private Integer frequencyUnit; + /** + * 计划状态(1:未启用；2：运行中；3：已结束；4：已过期 + */ + private Integer planStatus; + /** + * 巡检人 + */ + private String inspectUser; + /** + * 上次巡检时间 + */ + private Date lastTime; + /** + * 下一次巡检时间 + */ + private Date nextTime; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java new file mode 100644 index 00000000..631e4af6 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java @@ -0,0 +1,53 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +/** + * 科室设备巡检设置参数 + */ +@Data +public class DeviceInspectSetResponse { + + private Integer id; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 资产编码 + */ + private String code; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 时间频率 + */ + private String frequency; + + /** + * 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒） + */ + private Integer frequencyUnit; + + /** + * 状态（1：启用；2：禁用） + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java new file mode 100644 index 00000000..aa0cc314 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java @@ -0,0 +1,117 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备巡检计划VO + */ +@Data +public class DeviceInspectTakeResponse { + + private Long id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + private String planOrderIdFk; + + /** + * 状态（0：未巡检；1：巡检中；2：已巡检） + */ + private Integer status; + + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 备注 + */ + private String remark; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 审核人名称 + */ + private String auditUserName; + + /** + * 计划开始时间 + */ + private Date strartTime; + /** + * 计划结束时间 + */ + private Date endTime; + + /** + * 计划状态(1:未启用；2：运行中；3：已结束；4：已过期 + */ + private Integer planStatus; + /** + * 巡检人 + */ + private String inspectUser; + /** + * 上次巡检时间 + */ + private Date remindTime; + private String inspectName; + private Date expectedTime; + private Integer type; + private Integer repairType; + private Integer level; + + + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java new file mode 100644 index 00000000..cb05b30f --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java @@ -0,0 +1,108 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备养护记录详情响应结果 + */ +@Data +public class DeviceMAOrderDetailResponse { + + /** + * id + */ + private Integer id; + + /** + * 设备养护记录号 + */ + private String orderIdFk; + + /** + * 条码 + */ + private String code; + + /** + * 耗材字典ID + */ + private String nameCode; + + /** + * 产品ID + */ + private String relId; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 设备状态 0：异常 1：正常 + */ + private Integer deviceStatus; + + /** + * 养护状态 0：未养护 1：已养护 + */ + private Integer maStatus; + + /** + * 养护人 + */ + private String createUser; + + /** + * 养护说明 + */ + private String remark; + + /** + * 产品名称 + */ + private String productName; + + /** + * 医疗器械注册人名称 + */ + private String ylqxzcrbarmc; + + /** + * 注册证备案号 + */ + private String zczbhhzbapzbh; + + /** + * 规格型号 + */ + private String ggxh; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java new file mode 100644 index 00000000..ab5450d9 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java @@ -0,0 +1,65 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备养护记录接口响应结果实体 + */ +@Data +public class DeviceMAOrderResponse { + + private Integer id; + + /** + * 设备养护记录号 + */ + private String orderId; + + /** + * 设备领用单据号 + */ + private String receiveOrderId; + + /** + * 状态 + */ + private Integer status; + + /** + * 养护时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 养护人 + */ + private String createUser; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 养护说明 + */ + private String remark; + + /** + * 设备编号 + */ + private String code; + + /** + * 科室名称 + */ + private String deptName; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java new file mode 100644 index 00000000..6906a683 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java @@ -0,0 +1,60 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DeviceProjectSetResponse { + private Integer id; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remak; + + /** + * 更新时间 + */ + private Date udpateTime; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新人名称 + */ + private String updateUserName; + + /** + * 创建人 + */ + private String createUser; + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java new file mode 100644 index 00000000..80086429 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java @@ -0,0 +1,138 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备领用记录详情响应结果 + */ +@Data +public class DeviceReceiveOrderDetailResponse { + + /** + * id + */ + private Integer id; + + /** + * 设备领用记录号 + */ + private String orderIdFk; + + /** + * 原始码 + */ + private String originCode; + + /** + * 码 + */ + private String code; + + /** + * 耗材字典ID + */ + private String relId; + + /** + * 产品DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 领用时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 产品名称 + */ + private String productName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 货位名称 + */ + private String invSpaceName; + + /** + * 货位名称 + */ + private String invSpaceCode; + + /** + * 注册/备案凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产厂家 + */ + private String ylqxzcrbarmc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 是否可以自定义序列号 + */ + private Boolean editSerialNo; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 供应商ID + */ + private String supId; + + /** + * 供应商名称 + */ + private String supName; + + /** + * 生产厂家 + */ + private String manufactory; + + /** + * 计量单位 + */ + private String measname; + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java new file mode 100644 index 00000000..7662f583 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java @@ -0,0 +1,133 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备领用记录响应结果 + */ +@Data +public class DeviceReceiveOrderResponse { + + /** + * id + */ + private Integer id; + + /** + * 领用记录号 + */ + private String orderId; + + /** + * 领用部门 + */ + private String fromDeptCode; + + /** + * 领用仓库 + */ + private String fromInvCode; + + /** + * 领用货位 + */ + private String fromInvSpaceCode; + + /** + * 接收部门 + */ + private String deptCode; + + /** + * 接收仓库 + */ + private String invCode; + + /** + * 接收货位 + */ + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已审核 + */ + private Integer status; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建人 + */ + private String createUserName; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 领用人 + */ + private String receiveUserName; + + /** + * 领用人 + */ + private String receiveUser; + + /** + * 领用时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 接收部门 + */ + private String deptName; + + /** + * 接收仓库 + */ + private String invName; + + /** + * 接收货位 + */ + private String invSpaceName; + + /** + * 领用部门名称 + */ + private String fromDeptName; + + /** + * 领用仓库名称 + */ + private String fromInvName; + + /** + * 领用货位名称 + */ + private String fromInvSpaceName; + + private String auditUserName; + + private Integer type; + + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java new file mode 100644 index 00000000..b98ce421 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java @@ -0,0 +1,48 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单VO + */ +@Data +public class DeviceRepairOrderDetailResponse { + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + + +} diff --git a/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java new file mode 100644 index 00000000..47193658 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java @@ -0,0 +1,152 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单VO + */ +@Data +public class DeviceRepairOrderResponse { + + private Integer id; + + /** + * 单号 + */ + private String orderId; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 资产编码 + */ + private String code; + + /** + * 状态（0：草稿；1：未审核；2：已审核；3：未处理 4：维修中 5：已处理） + */ + private Integer status; + + /** + * 创建人 + */ + private String createUser; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 报修说明 + */ + private String msg; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 备注 + */ + private String remark; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 审核人名称 + */ + private String auditUserName; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + // ----------------------新增字段=------------------------------- + /** + * 维修类型 1:自行维修；2：外部维修 + */ + private Integer repairType; + /** + * 紧急类型 1,正常；2,较急；3,特急 + */ + private Integer urgencyType; + /** + * 计划完成日期 + */ + private Date planTime; + /** + * 报修图片 + */ + private String uploadImage; + + + /** + * 维修人 + */ + private String repariName; + + /** + * 维修人名称 + */ + private String repName; + /** + * 维修开始时间 + */ + private String repariStartTime; + /** + * 维修结束时间 + */ + private String repariEndTime; + /** + * 维修说明 + */ + private String repariRemark; + /** + * 维修图片 + */ + private String repariImage; + private String inspectUser; + private String inspectUserName; + +} diff --git a/src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java new file mode 100644 index 00000000..82e242ab --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java @@ -0,0 +1,103 @@ +package com.glxp.api.res.dev; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.util.Date; + +/** + * 养护记录详情接口结果封装类 + */ +@Data +public class InvMAOrderDetailResponse { + + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 养护记录号 + */ + private String orderIdFk; + + /** + * 条码 + */ + private String code; + + /** + * 耗材字典ID + */ + private Long relId; + + /** + * DI标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 养护数量 + */ + private Integer count; + + /** + * 养护状态 0：未养护 1：已养护 + */ + private Integer maStatus; + + /** + * 设备状态 0：异常 1：正常 + */ + private Integer deviceStatus; + + /** + * 养护时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 产品名称 + */ + private String productName; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 注册/备案凭证号 + */ + private String zczbhhzbapzbh; + + /** + * 生产厂家 + */ + private String ylqxzcrbarmc; + +} diff --git a/src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java b/src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java new file mode 100644 index 00000000..53fb81d5 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java @@ -0,0 +1,85 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +import java.util.Date; + +/** + * 养护记录接口返回结果 + */ +@Data +public class InvMAOrderResponse { + + private Integer id; + + /** + * 养护记录号 + */ + private String orderId; + + /** + * 分库码 + */ + private String invCode; + + /** + * 货位码 + */ + private String invSpaceCode; + + /** + * 状态 0：草稿 1：未审核 2：已完成 + */ + private Integer status; + + /** + * 养护日期 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 养护人 + */ + private String createUser; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 备注 + */ + private String remark; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 货位名称 + */ + private String invSpaceName; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 审核人名称 + */ + private String auditUserName; + +} diff --git a/src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java b/src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java new file mode 100644 index 00000000..bb30e9b2 --- /dev/null +++ b/src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java @@ -0,0 +1,46 @@ +package com.glxp.api.res.dev; + +import lombok.Data; + +/** + * 库存养护查询库存产品VO + */ +@Data +public class InvMAProductResponse { + + /** + * id + */ + private String id; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 产品名称 + */ + private String cpmctymc; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productionDate; + + /** + * 失效日期 + */ + private String expireDate; + +} diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java index 2ec8f5bc..5b3fbfe8 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java @@ -1,8 +1,10 @@ package com.glxp.api.res.sync; + import com.glxp.api.entity.dev.*; -import com.glxp.api.entity.inv.*; +import com.glxp.api.entity.inv.DeviceInspectTaskEntity; +import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 98905ca8..b153f397 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.AuthAdminDao; import com.glxp.api.dao.auth.SysUserRoleMapper; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.SysUserRole; import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.FilterAuthUserRequest; @@ -32,6 +33,8 @@ public class AuthAdminServiceImpl implements AuthAdminService { private AuthAdminDao authAdminDao; @Resource SysUserRoleMapper sysUserRoleMapper; + @Resource + DeptServiceImpl deptService; @Override public List listAdminPage(FilterAuthUserRequest filterAuthUserRequest) { @@ -64,7 +67,12 @@ public class AuthAdminServiceImpl implements AuthAdminService { */ @Override public AuthAdmin findById(Long id) { - return authAdminDao.findById(id); + AuthAdmin authAdmin = authAdminDao.findById(id); + if (authAdmin != null) { + DeptEntity dept = deptService.selectByCode(authAdmin.getLocDeptCode()); + authAdmin.setDeptName(dept.getName()); + } + return authAdmin; } /** diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java index 0ebc5598..367f740d 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java @@ -96,7 +96,7 @@ public interface DeviceInfoService extends IService { List listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status); - List listVoByCodes(List deviceCodes, String deptCode, DeviceStatusEnum status); + List listVoByCodes(List deviceCodes, String deptCode, List status); boolean exitOrder(Long orderId, String deviceCode); diff --git a/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java index a4b2a711..c9e05b48 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java @@ -6,9 +6,7 @@ import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; import com.glxp.api.req.dev.DeviceRepairApplyAddParam; import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam; -import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; import com.glxp.api.req.dev.DeviceRepairApplyQuery; -import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse; import java.util.List; @@ -38,5 +36,4 @@ public interface DeviceRepairApplyService extends IService implements DeviceCheckDetailService { - final DeviceCheckService deviceCheckService; - final DeviceInfoService deviceInfoService; - final DeviceRepairService deviceRepairService; + @Resource + DeviceCheckService deviceCheckService; + @Resource + DeviceInfoService deviceInfoService; + @Resource + DeviceRepairService deviceRepairService; @Override public List pageList(DeviceCheckDetailQuery query) { diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java index 9da382f9..0cefbdd6 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java @@ -23,6 +23,7 @@ public class DeviceCheckItemDictServiceImpl extends CustomServiceImpl pageList(DeviceCheckItemDictQuery query) { PageHelper.startPage(query.getPage(), query.getLimit()); List list = super.list(Wrappers.lambdaQuery(DeviceCheckItemDictEntity.class) + .eq(query.getType().toString() != null, DeviceCheckItemDictEntity::getType, query.getType()) .like(StrUtil.isNotBlank(query.getCode()), DeviceCheckItemDictEntity::getCode, query.getCode()) .like(StrUtil.isNotBlank(query.getName()), DeviceCheckItemDictEntity::getName, query.getName()) .orderByDesc(DeviceCheckItemDictEntity::getCreateTime) diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java index 5244dd91..841d7777 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java @@ -16,7 +16,6 @@ import com.glxp.api.util.SnowflakeUtil; import com.glxp.api.vo.dev.DeviceCheckPrintVo; import com.glxp.api.vo.dev.DeviceCheckPrintVo.DetailVo; import com.glxp.api.vo.dev.DeviceCheckVo; -//import com.glxp.api.vo.dev.DevicePlanDetailVo; import com.glxp.api.vo.dev.DevicePlanDetailVo; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -95,7 +94,7 @@ public class DeviceCheckServiceImpl extends ServiceImpl(); } - List productItems = finalItemMap.get(d.getProductId() + "_"); + List productItems = finalItemMap.get(d.getProductId() + "_" ); if (CollectionUtil.isNotEmpty(productItems)) { items.addAll(productItems); } @@ -107,6 +106,7 @@ public class DeviceCheckServiceImpl extends ServiceImpl { DeviceCheckDetailItemEntity deviceCheckDetailItem = DeviceCheckDetailItemEntity.builder() @@ -134,9 +134,11 @@ public class DeviceCheckServiceImpl extends ServiceImpl listVoByCodes(List deviceCodes, String deptCode, DeviceStatusEnum status) { + public List listVoByCodes(List deviceCodes, String deptCode, List status) { List list = super.baseMapper.listVoByCodes(deviceCodes, deptCode, status); return list; @@ -229,6 +229,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl list = super.list(Wrappers.lambdaQuery(DeviceRepairApplyDetailEntity.class) + .eq(DeviceRepairApplyDetailEntity::getApplyId, applyId) + .eq(DeviceRepairApplyDetailEntity::getStatus, DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS)); + if (CollectionUtil.isNotEmpty(list)){ + deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class) + .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.PROCESSING) + .eq(DeviceRepairApplyEntity::getId, applyId)); + }else { + deviceRepairApplyService.update(Wrappers.lambdaUpdate(DeviceRepairApplyEntity.class) + .set(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyStatusEnum.FINISH) + .eq(DeviceRepairApplyEntity::getId, applyId)); + } } @Override @@ -141,7 +181,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl implements DeviceRepairApplyService { + @Resource + DeviceInfoService deviceInfoService; + @Resource + DeviceCheckDetailService deviceCheckDetailService; - private final DeviceInfoService deviceInfoService; @Autowired @Lazy @@ -45,14 +51,18 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl pageList(DeviceRepairApplyQuery query) { - String acceptInfo = query.getAcceptInfo(); - String repairInfo = query.getRepairInfo(); if (query.getPage() != null) { PageHelper.startPage(query.getPage(), query.getLimit()); } + List statuss = query.getStatuss(); + DeviceRepairApplyStatusEnum status = query.getStatus(); + if (status != null){ + statuss.add(status); + } + String acceptInfo = query.getAcceptInfo(); + String repairInfo = query.getRepairInfo(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(DeviceRepairApplyEntity.class); wrapper.eq(query.getApplyId() != null, DeviceRepairApplyEntity::getId, query.getApplyId()) - .eq(query.getStatus() != null, DeviceRepairApplyEntity::getStatus, query.getStatus()) .eq(query.getConfirmUserId() != null, DeviceRepairApplyEntity::getConfirmUserId, query.getConfirmUserId()) .eq(StrUtil.isNotBlank(query.getApplyDeptCode()), DeviceRepairApplyEntity::getApplyDeptCode, query.getApplyDeptCode()) .orderByDesc(DeviceRepairApplyEntity::getStatus, DeviceRepairApplyEntity::getApplyTime); @@ -80,6 +90,12 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl statusValues = statuss.stream() + .map(DeviceRepairApplyStatusEnum::getKey) // 假设 getStatusValue() 是获取用于查询的字符串值的方法 + .collect(Collectors.toList()); + wrapper.in(DeviceRepairApplyEntity::getStatus, statusValues); + } List list = super.list(wrapper); return list; @@ -99,8 +115,16 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl detailEntityList = param.getDetailEntityList(repairApply.getId(), deviceInfoService, user); + Long taskId = param.getTaskId(); detailEntityList.forEach(d -> { deviceInfoService.repairApply(d.getDeviceCode(), d.getDeptCode(), d.getApplyId()); + if (taskId != null){ + deviceCheckDetailService.update(Wrappers.lambdaUpdate(DeviceCheckDetailEntity.class) + .set(DeviceCheckDetailEntity::getApplyId, repairApply.getId()) + .eq(DeviceCheckDetailEntity::getTaskId, taskId) + .eq(DeviceCheckDetailEntity::getDeviceCode, d.getDeviceCode()) + ); + } }); repairApply.setUpdateTime(LocalDateTime.now()); super.save(repairApply); @@ -149,7 +173,6 @@ public class DeviceRepairApplyServiceImpl extends ServiceImpl implements DeviceRepairService { - final DeviceRepairApplyDetailService deviceRepairApplyDetailService; - final DeviceInfoService deviceInfoService; + @Resource + DeviceRepairApplyDetailService deviceRepairApplyDetailService; + @Resource + DeviceInfoService deviceInfoService; @Override public List pageList(DeviceRepairQuery query) { @@ -39,7 +42,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl list = super.list(Wrappers.lambdaQuery(DeviceRepairEntity.class) - .eq(DeviceRepairEntity::getCreateUserId, query.getCreateUserId()) + .eq(DeviceRepairEntity::getRepairUserId, query.getCreateUserId()) .eq(query.getIsFinish() != null, DeviceRepairEntity::getFinishFlag, query.getIsFinish()) .eq(StrUtil.isNotBlank(query.getDeviceCode()), DeviceRepairEntity::getDeviceCode, query.getDeviceCode()) .orderByAsc(DeviceRepairEntity::getFinishFlag) @@ -59,7 +62,6 @@ public class DeviceRepairServiceImpl extends ServiceImpl select info.deptCode,info.productId,info.status,info.nameCode,info.productName - ,info.ggxh,info.manufactory,info.measname,info.checkLock - ,count(deviceCode) count, dept.name deptName + ,info.ggxh,info.manufactory,info.measname,info.checkLock + ,count(deviceCode) count, dept.name deptName from device_info info left join auth_dept dept on dept.code = info.deptCode @@ -60,7 +60,7 @@ left join auth_dept dept on dept.code = info.deptCode - and info.deviceCode = #{param.deviceCode} + and info.deviceCode like concat('%',#{param.deviceCode},'%') and info.deptCode = #{param.deptCode} @@ -86,10 +86,17 @@ and info.productName like concat('%',#{param.productName},'%') - - and info.status != 'destroy' - and info.deviceCode not in ( select deviceCode from device_plan_detail where planId = #{param.planId} ) - + + and ( + info.deviceCode like concat('%',#{param.deviceCodeAndUdi},'%') + or + info.udi like concat('%',#{param.deviceCodeAndUdi},'%') + ) + + + and info.status != 'destroy' + and info.deviceCode not in ( select deviceCode from device_plan_detail where planId = #{param.planId} ) + order by info.deviceCode @@ -98,11 +105,11 @@