Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform
This commit is contained in:
zyx.net
+24
-11
@@ -37,8 +37,12 @@ import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
|
||||
import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEnPlatform;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOPlatform;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEOEnPlatform;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEOPlatform;
|
||||
import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO;
|
||||
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
|
||||
import com.jero.modules.project.entity.ProjectLibraryBase;
|
||||
@@ -532,7 +536,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
||||
List<String> userIdList = new ArrayList<>();
|
||||
userIdList.add(oldPciEo.getDutyPerson());
|
||||
if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
|
||||
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
|
||||
if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
|
||||
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
|
||||
}
|
||||
}
|
||||
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
|
||||
oldPciEo.setEndTime(newPciEo.getEndTime());
|
||||
@@ -789,7 +795,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
||||
List<String> userIdList = new ArrayList<>();
|
||||
userIdList.add(oldPciEo.getDutyPerson());
|
||||
if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
|
||||
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
|
||||
if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
|
||||
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
|
||||
}
|
||||
}else if(role == ProjectRoleEnum.HOMOLOGATION_ENGINEER.getIntValue()){
|
||||
userIdList.add(projectLibraryBase.getStudioEngineer());
|
||||
}
|
||||
@@ -1805,12 +1813,17 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
||||
for (CertificationInventoryFlowStatusEnum value : values) {
|
||||
Map<String,Object> flowStatusMap = new HashMap<>();
|
||||
String name = value.getCnName();
|
||||
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
name = value.getEnName();
|
||||
if(!CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getCnName().equals(name)
|
||||
&& !CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getEnName().equals(name)
|
||||
&& !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getCnName().equals(name)
|
||||
&& !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getEnName().equals(name)){
|
||||
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
|
||||
name = value.getEnName();
|
||||
}
|
||||
flowStatusMap.put("name",name);
|
||||
flowStatusMap.put("value",value.getValue());
|
||||
result.add(flowStatusMap);
|
||||
}
|
||||
flowStatusMap.put("name",name);
|
||||
flowStatusMap.put("value",value.getValue());
|
||||
result.add(flowStatusMap);
|
||||
}
|
||||
return Result.OK(result);
|
||||
}
|
||||
@@ -5542,9 +5555,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
||||
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
|
||||
if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
|
||||
ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEO.class, copy);
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, copy);
|
||||
}else{
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEO.class, dataList);
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, dataList);
|
||||
}
|
||||
}else{
|
||||
if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) ||
|
||||
@@ -5555,7 +5568,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
||||
BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn);
|
||||
copyEn.add(projectCertificationInventoryDutyEnginnerEOEn);
|
||||
}
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEn.class, copyEn);
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEnPlatform.class, copyEn);
|
||||
}else{
|
||||
List<ProjectCertificationInventoryEOEn> dataListEn = new ArrayList<>();
|
||||
for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) {
|
||||
@@ -5565,7 +5578,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
||||
}
|
||||
//下拉选中英文转换
|
||||
// transition(dataListEn,projectCertificationInventoryEO);
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEn.class, dataListEn);
|
||||
workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEnPlatform.class, dataListEn);
|
||||
}
|
||||
}
|
||||
workbook.write(excelOS);
|
||||
|
||||
+2
@@ -1649,6 +1649,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
|
||||
String regulationOwnerName = sysUsers.stream().filter(e -> regulationOwnerId.equals(e.getId())).
|
||||
map(SysUser::getUsername).collect(Collectors.joining(","));
|
||||
projectLawsInventoryEO.setRegulationOwnerName(regulationOwnerName);
|
||||
projectLawsInventoryEO.setRegulationOwnerIdName(regulationOwnerName);
|
||||
}
|
||||
String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson();
|
||||
if (StringUtils.isNotEmpty(engineeringInterfacePerson)) {
|
||||
@@ -8830,6 +8831,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
|
||||
}
|
||||
|
||||
}
|
||||
sysRoles = sysRoles.stream().distinct().collect(Collectors.toList());
|
||||
return sysRoles;
|
||||
}
|
||||
|
||||
|
||||
+218
@@ -0,0 +1,218 @@
|
||||
package com.jero.modules.project.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 认证清单工程接口人和责任人导出类
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-03
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("project_certification_inventory")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
|
||||
public class ProjectCertificationInventoryDutyEnginnerEOEnPlatform implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**类别*/
|
||||
@Excel(name = "Category", width = 20)
|
||||
@ApiModelProperty(value = "类别")
|
||||
private String category;
|
||||
|
||||
/**检验项目*/
|
||||
@Excel(name = "Inspection Items", width = 20)
|
||||
@ApiModelProperty(value = "检验项目")
|
||||
private String inspectionItem;
|
||||
|
||||
/**配置项*/
|
||||
@ApiModelProperty(value = "配置项")
|
||||
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
||||
private String configItem;
|
||||
|
||||
/**WVTA ID*/
|
||||
@Excel(name = "WVTA ID", width = 20)
|
||||
@ApiModelProperty(value = "WVTA ID")
|
||||
private String wvtaId;
|
||||
|
||||
/**标准编号*/
|
||||
@Excel(name = "Standard No", width = 20)
|
||||
@ApiModelProperty(value = "标准编号")
|
||||
private String serialNumber;
|
||||
|
||||
/**责任领域*/
|
||||
@ApiModelProperty(value = "责任领域")
|
||||
private String dutyTerritory;
|
||||
/**责任领域名称**/
|
||||
@Excel(name = "Responsible Field", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**工程接口人*/
|
||||
@ApiModelProperty(value = "工程接口人")
|
||||
private String sdt;
|
||||
/**工程接口人名称**/
|
||||
@Excel(name = "Eng. Interface", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String sdtName;
|
||||
|
||||
/**责任人*/
|
||||
@ApiModelProperty(value = "责任人")
|
||||
private String dutyPerson;
|
||||
/**责任人名称**/
|
||||
@Excel(name = "Assignee", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyPersonName;
|
||||
|
||||
/**交付物模板*/
|
||||
@ApiModelProperty(value = "交付物模板")
|
||||
private String deliverableTemplate;
|
||||
/**交付物模板名称**/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "Deliverable Template", width = 40)
|
||||
private String deliverableTemplateName;
|
||||
|
||||
/**交付物类型*/
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private String deliverableType;
|
||||
// 交付物类型名称
|
||||
@Excel(name = "Deliverable Type", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**交付物*/
|
||||
// @Excel(name = "交付物", width = 15)
|
||||
@ApiModelProperty(value = "交付物")
|
||||
private String deliverable;
|
||||
|
||||
/**文档库id*/
|
||||
// @Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private String bussDocumentLibraryId;
|
||||
|
||||
|
||||
|
||||
/**交付结果*/
|
||||
@Excel(name = "Deliverables Result", width = 20)
|
||||
@ApiModelProperty(value = "交付结果")
|
||||
private String deliveryResult;
|
||||
|
||||
/**截止日期*/
|
||||
@Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "截止日期")
|
||||
private java.util.Date endTime;
|
||||
|
||||
/**流程状态*/
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
private String flowStatus;
|
||||
// 流程状态展示名称
|
||||
@Excel(name = "Process Status", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String flowStatusName;
|
||||
|
||||
/**报告编号*/
|
||||
// @Excel(name = "Report No", width = 20)
|
||||
@ApiModelProperty(value = "报告编号")
|
||||
private String reportNumber;
|
||||
|
||||
/**产品型号*/
|
||||
// @Excel(name = "Product Model", width = 20)
|
||||
@ApiModelProperty(value = "产品型号")
|
||||
private String productModel;
|
||||
|
||||
/**生产企业名称*/
|
||||
// @Excel(name = "Name Of Manufacturer", width = 40)
|
||||
@ApiModelProperty(value = "生产企业名称")
|
||||
private String productionEnterpriseName;
|
||||
|
||||
/**认证进度*/
|
||||
|
||||
@ApiModelProperty(value = "认证进度")
|
||||
private String certificationProgress;
|
||||
|
||||
/**认证进度展示名称**/
|
||||
@TableField(exist = false)
|
||||
// @Excel(name = "Homologation Progress", width = 40)
|
||||
private String certificationProgress_dictText;
|
||||
|
||||
// @Excel(name = "认证进度备注", width = 15)
|
||||
@ApiModelProperty(value = "认证进度备注")
|
||||
private String certificationProgressRemark;
|
||||
|
||||
/**项目库id*/
|
||||
@ApiModelProperty(value = "项目库id")
|
||||
private String projectLibraryId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ids;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String roleCode;
|
||||
|
||||
/**值类型，对应SysCategoryValueTypeEnum中value**/
|
||||
@TableField(exist = false)
|
||||
private String valueType;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String excelName;
|
||||
|
||||
// @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
|
||||
@TableField(exist = false)
|
||||
private String endTimeStr;
|
||||
}
|
||||
+218
@@ -0,0 +1,218 @@
|
||||
package com.jero.modules.project.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 认证清单工程接口人和责任人导出类
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-03
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("project_certification_inventory")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
|
||||
public class ProjectCertificationInventoryDutyEnginnerEOPlatform implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**类别*/
|
||||
@Excel(name = "类别", width = 20)
|
||||
@ApiModelProperty(value = "类别")
|
||||
private String category;
|
||||
|
||||
/**检验项目*/
|
||||
@Excel(name = "检验项目", width = 20)
|
||||
@ApiModelProperty(value = "检验项目")
|
||||
private String inspectionItem;
|
||||
|
||||
/**配置项*/
|
||||
@ApiModelProperty(value = "配置项")
|
||||
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
||||
private String configItem;
|
||||
|
||||
/**WVTA ID*/
|
||||
@Excel(name = "WVTA ID", width = 20)
|
||||
@ApiModelProperty(value = "WVTA ID")
|
||||
private String wvtaId;
|
||||
|
||||
/**标准编号*/
|
||||
@Excel(name = "标准编号", width = 20)
|
||||
@ApiModelProperty(value = "标准编号")
|
||||
private String serialNumber;
|
||||
|
||||
/**责任领域*/
|
||||
@ApiModelProperty(value = "责任领域")
|
||||
private String dutyTerritory;
|
||||
/**责任领域名称**/
|
||||
@Excel(name = "责任领域", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**工程接口人*/
|
||||
@ApiModelProperty(value = "工程接口人")
|
||||
private String sdt;
|
||||
/**工程接口人名称**/
|
||||
@Excel(name = "工程接口人", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String sdtName;
|
||||
|
||||
/**责任人*/
|
||||
@ApiModelProperty(value = "责任人")
|
||||
private String dutyPerson;
|
||||
/**责任人名称**/
|
||||
@Excel(name = "责任人", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyPersonName;
|
||||
|
||||
/**交付物模板*/
|
||||
@ApiModelProperty(value = "交付物模板")
|
||||
private String deliverableTemplate;
|
||||
/**交付物模板名称**/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "交付物模板", width = 20)
|
||||
private String deliverableTemplateName;
|
||||
|
||||
/**交付物类型*/
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private String deliverableType;
|
||||
// 交付物类型名称
|
||||
@Excel(name = "交付物类型", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**交付物*/
|
||||
// @Excel(name = "交付物", width = 15)
|
||||
@ApiModelProperty(value = "交付物")
|
||||
private String deliverable;
|
||||
|
||||
/**文档库id*/
|
||||
// @Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private String bussDocumentLibraryId;
|
||||
|
||||
|
||||
|
||||
/**交付结果*/
|
||||
@Excel(name = "交付结果", width = 20)
|
||||
@ApiModelProperty(value = "交付结果")
|
||||
private String deliveryResult;
|
||||
|
||||
/**截止日期*/
|
||||
@Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "截止日期")
|
||||
private Date endTime;
|
||||
/**流程状态*/
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
private String flowStatus;
|
||||
// 流程状态展示名称
|
||||
@Excel(name = "流程状态", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String flowStatusName;
|
||||
|
||||
/**报告编号*/
|
||||
// @Excel(name = "报告编号", width = 20)
|
||||
@ApiModelProperty(value = "报告编号")
|
||||
private String reportNumber;
|
||||
|
||||
/**产品型号*/
|
||||
// @Excel(name = "产品型号", width = 20)
|
||||
@ApiModelProperty(value = "产品型号")
|
||||
private String productModel;
|
||||
|
||||
/**生产企业名称*/
|
||||
// @Excel(name = "生产企业名称", width = 20)
|
||||
@ApiModelProperty(value = "生产企业名称")
|
||||
private String productionEnterpriseName;
|
||||
|
||||
/**认证进度*/
|
||||
|
||||
@ApiModelProperty(value = "认证进度")
|
||||
private String certificationProgress;
|
||||
|
||||
/**认证进度展示名称**/
|
||||
// @Excel(name = "认证进度", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String certificationProgress_dictText;
|
||||
|
||||
// @Excel(name = "认证进度备注", width = 15)
|
||||
@ApiModelProperty(value = "认证进度备注")
|
||||
private String certificationProgressRemark;
|
||||
|
||||
/**项目库id*/
|
||||
@ApiModelProperty(value = "项目库id")
|
||||
private String projectLibraryId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ids;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String roleCode;
|
||||
|
||||
/**值类型，对应SysCategoryValueTypeEnum中value**/
|
||||
@TableField(exist = false)
|
||||
private String valueType;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String excelName;
|
||||
|
||||
// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
|
||||
@TableField(exist = false)
|
||||
private String endTimeStr;
|
||||
}
|
||||
+224
@@ -0,0 +1,224 @@
|
||||
package com.jero.modules.project.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 项目库-认证清单表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-03
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("project_certification_inventory")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
|
||||
public class ProjectCertificationInventoryEOEnPlatform implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**类别*/
|
||||
@Excel(name = "Category", width = 20)
|
||||
@ApiModelProperty(value = "类别")
|
||||
private String category;
|
||||
|
||||
/**检验项目*/
|
||||
@Excel(name = "Inspection Items", width = 20)
|
||||
@ApiModelProperty(value = "检验项目")
|
||||
private String inspectionItem;
|
||||
|
||||
/**配置项*/
|
||||
@ApiModelProperty(value = "配置项")
|
||||
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
||||
private String configItem;
|
||||
|
||||
/**认证类型*/
|
||||
@Excel(name = "Certification Type", width = 20)
|
||||
@ApiModelProperty(value = "认证类型")
|
||||
@TableField(exist = false)
|
||||
private String attestationTypeName;
|
||||
|
||||
/**WVTA ID*/
|
||||
@Excel(name = "WVTA ID", width = 20)
|
||||
@ApiModelProperty(value = "WVTA ID")
|
||||
private String wvtaId;
|
||||
|
||||
/**标准编号*/
|
||||
@Excel(name = "Standard No", width = 20)
|
||||
@ApiModelProperty(value = "标准编号")
|
||||
private String serialNumber;
|
||||
|
||||
/**责任领域*/
|
||||
@ApiModelProperty(value = "责任领域")
|
||||
private String dutyTerritory;
|
||||
/**责任领域名称**/
|
||||
@Excel(name = "Responsible Field", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**工程接口人*/
|
||||
@ApiModelProperty(value = "工程接口人")
|
||||
private String sdt;
|
||||
/**工程接口人名称**/
|
||||
@Excel(name = "Eng. Interface", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String sdtName;
|
||||
|
||||
/**责任人*/
|
||||
@ApiModelProperty(value = "责任人")
|
||||
private String dutyPerson;
|
||||
/**责任人名称**/
|
||||
@Excel(name = "Assignee", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyPersonName;
|
||||
|
||||
/**交付物模板*/
|
||||
@ApiModelProperty(value = "交付物模板")
|
||||
private String deliverableTemplate;
|
||||
/**交付物模板名称**/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "Deliverable Template", width = 40)
|
||||
private String deliverableTemplateName;
|
||||
|
||||
/**交付物类型*/
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private String deliverableType;
|
||||
// 交付物类型名称
|
||||
@Excel(name = "Deliverable Type", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**交付物*/
|
||||
// @Excel(name = "交付物", width = 15)
|
||||
@ApiModelProperty(value = "交付物")
|
||||
private String deliverable;
|
||||
|
||||
/**文档库id*/
|
||||
// @Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private String bussDocumentLibraryId;
|
||||
|
||||
|
||||
|
||||
/**交付结果*/
|
||||
@Excel(name = "Deliverables Result", width = 20)
|
||||
@ApiModelProperty(value = "交付结果")
|
||||
private String deliveryResult;
|
||||
|
||||
/**截止日期*/
|
||||
@Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "截止日期")
|
||||
private java.util.Date endTime;
|
||||
|
||||
/**流程状态*/
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
private String flowStatus;
|
||||
// 流程状态展示名称
|
||||
@Excel(name = "Process Status", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String flowStatusName;
|
||||
|
||||
/**报告编号*/
|
||||
@Excel(name = "Report No", width = 20)
|
||||
@ApiModelProperty(value = "报告编号")
|
||||
private String reportNumber;
|
||||
|
||||
/**产品型号*/
|
||||
@Excel(name = "Product Model", width = 20)
|
||||
@ApiModelProperty(value = "产品型号")
|
||||
private String productModel;
|
||||
|
||||
/**生产企业名称*/
|
||||
@Excel(name = "Name Of Manufacturer", width = 40)
|
||||
@ApiModelProperty(value = "生产企业名称")
|
||||
private String productionEnterpriseName;
|
||||
|
||||
/**认证进度*/
|
||||
|
||||
@ApiModelProperty(value = "认证进度")
|
||||
private String certificationProgress;
|
||||
|
||||
/**认证进度展示名称**/
|
||||
@TableField(exist = false)
|
||||
private String certificationProgress_dictText;
|
||||
|
||||
// @Excel(name = "认证进度备注", width = 15)
|
||||
@ApiModelProperty(value = "认证进度备注")
|
||||
private String certificationProgressRemark;
|
||||
|
||||
/**项目库id*/
|
||||
@ApiModelProperty(value = "项目库id")
|
||||
private String projectLibraryId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ids;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String roleCode;
|
||||
|
||||
/**值类型，对应SysCategoryValueTypeEnum中value**/
|
||||
@TableField(exist = false)
|
||||
private String valueType;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String excelName;
|
||||
|
||||
// @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
|
||||
@TableField(exist = false)
|
||||
private String endTimeStr;
|
||||
|
||||
}
|
||||
+264
@@ -0,0 +1,264 @@
|
||||
package com.jero.modules.project.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 项目库-认证清单表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2023-03-03
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("project_certification_inventory")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表")
|
||||
public class ProjectCertificationInventoryEOPlatform implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**类别*/
|
||||
@Excel(name = "类别", width = 20)
|
||||
@ApiModelProperty(value = "类别")
|
||||
private String category;
|
||||
|
||||
/**检验项目*/
|
||||
@Excel(name = "检验项目", width = 20)
|
||||
@ApiModelProperty(value = "检验项目")
|
||||
private String inspectionItem;
|
||||
|
||||
/**配置项*/
|
||||
@ApiModelProperty(value = "配置项")
|
||||
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
|
||||
private String configItem;
|
||||
|
||||
/**认证类型名称**/
|
||||
@Excel(name = "认证类型", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String attestationTypeName;
|
||||
|
||||
/**WVTA ID*/
|
||||
@Excel(name = "WVTA ID", width = 20)
|
||||
@ApiModelProperty(value = "WVTA ID")
|
||||
private String wvtaId;
|
||||
|
||||
/**标准编号*/
|
||||
@Excel(name = "标准编号", width = 20)
|
||||
@ApiModelProperty(value = "标准编号")
|
||||
private String serialNumber;
|
||||
|
||||
/**责任领域*/
|
||||
@ApiModelProperty(value = "责任领域")
|
||||
private String dutyTerritory;
|
||||
/**责任领域名称**/
|
||||
@Excel(name = "责任领域", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryName;
|
||||
/**责任领域名称-英文**/
|
||||
@TableField(exist = false)
|
||||
private String dutyTerritoryNameEn;
|
||||
|
||||
/**责任部门*/
|
||||
@ApiModelProperty(value = "责任部门")
|
||||
private String dutyDepart;
|
||||
/**工程接口人*/
|
||||
@ApiModelProperty(value = "工程接口人")
|
||||
private String sdt;
|
||||
/**工程接口人名称**/
|
||||
@Excel(name = "工程接口人", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String sdtName;
|
||||
|
||||
/**责任人*/
|
||||
@ApiModelProperty(value = "责任人")
|
||||
private String dutyPerson;
|
||||
/**责任人名称**/
|
||||
@Excel(name = "责任人", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String dutyPersonName;
|
||||
|
||||
/**交付物模板*/
|
||||
@ApiModelProperty(value = "交付物模板")
|
||||
private String deliverableTemplate;
|
||||
/**交付物模板名称**/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "交付物模板", width = 20)
|
||||
private String deliverableTemplateName;
|
||||
|
||||
/**交付物类型*/
|
||||
@ApiModelProperty(value = "交付物类型")
|
||||
private String deliverableType;
|
||||
// 交付物类型名称
|
||||
@Excel(name = "交付物类型", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeName;
|
||||
// 交付物类型名称-英文
|
||||
@TableField(exist = false)
|
||||
private String deliverableTypeNameEn;
|
||||
|
||||
/**交付物*/
|
||||
// @Excel(name = "交付物", width = 15)
|
||||
@ApiModelProperty(value = "交付物")
|
||||
private String deliverable;
|
||||
|
||||
/**文档库id*/
|
||||
// @Excel(name = "文档库id", width = 15)
|
||||
@ApiModelProperty(value = "文档库id")
|
||||
private String bussDocumentLibraryId;
|
||||
|
||||
|
||||
|
||||
/**交付结果*/
|
||||
@Excel(name = "交付结果", width = 20)
|
||||
@ApiModelProperty(value = "交付结果")
|
||||
private String deliveryResult;
|
||||
|
||||
/**截止日期*/
|
||||
@Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "截止日期")
|
||||
private Date endTime;
|
||||
/**流程状态*/
|
||||
@ApiModelProperty(value = "流程状态")
|
||||
private String flowStatus;
|
||||
// 流程状态展示名称
|
||||
@Excel(name = "流程状态", width = 20)
|
||||
@TableField(exist = false)
|
||||
private String flowStatusName;
|
||||
|
||||
/**报告编号*/
|
||||
@Excel(name = "报告编号", width = 20)
|
||||
@ApiModelProperty(value = "报告编号")
|
||||
private String reportNumber;
|
||||
|
||||
/**产品型号*/
|
||||
@Excel(name = "产品型号", width = 20)
|
||||
@ApiModelProperty(value = "产品型号")
|
||||
private String productModel;
|
||||
|
||||
/**生产企业名称*/
|
||||
@Excel(name = "生产企业名称", width = 20)
|
||||
@ApiModelProperty(value = "生产企业名称")
|
||||
private String productionEnterpriseName;
|
||||
|
||||
/**认证进度*/
|
||||
@ApiModelProperty(value = "认证进度")
|
||||
private String certificationProgress;
|
||||
|
||||
// 认证进度排序字段
|
||||
@TableField(exist = false)
|
||||
private String certificationProgressNumber;
|
||||
|
||||
/**认证进度展示名称**/
|
||||
@TableField(exist = false)
|
||||
private String certificationProgress_dictText;
|
||||
|
||||
// @Excel(name = "认证进度备注", width = 15)
|
||||
@ApiModelProperty(value = "认证进度备注")
|
||||
private String certificationProgressRemark;
|
||||
|
||||
/**项目库id*/
|
||||
@ApiModelProperty(value = "项目库id")
|
||||
private String projectLibraryId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String ids;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String roleCode;
|
||||
|
||||
/**值类型，对应SysCategoryValueTypeEnum中value**/
|
||||
@TableField(exist = false)
|
||||
private String valueType;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String excelName;
|
||||
|
||||
// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd")
|
||||
@TableField(exist = false)
|
||||
private String endTimeStr;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String reasonForReturn;
|
||||
|
||||
//排序（1->正序， 2->倒序）
|
||||
@TableField(exist = false)
|
||||
private String orderBy;
|
||||
|
||||
//排序字段
|
||||
@TableField(exist = false)
|
||||
private String orderByField;
|
||||
|
||||
/**清单校核截止时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "清单校核截止时间")
|
||||
private Date inventoryVerifyEndTime;
|
||||
|
||||
/**责任确认截止时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "责任确认截止时间")
|
||||
private Date taskConfirmEndTime;
|
||||
|
||||
/**认证类型*/
|
||||
@ApiModelProperty(value = "认证类型")
|
||||
private String attestationType;
|
||||
|
||||
/**一级责任领域**/
|
||||
@TableField(exist = false)
|
||||
private String firstLevelDutyTerritory;
|
||||
|
||||
@ApiModelProperty(value = "关联平台件数据")
|
||||
@TableField(exist = false)
|
||||
private List<ProjectCertificationInventoryEOPlatform> projectCertificationInventoryEOS;
|
||||
}
|
||||
+4
@@ -186,6 +186,10 @@ public class ProjectLawsInventoryEO implements Serializable {
|
||||
@ApiModelProperty(value = "法规工程师名称")
|
||||
private String regulationOwnerName;//法规工程师名称
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "法规工程师名称（前端指定要的）")
|
||||
private String regulationOwnerIdName;//法规工程师名称（前端指定要的）
|
||||
|
||||
/**认证工程师id*/
|
||||
@ApiModelProperty(value = "认证工程师id")
|
||||
private String homologationEngineerId;
|
||||
|
||||
Reference in New Issue
Block a user