diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportLicenseRespVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportLicenseRespVO.java index 4c97692..e3f6e80 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportLicenseRespVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportLicenseRespVO.java @@ -2,16 +2,12 @@ package org.agt.module.license.controller.admin.report.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.constant.TransType; import com.fhs.core.trans.vo.VO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.agt.framework.excel.core.annotations.DictFormat; import org.agt.framework.excel.core.convert.DictConvert; import org.agt.module.license.controller.admin.license.vo.LicenseDetailVO; -import org.agt.module.license.dal.dataobject.customer.CustomerDO; -import org.agt.module.license.dal.dataobject.project.ProjectDO; import java.time.LocalDate; import java.time.LocalDateTime; @@ -27,7 +23,6 @@ public class ReportLicenseRespVO implements VO { private Long id; @Schema(description = "客户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31667") - @Trans(type = TransType.SIMPLE, target = CustomerDO.class, fields = "name", ref = "customerName") private Long customerId; @Schema(description = "客户名称") @@ -35,7 +30,6 @@ public class ReportLicenseRespVO implements VO { private String customerName; @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2496") - @Trans(type = TransType.SIMPLE, target = ProjectDO.class, fields = "name", ref = "projectName") private Long projectId; @Schema(description = "项目名称") @@ -98,6 +92,9 @@ public class ReportLicenseRespVO implements VO { @DictFormat("lic_license_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Integer status; + @Schema(description = "商务状态", example = "1") + private Integer businessStatus; + @Schema(description = "备注", example = "随便") @ExcelProperty("说明") private String remark; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportProgressProjectRespVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportProgressProjectRespVO.java index c4472be..ab236de 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportProgressProjectRespVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/report/vo/ReportProgressProjectRespVO.java @@ -27,6 +27,9 @@ public class ReportProgressProjectRespVO { @Schema(description = "项目状态", example = "18334") private Integer status; + @Schema(description = "商务状态", example = "18334") + private Integer businessStatus; + @Schema(description = "serialNo", example = "随便") private String serialNo; diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/report/ReportMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/report/ReportMapper.xml index 1cfafd6..d722303 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/report/ReportMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/report/ReportMapper.xml @@ -20,6 +20,7 @@ SELECT p.`name` project_name, p.`status` status, + p.business_status, p.start_time, cu.`name` customer_name, l.serial_no, @@ -90,6 +91,7 @@ l.approver, l.approve_time, p.`status`, + p.business_status, l.remark, l.data_type, l.creator, @@ -109,7 +111,7 @@ crm_license_server l LEFT JOIN crm_project p ON l.project_id = p.id AND p.deleted = 0 - LEFT JOIN crm_customer c ON l.customer_id = c.id + LEFT JOIN crm_customer c ON p.customer_id = c.id AND c.deleted = 0 LEFT JOIN system_users bo ON p.business_owner = bo.id AND bo.deleted = 0