ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 77906

Browse Source 
企业标准--导入和新增 选择相同的人员，回显不一样，要如何统一
This commit is contained in:
mzaxd
2023-11-03 17:43:37 +08:00
parent f0b157bc38
commit 8c67cd6961
18 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java
+4 -4
View File
@@ -11,22 +11,22 @@ import lombok.Data;
@Data
public class ESAbolishFlowUserVO {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("发起人")
private String createUser;
// 相关人员
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("相关人员")
private String relatedUser;
// 主起草人主管级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("起草人和会签人主管级领导")
private String leader;
// 标准化审批人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化审批人")
private String standardizationUser;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
+4 -4
View File
@@ -232,7 +232,7 @@ public class ProcessEsAnnualInit implements Serializable {
* 主起草人
*/
@Excel(name = "*主起草人", width = 15, orderNum = "10")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@@ -248,12 +248,12 @@ public class ProcessEsAnnualInit implements Serializable {
* 主起草单位责任人
*/
@Excel(name = "*起草单位责任人", width = 20, orderNum = "12")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
@Excel(name = "*标准推进人", width = 15, orderNum = "16")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter;
@@ -311,7 +311,7 @@ public class ProcessEsAnnualInit implements Serializable {
/**
* 流程中的主起草人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "流程中的主起草人")
private String prcMainDraftUser;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/vo/AnnualInitFlowUserVO.java
+7 -7
View File
@@ -15,38 +15,38 @@ import java.util.List;
@Data
public class AnnualInitFlowUserVO {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化工程师")
private String standardEngineer;
// 部所联络人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("各部所联络人")
private String contactUser;
// 部所联络人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("各部所联络人集合")
@JsonIgnore
private List<String> contactUserList;
// 主起草单位主管
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草单位主管")
private String approvalUser;
// 主起草单位主管
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草单位主管集合")
private List<String> approvalUserList;
// 主起草人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人")
private String mainDraftUser;
// 主起草人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人集合")
@JsonIgnore
private List<String> mainDraftUserList;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+4 -4
View File
@@ -415,11 +415,11 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
item.setAuthDept(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getAuthDept(), listDict));
item.setEnStandardCode(excelUtils.translateDictValue("enterprise_standard_code", item.getEnStandardCode(), listDict));
item.setCooperationUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getCooperationUnit(), listDict));
item.setMainDraftingUser(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUser(), listDict));
item.setMainDraftingUser(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUser(), listDict));
item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("username", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setContactUser(excelUtils.translateDictValue("username", "id", "sys_user", item.getContactUser(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("realname", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setContactUser(excelUtils.translateDictValue("realname", "id", "sys_user", item.getContactUser(), listDict));
});
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+8 -8
View File
@@ -232,7 +232,7 @@ public class ProcessEsAnnualReport implements Serializable {
* 主起草人
*/
@Excel(name = "*主起草人", width = 15, orderNum = "8")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@@ -248,7 +248,7 @@ public class ProcessEsAnnualReport implements Serializable {
* 主起草单位责任人
*/
@Excel(name = "*起草单位责任人", width = 20, orderNum = "9")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
@@ -256,7 +256,7 @@ public class ProcessEsAnnualReport implements Serializable {
* 标准推进人
*/
@Excel(name = "*标准推进人", width = 15, orderNum = "11")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter;
@@ -337,35 +337,35 @@ public class ProcessEsAnnualReport implements Serializable {
/**
* 部门联络人
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "部门联络人")
private String contactUser;
/**
* 工作组所联络人
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "工作组所联络人")
private String workGroupUser;
/**
* 工作组所联络人集合
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "工作组所联络人集合")
private String workGroupUserList;
/**
* 联络人主管级上一级领导
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "联络人主管级上一级领导")
private String contactUserLeaderLeader;
/**
* 收集联络人主管级领导
*/
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
@ApiModelProperty(value = "收集联络人主管级领导")
private String collectUserLeader;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/vo/AnnualReportFlowUserVO.java
+5 -5
View File
@@ -11,27 +11,27 @@ import lombok.Data;
@Data
public class AnnualReportFlowUserVO {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化工程师")
private String standardEngineer;
// 部所联络人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("个部所联络人")
private String contactUserList;
// 标准专家
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("工作组联络人")
private String workGroupUserList;
// 主起草人主管级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("收集联络人主管级领导")
private String collectUserLeader;
// 主起草人主管级领导上级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("联络人主管级上级领导")
private String contactUserLeaderLeader;
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+3 -3
View File
@@ -401,10 +401,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
item.setEnStandardCode(excelUtils.translateDictValue("enterprise_standard_code", item.getEnStandardCode(), listDict));
item.setAuthDept(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getAuthDept(), listDict));
item.setCooperationUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getCooperationUnit(), listDict));
item.setMainDraftingUser(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUser(), listDict));
item.setMainDraftingUser(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUser(), listDict));
item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("username", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("username", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("realname", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
item.setStandardPromoter(excelUtils.translateDictValue("realname", "id", "sys_user", item.getStandardPromoter(), listDict));
item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
});
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/entity/vo/ESArchiveFlowUserVO.java
+4 -4
View File
@@ -12,22 +12,22 @@ import lombok.Data;
public class ESArchiveFlowUserVO {
// 创建人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("创建人")
private String createUser;
// 相关人员
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("相关人员")
private String relatedUser;
// 创建人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("起草人和会签人主管级领导")
private String leader;
// 标准化审批人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化审批人")
private String standardizationUser;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/vo/ESChangeFlowUserVO.java
+5 -5
View File
@@ -11,27 +11,27 @@ import lombok.Data;
@Data
public class ESChangeFlowUserVO {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人")
private String mainDraftUser;
// 主起草人主管级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人主管级领导")
private String mainDraftUserLeader;
// 主起草人主管级领导上级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人主管级领导上级领导")
private String mainDraftUserLeaderLeader;
// 标准化审批人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化审批人")
private String standardizationUser;
// 相关人员
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("相关人员")
private String relatedUser;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/entity/vo/ESEnableFlowUserVO.java
+4 -4
View File
@@ -12,22 +12,22 @@ import lombok.Data;
public class ESEnableFlowUserVO {
// 创建人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("创建人")
private String createUser;
// 相关人员
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("相关人员")
private String relatedUser;
// 创建人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("起草人和会签人主管级领导")
private String leader;
// 标准化审批人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化审批人")
private String standardizationUser;
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+14 -14
View File
@@ -304,7 +304,7 @@ public class ProcessEsInitChange implements Serializable {
@ApiModelProperty(value = "零部件名称")
private String componentName;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@@ -312,18 +312,18 @@ public class ProcessEsInitChange implements Serializable {
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
/**
* 新主起草单位负责人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "新主起草单位负责人")
private String newMainDraftingUnitResponsiblePerson;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter;
@@ -446,7 +446,7 @@ public class ProcessEsInitChange implements Serializable {
/**
* 新主起草人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "新主起草人")
private String newMainDraftingUser;
@@ -460,63 +460,63 @@ public class ProcessEsInitChange implements Serializable {
/**
* 部所联络人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "部所联络人")
private String contactUser;
/**
* 标准专家
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "标准专家")
private String standardExpert;
/**
* 主起草人主管级领导
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人主管级领导")
private String mainDraftUserLeader;
/**
* 主起草人主管级领导上级领导
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人主管级领导上级领导")
private String mainDraftUserLeaderLeader;
/**
* 标准化审批人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "标准化审批人")
private String standardizationApprovalUser;
/**
* 新主起草部门领导的领导
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "新主起草部门领导的领导")
private String newMainDraftUserLeaderLeader;
/**
* 新主起草部门领导
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "新主起草部门领导")
private String newMainDraftUserLeader;
/**
* 相关人员
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "相关人员")
private String relatedUser;
/**
* 抄送人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "抄送人")
private String copyUser;
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java
+11 -11
View File
@@ -11,57 +11,57 @@ import lombok.Data;
@Data
public class InitChangeFlowUserVO {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人")
private String mainDraftUser;
// 部所联络人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("部所联络人")
private String contactUser;
// 标准专家
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准专家")
private String standardExpert;
// 主起草人主管级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人主管级领导")
private String mainDraftUserLeader;
// 主起草人主管级领导上级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人主管级领导上级领导")
private String mainDraftUserLeaderLeader;
// 标准化审批人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化审批人")
private String standardizationApprovalUser;
// 新起草部门主管级领导上级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("新起草部门主管级领导上级领导")
private String newMainDraftUserLeaderLeader;
// 新起草部门主管级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("新起草部门主管级领导")
private String newMainDraftUserLeader;
// 相关人员
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("相关人员")
private String relatedUser;
// 抄送人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("抄送人")
private String copyUser;
// 创建人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("创建人")
private String createUser;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/vo/ESRecheckFlowUserVO.java
+4 -4
View File
@@ -11,22 +11,22 @@ import lombok.Data;
@Data
public class ESRecheckFlowUserVO {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人")
private String mainDraftUser;
// 主起草人主管级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人主管级领导")
private String mainDraftUserLeader;
// 标准化审批人
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("标准化审批人")
private String standardizationUser;
// 主起草人主管级领导上级领导
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty("主起草人主管级领导上级领导")
private String mainDraftUserLeaderLeader;
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+8 -7
View File
@@ -3,6 +3,7 @@ package com.jero.modules.laws.common.util;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.DictModel;
@@ -336,9 +337,9 @@ public class ImportUtil {
// 单选用户转换
public String convertSingleUserId(String cellValue) {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
return sysUserService.getOne(sysUserLambdaQueryWrapper).getId();
QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
wrapper.apply("CONCAT(realname, '(', username, ')') = {0}", cellValue);
return sysUserService.getOne(wrapper).getId();
}
// 零部件转换
@@ -425,11 +426,11 @@ public class ImportUtil {
return Objects.nonNull(sysDepartService.getOne(sysDepartLambdaQueryWrapper));
}
// 单选人员
// 改为校验人员+姓名 单选人员
public boolean singleUserValid(String cellValue) {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
return Objects.nonNull(sysUserService.getOne(sysUserLambdaQueryWrapper));
QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
wrapper.apply("CONCAT(realname, '(', username, ')') = {0}", cellValue);
return Objects.nonNull(sysUserService.getOne(wrapper));
}
// 多选组织机构
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
+3 -3
View File
@@ -143,7 +143,7 @@ public class EnterpriseStandardPlan implements Serializable {
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String authDept;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@@ -151,11 +151,11 @@ public class EnterpriseStandardPlan implements Serializable {
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
+6 -6
View File
@@ -61,8 +61,8 @@ public class EnterpriseStandardPlanVo {
@ApiModelProperty(value = "配合单位")
private String cooperationUnit;
@Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser;
@@ -71,13 +71,13 @@ public class EnterpriseStandardPlanVo {
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit;
@Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson;
@Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter;
laws-modules/src/main/java/com/jero/modules/laws/library/entity/LawsProblemLibrary.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class LawsProblemLibrary implements Serializable {
/**发帖人id*/
@Excel(name = "发帖人id", width = 15)
@ApiModelProperty(value = "发帖人id")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private java.lang.String userId;
/**回答列表*/
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsNewsFeed.java
+2 -2
View File
@@ -97,7 +97,7 @@ public class LawsNewsFeed implements Serializable {
private java.lang.Integer readCount;
/**编辑人*/
@ApiModelProperty(value = "编辑人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String writer;
/**推送范围标识（1-指定用户、2-全体用户）*/
@@ -108,7 +108,7 @@ public class LawsNewsFeed implements Serializable {
@ApiModelProperty(value = "推送范围")
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String pushRange;
@ApiModelProperty(value = "是否可以编辑和删除")