From dbe9b41b6da87b0c8c8a711b0dcab8ec79c41ed3 Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Tue, 30 Jul 2024 16:24:03 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E8=A1=A5?= =?UTF-8?q?=E5=81=BF=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84params=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f0660df..6ba975b 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 @@ -144,7 +144,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service, StartProces if (StringUtils.isNotBlank(param)){ variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); }else { - variables = JSONObject.parseObject(entity); + variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); } variables.put("creator", TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()))); R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(), From ccad4b1d74636dd0e31bed4b900e6ec4157fc35f Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Tue, 30 Jul 2024 16:28:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E8=A1=A5?= =?UTF-8?q?=E5=81=BF=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84params=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6ba975b..aa68cc7 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 @@ -144,7 +144,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service, StartProces if (StringUtils.isNotBlank(param)){ variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); }else { - variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); + variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(entity,DateUtil.PATTERN_DATETIME), Map.class); } variables.put("creator", TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()))); R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(), From d89794d31ab69c07f54a5a1e00daf88b98fdec52 Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Tue, 30 Jul 2024 19:22:57 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=97=A5=E5=BF=97=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java index dffc84e..5cec3ce 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java @@ -70,7 +70,8 @@ public class ImsAnalyseExampleServiceImpl extends ServiceImpl Date: Tue, 30 Jul 2024 22:00:57 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E8=A1=A5?= =?UTF-8?q?=E5=81=BF=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/access/service/impl/AccessPlanV4ServiceImpl.java | 2 +- .../operational/access/service/impl/AccessTaskV4ServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 aa68cc7..029d156 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 @@ -144,7 +144,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service, StartProces if (StringUtils.isNotBlank(param)){ variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); }else { - variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(entity,DateUtil.PATTERN_DATETIME), Map.class); + variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(accessPlanV4DTO,DateUtil.PATTERN_DATETIME), Map.class); } variables.put("creator", TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()))); R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(), diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java index 2c49021..675064c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessTaskV4ServiceImpl.java @@ -120,13 +120,13 @@ public class AccessTaskV4ServiceImpl implements AccessTaskV4Service, StartProces if (StringUtils.isNotBlank(param)){ variables=JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(param,DateUtil.PATTERN_DATETIME), Map.class); }else { - variables = JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(entity, DateUtil.PATTERN_DATETIME), Map.class); + variables = JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(accessTaskV4DTO, DateUtil.PATTERN_DATETIME), Map.class); } if(ObjectUtil.isNotEmpty(accessTaskV4DTO.getCreateUser())){ variables.put("startFlowUserId",accessTaskV4DTO.getCreateUser().toString()); } variables.put("solve",TaskUtil.getTaskUser(accessTaskV4DTO.getHandler().toString())); - R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(),dictValue, + R result = compensateProcessClient.startFlow(AuthUtil.getUserId().toString(),dictValue, FlowUtil.getBusinessKey("access_task_v4", String.valueOf(accessTaskV4DTO.getId())), accessTaskV4DTO.getName(),variables); log.error("开启检修任务流程失败{}" + result); From 37d91937990ec4fcee82ed902e30bb83620eac76 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 31 Jul 2024 08:24:46 +0800 Subject: [PATCH 05/10] =?UTF-8?q?#=20=E8=AE=BE=E5=A4=87=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=96=B0=E5=A2=9Ebug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/equipment/controller/EmDefinitionController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java index 3b0cdc6..5f8ec5e 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java @@ -18,7 +18,9 @@ import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; @@ -89,9 +91,9 @@ public class EmDefinitionController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "新增", notes = "传入EmDefinitionDTO") public R save(@Valid @RequestBody EmDefinitionDTO emDefinitionDTO) { - EmDefinitionEntity emDefinition = new EmDefinitionEntity(); - Func.copy(emDefinitionDTO, emDefinition); - return R.data(emDefinitionService.save(emDefinition)); + EmDefinitionEntity definition = BeanUtil.copy(emDefinitionDTO, EmDefinitionEntity.class); + definition.setCreateUser(AuthUtil.getUserId()); + return R.data(emDefinitionService.save(definition)); } /** From bd8f7a75c36a78569da553de0e9b00d0525533f2 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 31 Jul 2024 08:44:15 +0800 Subject: [PATCH 06/10] =?UTF-8?q?add=EF=BC=9A=E6=97=A5=E5=B8=B8=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java | 3 +++ .../maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java index fc36121..e5a7cd9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java @@ -27,4 +27,7 @@ public class OperMaintenanceMonitorReportMonthDTO implements Serializable { @ApiModelProperty(value = "机构ID") private Long deptId; + @ApiModelProperty(value = "站点编号") + private String stationCode; + } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java index 660269c..8c61857 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java @@ -49,6 +49,7 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito eq(OperMaintenancePlanEntity::getIsDeleted, 0L); ge(OperMaintenancePlanEntity::getDisposeTime, startDate); lt(OperMaintenancePlanEntity::getDisposeTime, startDate.plusMonths(1)); + eq(StringUtil.isNotBlank(req.getStationCode()),OperMaintenancePlanEntity::getStationCode,req.getStationCode()); eq(Func.isNotEmpty(req.getDeptId()), OperMaintenancePlanEntity::getCreateDept, req.getDeptId()); }}); From 8c80d96ab46df55ad668157dae9fe082b7aa5bb5 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 31 Jul 2024 08:45:36 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obj/services/impl/ObjectUserServiceImpl.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java index e51682b..6ffe9ac 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectUserServiceImpl.java @@ -11,7 +11,9 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; @@ -53,11 +55,11 @@ public class ObjectUserServiceImpl extends ServiceImpl(); } - R> users = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName()); - if(!users.isSuccess() || CollectionUtil.isEmpty(users.getData())){ - return new ArrayList<>(); - } - Map userMap = users.getData().stream().collect(Collectors.toMap(User::getId, Function.identity())); +// R> users = userClient.userListByCodeAndNameAndAccount(AuthUtil.getTenantId(),content.getUserCode(),content.getUserName(),content.getLoginName()); +// if(!users.isSuccess() || CollectionUtil.isEmpty(users.getData())){ +// return new ArrayList<>(); +// } +// Map userMap = users.getData().stream().collect(Collectors.toMap(User::getId, Function.identity())); return objectUsers.stream().map(objectUser->{ ObjectUserListVO builder = new ObjectUserListVO(); builder.setId(objectUser.getId()); @@ -65,7 +67,8 @@ public class ObjectUserServiceImpl extends ServiceImpl Func.isNotEmpty(o.getUserId())).collect(Collectors.toList()); } } From 64628cfa4af4e2c4565f375d9c63d8de8eae3d56 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 31 Jul 2024 08:47:31 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E6=8A=A5?= =?UTF-8?q?=E5=A4=87=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/service/impl/EventServiceImpl.java | 35 +++++++++------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java index a0a406c..495e95e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java @@ -1,6 +1,7 @@ package com.hnac.hzinfo.inspect.task.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import com.hnac.hzims.operational.defect.constants.DefectConstant; @@ -92,31 +93,35 @@ public class EventServiceImpl extends ServiceImpl @Override @Transactional(rollbackFor = Exception.class) public boolean addTaskEvent(EventAddVO eventVO){ - BladeUser user = AuthUtil.getUser(); - //第一次登记时，需领用任务 if(!AuthUtil.isAdministrator()){ + // 判断当前登录人是否在任务人员列表中 ITaskService taskService = SpringUtil.getBean(ITaskService.class); TaskEntity taskEntity = taskService.getById(eventVO.getTaskId()); - TaskUserEntity taskUserEntity = taskUserService.getOne(Wrappers.lambdaQuery().eq(TaskUserEntity::getTaskId,eventVO.getTaskId()).eq(TaskUserEntity::getUserId,user == null ? eventVO.getUserId() : user.getUserId())); - if(taskUserEntity==null){ + BladeUser user = AuthUtil.getUser(); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(TaskUserEntity::getTaskId, eventVO.getTaskId()) + .eq(TaskUserEntity::getUserId, user == null ? eventVO.getUserId() : user.getUserId()); + TaskUserEntity taskUserEntity = taskUserService.getOne(wrapper); + if(taskUserEntity == null){ throw new ServiceException("该任务已被别人领取"); } if(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus().equals(taskUserEntity.getClaimStatus())){ taskUserEntity.setClaimStatus(TaskContants.ClaimStatusEnum.COLLECT.getStatus()); taskUserEntity.setClaimTime(LocalDateTime.now()); taskUserService.updateById(taskUserEntity); - if(PlanContants.PlanMethodEnum.SEIZE.getMethod().equals(taskEntity.getMethod())){//如果是抢占任务,删除能够抢占此任务的其他人 - taskUserService.remove(Wrappers.lambdaQuery().eq(TaskUserEntity::getTaskId,eventVO.getTaskId()).ne(TaskUserEntity::getId,taskUserEntity.getUserId())); + if(PlanContants.PlanMethodEnum.SEIZE.getMethod().equals(taskEntity.getMethod())){ + //如果是抢占任务,删除能够抢占此任务的其他人 + LambdaQueryWrapper removeUser = Wrappers.lambdaQuery() + .eq(TaskUserEntity::getTaskId, eventVO.getTaskId()) + .ne(TaskUserEntity::getUserId, taskUserEntity.getUserId()); + taskUserService.remove(removeUser); } } } EventEntity event = BeanUtil.copy(eventVO, EventEntity.class); event.setUserId(eventVO.getUserId()); -// if(Func.isEmpty(user)){ -// event.setTenantId("000000"); -// } event.setObjectId(eventVO.getObjId()); event.setCode(CodeUtils.randomCode()); boolean success = this.save(event); @@ -160,18 +165,6 @@ public class EventServiceImpl extends ServiceImpl if(success && fileList.size()>0){ success = eventAttachmentService.saveBatch(fileList); } - //如果是问题则启动工作流引擎 - if(TaskContants.ProblemEnum.yes.getType().equals(eventVO.getIsProblem())){ - //TODO 并入缺陷处理模块 -// startFlow(user,taskObj,event); - /* OperPhenomenonEntity phenomenon = new OperPhenomenonEntity(); - phenomenon.setSourceCode(DefectConstant.DefectSourceEnum.XJ.getStatus()); - phenomenon.setSourceId(event.getId()); - phenomenon.setFinder(user == null ? eventVO.getUserId() : user.getUserId()); - phenomenon.setDescripiton(eventVO.getDescription()); - phenomenon.setInitResult(eventVO.getInitResult()); - startPhenomenonFlow(phenomenon);*/ - } checkProjectFinish(eventVO); return success; } From d839a0ec1e84105b4e3f8ac54a5be1a05b36e14c Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Wed, 31 Jul 2024 09:09:08 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java index 63450d1..8ecc34d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java @@ -1192,7 +1192,7 @@ public class TaskServiceImpl extends ServiceImpl impleme if (CollectionUtil.isEmpty(list)||CollectionUtil.isEmpty(undoneIds)){ voteChartVo.setFinishRate(0.00d); }else { - BigDecimal divide = new BigDecimal(finishIds.size()).divide(new BigDecimal(list.size()),2, RoundingMode.UP); + BigDecimal divide = new BigDecimal(finishIds.size()).divide(new BigDecimal(list.size()),2, RoundingMode.HALF_UP).setScale(2,RoundingMode.HALF_UP); voteChartVo.setFinishRate(divide.doubleValue()); } return voteChartVo; From 889c3110e30ae748df24277cb6fecfe371d75ba1 Mon Sep 17 00:00:00 2001 From: liwen Date: Wed, 31 Jul 2024 13:42:03 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E7=A5=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8B=BE=E9=80=89=E5=9B=BE=E6=A0=87=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/ticket/pom.xml | 2 +- .../service/impl/FirstWorkTicketServiceImpl.java | 12 +++++++----- .../template/电气第一种工作票模版.docx | Bin 39277 -> 40818 bytes 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index d1732f0..f5bfa18 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -15,7 +15,7 @@ UTF-8 UTF-8 - 1.0.3 + 1.1.5 1.9.6 4.1.2 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java index 15eeb51..1382892 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java @@ -370,11 +370,13 @@ public class FirstWorkTicketServiceImpl extends ServiceImplY-Ol)&v+fF9d{m;2|AMRuC-c{XIU0t>I z+TB-;VD~*>@$4`I`q!fNpdcVV2?E%F@}%7c6LJ^Uso;+eS)Z2@2y3X=#O%Oj|CBdu zYdkzs5euz~xtfu6a4{SxKa&TA;H!Xa>q{^)H^;WuaOXmVft`B^QC3v9)M{ zBNA(zUPAr$%E2)G!sCP&=sMYe2@&!b7W3OTB4cd>(gE4m`FCQIza&9tP!f&!zFNxl zcO*}e!HI5NN_2&n<0esK9&qky+9mg$Z-Upl*(K003c0hn0;#{VIPBD56-A(P7g&3~ zl&GG3?*(mg4N>E?IWW_6JI)gw`I_zSSIV=f4(e@WTuyH0!!AL6!LDNw;=!U|A zOmx&$Cv&;-9fond$A#U45;hchsB8`aZVQ@Om0>)|%!G_&+@(N&Q|&=k1hk(=l#A1> zkyYtraf1AWIaKt&i>(JG+tEg9bpR0Aa@b7^J_}(pv^y_serinr_Pudo%$_|7^8CB{ z;|u2xmjI7#p^@!*XQF?j>bMy}8fGvw1|*1n%>~cNc>kVDU}JhC{}fehn97I;z;~GZ zyR=xP<$>K{n8x<$_5SPbpSty1(Hp)N>*;&}bi8M0thAhT7~WDZpKCR=nhuE~GKs zs7uI)LtU23Z?7+;jc>h|RA+kDt#ms_qD;pm?>1>gdZUfoql#2r4JDR%s~8?tP9`17 z65cV8nVx#1^kSO#cEp(#GS{kD=kx2V-*6*i!|6J#6*Ebc=*kIOKRO3Ck_;B+aSOp0 zHHm3v&ON=LYEaNNkg{r;pbChNTgDTa3}?!OGQ=*H4irtL!!|}=AeQ%Q5N% ziN|ePg^-1VC7~B@k%a*PVI@eSN5%oPoHw{o{dOupkr=vpM-W8VXV8V>(adcr(YU2; zx2a%SEglpTk}=*_?2{Jvl6luEGANZST#DlAIvqcr-k%$}JmG(3tt`C;_mCtdDbk;t z{@%(_5ZEa$n?EeRYP8D0aK)IRR4B;#_g>4jPd4{-Ph%NAH=S5~O>~fz)nR3^sBYEoYoWo;71XY)_1HcCo#>@Skkh>i z;rp5hA8lNn-B7--%HVZwb8Q0n96m4}y+U187)3Tj{3ndq+NSQ$i9;hb0ugKdz-tBY zRs=4@L3w`;t|&dUdJM;jc}MS?3fMQA!Lx$whG1TBY&Yxay;V;l-nVXCWnFdnHkG@{ zbcN#{nG5l-{F0v-{QpRsU1}NJ#g7g~zkPJwn&$YWVqbaG8Q+gR<}uZ`NWjU#Tyt@~G<1Y$L4-%l;1wTG ztSC%DCxX-$G-TR7%^~idG;OZez0D{|)}-UOW}*|mNA#=b12vOD-(=V(hu+|nNuzSU z*>t-$>her)>u}aUTm1zfvj?O8a@l<`{Q7b*|h7HM}u9ZaJ zhr^3tJXcr|_1Wkclg%6wY15NJtKlQo-WtlLOhg=q*Si_y>T+P{ML!} zUEi(B@NZ+>y6G5U&?F|3Z9)s}#!6*CJGEUV9g!{vB79TQjdeL-(WK_L;R{QUoMmX& z+6B$@`&i8b>%LRXT}fCq63a$E%f=V2$6f!yjvd=k_uCmSvHHp;%RI$en(LvrWt}2|4JfK zHrMw6GAH;4K`el=Bz-zna9t2bLx;Xh?{TlP{yuqt27pH&UqHMzx0g?Mhc6!KOZemY zIM%mQ;eJDKcGjEK@CfTd*jyhG?wKerU;PS2i0xO%t<66<1%AaJhS9_5C1OL95M^V* zl2pUaCyp{Qe>kZWWI|4`L%hz~hpDEhQn;cAB3vlMsgqx^Tf*R=c=GuYQehtvIRjBu zIjPGraDgO>7^%hD^>1uQ@pN^nxX5zVa{h@q^2b#kn$!rP?jmXo_?W;_5sJ>I`y#tc zl@UN9g6dp}UaMNkn^c%z)E5~BgIe`sOoe*>1)ExBvq)k-U1o}x;%{IPF19Rtj1pm4 zy2z&)**@EZF?|$5B=V?>h>|LIL3KZMXd}clDv$n*o z7A|ZpW#iJZ2)yh;AMha6`TG6rk4I`>J2 z5q4aZaRJ-JK}(`V%fC%p%X&I#-@opQE87Lhk5XdD3YJ4A_#}EsELG{I;X71qxI!Vj z{`XvaxK+HWiK<}r$Xmt7eWAn&6Jk!4D8N5u(-vg>aqdbZ1gHYOT$&JZ#B)2+91*81 zs|)mE{=$|$RjvqS5JK2NcJ^&#MkXT7tMV18v;u}k8N6abMXCr8B|6w#;W)>1wpla+ z$ElSF#|d5tl4x$39C0>-Y)fh;eO3nII`Vy`k(MLoR%e4v77THzRHie6u)hyHuz*~W zm_tN`a^&MPS8JzOX-lZ zxhs7YuA|_;5dG}r3Uch~DSt@u8wuw#X+e3>6!tr(x@ny4^|a)(lNf`C&BDx2{?V#@*O2`nQ|hhRKRzpxVp1FQT*qYWgb zGHJ?CqD3%HHVybS%Yzr##BV87t?u*?{?VQStFU~*Np4cmc zoA77M(|3$gkQI>0Be~`$3|%FKz)c`FYNCdQGRxANRb?a^RAQw{PNqoJwGOC7p?81P8RNTvG5`;Dx;Nz&^SP2cDCWC{~^6s$87o=N7E8lUfQ zx7NT>(ypftsid!4z)|k z$HT@ez+Cd#ri_5E8=CGB>#aQuqx)dqE5XM6s!$NXZ~Kx&?`3TG1Y8&8G5HNtZ;d)e-;BOE z!f%(1cG`1>gm5Pu@c-(}P#;zanS0?Ki#LInHcm^=_ILI5j zUcaTKQ!w8W4!wMC{+tLMueOUk$ZSJm!ct$OUzBp?~t`0Rzk%yWrz57z5*{ z9jwLM+*rplxRVyXqTHu;H8lj90{}{{CCbG1EzuA{gO)6soGi_`ggz$~Stli0F(q0F z8`%fKda}<^48G+b%j_-HmLQh`rTO$yOAY(>`+H(hB%Ni(9!YF0B3ZpPgEhj&1X@iO z_^=37o}qk>pkrVwRE;t(DTqzDVu>RD(ZFjK{9rA@->lyqfe6{rp^n~nwSeIA$j8j! zfbbngJ3|AAFBt+t1Deh+=A~_oCvaG4{?@ zDIo^bX!Ml$CVl;$@2?M-e(salfTOyb9lx)ab-u6kkuxU367O-3E?zmE-pi}|0cDjR z91Z>`_oCxISK}#WZMAy0RltOseN>r-EbE+19;WK_YXmE@S-vjTXuR#0{<$lC@?5Hg zA?L}>8A!B&pCLCJt`vj-J$?L}1mMR*SXgn?;!ndd7ay61i9RPPp`(bq%JJyU_l>kv zMf!$6XDz;6PDvCf{cMp>omN_X?2Y2SDyByGeI z#s|_3q4&dyq+8J=>zFdQTa*^knn%t;rgZGpV@+6{ z=~XQ0s9n1Y7)&@8)sI)Az8`=OD_=k9x|*6w1ZTuhi{|5%td@|eNK1~BI6~Vc^+mOk z$B9aH)_r0 zmx42B604eZ|bKhe$-a{5&K!%EFtA0| zJYA*CO5Pl^s`h1;$E8Fgn(Ow9i;KEyP930b5toDPPLXJmC?t;u$@Ey=`e9U_(?zsm z+0gc)nyGCj(m7m+C91Ep^6f9w+eYx@fR74uvau{2jzswn{3QBaoyhAfI^yK(gHeQbG3*dX|1eq3+N@`!*bR;< zg==w5t|Y|m)9KrVEtlAYIIZ8$XQGhi6lq^2Cfy65^6P<-zEim$LD4@Ca+P929|XMn zYuvNpvW4udx>dw(hGrA2LAd$IUaWx|*zL?~ty&8NXObcsde)u4=xo#dCwjw8b(lIP z7}tlv{^JSOGlvH538$How9v?$2rVVJ=1Wui*(W>KS2r6wTic(bf^NClJD=xob;$B` zh2Ke#By5=}TL@HOAc{jm{I-Z`sDp2WR*5~D%JfC`Ko2Y^POrmunBv&^ zg0~{tW}QIu*_l)QOT{!ZpZNG=YK*}TV>ODu%eG5J%xV@t!ME#$UO0%CU6v&=>7%x! zaWV&;jwc7|CX%5sLukL2P;1mhfFtWm|?4!siy zbh^X{%yu5izuVsxXae{_j5vYJX*x)xA&3C4N2GibStF#mxK zb%cXZuxRj?_4yez6dJzT5-at@a}TgMA#O$Xf}i0L%fyA}m+yM>g5g#XylA(D_ZeOP zV*2B6USpO2n9R?D9Ccn#L|};X>vL8!$k*8(-|P=Yy3E;F?1}FdacJG zcYF;ew7GI}{Qgqt%(K&JtG)4i+?qVegNT^EzCxUL{tFTC`1%7Pe6D!kpECBZ`>kdS zdiV5n?W>0CC%ltkHXFtuM5NFBe*_siAYeZ|43{0Ekjk`005kEIU>bvOb4HerYy z5H)I(HPb2R@j?K`7*5$gsWY$l+jnI^h}ThigFV+QT{mdjALr0q2IDrXT-cvjCGsa> z!}1O)6q@7nE5XHaoa!lehtQ9?{oC|;50iXR1LB+*Db8@b@?^^O%$%^p046XxqCdpW z*{W1QF~@H$xYkvNjx~O**X3iaHQ>Dj&Yym*DhAuWeawLKZry`!T3+J1oD|o)ZYFds zOPsvrk2D($rg0jf({x&AavO!K%O~^`@cEH`>!gS6Y zXLPsvAqr=LNq;jw?gtT-`?IRy>r3xR>r5JK3k6CG78?Yt#MB zTt3aKP^+`T&|LRbBw3UTM$aP<|8}>F+@DP|&I(vscnmLEQ|;R}hd0Zl>2vy5MI$*8 zF0pIIMuZfS%aY!t7=LE7J27l1;5vf!fN!6{OMq{J&fh43ZGw8B%|tKIdU&m{k>AMi zYhdG}5}xO=47$#D+|F_hI8<&jF65)b#||09W_DC8>O;TQa+(cehHTP}HM%t0wm2Tv zBmq=#lPK758Sd(_=n5WaN%iHwWbxgJ_d;}Q4TN4!`8Bf=oOBb$&7zE#&4P88L)n(h zh?@katZ#_TS8tTgyc&>6mG2djBEhX4Z7sffXL~P1KmSGC6MBb|%~bz3+|}c{L)Lum z+4vk(Se~Z!-VoG5V$kBOyVCCvP!usT(ghms`jI0}`w&Ih0;YeNTEfV?HBWrI)At;> z!R{^S-{oA3he?h4q|zSAt_c?xfk@7jpS;$iv34Y`#jSp@3RyherYj2ClE+C$FkJ;k zbuTCM?WYKdWFFdK(TxO>{WkE&6(PT$X)<3bff~bp{sanSx{XZ*+73QXcL1BBCcjFZlJf?UK5M zU_7#lYteHv$6aTxiB+)zP{$Ori^b4N?7M&S5Mh7!qhkE13RP9`g(Hxl7&q$uyzs-o z%#7YeKPnw}SzGXpFrt?+CP+8^r{EjIpSo+f$c3~Z0uuv}dLVQBva~T9iUAu%DCPzD z{i3jB;Z@423dDdv`3ML`rq!p`ixa1ZE>nfDck@WeqKb&~dcP1}YwC%NS`!ARpInqr z10Q&?3VgP4llx=9t1VSIDiXN|Wz6b-o7(DSZ*=~<=?m=WdA3#IQ-wGHcq@N)+oE=!C|_G8NGaMZl>*FzPz2&F>y!R7^$mM zr}hXuO~&r*lOv2v4=D4*b*t){NNSSUjr2AQ<|?T#ZjqP7&o(4gz`u#V>k=f8LrGr> zGwpM&Vj`EKpWvcAI2h5@PQR6b&uZtT!}kQT(%SDm@9+nxi;T-fPFvgcDpv37TF0wE z<*~>2&GK+3W1jwlK+p37Q4MsSKW1?4&IhJl{Wbsnc0KUi{rSFg!}sU@-c#X^B=o{G zjY}hVRi}0v#<@$?S%Q|)7`<6fCrhSnz(46>sSI!JDNU6<+4d{iN{hL z_IbBeyt|i3gX16j;(GW;b9IhN+GbdkRrgnBAWHvYz}H-7;D|8v>Htu4PVp}i;hW%D z4elMs0PMnrQlzKDz;kIX6}en~aHlX9mxb8EK?_f$XR?b9U@{>UbbrxP2}%-gj<{PNwozHD99_0&JtZkE(18hkH(bm};Y5rE65L8x zz8c@T9UFQ`8$xL$Fu5Uj+ivG|#LJKHtM~b!ZFx%)Sk9}x0-U^`>t=TgUH5jRR1*S+ zGz+!T>U0FZs&>e9t^h$Rz-Q1B#T6%FzO1b#%iWD}e`U)zScc&H{^YY02;zpIa=|Wx zA%iiYOa}$ebZtN*>PDX7K|cfiLM>oFT!0?u^jcjW^AR;GiPWWeZ$42Mwd|=NlZI9t zRcruoY{E);@y8L8@tt~e9biGQON0{;^g&1s#lq8i*E<1vfBz18Qi@5T!AhHJ1Ny=r zT0$MC4Ayg(FI;xcNF@mIyAE}$-7Z^!&;(+G7%271%Q^kY>F_zXFU%B5bsni=}V{;>zGoVO`Dt^ zbmWPWGssIvC!-$fp@hk@{IryVMMO*y;VSVAW)=eKm!11CS+rh8u=VWM)R&CKg4!Wb)r)24}!u zsLmK!@7Jbs^4Prgbls4u!>H=C_RAQ;w%e!}{bSmy-2_e64}vNfL|0ld8}-C?FqONR zJlxT(CrfPWv)?@kVF(y!fR~0M`ygZpdamzT@Ea=Mh-4gZ++2I8BG(C!}ua zZm8||+E@KM7+*=O&f`~Wi)#eBUzmA97-n`=TfX}y#(jH>tKWAK<@M)R<}I+e1&eo% z^Z<`qiqo5p3G3M~Wl z&TUb?{{qiJq@gGTe$ulWYWM76M*^Un_s1*?j9BK4yG) zkzJ4=fU|Gp>#XOlSIt})!ZMlqS}S1aJLLtE&l(5A$UK4MuS>Bg9({kyB!X198oMJt zrExDuLW$J{Um%D{Kzb+k8V6cIum~&0bUvP)PpJ|dJMoi(lRkF}1QD<)!g>qBSYi+? zrHe9>$CPR|JznBEALWA(q-bW`n@l+zn(X)q^Qaj+X^ayugIqgHT7q_|vVAeM3AlIq zKGu<+HThm4T`@9T`FcA(vt)a=H-6vsuJ8E#dHAROPV`)(AQ+Uq&~4wl^?Bd9WzUdA zhAFVkr71@3sot3b1qXbsU(JU1VuBtmKW^3aM9JlzpW;3lLQ%%#THz!uvUmv0HWVu8 zm&C5R@EX0!{M1jR9p?rYCTM6n3r{J|)}5MULo0BGjpH!_N2)PYnREWK-R&Y`resmp z`d4v&r<7R9bJ`TT zS#%%rba=s&b|A#%-p3W}-r(!S;bfS9zar@1tdnTFCHKSi`RVx`@M(V7=TY?(M(lpJ zyXNce0KUsWpcabQlP5xKT6blyoZn0b^(jR`WF20>pj$Cny83n#$--r+)pS9P_amW* z5;*5kKv|0|!s((GWKJU*nc#}To=JTODs&^r54j~w0ADj}W7`yuzLqyF)xJ?3PY^%e zV|B7V^LGQ-Yw%<H+(bK_-*X)fB$+Xy0ch_W3Z`|~Q`xjIA{E&WA<(FSrb-js zF;TI!47l>VeQ%1$i!}&sZJ!Y5ot_hY;`kjunj|1N(!vhBA-2o}j)Jtwp!4oQ@3|&uONGeK;J<8sGEa%SF+BaJ*PpZg+!^w zvlC!312fh^8+&1}sX2ekP#Xrgod2rAFAi$x1b&TDy=?h!#)M4S$E7I{2)ga}UiyuZ zkCKeZrunyY*J$i0T35QMvx{JA+2s!sn?zvO2VB4uEJ0K=ja#j)I=Fc8(~)qDZ*E41 z%!S?a27}l;FXV$Bg+|awhuzi;m1PVgP^s8MoUtWwaKVdT=T~5tIbZ|q<06cy2Q_(x z+}&XI38AoMKk2!UBf`pTaB1XPhU^v;4Q1J9Dl>-9Ca(xsOa2>nq&VZ!6q9~HM6P=9 z4`_0i6^QU(g+4Ef=ar$iV$;yMX_N={ke2wU-!F|`W6>No`s4+TbWyF!AJrQVl~dZe zlq-%&x0laSfsR*a4+Egmnw?GMFzPlLbIkjeKQN%q2@n^A(=EdYO3#9ij4=1Zt|kSw z(iqmm!t#9Qz8+47h_ZKyH#9#8NeK0bBnu<<(DYD6FlDZQWq}mV^7j#m;|pz?MuBLjDG$si){M0ArH_9l*;-*+)x%Dj@+YB zrZakqncU(U(=(|xUufMIx_-T0PuoBJU;PmOEmfsg9yBC~8oly~-7L8cCII0v8XP$$ z41E!RdS>h~T3o$2`phnIgI#R{<)dF=BJksk6ki{vl#cOzYS{6-*a?W=0r&AJ&TP_C z{do1fsHy@M!#IDb-GL1c)t@oCW;SF#_2JM5u!Vo6(aZ>#DVK3qQNyTEf%_g{7+jZ*Y6a~NFfp>63WCx^?7IBaiQVFCGVMM zhF(C4!2|jGBxlfhqx~oY2>TxVsF(dPi^2R=PcMLk=)H?_%Xn@I{RnL#sTrI|F7-?1 zELZH}T(yM23MDHGElm3(%+x4Ov>CbEia3bczC$x4wCt{ZvM~pBI?=mkPg5=1Fa}}$6fK}V0KyzA5s|9(ynu)6PIo0= z)*O&k@Y%_3upRhkg-mja(S#!vm?DBS5?aTsrpuOk(${1Y7WCHynTi66y^v4cz$VBX zb+gIRA|`WL^}PHFn^)G941^n;Mdih*r%&oN09VY(CpBV*cdto)zMTn9(&R0MWbGG) z;Wo6z-jDWoi|^%_tt(NLzGxIMF_Q@LVQc^=eW4Mahv+fwfw$M@#`fEWzrFeSD$Kig z^L$y0;3Euk_0$FXI@lKAvb0-NlSFYw#8j;VD}k)2|^K zY}vo%Km8$pgD{$c;ERwlMJ7mZeX{uT`K(a8uD5je-l-JPS7&}Q-QQ7hcHvgPsspe* zuiEQ9a4R$vB-^iC-inB?gOJ{Rs|sxm7IMM;!hGbx2~INUq_4VRnH2HDTekX4^E`nl zyJ4Z^fgf$aMmU^`ycGVH0qo?xbu8e?+$J$AGf-Pw8M{3Pk_Tfc4s zx}ICOz&raAQ{fk2gXb(!8R`SmrGs7lu$mpdqR;b5L6t#O%j5JsjwP}L1qoSi{>c##?`oj|q+ z=bwYvD$^xm^1bazDp@_bqA$>U+D&FDuN!*j2e3~T3U%zH9v!vC04MNK%yd>$Rk+QQDs7OGZHlurK)>Ju#YWLaB7Ls zO>k~bT)4D7aX1%>VwXLWSz#0Gcr&vHJZi^|n^L+CRdPGQi-E-w9=|jz2R-55KTxl=5^vVmJ0~xeKPo>Bv(5j-8Sc&r4-8)s?2OcKc*G9=XCGiUX!82h)h56Lcu__rp!)J~_BrVxf$@ zkWlbr1BaVZWD@8T2Fc{zc&7&?U0achvNaLy1tG2Ns87%b63bxcNB>zFDQ|yPg8!T!zv(WVp8uuKrh7agWy)R%a?9=`?!}%aUhb#8U z5plo4B$68x#6Zq&!1Le!+N3kp6R;-n^(RVxCm}p+gr_9Zg+nG5auN99DGfz?-}+?L z%Mfq5Vr19KZ3ioR?ItXyaiw>_`V@>EPiWyXsUW?{J$2Vz6|Hg#v!B%i>b!D6-Y&Yz!ZjaPIQImiCU{wwl~XE6|n6rD!t;4LNrNUC(BelmSdu)xyVCBE*aH+9tqNkQM?MdZf9=&KbwgcFJxg*J+vvgI|RNhSm1cTJcZa`Z=C;O!xqH64N13TlV zAWwLcvJ}LW7*AxL*hbZqOez&l2*~yS~ zxnxcFr=w1Skjf_U$CBqp20w_=8y`rN*!Zw%Vh`YPD#9RAb7Ogo580r5$3?5nA}@Uk zRj&nnn%}2qm#3fIa|L3k2Sl=20GQQYp}!Y#g$*1nahLs@o(^~L1ZCQa3%bLfrR^Td zOb}lOj+7A0G`pOLH#k$&q4M@I;O)|XBSrG_R4<9F1XC*Mv+9{-n#FL16-N!=6({@j zo2e+Gvay?PTg#$~2Ez<4NbV!W1!lS^A^H-q>3-g+|AK32EE}(gJ4)4e07wuBm_>Ty zekH;|l4$I8zgmJy^b|`mV%%}8N#J!Y;MjnTBWy`X{FQ@+xI=`y%!6YqVANG7hUcYNywyN4zJ{Ho))g9Q>exD%$pCzyPG%Z;zy zR@c7AJcE1Gs=-8%+@UVBK7hF(B*v(Sm?hFblk>M{W<%6MOBS$>-OJ5 zTh>wM?G~&thogjKYs^cIcWVoa_GC+rWr4UAvAhTyKX@4M{TvcmvYTqRP{<@bT-4ID z-RgWQUGn|wsfT*@fVs+Theo@&)i5DaGBy%K);yjc>taHexzppy;?)k!WZ@_$l42zJ z9|33&ab7bFejpE72H870L;mK{3!Y^b0pFbjZo$d}93gfP#-ebHPjCC936di;9nh z&$3p*&#L<9k=36>Wp#8>Bv?0Z=nr^?h9d;VoCJ4GoCB{OjlMm+H*DLH|cUFI~EiH zmJiP?u7xu)@i5;%-nWmzjg?N06fE@)_-8pPf#j$8UE-djlQt8tEDxwgbOQMwNzC!fNSjwSS5k>{v06>Gi` z8EP0!^0}C4iLW}Url&X9Pf$85!7%%n?1VWLb5!}-5z9hFIz)&MB?k*Jt37;*7u_>m z$f^ui&8s^8Bke%}f-S?jGQsqPQC5CU>)SM;WfK3Dak4As>T6Of7YSGAcuPhqM=K+=_n#_| zKs~vJ%AFl#S?x1Z$|8daLkfqr=Fh|w2iw0n*zbd9jxWCY5)-*ejHrTKK!M}aIypsq z?5JAkPi%v%AaQsYtvcAQ*<@LD?BF3L#}K8-Qx@Mpa}0ecLw4kZszZa-?N|~UnS^`< zeMNODAXe;ZEh2pDjDT8Hm~`$LcEAJRNTvDz%9HsFrxFLX1T6ZC4?ANH`qN_%2eFw5 zaGixF8DrV%>Oph3^4y+0+^|dBUIU~0mJ*%3TFJL_thg;ISA|| z&WI#hcruN|nj$4cklJB8L?#M%xFk~=<)3>JRO0?15ZGy0fz!ti(U%uyxm>g{q(UHI z(UWo~&f>LWFsjf$lJ3H)z=PKsz$RfrvgMv))*BXMThNrCCJ*mVn*QV8*dtFW_nE^A z0zB;>-ws-}2MC$|weMZgi6lKj(}ZRU@QJQPE~VM@&X# zQj{5Vs^^*m79;$b*BVguXVTJHM7f3DxcW2)rb)BRU%*6D`huN6He$trF>Xp=g|tA| z&{;(O>975N(zTtxt*Ci~#2Bja~fz(g^LBbv@tf389e7?$rtDyrJN{%^~C0w~7j{Huas;;g@xH*UX^@^NTDXwxxEpas>fkz748-7b{ z6sG1MPR^|z0UtExN;!8;afl$Pj5Dn0DXde16qpVpUs%cxOnlpec~q-uFsn>nSCPA# z8-(cExe^2rzqs?darZ$^XtPzvUIS}lIk~6qrks@lqLY@sXZPRFm__p1Fp}q8c1z83 zWAcBqSBxuF@i51DHjfCq25Gub=>%|anwlFW-w74MA`JDft74|#v5lpQNr%h@{n`~- zd0Na|!t=1z3@MZv_{+RR-MPG&ii_kd1#J5Z4Ee1cHPJ$cUvQN4f=CDHw}eWD4&;mr z@twGUmj<#aUU4xFdxnM2cKh?yT(!^#U(9v>e=y{N{Z-0hcX5Mb|^gbc_cf59oIuz0o-PF--gp(!C7c%_eINLmXA9wYn;%hZs2?YayVGwckQBF;K+EQWF$^VAE(#;_#VUSdOUy5XXu zgM?tNfww*xH(n&z-@1Cj;#8uoVPpWV1Ux#tUvYUz93J<-wxAu%`n>K~GmRajyol1V>0Jkg4U^1rh`PhLL2_S~0RmQ;$UIh8!42CFNQ! zDb5g2*Hz+@yvoEFAk35p6yX zW%}yiwLgA>pZj63fcseC;z=ys$_>3%`%kY@?trckuh?!#9g5mTu7YI1@)3WbdbJ+= zLoArwOhWXJ=Yd>V+#~ztWVdCxZnkG|dG%h$U_EQmxscIffKsCgJ_TL|3=7!)&jt1S zYOjQUZVFnJzpJ|<{eB0;!aiD8a<-f>;W%sWr4<&8r`NQyvxj^4@YV9G~CFTDO%EU>Y{g={# z;ZeV8F6#K$PF-H(hZ~NU2d082xy=)CIgKrngLzjeM6k~W_hc{>Hu3uqIX4a^UkXL$ z^#0iZC5kkS_Q)4{i_+tMP{5LBzn~fYMH#ty!98@b7FfpI6$)|tnOSj$5H^e7V1E^Z z~k?u45ihhVrDujLIN^Li;-MBjlk~fRFB% zHRA5(JW%ER`r-7x{?qzBDTk8ilK*S+y6mQ{j!$YKveWJLhveTBC@6?#HkpM+;~GY$ z){}x$gU5N5KEre3eXS2t>3_0BBScfn-t`7=q=vuQgiJGbv+s!f8tr~JFnqK>?1LwI zLuJp0ecj6Wf0EycltAQ^cmEW?ccrEKqjD^z{1b>i-IQT(;)B2&yf?I}2}qptW^>b_ z_$Mg%}8M01f8_6=rQba~$O_ppkuaTN0RL>Molx3J|ERp35 zGqg&SHp`?(wvwgA6Ec=!5@W4NNZuh&JoH}g<+{56IRAXFbD!({asP3j`+Pr=DdyG^ zIsq`NWK@D7VR}pKbGJ&v2DOI+8>G@bWu+UZ=hb}{hI}{dZLgkgY~xy4xtD(ZxLnd7 z?`G+ewnsXv7H0Wpas^8#J5M*3rFXbhBc9=&E<=mlPU$ky%8%|YX$w*NMpr+>6W)+_ z8I9Fu8=aL$);RfI~=eJxbDt zZ~uHb8Vy$zMn^bR9~^OILQR6P(l|?DW=;CBIKkGe*%?D}_*L&*p9regl=6wmnTj8% zFe9?cy}?ilb6pQ%EXt#nPD3n(zd8BxC;2~~X%~=<$^J9M1S|{Z__d4H(a*R3d`vh3 z`$W_TSBcDXT)fU_4s=bbtiGngY#z~<7oS9jP*GuOZ<@t4N9%x^1lc0Vw`5ar zsFx>3KNL})hiq|M{9!AaTH3I~;IZLj+nUPRk(MPk?b`A-#&``KrRJ6zadw^l9^E#* zGj#<==jN*F_MuXr+{&)kk#R=J8j<}rPu4F+)tp*vbd2Dp*1xFqdE;FY4O=!!QQy!j zAs=}q#lG`m{YpD0ni}Z)+0Xl#vANKrMdT-X{FECQdz7-=frAF~V8dPl#RA>&BG_;z zEpovoDJrY_y^kZ^$I$GjgV(_yOyIob%7GK?*1=cL}*XFk%$n*h<=#|EPx(xv%W!Ab46Nxf!VN$xnQ*DX35dEQZ~!zzK1;S(1s z1~#TuJ-%!Hck?oe+vVOaE`1fxUU(0|VDF^C18-%z>nif&gTe$>{3|9aRrQqvOZ}wg zjmw68aul9PFh<@vkv04SNs+H}H1havK6&%6iOlb~OWKWw*&bzE(wXOmcrkw%KCDmH zs|x9(X`AlZXDrRp@8YyNGi?S&aa*PL+K+O4T`G_U96LXD=>f{$QbpP6h@hw2#XJum z?b}YDQ%AZP2Q%{b`QvabCKfJZ468^JSvq!PrZ=!QZ#|c$2;{ z>O7nG;@?;OEI1<9LPiy297fP3128tBAVdDBRF=q+!sj48I=oe!RG1_+`5oS5B z@z4&@qu1z5gF9b@R3%a8i8O`64qv@uZg!;Ma9Bk(Ink-TKj8+~VPSrg4Ar-j)cxi8V7|m73;dqY{Qe0U zv#d{bG9s#GKHMqy4tDDmcae*cefBIM}KY#QUEY;W0$nCNZC$cULtha`+ZIhtH~ z6FsCdX#Yk05K;C|#JNWWL1TQyWx4=Q;6vhXAB>yoN(3nqw47rstjnwxmQm5Ds#*H1WH-ro4D)J z-b+G*xnMZk7MjfhTEGNS$Oitv0*dnoS->3H1;8s{4TS?B#d3j){K0;fEyN@N7VF>| zEe9;I%v6x8yp|PqPU%WDt(v}80}fMPS)0JV94!^=6^saOMVDF8F{|QA{7*jt(sOph zTR>Zm2}ET9DAxi?V*#sNCulYYNM~XJDHpB!yQgezJ53X`fzxzbjGP0F`8`~O6rhtoV3#gm|n%D$rV>DRDv4iS;z_hy@IKV-x qt^q!NzcCgKjL{fyjiU$u1YU8hAyq7p%CmroSg<<}Ct1r`J?mdzQg&zn delta 17045 zcmY)VV{o8N+l33qwrx9^*tTuk$;8Rzif!Aror!H*6Hhp?^WE?B)vjIpXP?#mtGl|_ zI?mO1zrn7Wz!ErMIpa}fY(POkd=dq5fTS74Ar_R78|fag6yHDGGJvq27G*!INGX(0 z4TIH|Hbt8SzW5$dcoC<5=hfwS{wUGVUG+_oQj4N(YlKbK2r6A6ekD@$ORK;9iOUhc z7UE6IpoE_|HuJ_KW=$=pb+0%!WQc2Y$K&oc+8^;~0Z*F-4d5d^A?c=Tj&mQe3)F}0ztMYH=mIc%C)7`(tuz|SC>)CO>=5t~>Ob#tKfjR9B zC(v#+Ag*}E)eh)xJkYLqg|?l?gW>6>50--9Y`Xo)>IdApU_1(eR<8rDOT3y$^UXoJ zzPl?;V*?#9>oB_}n4--BHw0jv00Y!Vw=YNQZ{oV!i*JLtJBLyyuCV9?8fG|NMcyW3 z3wdhD=R&VG1E-?&d{+;4r6FeN^Oln49r9l^cN+$&M@!jsw9zujHD?q`O)?y`&E9Fp zD{$i(5QRI4QONY4i59}6Z2ZHWW>1L9a^MgcARr(xAmNICgl$^Av%En;k~cu90m0T> zWg5*a*?_JhG&Bhkk2HZ6tVr~YG9hZ?F}Ow%0&o{{l=gm^WMv3bo;zlA$N~w{)I7w65jO%PWn;p%B&*OcQr%#QVmD7}R7&*Fz#nQU#yMd4UP*28 zDPruNb>=vFtl>FZd0N(cJ+$((KrZtPLc0F;9qxWa!mpg*!z8{qdSh)5@nw?IvxMW^ z3EKb+9JX;0zG$2HKTfsa$y-9ue`nL!v>XlI&Mf-7hRjK;=clHjyuCbJF#HiEsA?aM7#Od=pWrnQFAeiyV;&7Bcz2U zZrqft#nAZBGy3#@(T-=L0CEXm(nx%g^Jc-FsAaIl$?(9?DnX;oc)Mx?11+IG?KjB( z?>>xE`GBe?2Y{0Tb8=aq;lM8NRycz-i$JJN2AX<$ zCx~N-LS1?r0;Op50)l@Yf{{)ki*j;4G~UUS$J*yG&k&shbr+o#9Qh^6NGdT_5lX8z zuw%>w9k*Cg&syfyuN$-1ZRHCWX|L2D7;cM?4xqb#Lsr~_(52UKgCUaPELAwexkoZI zQyiLB-UuNMJ2QiXITq{vzaRD+uZ9gc9>u!RM~mYfS!0-2Gn4*=h>D5{r(efK za24WNMUjk0Hn$~5=9F-9Ne40N`c+6zMtxqi%S0uqU7MF%Dv~XnJ%>A1yl&m>MSol_ ztSM-wVx!+tW#qiN>eM#feVN|9ata_*TPXk+lc`hHi$?N!em`D6ull|pxBORM+Cm*> za3g54bsBpzYPLN1vK6zBH?ixy)f|4o4tG~E>BHAQezrJ2TDA)qX^yP6ZjeniKiS9z z3o9a-Rz*+LFT-bs$b)6^{d*_8(HmS+c`G&J_P}&-j4c}pVrz+oqq2<(yH)iF}N1;_WEc`)utA{ z7IeX{n!t`rVW=cOSZb4VJ`f_xx{utgYyA~RWS)=WSxvymZ^u$D zeXiXRR&K0U6sfMZ$uhgU+*2c0AlQznoq87{?qwrwCjf#|-?Z3wzwz1C%Roy13g1@Wy0!aubG24u@T{2g066;n$>OwS)5_ZH zo+&rDhIYQf%cs)1uH0-Dy6j`n0tu<;+yJGpbN&|)=)a^)d@2?i3Ie3nfw&=8hgW$U z)P6unck}WQfJ-I8K{4HRA_IOo3GZU<{w=R?~w0?1#9e%O@_BwTP z;(_khfd93(<@hh~ znNCO%UD`I3^@-^Wc8pH9`#{f`pkddJ)H88_~ks zLT+iCV6b2dK9%V(YejSgodBOKYb-qWqDZX%kiQE-G64He8-@d_xPK*$a2$9G?1`Et zUnqs(4lHn5;<$0=fmKqSQ7G{KyK)%C{1n;<>e4cUtni`^IIS5(xe#n++B>YHsxqwA z3IsnZm5HiLgz57wG~r@N1zTm-2#v-9P&NzUM3_lQF%-}8mj>?p-V1eOmL>#ggmQN6e=e- zz5_^W&cD=2lN^ZLEz~9Jn`g{2AvlGd`wzus&`nqa7UjS%XUEh?X$BmJgOm$FV(S?L zYFN1kB39-<*-=p8A<9)yOm=jf9SW()UQtOgP?f{93uMIEJuWa3WnekRH?UL&)njte zOc2Tw;KY^iL`%>iNS*t*`1{$YBLm`?5`bnBogCG`od`-{Ls57ihrneMnm;(nmaY3( z&AL?c@`xvu@|{Q|a1nVa<@&~4PMKv%;@ZqApn(@%B8tUuDKH2k4dAs55bp^-wH?Z$ zW>_?ih3UqG;9sdMCXH~_1<=rBBM;I6m?`&btjfH~bfed6lk?mG1BPSZz(RK)4{+Pp zli~jJF#hpnc}8b8%0v>q+f>Es`m!sV0bGk!Zy7&1mHgL%N#2=}>Ph#AG`|orjKaYk ze`x2n^qH8!beB!xqi65>$L7j2b!RvsM;9FU)U%Y%j`PYI(BJRIXT3EPVV{v7^B3k6 z+FJ*9sMS>8$s_u8Tw~Df1roNb9v~*VP~3mO$os4bjfeXr_&b?fmj9dooBu|V`isTC zJA=P|?l3zJpNhp>;O4i)i(UH;68O}JKxf9$j$gc+J!4Ppezy2`Q%5;8-j&Vm>cSg# z`(;k(PI$QE&@D_i5^^~QXI3^^o_YymhY1Sh}C z)tf5*`X~QKNBy3R9$mbk`S^CGDU08F-XJj3VOdkIyMx%7OoQb&+)m%n|6k!Z?28a5 z1r7odkX(n03+Om*v7mf1&-0152SZ5444Ge zkh76yCfTDfWFjht-Ru#baw{N!+1a?%os&rCE^#9;0t%TVZIs*`lU0#+DwLuena-1g z`k55=QZDM!n>3R(kXlyavyq5&+>Nni?8*CfMKL6^Z7G>yK^gCvf*@`R1jP3--IT^s zpLmjpL79miWNz~)cT^n|>N~dZ&6p$T{&G`4C9HyEw7d`yrvieLIFEfWNA(s+hFi+m z_b`X`0rOVFy2I|edyD-&-Hi)*v`agoAJ9mn3`o!9Q_0O+Y}Mw>gl{ZWLe*OUZB!!S}TWi!ta zvG?AV@ZJ{l7Y-t=VKmUMQ*h~apNc6Yn3Lgz;T7TLM-nOa)3MHwC89lNpefVu66ud{ zFHcLJEKscq0}bFfVLMDJ4AJxCf-$c4IX5FW7^sWw&aLoqSt5WpYjbYUMKS05gQcS<1BYTvR3+N)6_)JQ;u@TL&(;JWMS$MpB)w5maf5iqSnW(iFVMXci1NGhRHqeQ~Xb0o%sxvmHeL z815q<*w`{6S%cGlq|5yGy4L=fURbV{7k-4AypZdDD(W{7@n&wrkqyE|C-0&3lVe1Q zfoA8KmN@baHpa;|_yJC2Yv)kYZ7fT|48m0avO<GIMvZ zaCG}WlW_IR<|n#U*V(h4`**OMyI_u*JM8L7?WkZXN|JIoOJxGjeWI<5!?uX(g-1JU z9KD7)TEFFwOcXS*4SLWvq%6D|&Kya?RrAx23l5%5bQ4TW=Sib1y ze}C)#=2xqZ%T41jP`PN%yre(OWbHK6q?i3XvOht->2)!t`%#9k+DoRf(#4;xllC|b z%zoZ{KX#X9M(G;XOt_mN5UH$LrQscKOb3~;TOtuHPrGD;~ z&e2=E?k81gAf1dhA0Fw6sZBKjbwlq+GLK71c_#7I?t%&qYeYC9B`Q&C&#WE?ajT`&TH^n2<^TqAUyLtKCR zRVt!zr6J0Zf`Wm)_K*!tufUb`XUZeP@FkNZr{DrBM{hN>+y2)-$VyVZA)B*sEO)Wm zUMAe6$L-S6Qmr(+H~M3Mmz;w0a_R(mu<}VEvr*UkWPGBlN~V-<+JRONM{g2q3`K

