From 5d8e614d48e7924c364b2782ef413028b515c98e Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Thu, 25 Jul 2024 16:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=A5=A8=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ticket/standardTicket/entity/StandardTicketInfoEntity.java | 8 ++++++++ .../standardTicket/service/impl/OperationTicketServiceImpl.java | 4 ++++ .../ticket/twoTicket/service/impl/TicketProcessServiceImpl.java | 1 + .../hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java | 7 +++++++ hzims-service/ticket/src/main/resources/db/3.0.0.sql | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java index 0312ece..f17677c 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java @@ -178,4 +178,12 @@ public class StandardTicketInfoEntity extends TenantEntity implements Serializab @ApiModelProperty("图片附件") private String picture; + +// @ApiModelProperty("设备编号") +// @QueryField(condition = SqlCondition.EQUAL) +// private String emCode ; +// +// @ApiModelProperty("设备名称") +// @QueryField(condition = SqlCondition.LIKE) +// private String emName; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java index 34c9db7..028eb9a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java @@ -156,6 +156,7 @@ public class OperationTicketServiceImpl implements OperationTicketService , Star standardTicketInfoVo.setCode(code); //3. 保存操作对象 StandardTicketInfoEntity standardTicketInfo = getStandardTicketInfoEntity(standardTicketInfoVo); + standardTicketInfo.setStatus(1); boolean save = standardTicketInfoService.save(standardTicketInfo); if (!save) { throw new ServiceException("Save failed"); @@ -382,6 +383,9 @@ public class OperationTicketServiceImpl implements OperationTicketService , Star log.error("安全措施为空哦"); return new ArrayList<>(); } + measureEntityList= measureEntityList.stream().map(s->{ + s.setStatus(1); + return s;}).collect(Collectors.toList()); boolean save = standardTicketMeasureService.saveBatch(measureEntityList); if (!save) { throw new ServiceException("Save failed"); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index a5fe953..c294360 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -790,6 +790,7 @@ public class TicketProcessServiceImpl implements TicketProcessService, StartProc measure.setCreateDept(workTicketInfoEntity.getCreateDept()); measure.setCreateUser(workTicketInfoEntity.getCreateUser()); measure.setExecutor(AuthUtil.getUserId()); + measure.setStatus(1); return measure; }).collect(Collectors.toList()); boolean savedBatch = workTicketSafetyMeasureService.saveBatch(measureEntityList); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java index 1c58a20..fe36451 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java @@ -36,6 +36,7 @@ public class StandardTicketInfoVo extends TenantEntity { @ApiModelProperty("编号") private String code; + @ApiModelProperty("发令人") private Long issueOrderPerson; @@ -167,4 +168,10 @@ public class StandardTicketInfoVo extends TenantEntity { @ApiModelProperty("图片附件") private String picture; + +// +// @ApiModelProperty("设备编号") +// private String emCode ; +// @ApiModelProperty("设备名称") +// private String emName; } diff --git a/hzims-service/ticket/src/main/resources/db/3.0.0.sql b/hzims-service/ticket/src/main/resources/db/3.0.0.sql index 101eda0..364b1fd 100644 --- a/hzims-service/ticket/src/main/resources/db/3.0.0.sql +++ b/hzims-service/ticket/src/main/resources/db/3.0.0.sql @@ -7,3 +7,7 @@ ALTER TABLE `hzims_standard_ticket_info` ADD COLUMN `is_normal` tinyint(2) NULL DEFAULT 1 ; ALTER TABLE `hzims_work_ticket_info` ADD COLUMN `is_normal` tinyint(2) NULL DEFAULT 1 ; + +ALTER TABLE `hzims_standard_ticket_info` +ADD COLUMN `em_code` varchar(255) NULL COMMENT '设备编号' , +ADD COLUMN `em_name` varchar(255) NULL COMMENT '设备名称' ; \ No newline at end of file