修改

jinlin

2023-12-08 9b31782deaeaa36efb013f538c99d8f5df94eed4

 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;
@@ -24,6 +26,8 @@
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,6 +48,9 @@
    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private SysUserService sysUserService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -54,14 +61,13 @@
            @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "software_name^LK"),
            @ApiImplicitParam(name = "secretClass", value = "密级", dataType = Constant.QT.STRING, format = "secret_class^EQ"),
            @ApiImplicitParam(name = "criticalLevel", value = "关键等级", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
            @ApiImplicitParam(name = "testLevel", value = "测试级别", dataType = Constant.QT.STRING, format = "test_level^EQ"),
            @ApiImplicitParam(name = "softwareType", value = "软件类型", dataType = Constant.QT.STRING, format = "software_type^EQ"),
            @ApiImplicitParam(name = "isContract", value = "是否签署合同", dataType = Constant.QT.STRING, format = "is_contract^EQ"),
            @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}")
@@ -77,9 +83,15 @@
    public Result insert(@RequestBody Project project) {
        //效验数据
        ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class);
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        String year = sdf.format(new Date());
        Map<String, String> map = new HashMap<>();
        map.put("funCode", "project");
        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();
    }
@@ -90,12 +102,13 @@
    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();
    }

    @DeleteMapping
    @DeleteMapping("deleteProject")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids) {