fix work report

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<List<AdminUserRespDTO>> getPersonalUser() {
-
-        Long userId =  getLoginUserId();
-        List<Long> ids = new ArrayList<>();
-        ids.add(userId);
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(ids);
-        List<AdminUserRespDTO> 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<WorkTeamDetailDO> detailDOList = workTeamService.getUserWorkTeamDetail(userId, WorkTeamUserRoleEnum.组长.getValue());
-        //组长的话把这些组的工人列表都查上,其他人所有人都查
-        List<Long> workTeamIds =null;
-        if(detailDOList!=null && detailDOList.size()>0){
-            workTeamIds = detailDOList.stream().map(WorkTeamDetailDO::getWorkTeamId).collect(Collectors.toList());
-        }
-        List<WorkTeamDetailDO> workTeamDetailDOS = workTeamService.getDetailByWorkTeamIds(workTeamIds);
-        Set<Long> idsSet = convertSet(workTeamDetailDOS, WorkTeamDetailDO::getUserId);
-        if(idsSet!=null && idsSet.size()>0){
-            pageReqVO.setWorkerIds(new ArrayList<>(idsSet));
-        }
         List<OrgWorkerDO> orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO);
 
         return success(orgWorkerService.buildVOList(orgWorkers));

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)

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<Integer> statusList = new ArrayList<>();

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