Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 13:22:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

数据结构修改

Browse Source
This commit is contained in:
lym
2024-04-30 09:14:02 +08:00
parent 5b06fca087
commit d5705c9d4b
10 changed files with 198 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessGroupController.java
+8 -2
View File
@@ -47,8 +47,6 @@ public class ProcessGroupController {
@Resource
private ProcessGroupService processGroupService;
@Resource
private ProcessService processService;
@PostMapping("/create")
@Operation(summary = "创建工序组")
@@ -92,6 +90,14 @@ public class ProcessGroupController {
return success(BeanUtils.toBean(pageResult, ProcessGroupRespVO.class));
}
@GetMapping({"/list-all-simple","/simple-list"})
@Operation(summary = "获得工序组全部")
@Parameter(name = "name", description = "工序组名称", required = false, example = "xxx")
@PreAuthorize("@ss.hasPermission('system:process-group:query')")
public CommonResult<List<ProcessGroupRespVO>> getProcessGroupAll(@RequestParam(required = false, value = "name") String name) {
return success(processGroupService.getProcessGroupList(name));
}
@GetMapping("/export-excel")
@Operation(summary = "导出工序组表")
@PreAuthorize("@ss.hasPermission('system:process-group:export')")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupService.java
+3
View File
@@ -2,12 +2,14 @@ package com.cf.imes.module.system.service.process;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupPageReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupRespVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessListSaveReqVO;
import com.cf.imes.module.system.dal.dataobject.process.ProcessGroupDO;
import com.cf.imes.framework.common.pojo.PageResult;
import javax.validation.Valid;
import java.util.List;
/**
* 工序组表 process_group Service 接口
@@ -54,4 +56,5 @@ public interface ProcessGroupService {
*/
PageResult<ProcessGroupDO> getProcessGroupPage(ProcessGroupPageReqVO pageReqVO);
List<ProcessGroupRespVO> getProcessGroupList(String name);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java
+15 -2
View File
@@ -1,10 +1,14 @@
package com.cf.imes.module.system.service.process;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupPageReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupRespVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessListSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessRespVO;
import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO;
import com.cf.imes.module.system.dal.mysql.process.ProcessMapper;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
@@ -117,7 +121,16 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
@Override
public PageResult<ProcessGroupDO> getProcessGroupPage(ProcessGroupPageReqVO pageReqVO) {
return processGroupMapper.selectPage(pageReqVO);
return processGroupMapper.selectPage(pageReqVO.setOrganId(OrganContextHolder.getOrganId()));
}
@Override
public List<ProcessGroupRespVO> getProcessGroupList(String name) {
List<ProcessGroupDO> processGroupDOList = processGroupMapper.selectList(new LambdaQueryWrapperX<ProcessGroupDO>()
.likeIfPresent(ProcessGroupDO::getName, name)
.eq(ProcessGroupDO::getOrganId, OrganContextHolder.getOrganId())
.select(ProcessGroupDO::getId, ProcessGroupDO::getName));
return BeanUtils.toBean(processGroupDOList, ProcessGroupRespVO.class);
}
@@ -172,7 +185,7 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
return itemsBuilder.length() > 0 ? itemsBuilder.toString() : "[]";
}
// 批量更新工序组默认
// 批量更新工序组默认
public void updateProcessGroupIsDefault(Long processGroupId, Long organId) {
processGroupMapper.updateIsDefault(processGroupId, organId);
}