diff --git a/hzims-model/pom.xml b/hzims-model/pom.xml new file mode 100644 index 0000000..6138ca2 --- /dev/null +++ b/hzims-model/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + com.hnac.hzims + hzims-back + 4.0.0-SNAPSHOT + + + hzims-model + + + 8 + 8 + UTF-8 + + + + + + org.projectlombok + lombok + + + org.springblade + blade-starter-swagger + provided + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + ${project.name} + + + + + \ No newline at end of file diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/ProcessWorkFlowResponse.java b/hzims-model/src/main/java/com/hnac/hzims/vo/process/ProcessWorkFlowResponse.java similarity index 94% rename from hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/ProcessWorkFlowResponse.java rename to hzims-model/src/main/java/com/hnac/hzims/vo/process/ProcessWorkFlowResponse.java index 5199477..86b203e 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/ProcessWorkFlowResponse.java +++ b/hzims-model/src/main/java/com/hnac/hzims/vo/process/ProcessWorkFlowResponse.java @@ -1,4 +1,4 @@ -package com.hnac.hzims.operational.maintenance.vo; +package com.hnac.hzims.vo.process; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hzims-service-api/hzims-operational-api/pom.xml b/hzims-service-api/hzims-operational-api/pom.xml index 539360f..1496685 100644 --- a/hzims-service-api/hzims-operational-api/pom.xml +++ b/hzims-service-api/hzims-operational-api/pom.xml @@ -57,6 +57,14 @@ org.springblade blade-system-api + + + + com.hnac.hzims + hzims-model + 4.0.0-SNAPSHOT + provided + diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java index 75593b0..e7ba767 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/MaintenanceFeignClient.java @@ -2,7 +2,7 @@ package com.hnac.hzims.operational.maintenance.feign; import com.hnac.hzims.operational.OperationalConstants; import com.hnac.hzims.operational.maintenance.feign.fallback.MaintenanceFeignClientFallback; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Repository; diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/fallback/MaintenanceFeignClientFallback.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/fallback/MaintenanceFeignClientFallback.java index 74c921f..3bf2ebb 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/fallback/MaintenanceFeignClientFallback.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/fallback/MaintenanceFeignClientFallback.java @@ -1,7 +1,7 @@ package com.hnac.hzims.operational.maintenance.feign.fallback; import com.hnac.hzims.operational.maintenance.feign.MaintenanceFeignClient; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import org.springframework.stereotype.Component; /** diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index e9dd242..74a6977 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -247,6 +247,13 @@ + + + com.hnac.hzims + hzims-model + 4.0.0-SNAPSHOT + + diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java index 828644c..9efc68a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java @@ -2,7 +2,7 @@ package com.hnac.hzims.operational.maintenance.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.operational.maintenance.service.MaintenanceService; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java index 7b898e9..cfcf992 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.operational.maintenance.service; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; + +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import java.util.List; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java index 5a3f4dd..d49a905 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java @@ -21,7 +21,7 @@ import com.hnac.hzims.operational.maintenance.service.MaintenanceService; import com.hnac.hzims.operational.maintenance.template.service.TemplateService; import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo; import com.hnac.hzims.operational.util.StringObjUtils; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index cf9ac58..c8c62f7 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -267,7 +267,13 @@ redis.clients jedis - + + com.hnac.hzims + hzims-model + 4.0.0-SNAPSHOT + compile + + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java index a8d5e41..924e7bc 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/consumer/StandardWorkTicketConsumer.java @@ -6,7 +6,7 @@ import com.hnac.hzims.ticket.processflow.entity.WorkflowOperationLog; import com.hnac.hzims.ticket.processflow.service.WorkflowOperationLogService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.extern.slf4j.Slf4j; import org.springblade.queue.annotation.RedisQueue; import org.springblade.queue.consume.IQueueConsume; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java index 5ff6e28..7b514b2 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/controller/ProcessTypeController.java @@ -11,7 +11,7 @@ import com.hnac.hzims.ticket.processflow.properties.WorkTicketProperties; import com.hnac.hzims.ticket.processflow.service.ProcessTypeService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import org.springblade.core.tool.api.R; import org.springblade.core.tool.jackson.JsonUtil; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/service/ProcessService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/service/ProcessService.java index 04fb0c5..76adfc0 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/service/ProcessService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/service/ProcessService.java @@ -1,7 +1,7 @@ package com.hnac.hzims.ticket.processflow.strategy.service; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; /** * @Author dfy diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java index 7410a48..0fb3e7f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MachineryTicketProcessServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java index 8f2f59f..c6cbbf8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/MaintenanceProcessServiceImpl.java @@ -4,7 +4,7 @@ import com.hnac.hzims.operational.maintenance.feign.MaintenanceFeignClient; import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java index 2b68939..5cacbd6 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OneTicketProcessServiceImpl.java @@ -1,10 +1,10 @@ package com.hnac.hzims.ticket.processflow.strategy.serviceimpl; import com.hnac.hzims.ticket.processflow.service.ProcessDictService; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; import com.hnac.hzims.ticket.twoTicket.service.TicketProcessService; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java index edf38be..5cb177b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/processflow/strategy/serviceimpl/OperationTicketProcessServiceImpl.java @@ -3,8 +3,9 @@ package com.hnac.hzims.ticket.processflow.strategy.serviceimpl; import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.processflow.strategy.abstracts.ProcessAbstractService; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; + import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java index 4f0ed6b..4d16941 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/redisConsume/WorkTicketMsgConsume.java @@ -3,8 +3,9 @@ package com.hnac.hzims.ticket.redisConsume; import com.alibaba.fastjson.JSONObject; import com.hnac.hzims.common.config.RedisMessageListener; import com.hnac.hzims.ticket.constants.TicketConstants; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; + import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java index 791f8e1..b40a060 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardWorkTicketController.java @@ -2,13 +2,13 @@ package com.hnac.hzims.ticket.standardTicket.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.standardTicket.service.StandardWorkTicketService; import com.hnac.hzims.ticket.processflow.properties.TicketProperties; import com.hnac.hzims.ticket.processflow.properties.WorkTicketProperties; import com.hnac.hzims.ticket.processflow.strategy.entity.WorkflowQueue; import com.hnac.hzims.ticket.processflow.strategy.service.ProcessService; import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java index a91b503..8ff618e 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java @@ -1,7 +1,8 @@ package com.hnac.hzims.ticket.standardTicket.service; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; + import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import javax.servlet.http.HttpServletResponse; 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 9b4e340..0503ea0 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 @@ -14,7 +14,6 @@ import com.hnac.hzims.operational.station.feign.IStationClient; import com.hnac.hzims.ticket.constants.TicketConstants; import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketMeasureEntity; import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService; @@ -26,6 +25,7 @@ import com.hnac.hzims.ticket.twoTicket.utils.WordMapUtils; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketMeasureVo; import com.hnac.hzims.ticket.utils.PdfUtils; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/utils/OperationWordHelper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/utils/OperationWordHelper.java index 52e4553..eb1b45b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/utils/OperationWordHelper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/utils/OperationWordHelper.java @@ -42,7 +42,7 @@ public class OperationWordHelper { public static String getWorkTicketStatus(Integer status) { String result = null; switch (status) { - case 0: + case 1: result = "电气操作票.docx"; default: result = "电气操作票.docx"; diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java index 41f7f57..e278b04 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/TicketProcessService.java @@ -1,7 +1,7 @@ package com.hnac.hzims.ticket.twoTicket.service; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import javax.servlet.http.HttpServletResponse; 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 49a6288..7786549 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 @@ -22,7 +22,6 @@ import com.hnac.hzims.ticket.constants.TicketConstants; import com.hnac.hzims.ticket.constants.WorkTicketConstants; import com.hnac.hzims.ticket.processflow.service.ProcessDictService; import com.hnac.hzims.ticket.processflow.strategy.core.ProcessIdWorker; -import com.hnac.hzims.operational.maintenance.vo.ProcessWorkFlowResponse; import com.hnac.hzims.ticket.twoTicket.constant.TicketConstant; import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger; import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; @@ -40,6 +39,7 @@ import com.hnac.hzims.ticket.workTicket.entity.*; import com.hnac.hzims.ticket.workTicket.service.*; import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketDelayServiceImpl; import com.hnac.hzims.ticket.workTicket.service.impl.WorkTicketOperateTimeServiceImpl; +import com.hnac.hzims.vo.process.ProcessWorkFlowResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/hzims-service/ticket/src/main/resources/template/secondary/工作票安全措施附页.docx b/hzims-service/ticket/src/main/resources/template/secondary/工作票安全措施附页.docx index ed79a2b..a58602b 100644 Binary files a/hzims-service/ticket/src/main/resources/template/secondary/工作票安全措施附页.docx and b/hzims-service/ticket/src/main/resources/template/secondary/工作票安全措施附页.docx differ diff --git a/hzims-service/ticket/src/main/resources/template/secondary/有限空间监测记录单.docx b/hzims-service/ticket/src/main/resources/template/secondary/有限空间监测记录单.docx index 1a68c60..5665ece 100644 Binary files a/hzims-service/ticket/src/main/resources/template/secondary/有限空间监测记录单.docx and b/hzims-service/ticket/src/main/resources/template/secondary/有限空间监测记录单.docx differ diff --git a/hzims-service/ticket/src/main/resources/template/secondary/每日开工和收工时间附页.docx b/hzims-service/ticket/src/main/resources/template/secondary/每日开工和收工时间附页.docx index 43cab96..85b41ac 100644 Binary files a/hzims-service/ticket/src/main/resources/template/secondary/每日开工和收工时间附页.docx and b/hzims-service/ticket/src/main/resources/template/secondary/每日开工和收工时间附页.docx differ diff --git a/hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx b/hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx index abdde27..1f7c91c 100644 Binary files a/hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx and b/hzims-service/ticket/src/main/resources/template/水力机械工作票模版.docx differ diff --git a/hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx b/hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx index 702f915..20fdae5 100644 Binary files a/hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx and b/hzims-service/ticket/src/main/resources/template/电气第二种工作票模版.docx differ diff --git a/pom.xml b/pom.xml index 722d126..721b407 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ hzims-service hzims-service-api + hzims-model