修改

jinlin

2023-12-12 0dff85a422669f41ef6d8e88fa24bf26ca164cbd

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java

@@ -1,6 +1,7 @@
package com.zt.life.modules.project.controller;


import cn.hutool.core.convert.Convert;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
@@ -15,6 +16,7 @@
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -46,6 +48,9 @@
    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private SysUserService sysUserService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -61,8 +66,8 @@
            @ApiImplicitParam(name = "tableName", value = "功能表", dataType = Constant.QT.STRING)
    })
    public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return PageResult.ok(projectService.page(queryFilter));
        List<Project> Project =projectService.page(queryFilter);
        return PageResult.ok(Project);
    }

    @GetMapping("{id}")
@@ -82,9 +87,11 @@
        String year = sdf.format(new Date());
        Map<String, String> map = new HashMap<>();
        map.put("funCode", "project");
        map.put("year",year);
        map.put("year", year);
        project.setYear(year);
        project.setCode(sysCodeRuleService.getNewCode(map));
        String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
        project.setProjectLeader(leaderName);
        projectService.insert(project);
        return Result.ok();
    }
@@ -95,8 +102,9 @@
    public Result update(@RequestBody Project project) {
        //效验数据
        ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
        String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
        project.setProjectLeader(leaderName);
        projectService.update(project);

        return Result.ok();
    }