From b27d06b8f0b805efd16e28fd80a57a0ed8a053ce Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:31:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/controller/QaAuditReportController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/controller/QaAuditReportController.java b/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/controller/QaAuditReportController.java
index f03abe5..f38ef5f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/controller/QaAuditReportController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/controller/QaAuditReportController.java
@@ -13,12 +13,15 @@
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.configAuditReport.dto.ConfigAuditDto;
+import com.zt.life.modules.project.model.ProjectUserName;
+import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.qaAuditReport.dto.QaAuditReportDto;
import com.zt.life.modules.qaAuditReport.model.QaAuditReport;
import com.zt.life.modules.qaAuditReport.service.QaAuditReportService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
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;
@@ -48,10 +51,16 @@
private QaAuditReportService qaAuditReportService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private SysCodeRuleService sysCodeRuleService;
@Autowired
private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private SysUserService sysUserService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -60,7 +69,10 @@
@ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK") })
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "p.software_identity^LK")
+ })
public PageResult<QaAuditReport> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
return PageResult.ok(qaAuditReportService.page(queryFilter));
}
@@ -110,9 +122,11 @@
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
qaAuditReportService.delete(ids);
+ projectService.deleteItem(ids,"qa_audit_report_incongruent","report_id");
return Result.ok();
}
+
@GetMapping("exportQaReport")
@ApiOperation("鎵撳嵃QA瀹℃牳鎶ュ憡")
@LogOperation("鎵撳嵃QA瀹℃牳鎶ュ憡")
@@ -120,4 +134,15 @@
qaAuditReportService.exportQaReport(id, request, response);
}
+ @GetMapping("getNameById")
+ @ApiOperation("鐢ㄦ埛鍚�")
+ public Result<ProjectUserName> getNameById(String projectLeaderId, String projectTestersId, String projectConfigerId) {
+ ProjectUserName name =new ProjectUserName();
+ if (projectLeaderId.length()>10||projectTestersId.length()>10||projectConfigerId.length()>10){
+ name.setProjectLeaderName(sysUserService.getNames(projectLeaderId));
+ name.setProjectTestersName(sysUserService.getNames(projectTestersId));
+ name.setProjectConfigerName(sysUserService.getNames(projectConfigerId));
+ }
+ return Result.ok(name);
+ }
}
--
Gitblit v1.9.1