i3ozxHKxbNIL~3(6+`p@YL-C&u%b$%hY7!B^oj z(P2J4q^ZYi$oJt*;Vp9nKl3Ylke2{0o=#(eN-ceAcP|`c8UjXOLKxP>^_3r~v1*^{ z#02DWtUH?fryo4w!@I>-2^)%oPO%gRujdtFtK*q-U`aYA2*c0&#i!`GTNU{FRrj$# zHU>yO1*~ELk|uMVw{5j1&C?q*^i`pKXje#|#IFHTKkCkSqTp0=@}M~=d|aju-xPS+ zos60BB*&gAdNd@U`Q0Ub{7f#~jThd|88Uug!OYLOp?kc<()pxe7*S!>;;JPl6TkV> z&fvTBb>HWL_RqV1-{8!o=;Y9Mi`lXL+F?JWw`^1! z?9#wYvXb0BP6K1d%ZU^GHgeCf`8OeCBe~vqd^7ruuFwQ9bB7Bq5p##j&#yDBg!#kl z_;^E}H9LPA3l@jN^61sO)1II#9c**37=(YH`Sy;?kW({jM*isan53hpIF>ebL!Rk} zX1Z-d_(`pio*nim%`KpUsY`xIW^x<3)XE)gt_+<6+Q>+rGm(t9 zj)6c6$%+y%S^pOiM`#-56g-9D_Oti*3MXbsy;-y_H92g)uox|VG+zJ5&Hfg`ht*J! z6V^!FZ-UwK6{Wu7exwDdAx#JetnJ9^5yu2)3OA>owN>v|k&kmPy~--~UF9kbeTomk zvYGMLB!q$@!b+5vL`yfZub3vvPj#M z>3R|bSp7j|Gv*b)!<3Y_92O=z82-Zlt>+cHXT{)F{($(UIvUlIz3|WZIt%`wZYkz_ zaOrgj*yML}-fr#3rIQAcE}^L|-PRB!ADBdkDne1LC0)v!AsCNSQamg@;v(sUlD`*5 z4MBEw$i_qm4JP>6%sn{23(f&op{4*TbJ7sIg<5v$nba)NcW<$C>%)L6fjzxF+J!r3 zbksx8+F2zZsl)uS?F1#0BPc3(d^);)om*ZD=w+X@($^9b_4s|IVh6i9wIkmsEx|F& zK!6AbOk-Gh7e#pbBCpUa*4A{48mX?RS*LM3N@s!M1iC_z;;S#dd@c-8#}V;78L8u# zEEdS2$Y0xw{3rb~W>`_8{K|f1%!}~a$gcN5yd2Hm4j~($gYyiFI>;&DnYcY-y+|bh zc`}p%PIR}mPVjz^9ZCG{pL2TLRA5S<3W}s+x>0SskAYSPuvTry7_+UzBvnDj7`)glkiN} zxzNL17r4SO)<}wI%tR_%GsK_EBpvs_ZFX+>o|BV9uix*@u1A~uKL&Td7%eVI7B9_g z`RM5p6(Z$7)nE?BIsRIdl4`_DWLm07oX>zg2#fqiFD3Zy=!Yyt&{Ci-2P_`i|dfGrzgT4PvmH-b%&k`gl6}< zMj=lt5=F*A$x5GNhLB>353n%Tl@l88B1^G=Yu$F>2EdN@(+QJt3VotM99>asO;4R> zrGG7u@*xNI5d2C6D;(alOQ0kAakkR%qojSosP;UCxpYeNLPX=O-IbGcCE6?$*O;oj zeDFoFPPi_h{5~A^xh4Fj3;VeRfDU;{-g#)snB^HMNva(CzSbHHI~6O7naw=)j~jdn zn=JWL94Ms|?pB=!Faa|T(q3vF$R&4dZe+pjB&&#^N_T&UOZVXx0m~RX_7B%*bO*`}- zEMOqqfK>3A=#Nb4Q4aAG#6DgA3^axNBDHcr;3K563^iQop%xxX5?&CV&tmtAn`n+1+N5m3_ zJeWQ*sMgP9q~mErC3NyXQM;kK@Dl7c=9L(xlCTu+#mZ-Ph^mBcj2 zz=l-HqLJ&o6v`sQA`7lQ(J>uw4#B8&l zl62IM0XZzLda9!|cvYHnd=(JNF>!-u;0z%W??h1Uma>lRl=0R!-$kGub?VA8Zc=FR zJnqT|(lV&%85NzKmU&y&hM$ezhmflneP2HmumWa-HEaK!{6+M*EjOBZRBHVFC$}&A z)akdM|AznjY&~(dXI~HlIR9^dVkQo#3dR;goFH3879P{Et%(eBcO&nxE8UMk+aBe`Is02Mt#642H>GM- z7&ue1)7f24fn!>cdEqZH{Q;pLyN#hoI(G13?vgV*?ZV9kIYTrse(EF5l-~SzC8g>^ z0LlP!);ViC?g>+%T9Zr_$b0-KKsf{C>c^6h?r zd65!T2)9E)(Mo2E2b=w%iO5M>b7GM{7%0B8o8QBcl~1%v#3Z}1qN2o6)T#ZiYxR@h zTZH_!6!#PSEJ*72{BF7Z9!`ctCqD1bAu|F`J!70>|M>QwEV1roh3pa|%uI=!7ZQx30rCU;z}Xn8w6HM&VLzR%D8uuH zGW3i@SwI!0mx*InEm3LUE$Q_~5wJ13%bD6pfTsyF{>9DmX+o$;j%Zr(4S}MAdc5kt z-uZI_T%+Sn)aLW|qUWZXhhZR9pOlQRCk&8&P z<&n(*>B5_DJhl232qVkP|&VQ)o9ax@d%;O68MA>~{X=oO1VG~v$S-1fQE!>^W% z5D_9+mBKEgCs=hhdUJ8Np79S(+50tSDl7`T2##3ofxomZGSUw&M7N!VYMd?`#2D>5mbFJwShfxZvHbW6x*s%3ES z`WqC8^3)KYQH7t>SOJadp^r)W4SQcY^R!ia)hacN*Q1Ry;fEWtB5EXn@bsGujpXAJdPZ$UI4ahy4LBFZnfht+DYsTHke;ZIY+0tV z;_Jfr$dZ}_ize#BA{pc>YJnXnL1^*g5WnMu@D}#QxL6t? z7u!slc2#~1#!NPkgMbu=e)Mxbna;t6r~eXz080MJGkoE|CgD%~UXCmKL~ z=9QqNUq~4O2En+Cu!OmYQQ8E%*+bLMuZy{j;~JocH%j+)4ycF5wp|3mp`5c zXFu<2IU;iVI^K_kvW0%N_qun!#`B%j){{=VoPK?-dLruz)h;Oig6;*U#lkJ~tu_e3 zqlo|9@B=!tfm%5DUI@9+VmEb*y{MX;nFwvU7O9djdHDaEkT%dUrrd`wrQ4^FLA$K}8501X#So1m zu}`Xj>oB?yV@7hhx%B$PT@nnt`Q^&EPGHJiOST0h2Txm(i6@4-K!n=3m3IA`8J@ch zFe&swkbjgWUEne-B#lCH-vO1r70aMjNwj)h8TrSLiiJktyjQ4N&gV4Zz$u%R7_qe1 zqSpy${qF1M^giNXdl+Q?XZ4h8h8l1%__laHjJ?9vDwu`J8Whyo+wE%cJ*|XZaCY_F z4aETjMO?{<$deF2gh)iJIFp%UlJAhD%}UTJMOcLQgg8Ksz1kp@*2b z87qT=w_5iQgUrJz9&=vD!B{2(+&j>uLIzAc2e9+c=^^W z^|BPR5!yeG-U5XP+Nte)pCuo4a%ph#t43g5lNwMOD+lqE2elCkQ#~4podzA+9{3pH^KwR)s@i8rLWbS}J#XcC^ zG6+eY%efRb+lHAndDZ5@X*`QN9Fs?Cl(0UEd_>M2_GS9MrX$?D$`??Q_0&-8yv3{n zYlBc=V)EbQPqhmFPGD_;Bzy~Ux*_p~=+CKSTUTHT= z=Jte$Dd9l;b^~3&$l#1Q#fm`2>0nQP^9ka(B^)(O%h2GXg<4UK6a|My+Wdp~GyF$I zAeXFZ#(E*nIN)w><|3XXihTeTA<+uQviiKQW}ny;hJ`SNf3uw@Q1luIT1~3TtNIUf z9fp;d)T@?)5gIJa7=+WrZcN|A6A8LJj5mIp5*i9bf1!A@fd2F~V(g_)w>WO8d6mC& zCPZgF!+>>v%!x;?qcRSY!Rmj5Dju?v`&UR~W=4L(5PwW?tJ9N;sn8KuX*3+}c;)?9 z?YT>aeXX&9Z{CsAMlT%DK0`{1@(ALVPo91t3-rk-;ORkdQsjmVrvzC?k2w5~0mD&M zA{kMzS+>KlhpH*3w=TI_I=&Qny~msn(n<%VsnX}bmlqfxjLn;wm4AzKV=IbaC1mJs zUx%x)a6w*8f)o0@ng(XZe-cE8>a!Am#0)+_IC)*GdDCq_a&rJY68iBV`&saWFIwTA&_IK2 zaV<)a8IkvsVbI-Ln_M_8LV9pxq@WcTGPqkRzuRF>tI4-;{fl+qO`OOeBIXkg5s z4?8SgSHQgFU7!%JNa)*6x(Jx++rGI7V8y&Eho+|fg+*9Gy($J9w||R1q_?+Ei(SL{M=~}Q5<3VDg?;B zqY!rQFyz}}24%uNeqmf{Ztd6dpc^B#ND&{>QJV{l^qEs}W*$q=R_(yn_QuCbkFUw; z*C}70!B4qzf|XZ1vJQR#pDTeCI|~}py8Msa`SR(0#q6W4?5z*=k{5yegqm#=&Evx?~W_`%4ymQ)Ro&D zu7rAGSA&?|;a1v{WbB8$5?Zj0ux;hAfzO&^Wi1Ylb_gS<-*|~t4dH?<^AELtWL0UH z$7*g;!iy_ju>0ZFF;#15WY5GT124v(!5h;UucA7f#TN)vX1fjp_S5e?fc#h&A@<5| zq&F}uONw|pEen~Ui6)DF41*7zdiCn&Os;XEsNdyAwW2~Q7lNHglvS^BjRH;3&Q!q$ zZnkL+SmxHZnNYj?LZItvPQ4SeI37;%Z1}{tfzl%$=0p1KnIVgDYkyZ=Y9I&u8FYrgzpVX%6qmk|>Ucbgh~nm$G31t-^I_%p4<9@qM#(Xfiw{{fPo ze*r~5jLXDQ-AJgw&{Nyb_WmOhaNdLY-RXo86l*fE1k;JKDvd7;K!}L)0LRG=IWg`ESyH~;$6P`m-7BJ~R$B#Xr=Zz#f7Hq5%9R|qxmqSwNu2n^QmZW$-x z?z(lJ@zy3_hfehN{9o@Cb~~ez34yujP@phXpgb=lKjC`OpI|W@T)Cqd(v%bf#bTUs z@o5LJOb9ku^P(g};J)}~x?79J^pWfa)hTf*>oDPG$d`ERjIW6~=AB{Iv4Gnr3>Kw! zim^)Kac?2J)d{r>Jh#bgj){os^dX&JUXoGa&cX^}@2@-@Nm!lHqr+(5heK3+w=v|)b8&TfCvaXkElkGNP2@G?B+2I zE(&TF$a(^HmyCmIkU4lSvxz8Z3iEZiJjt@VNb6Q9H`yNz_9}%x0imqY;}E^$5FoZg z*q4+w$j%8nY(8__7z$jnd= z0;v)qUe^W@F#hvhbWc^# zJ&wqJL9F?j+69@hx9GBr!jw@P)24**swo-@l7K{g;os&=KmVd;Ka{CRgx^0JP<{LH zsqZE3By+;m$&Ohcx|Y3^Moh{5F74&7&^&r(c(7lVW-^dz&LD}ZQi>~+U7=vG83js61DRBUgsV#*;&Jz6s;wd0#nQ) z907U?sBgHe>i`?WZ4f^$(0?{i#6qdpJmHx053Cr^EaxKXmCPs1`M){dq`H8xOMx0Ipm!P&EG#`W2?gsz( zHsF2FQttU-WrVnXhaaB{sn*trm3lcjIlN@rbb$IB)QiNw?i0SP8Pf#bbKGGW3g1^Iin9ETOw!S}n+e+2aP8!Nv; z3wFmq4;e7-x5<`Y1&byXk6q2heap4cIMCK6>ojNSvm6Op=_^)I3w5s(FF{E9rvWWx zrwD6Z_WNxIqkoA{qU#Ln1YL5$cSkgBtWO2#p$IEup@f_yXRgL8=THTZ2m1o0R8r_4 zVv;Rd(Of4f7bdNhod{wxnLG2r^O8+|nDe*dnyZpU zQa{VXVHaZCYqLn{Rfx=A4en0Gk4yC@Z{=HhdZ?KiuH~nZKEF1XQJB#4Z_btNbg6oO zxh}lq&b>X4iSJ8P1R%J|P1&CWhk}R4HQKK0AN>=b8b|SpQ)0NR?e_^-{Z)eb^Ofe1XddiI z+!!+I!eT@#pNJ}$uGd2#sjDC!$(j!iI5zn*}A69gp!Jt{cQ>qOK%6_! zwI}zSqudO*+S(1NpsPML66~|^e{S_w8E+BSkl|9_qGcTZs}qaJsDL3>$?R{J*DV#g z?Kanjt;(;jzkN&rM zao;;1OH!`|Y*gQhmF&3bVDS@_>>r06skY9N+aNb!#0ewE#t%$WBBZN7sw*ri5^_<@ z1f0@iT9?N0(7RVcb-q#Wsv9LwmRqm0_dT)5ES766qLe!l!~viaWFtXR8sJ0-C~kYh zM?~T}TXyJ2%`L^;^%DCZGd(Ffx~!lHv!PD!7`*f0G|VVMODN{^Ou`~$bIln30xa|> z!6!|xDWODed}2;`BAGD5?AdcfA`PG{i6>XBC#TgoUbmME*Qb4%)yO`qt8Zg7p&=EL zS%x@M0Tj5{h`__8844O-J2g3@9uL2YK@^&o|YOqjCtOjEKg)1?V(LYE-0OSjthwl_U5PC1UrCvU2zNYB8 ziY8<+*slw*feG&~|L#=6&;U@APfu+ArGT!CcdBU}f84|DvROnff z;D(H0|KQ$FG#HC7esh!dyIXpsQ}F3@WuZ&{Fo!ozvEDTb$03I~gfQ6oxIaF5l)4Qq zhp2Jvd#QE*W%fRybAP?3YxK+X{C-QRE~78^2XOPT!w=ja|J<7f)hx#l#1Ucq|6^}( zlKN2PsxMR|#u>{3PUp6OkYR1dfQ1HE$s(xq=cx}YO@_b(EU#<3sxV3g7o#9saPr$j zv&JcGZ^5XWTQI8WV#5KWc@=TKqyNAdjxFQ$&H!YGm|?9jV_VdR=COId6aTnwO2 zh7WjZ&Ka=975y8{e6s46-t*4f&!k0Tsa zD2Ix+aV3ps+gfiqe9@A;ZPTneR7I?Kwj6^`i45)bVEGYJ)7SKog>HzvXGK)+A-WQ6 zlT5tX9g2mte?6%1Oo=`(oRzPTvFN!s*A$)k!7XG0ZFDh46(o4w78x)x;}-ZZtrlq0 zwT>3m!%#_mUqC9Qm%_k9KbJAB)HKNJuO%O=^s41vP@7E!mu$@< ziIFTzLCWA_EkaAoi5%97%B`x^I+S2GC{_fu+Q>i^*RU%S|80}Ewf^Z<{Ce6we**>w z)?O$0Uy~^_{(HmEwa)#jr_;OB`}-$NrWA9r3)PmM7NH6ts18sJxQwyFD~e~jR|WA3 ztdVLq@uoy)2{kgv>9)8c(}u-9r~_wt>?PH%ZY8hYLEN`0RIRU%yI2)SJYu_u8L(Ar z%Uz8m&H^K>ALq7(r;o+NvX{b_?3dJ~aEO*!SpOAX)>&&N)_PZicPrGl9AoU03+zcqa5; z?-zexkYSuG(@p!kdlvRHO*QZOnbz$=BWIDwHZj?i9|P0+%rp2OY)8*)7JtvVBJ9MX zMYEvPaer3{V~QHAG)TLpn7la8e<_c9U8G-`Y>Of57Y|$aJY;zgNh}xbsDo#WCktcR z6P7G1&06O4>DV>#GY4hI;M70q%e)YTY@$q5dj5c8x@1{3no<--b)Ia|qoA4Yd7^c2 zH1>ZxegakveqP+C&uJN~sMQSa*^u$|280>pDP>A8O|=N{^f)kr9SQF?(VZ=U3VfF6 zC(kpZie55I9)IM@Phv)j|7#r^kp<WzIMLR>A`|N8MV}{G zOV}r16BzUBxwS(kGjD!!ByI6(vI@-iIJQUQmj^o9^h$0~dy;AU%MdiW$%L$b#gw>G za7QHGAkSJX2GZ`B_%{_ITdiT;UOOn`&M^*pEkF@T++Zi=&nPqrV*6`_Kz}JIoJLAP z?#>ydlO&06v3GBBq77n%YL|jMxNNDBNVq9vwdL~YSJWB=tb zAXHL{FZ#HcYef#@z9SHTiK7YdVP0ZjVqKJ7nAys1H1N>msCToSRTHBZN<*ib4JDeU zSYZDQfEhIazKmfCBGwK8gKEPbX58?MVw~(OgXR zZ&24t!NTb-c0TgqlUNSLd6DDH3Vz69Ap*35IUhR%_v-(mEd-FIelURvFMu_AHHyuo zb^>2xptVV2$|Xz2wNed!q5`zQViHxZ=tMn*oj|~jAagqk=qE(5`676CC0OfLJ~KP> zZt<=MeM~!X;$O%bR?+#*HBP$`hZjRu0~qg7a~HCss7iu(q<_9s82V`Zi|1g!q8m`R zqDwDzZgNaoQKPw6K$qQbt$^?loDsG&$%9!^AI^6xauQ_*F<`dHML{AkPprWu1QzYTp03>qi>y956yEbrVhqDTuV3=@qvPhup9+M zU}!i!%Wue*BlMyG%}JMDS~zQ1{rIqp|3(4nKVJ3!SCEenI|u%&C<}|>DSs|lpH&=; zW-e%lzjSrc6kwwLPVusT=2R8YV9XLc6$W|0==9A(V95?XZhFp8rD|e-JJxX97|7w#_m~g0zG|{ zzkXJF>~SNq5Ia|3p2MZTJ0Wj3=l>WOm}Cdwdz#ML^Ox})T&7w)x+M<#<*H0DGDQ$=cbLp_*?n5 zwL~)wmOhM{Y4xa!_4ymL`M1U#1n}n%IOcCK5RhqD5D>Kg=liCmlcSruiK)HC|3$NV zHAMdJQ$!E;88O5zdSVm-tz-&`3wc30(I$q#5}O4&rc7W;@f)H5=BJd9@)6fnVc%I& z%OQ6f0=~59Kv>JBK|*on#{HC25!`hKr~U*&qFD?W6+Fj*YgXYL(Eh3t1-7KjQ<$2> zAO>$ae>}3qb$ZpH-oy&JEcXLLBFs`j4S8rD;|Em*k0wX*ZIin0JQUF*JBB)tyCxNi z#^Laiq1B@kf;w7my&-wCB#}zVyw0aF4VfHUjm%M9P@H5rYS;XC^?IpR!$;LlgT-ur zy6El`;`pu*F|r*GfHkzXP~RXJG7;@7o^K0s4cf`AP$r2wc&}8?ilgtZqh#&U2E%R< zlYxYA>NKW$>EGNhMpN$!$&$6e3C!WswSbXw&i#YV-_QC%))B2@&4>A;3ek=Ttr0n0 z{noZI%64t-c&&%lvigN^W!rIj4M#8(`{$2Q+#sc(k{??H zlCSFaF`nUKVi1_aV5n5#^=Icizh1xY7qg{y-@O!c!}^eR^^uOSnl+XD%0=d8bL|<- zt6~=w*T}sSQh2Yf$H;8jHJLf~kl#b!=^Ge#o5dt$ia&c~57~+^d0DLFX8DR6lAE{2 zCP+IX|@B$J{HJ!>d6ad$^!RN@G-^p zO=h2C&eYyF*JN zfaQPyid&9IOb(iB!_*u;dBR+CroO_-XJaKMKb)(@v?hEq?>tAQEB=!M=BY@d?*m8J oAUe5!o*m=E$>-+TFj>k>=9zEKlq54bQC56%%zOd1?UO(%0aYtC0{{R3