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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-04-04 21:32:13 +08:00
parent c4535f9b12 a74737ccb6
commit 602db8cac3
6 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
+6
View File
@@ -190,6 +190,12 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
private String standCode;
//模块结构单元变型号
private String dybxhbuss;
//模块结构单元名称
private String dymcbuss;
@TableField(exist = false)
private Map<String, Object> attrInfoMap = new LinkedHashMap<>();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+8 -2
View File
@@ -172,8 +172,14 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber())
.eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName());
List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
if ((list.size() ==1 && !list.get(0).getId().equals(sarBussionessStandEO.getId())) || list.size() >1){
return Result.error("当前企标标准号和企标名称已存在");
Integer valIdFlag = 0;
for (SarBussionessStand stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){
throw new com.adc.da.exception.AdcDaBaseException("企标标准号"+ sarBussionessStandEO.getStandCode() +"或企标名称"+ sarBussionessStandEO.getStandName() +"已存在");
}
}
}
sarBussionessStandEO.setModifyTime(new Date());
sarBussionessStandEOService.updateSarBussionessStand(sarBussionessStandEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+42 -10
View File
@@ -53,6 +53,8 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService;
import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
@@ -72,6 +74,9 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
import com.adc.da.slrs.sarUser.dao.TsUserDao;
import com.adc.da.slrs.sarUser.entity.TsUser;
import com.adc.da.slrs.sarUser.entity.UpDTO;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
@@ -264,6 +269,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private SarVppsTreeDao sarVppsTreeDao;
@Autowired
private TsUserDao tsUserDao;
@Autowired
private TsInstitutionDao tsInstitutionDao;
@Override
public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
SarBussionessStand bussionessStand = new SarBussionessStand();
@@ -2158,7 +2169,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
if (i != 0 && i != 1 && !rowList.equals("") && rowList != null ) {
int count = 1;
int count = 2;
count++;
String standSort = rowList.get("*企标类别");
@@ -2380,19 +2391,33 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String qcdw = rowList.get("起草部门");
if (StringUtils.isNotBlank(qcdw)) {
if (qcdw.length() > 100) {
return Result.error("第"+ count +"行输入的起草部门过长");
}
String qcbm = tsInstitutionDao.selectByName(qcdw);
if (qcdw != null && !qcdw.equals("")){
if (!qcdw.equals(qcbm)){
return Result.error("第"+ count +"行输入的起草部门不存在");
}
if (StringUtils.isNotBlank(qcdw)) {
if (qcdw.length() > 100) {
return Result.error("第"+ count +"行输入的起草部门过长");
}
}
sarBussStandAttrInfo.setQcdw(qcdw);
}
String qcrbuss = rowList.get("起草人");
if (StringUtils.isNotBlank(qcrbuss)) {
if (qcrbuss.length() > 100) {
return Result.error("第"+ count +"行输入的起草人过长");
}
sarBussStandAttrInfo.setQcrbuss(qcrbuss);
String account = tsUserDao.selectByAccount(qcrbuss);
QueryWrapper<TsUser> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(qcrbuss != null,"UNAME",qcrbuss)
.eq(account != null,"ACCOUNT",account);
TsUser tsUser = tsUserDao.selectOne(queryWrapper);
if (qcrbuss != null && !qcrbuss.equals("")) {
if (!account.equals(tsUser.getAccount()) && !qcrbuss.equals(tsUser.getUname())){
return Result.error("第"+ count +"行输入的起草人名称不存在");
}
if (qcrbuss.length() > 100) {
return Result.error("第"+ count +"行输入的起草人过长");
}
sarBussStandAttrInfo.setQcrbuss(qcrbuss + "(" + account + ")");
}
String sycxclass = rowList.get("适用车型");
@@ -2484,6 +2509,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String kcvppscnbuss = sarVppsTreeDao.getKcvppscnbuss(sarBussStandAttrInfo.getKcvppsbmbuss());
sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
// //模块结构单元变型号
// String dybxhbuss = rowList.get("模块结构单元变型号");
// sarBussStandAttrInfo.setDybxhbuss(dybxhbuss);
//
// //模块结构单元名称
// String dymcbuss = rowList.get("模块结构单元名称");
// sarBussStandAttrInfo.setDymcbuss(dymcbuss);
String dtqbbhbuss = rowList.get("代替企标编号");
sarBussStandAttrInfo.setDtqbbhbuss(dtqbbhbuss);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
+2
View File
@@ -77,4 +77,6 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
int clearData();
@Select("select name from ts_institution where name = #{qcdw} limit 1")
String selectByName(String qcdw);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java
+3
View File
@@ -75,4 +75,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}")
String selectByAccount(String qcrbuss);
}
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/FT),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
"3.企标类别(例如:Q/FD),文本状态(包含:发布、被代替、参考、即将实施、有效、直接上传、作废、待修订-指的其他企业标准),采用标准(包含:IDT等同采用、NEQ非等效采用、MOD修改采用)字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
"4.适用车型,能源类型,适用产品线字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文逗号分割\n" +
"5.发布日期,企标实施日期字段为年-月-日格式,必须精确到日,例如(2023-04-01)\n" +
"6.企标编号,企标名称,企标英文名称字段为文本,填写文本内容\n" +