diff --git a/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareClient.java b/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareClient.java index 0318679..b167472 100644 --- a/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareClient.java +++ b/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareClient.java @@ -37,6 +37,6 @@ public interface ISpareClient { @PostMapping(EXCEED_LIMIT) List exceedLimit(@RequestParam("deptId") Long deptId); - @GetMapping(EXCEED_LIMIT) + @PostMapping(SPARE_PART) List sparePart(@RequestParam("basics") List basics); } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java index 336f1fd..0cb25dc 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessContentEntity.java @@ -25,16 +25,11 @@ public class OperAccessContentEntity extends TenantEntity { private static final long serialVersionUID = 1L; - /** - * 库ID - */ + @ApiModelProperty(value = "库ID") @JsonSerialize(nullsUsing = NullSerializer.class) private Long libraryId; - /** - * 计划ID - */ @ApiModelProperty(value = "计划ID") @JsonSerialize(nullsUsing = NullSerializer.class) private Long planId; @@ -43,73 +38,48 @@ public class OperAccessContentEntity extends TenantEntity { @JsonSerialize(nullsUsing = NullSerializer.class) private Long ticketTemplateId; - /** - * 计划开始时间 - */ @ApiModelProperty(value = "计划开始时间") private Date planStartTime; - /** - * 计划结束时间 - */ @ApiModelProperty(value = "计划结束时间") private Date planEndTime; - /** - * 设备编码 - */ + @ApiModelProperty("站点编码") + private String stationCode; + + @ApiModelProperty("站点名称") + private String stationName; + + @ApiModelProperty("设备名称") + private String emName; + @ApiModelProperty(value = "设备编码") private String emCode; - /** - * 名称 - */ @ApiModelProperty(value = "名称") private String name; - /** - * 类型 - */ @ApiModelProperty(value = "类型") @JsonSerialize(nullsUsing = NullSerializer.class) private Integer typeCode; - /** - * 检修等级 - */ @ApiModelProperty(value = "检修等级") private String gradeCode; - /** - * 操作规范 - */ @ApiModelProperty(value = "操作规范") private String workStandards; - /** - * 安全警告 - */ @ApiModelProperty(value = "安全警告") private String safeInfos; - /** - * 实际工时 - */ @ApiModelProperty(value = "实际工时") @JsonSerialize(nullsUsing = NullSerializer.class) private Integer actHours; - /** - * 负责人 - */ @ApiModelProperty(value = "负责人") @JsonSerialize(nullsUsing = NullSerializer.class) private Long manager; - /** - * 描述 - */ @ApiModelProperty(value = "描述") private String descripiton; - } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessLibraryEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessLibraryEntity.java index c354b32..72d1e33 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessLibraryEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/access/entity/OperAccessLibraryEntity.java @@ -34,6 +34,12 @@ public class OperAccessLibraryEntity extends TenantEntity { private String emCode; /** + * 设备编码 + */ + @ApiModelProperty(value = "设备名称") + private String emName; + + /** * 检修等级 */ @ApiModelProperty(value = "检修等级") diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java index 7eaa129..fc5eb87 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java @@ -14,6 +14,9 @@ import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.feign.ISysClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -137,6 +140,7 @@ public class SpareClient implements ISpareClient{ * @return */ @Override + @PostMapping(SPARE_PART) public List sparePart(List basics) { return wtSpBasicService.sparePart(basics); } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java index 3ec89f4..2d619bf 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java @@ -4,6 +4,7 @@ import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.vo.SparePartVO; import com.hnac.hzims.spare.vo.WtSpBasicVO; +import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.annotation.UserDataAuth; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; import org.springframework.web.bind.annotation.RequestParam; @@ -48,5 +49,5 @@ public interface WtSpBasicMapper extends UserDataScopeBaseMapper getInList(Long spBasicId); - List sparePart(@RequestParam("basics") List basics); + List sparePart(@Param("basicIds") List basics); } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.xml b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.xml index 7db89ac..3e12697 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.xml +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.xml @@ -101,10 +101,10 @@ LEFT JOIN WT_SP_WAREHOUSE house ON total.WAREHOUSE_ID = house.id 1 = 2 OR - - and basic.ID in - - #{basic} + + basic.ID in + + #{item} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java index 3f73b8b..045776f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/AccessPlanV4Controller.java @@ -16,7 +16,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java index 896e2f3..d83c0c7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessLibraryController.java @@ -98,4 +98,11 @@ public class OperAccessLibraryController extends BladeController { public void downLoad() { service.downLoad(); } + + @ApiOperation(value = "检修库导入") + @ApiOperationSupport(order = 7) + @PostMapping(value = "/import") + public void libraryImport(@RequestParam MultipartFile multipartFile) { + service.libraryImport(multipartFile); + } } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java index de3219d..2ebc882 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/OperAccessTaskController.java @@ -101,6 +101,7 @@ public class OperAccessTaskController extends BladeController { public R> list(OperAccessTaskDTO req, Query query) { return service.list(req, query); } + /** * 分页 */ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java index 6704dcd..0abc6f7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessLibraryService.java @@ -10,6 +10,8 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + /** * 服务类 * @@ -27,4 +29,6 @@ public interface IOperAccessLibraryService extends BaseService> list(OperAccessLibraryListDTO req, Query query); void downLoad(); + + void libraryImport(MultipartFile multipartFile); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java index d7eaced..9c2a6c5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java @@ -147,6 +147,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ material.setIsDeleted(0); materialService.save(material); } + } /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java index f4d82a6..ef3725f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessLibraryServiceImpl.java @@ -17,25 +17,37 @@ import com.hnac.hzims.operational.access.service.IOperAccessLibraryDetailService import com.hnac.hzims.operational.access.service.IOperAccessLibraryService; import com.hnac.hzims.operational.access.vo.OperAccessLibraryVO; import com.hnac.hzims.operational.access.wrapper.OperAccessLibraryWrapper; +import com.hnac.hzims.operational.util.ExcelUtil; +import com.hnac.hzims.operational.util.PdfUtils; import com.hnac.hzims.safeproduct.feign.IDangerSourceClient; import org.apache.commons.lang.StringUtils; -import org.jfree.chart.util.ExportUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.system.cache.DictCache; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.util.*; import java.util.stream.Collectors; /** @@ -99,13 +111,95 @@ public class OperAccessLibraryServiceImpl extends BaseServiceImpl details = new ArrayList<>(); + Long libraryId = null; + for (int i = 2; i <= rows + 1; i++) { + // 读取左上端单元格 + Row row = sheet.getRow(i); + // 行不为空 + if (row == null) { + continue; + } + if( (i - 1) % 4 == 1){ + if(StringUtils.isEmpty(row.getCell(1).getStringCellValue())){ + continue; + } + OperAccessLibraryEntity library = new OperAccessLibraryEntity(); + library.setEmName(row.getCell(1).getStringCellValue()); + library.setGradeCode(DictCache.getValue("gradeCode",row.getCell(2).getStringCellValue())); + library.setLastServiceTime(row.getCell(3).getDateCellValue()); + library.setPeriod((int)row.getCell(4).getNumericCellValue()); + library.setStopHours((int)row.getCell(5).getNumericCellValue()); + this.save(library); + libraryId = library.getId(); + } + if(StringUtils.isNotEmpty(row.getCell(6).getStringCellValue())){ + OperAccessLibraryDetailEntity detail = new OperAccessLibraryDetailEntity(); + detail.setName(row.getCell(6).getStringCellValue()); + detail.setContent(row.getCell(7).getStringCellValue()); + detail.setPid(libraryId); + details.add(detail); + } + } + this.libraryDetailService.saveBatch(details); + } + + /** * 调整检修库明细 * * @author xiashandong diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java index d7add83..3a13109 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java @@ -283,7 +283,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl> statorMap = getHisData(emInfoExtendVo.getNumber(), map, df, statorSignages, signKeyMap, date); - runMonthReportUnitVoDZ.setName(emInfoExtendVo.getName() + "定子温度曲线"); + runMonthReportUnitVoDZ.setName(emInfoExtendVo.getName() + "定子电流/电压曲线"); runMonthReportUnitVoDZ.setDataMap(statorMap); unitYcDataList.add(runMonthReportUnitVoDZ); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java index c58ff94..215cfef 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java @@ -1,10 +1,12 @@ package com.hnac.hzims.operational.maintenance.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.operational.maintenance.service.IMaintenanceTaskQueryService; import com.hnac.hzims.operational.maintenance.vo.MaintenanceTaskQueryVO; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,6 +39,14 @@ public class MaintenanceTaskQueryController extends BladeController { return R.data(maintenanceTaskQueryService.getMaintenanceTaskQuery(month, deptId)); } + @GetMapping("/getMaintenanceTaskPage") + @ApiOperation("查询日常维护任务-分页查询") + @ApiOperationSupport(order = 1) + public R getMaintenanceTaskPage(@RequestParam("month") @ApiParam(value = "查询月份",required = true) String month, + @RequestParam(value = "deptId",required = false) @ApiParam("查询机构") Long deptId, Query query) { + return R.data(maintenanceTaskQueryService.getMaintenanceTaskPage(month,deptId,query)); + } + @GetMapping("/exportMaintenanceTaskQuery") @ApiOperation("导出日常维护任务") @ApiOperationSupport(order = 1) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java index 4223c84..4fd388c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java @@ -1,13 +1,17 @@ package com.hnac.hzims.operational.maintenance.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.operational.maintenance.vo.MaintenanceTaskQueryVO; +import org.springblade.core.mp.support.Query; import javax.servlet.http.HttpServletResponse; import java.util.List; public interface IMaintenanceTaskQueryService { - List getMaintenanceTaskQuery(String month,Long deptId); + IPage getMaintenanceTaskPage(String month, Long deptId, Query query); + + List getMaintenanceTaskQuery(String month, Long deptId); void exportMaintenanceTaskQuery(String month, Long deptId, HttpServletResponse response); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java index ec533e2..11c2053 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java @@ -8,8 +8,10 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; +import com.hnac.hzims.common.utils.Condition; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.operational.maintenance.constants.DictConstant; @@ -22,6 +24,7 @@ import com.hnac.hzims.spare.entity.WtSpBasicEntity; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.BorderStyle; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; @@ -60,6 +63,17 @@ public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQuerySer @Override + public IPage getMaintenanceTaskPage(String month, Long deptId, Query query) { + LambdaQueryWrapper wq = Wrappers.lambdaQuery() + .like(OperMaintenanceTaskEntity::getDisposeTime, month) + .like(Func.isNotEmpty(deptId),OperMaintenanceTaskEntity::getCreateDept,deptId) + .orderByAsc(OperMaintenanceTaskEntity::getDisposeTime); + IPage page = maintenanceTaskService.page(Condition.getPage(query), wq); + page.setRecords(this.fillTaskQuery(page.getRecords())); + return page; + } + + @Override public List getMaintenanceTaskQuery(String month,Long deptId) { LambdaQueryWrapper wq = Wrappers.lambdaQuery() .like(OperMaintenanceTaskEntity::getDisposeTime, month) diff --git a/hzims-service/operational/src/main/resources/template/excel/access_import_template.xls b/hzims-service/operational/src/main/resources/template/excel/access_import_template.xlsx similarity index 82% rename from hzims-service/operational/src/main/resources/template/excel/access_import_template.xls rename to hzims-service/operational/src/main/resources/template/excel/access_import_template.xlsx index 6c76782..db66ce3 100644 Binary files a/hzims-service/operational/src/main/resources/template/excel/access_import_template.xls and b/hzims-service/operational/src/main/resources/template/excel/access_import_template.xlsx differ diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java index 1e9e002..195239c 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java @@ -305,6 +305,9 @@ public class SafetyToolServiceImpl extends BaseServiceImpl - and info.make_date_time >= #{startTime} + and info.plan_start_time >= #{startTime} - and info.make_date_time <= #{endTime} + and info.plan_start_time <= #{endTime} GROUP BY info.EM_CODE,info.`type` diff --git a/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20.xml b/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20.xml index f15bd78..5fab432 100644 --- a/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20.xml +++ b/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20.xml @@ -28,12 +28,6 @@ - - - - - - @@ -87,16 +81,9 @@ - - - - - - - @@ -119,149 +106,143 @@ + + + + - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + - - + + - - - + + + - - - + + + - - - - - - - + + - - + + - - + + - - - + + + + + + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + - - + + - - - + + diff --git a/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20_bak.xml b/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20_bak.xml new file mode 100644 index 0000000..f15bd78 --- /dev/null +++ b/hzims-service/ticket/src/main/resources/file/水力机械工作票流程.bpmn20_bak.xml @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file