FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企标标准导入功能起草人只能填写账号，导入模板优化

Browse Source
This commit is contained in:
SUNJIABIN
2023-05-18 10:52:13 +08:00
parent b1079ab9a4
commit 3ff13e4771
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+4 -5
View File
@@ -2450,23 +2450,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String[] split3 = qcrbuss.split(",");
String account = "";
String str = "";
String qcr = "";
String qcrs = "";
for (int j = 0; j < split3.length; j++) {
str = split3[j];
account = tsUserDao.selectByAccount(str);
qcr = tsUserDao.selectByQcrName(account);
String name = tsUserDao.selectByName(account);
if (str != null && !str.equals("")) {
if (!str.equals(qcr)){
if (!str.equals(account)){
return Result.error("第"+ count +"行输入的起草人名称不存在");
}
if (str.length() > 100) {
return Result.error("第"+ count +"行输入的起草人过长");
}
if (StringUtils.isNotBlank(qcrs)){
qcrs += "," + str + "(" + account +")";
qcrs += "," + name + "(" + account +")";
}else {
qcrs = str + "(" + account +")";
qcrs = name + "(" + account +")";
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java
+1 -3
View File
@@ -76,9 +76,7 @@ public interface TsUserDao extends BaseMapper<TsUser> {
@Select("select UNAME from ts_user where USID = #{userId}")
String selectByName(String userId);
@Select("select ACCOUNT from ts_user where UNAME =#{qcrbuss}")
@Select("select ACCOUNT from ts_user where ACCOUNT =#{qcrbuss}")
String selectByAccount(String qcrbuss);
@Select("select UNAME from ts_user where ACCOUNT =#{str}")
String selectByQcrName(String str);
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class FieldConvertUtil {
public static String exportName = "填写说明\n" +
"1.导入数据从第三行开始,第一行为填写说明,第二行为表头,第三行是正式数据\n" +
"2.所有带*号的字段必须填写\n" +
"3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
"3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配,起草人因为涉及到同名问题只能填写账号例如(zhangsan3),如果有多个起草人需要使用英文逗号进行区分\n" +
"4.适用车型,能源类型,适用产品线字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文逗号分割\n" +
"5.发布日期,企标实施日期字段为年-月-日格式,必须精确到日,例如(2023-04-01)\n" +
"6.企标编号,企标名称,企标英文名称字段为文本,填写文本内容\n" +