zhc077
/
zmd_kejiju
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

立项、验收、结项功能添加 11.7

Browse Source
master
zhc077 2 weeks ago
parent bf64e4527e
commit 267adf748e
7 changed files with 61 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
  2. 1
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/controller/ProjectLogController.java
  3. 4
      jeecgboot-vue3/.env.development
  4. 2
      jeecgboot-vue3/src/views/projectApplication/jiexiang/jixiang4CaiZhengList.vue
  5. 2
      jeecgboot-vue3/src/views/projectApplication/lixiang/lixiang4CaiZhengList.vue
  6. 2
      jeecgboot-vue3/src/views/projectApplication/yanshao/yanshou4CaiZhengList.vue
  7. 2
      jeecgboot-vue3/vite.config.ts

84
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
Unescape View File

@ -122,20 +122,11 @@ public class ProjectController extends JeecgController<Project, IProjectService>
} }
/** /**
* @description: //('科技主管部门待提交', '1'); * @description: 申报列表，不同角色可见数据
* //('科技主管部门已提交', '2');
* //('不受理', '3');
* //('已受理', '4');
* //('申请人待提交', '5');
* //('申请单位待提交', '6');
* //('市科技局待提交', '7');
* //('市科技局已提交', '8');
* //('财政主管理部门待审核', '9');
* //('财政主管理部门审核通过', '10');
* @param: [project, pageNo, pageSize, req] * @param: [project, pageNo, pageSize, req]
* @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage < org.jeecg.modules.demo.project.entity.Project>> * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.demo.project.entity.Project>>
* @author: z.h.c * @author: z.h.c
* @date: 24/11/5 16:25 * @date: 24/11/7 14:56
*/ */
@ApiOperation(value = "项目表-分页列表查询", notes = "项目表-分页列表查询") @ApiOperation(value = "项目表-分页列表查询", notes = "项目表-分页列表查询")
@GetMapping(value = "/list4Audit") @GetMapping(value = "/list4Audit")
@ -165,6 +156,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
//('市科技局已提交', '8'); //('市科技局已提交', '8');
//('财政主管理部门待审核', '9'); //('财政主管理部门待审核', '9');
//('财政主管理部门审核通过', '10'); //('财政主管理部门审核通过', '10');
// 11 已立项
// 12 已验收
//13 已结项
//申请人数据 //申请人数据
if ("shenbaoren_role".equals(loginUser.getRoleCode())) { if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
@ -197,9 +191,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
@GetMapping(value = "/list4LiXiang") @GetMapping(value = "/list4LiXiang")
// @PermissionData(pageComponent = "projectApplication/productAudit/project4AuditList") // @PermissionData(pageComponent = "projectApplication/productAudit/project4AuditList")
public Result<IPage<Project>> list4LiXiang(Project project, public Result<IPage<Project>> list4LiXiang(Project project,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// 自定义查询规则 // 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR // 自定义多选的查询规则为：LIKE_WITH_OR
@ -227,9 +221,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
//13 已结项 //13 已结项
//财政管理员看到要立项的数据 //财政管理员看到要立项的数据
if ("caizheng_admin".equals(loginUser.getRoleCode())) { if ("kejiju_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("budget_status", 10,11); queryWrapper.in("budget_status", 10, 11);
}else { } else {
queryWrapper.in("project_status", 11); queryWrapper.in("project_status", 11);
} }
IPage<Project> pageList = projectService.page(page, queryWrapper); IPage<Project> pageList = projectService.page(page, queryWrapper);
@ -241,9 +235,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
@GetMapping(value = "/list4YanShou") @GetMapping(value = "/list4YanShou")
// @PermissionData(pageComponent = "projectApplication/productAudit/project4AuditList") // @PermissionData(pageComponent = "projectApplication/productAudit/project4AuditList")
public Result<IPage<Project>> list4YanShou(Project project, public Result<IPage<Project>> list4YanShou(Project project,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// 自定义查询规则 // 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR // 自定义多选的查询规则为：LIKE_WITH_OR
@ -271,9 +265,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
//13 已结项 //13 已结项
//财政管理可以看到要验收的数据 //财政管理可以看到要验收的数据
if ("caizheng_admin".equals(loginUser.getRoleCode())) { if ("kejiju_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("project_status", 11,12); queryWrapper.in("project_status", 11, 12);
}else { } else {
queryWrapper.in("project_status", 12); queryWrapper.in("project_status", 12);
} }
IPage<Project> pageList = projectService.page(page, queryWrapper); IPage<Project> pageList = projectService.page(page, queryWrapper);
@ -284,9 +278,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
@GetMapping(value = "/list4JieXiang") @GetMapping(value = "/list4JieXiang")
// @PermissionData(pageComponent = "projectApplication/productAudit/project4AuditList") // @PermissionData(pageComponent = "projectApplication/productAudit/project4AuditList")
public Result<IPage<Project>> list4JieXiang(Project project, public Result<IPage<Project>> list4JieXiang(Project project,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// 自定义查询规则 // 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR // 自定义多选的查询规则为：LIKE_WITH_OR
@ -303,19 +297,49 @@ public class ProjectController extends JeecgController<Project, IProjectService>
//13 已结项 //13 已结项
//财政管理可以看到要验收的数据 //财政管理可以看到要验收的数据
if ("caizheng_admin".equals(loginUser.getRoleCode())) { if ("kejiju_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("project_status", 12,13); queryWrapper.in("project_status", 12, 13);
}else { } else {
queryWrapper.in("project_status", 13); queryWrapper.in("project_status", 13);
} }
IPage<Project> pageList = projectService.page(page, queryWrapper); IPage<Project> pageList = projectService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
* @description: 市科技局立项、验收、结项审核流程
* @param: [param, req]
* @return: org.jeecg.common.api.vo.Result<org.jeecg.modules.demo.project.entity.Project>
* @author: z.h.c
* @date: 24/11/7 14:44
*/
@ApiOperation(value = "项目表-更新状态", notes = "项目表-更新状态") @ApiOperation(value = "项目表-更新状态", notes = "项目表-更新状态")
@PostMapping(value = "/updateStatus") @PostMapping(value = "/updateStatus")
public Result<Project> updateStatus(@RequestBody Project param, HttpServletRequest req) { public Result<Project> updateStatus(@RequestBody Project param, HttpServletRequest req) {
Project project = projectService.getById(param.getId());
projectService.updateById(param); projectService.updateById(param);
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ProjectLog log = new ProjectLog();
log.setOperatorName(loginUser.getRealname());
log.setOperatorId(loginUser.getId());
log.setProjectId(project.getId());
log.setProjectName(project.getProjectName());
log.setOperationTime(new Date());
log.setProjectStatus(param.getProjectStatus());
log.setBudgetStatus(param.getBudgetStatus());
// 11 已立项
// 12 已验收
//13 已结项
if ("11".equals(param.getProjectStatus())) {
log.setOperationMark("市科技局立项");
}
if ("12".equals(param.getProjectStatus())) {
log.setOperationMark("市科技局验收");
}
if ("13".equals(param.getProjectStatus())) {
log.setOperationMark("市科技局结项");
}
iProjectLogService.save(log);
return Result.OK("操作成功"); return Result.OK("操作成功");
} }

1
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/controller/ProjectLogController.java
Unescape View File

@ -53,6 +53,7 @@ public class ProjectLogController extends JeecgController<ProjectLog, IProjectLo
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<ProjectLog> queryWrapper = QueryGenerator.initQueryWrapper(projectLog, req.getParameterMap()); QueryWrapper<ProjectLog> queryWrapper = QueryGenerator.initQueryWrapper(projectLog, req.getParameterMap());
Page<ProjectLog> page = new Page<ProjectLog>(pageNo, pageSize); Page<ProjectLog> page = new Page<ProjectLog>(pageNo, pageSize);
queryWrapper.orderByDesc("operation_time");
IPage<ProjectLog> pageList = projectLogService.page(page, queryWrapper); IPage<ProjectLog> pageList = projectLogService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }

4
jeecgboot-vue3/.env.development
Unescape View File

@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
# 跨域代理，您可以配置多个 ,请注意，没有换行符 # 跨域代理，您可以配置多个 ,请注意，没有换行符
VITE_PROXY = [["/jeecgboot","http://10.121.2.107:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]] VITE_PROXY = [["/jeecgboot","http://localhost:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
#后台接口全路径地址(必填) #后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://10.121.2.107:18086/jeecg-boot VITE_GLOB_DOMAIN_URL=http://localhost:18086/jeecg-boot
#后台接口父地址(必填) #后台接口父地址(必填)
VITE_GLOB_API_URL=/jeecgboot VITE_GLOB_API_URL=/jeecgboot

2
jeecgboot-vue3/src/views/projectApplication/jiexiang/jixiang4CaiZhengList.vue
Unescape View File

@ -64,7 +64,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
fieldMapToTime: [], fieldMapToTime: [],
}, },
actionColumn: { actionColumn: {
width: 320, width: 350,
fixed: 'right' fixed: 'right'
}, },
beforeFetch: (params) => { beforeFetch: (params) => {

2
jeecgboot-vue3/src/views/projectApplication/lixiang/lixiang4CaiZhengList.vue
Unescape View File

@ -64,7 +64,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
fieldMapToTime: [], fieldMapToTime: [],
}, },
actionColumn: { actionColumn: {
width: 320, width: 350,
fixed: 'right' fixed: 'right'
}, },
beforeFetch: (params) => { beforeFetch: (params) => {

2
jeecgboot-vue3/src/views/projectApplication/yanshao/yanshou4CaiZhengList.vue
Unescape View File

@ -64,7 +64,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
fieldMapToTime: [], fieldMapToTime: [],
}, },
actionColumn: { actionColumn: {
width: 320, width: 350,
fixed: 'right' fixed: 'right'
}, },
beforeFetch: (params) => { beforeFetch: (params) => {

2
jeecgboot-vue3/vite.config.ts
Unescape View File

@ -67,7 +67,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
https: false, https: false,
port: VITE_PORT, port: VITE_PORT,
// Load proxy configuration from .env // Load proxy configuration from .env
// proxy: createProxy(VITE_PROXY), proxy: createProxy(VITE_PROXY),
}, },
build: { build: {
minify: 'esbuild', minify: 'esbuild',

Write Preview
Loading…
Cancel
Save