From c4345943156f354793acb6efe826dbb3df36de28 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Sat, 6 Jul 2024 00:55:43 +0800 Subject: [PATCH] fix work report --- .../admin/orgworker/OrgWorkerController.java | 30 ------------------- .../admin/orgworker/vo/OrgWorkerRespVO.java | 1 + .../ProduceReportDetailServiceImpl.java | 12 ++++---- .../src/main/resources/application.yaml | 1 + 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java index caad0befb..00028f2c7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java @@ -12,10 +12,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerPageRe import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerRespVO; import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.producereport.vo.ProduceReportDetailSaveReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.workteam.vo.WorkTeamUserRoleEnum; import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.orgworker.OrgWorkerDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.workteam.WorkTeamDetailDO; import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; import cn.iocoder.yudao.module.mes.service.orgworker.OrgWorkerService; import cn.iocoder.yudao.module.mes.service.workteam.WorkTeamService; @@ -35,12 +33,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 工位安排") @RestController @@ -143,20 +139,6 @@ public class OrgWorkerController { return success(list); } - /**个人报工，用户列表**/ - @GetMapping("/getPersonalUser") - @Operation(summary = "获得用户列表") - public CommonResult> getPersonalUser() { - - Long userId = getLoginUserId(); - List ids = new ArrayList<>(); - ids.add(userId); - Map userMap = adminUserApi.getUserMap(ids); - List userRespDTOS = new ArrayList<>(); - if(userMap.containsKey(userId)) - userRespDTOS.add(userMap.get(userId)); - return success(userRespDTOS); - } /**代替报工，用户列表**/ @GetMapping("/getOtherPersonalUser") @Operation(summary = "获得用户列表") @@ -195,18 +177,6 @@ public class OrgWorkerController { pageReqVO.setWorkDate(DateUtils.getDateRange(reqVO.getReportDate())); pageReqVO.setWorkerId(reqVO.getUserId()); - Long userId = getLoginUserId(); - List detailDOList = workTeamService.getUserWorkTeamDetail(userId, WorkTeamUserRoleEnum.组长.getValue()); - //组长的话把这些组的工人列表都查上,其他人所有人都查 - List workTeamIds =null; - if(detailDOList!=null && detailDOList.size()>0){ - workTeamIds = detailDOList.stream().map(WorkTeamDetailDO::getWorkTeamId).collect(Collectors.toList()); - } - List workTeamDetailDOS = workTeamService.getDetailByWorkTeamIds(workTeamIds); - Set idsSet = convertSet(workTeamDetailDOS, WorkTeamDetailDO::getUserId); - if(idsSet!=null && idsSet.size()>0){ - pageReqVO.setWorkerIds(new ArrayList<>(idsSet)); - } List orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO); return success(orgWorkerService.buildVOList(orgWorkers)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java index fb89ae63f..108c2eb8a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java @@ -25,6 +25,7 @@ public class OrgWorkerRespVO { private String orgName; @Schema(description = "工位", requiredMode = Schema.RequiredMode.REQUIRED, example = "4727") @ExcelProperty("工序类型") + @DictFormat("mes_org_type") private String orgType; @Schema(description = "工作日期", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportDetailServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportDetailServiceImpl.java index 056560e6d..b7c7f6d50 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportDetailServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportDetailServiceImpl.java @@ -50,7 +50,7 @@ public class ProduceReportDetailServiceImpl implements ProduceReportDetailServic @Resource private ProduceReportDetailMapper produceReportDetailMapper; @Resource - private ProduceReportChangeRecordService recordService; + private ProduceReportChangeRecordService produceReportChangeRecordService; @Override @Transactional @@ -59,7 +59,7 @@ public class ProduceReportDetailServiceImpl implements ProduceReportDetailServic // 插入 ProduceReportDetailDO produceReportDetail = BeanUtils.toBean(createReqVO, ProduceReportDetailDO.class); produceReportDetailMapper.insert(produceReportDetail); - recordService.saveChange(produceReportDetail.getId(),"", produceReportDetail.toString() + produceReportChangeRecordService.saveChange(produceReportDetail.getId(),"", produceReportDetail.toString() , ChangeTypeEnum.创建.getValue()); // 返回 return produceReportDetail.getId(); @@ -82,7 +82,7 @@ public class ProduceReportDetailServiceImpl implements ProduceReportDetailServic updateObj.setRemark(updateReqVO.getRemark()); updateObj.setReportTime(updateReqVO.getReportTime()); updateObj.setTotalTime(updateReqVO.getTotalTime()); - recordService.saveChange(updateObj.getId(),before, updateObj.toString() + produceReportChangeRecordService.saveChange(updateObj.getId(),before, updateObj.toString() , ChangeTypeEnum.编辑.getValue()); produceReportDetailMapper.updateById(updateObj); } @@ -95,7 +95,7 @@ public class ProduceReportDetailServiceImpl implements ProduceReportDetailServic if ( detailDO== null) { throw exception(PRODUCE_REPORT_DETAIL_NOT_EXISTS); } - recordService.saveChange(id,detailDO.toString(), "" + produceReportChangeRecordService.saveChange(id,detailDO.toString(), "" , ChangeTypeEnum.删除.getValue()); // 删除 produceReportDetailMapper.deleteById(id); @@ -165,12 +165,12 @@ public class ProduceReportDetailServiceImpl implements ProduceReportDetailServic String before = reportDetailDO.toString(); produceReportDetailMapper.updateById(reportDetailDO); if(status.equals(ReportStatusEnum.送审.getValue())){ - recordService.saveChange(reportDetailDO.getId(),before, reportDetailDO.toString() + produceReportChangeRecordService.saveChange(reportDetailDO.getId(),before, reportDetailDO.toString() , ChangeTypeEnum.提交.getValue()); } if(status.equals(ReportStatusEnum.通过.getValue())){ - recordService.saveChange(reportDetailDO.getId(),before, reportDetailDO.toString() + produceReportChangeRecordService.saveChange(reportDetailDO.getId(),before, reportDetailDO.toString() , ChangeTypeEnum.审核.getValue()); //分配给开工中的计划 List statusList = new ArrayList<>(); diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 5ffc9b40e..6b8bf755f 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -243,6 +243,7 @@ yudao: - iot_gateway - iot_mqtt_record - mes_view_task_product_summary + - mes_view_report_plan_summary sms-code: # 短信验证码相关的配置项 expire-times: 10m send-frequency: 1m