From 87fcf9e4b30f9df71e7e0d4b570aae6f87b2ee53 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 18:27:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 1 + .../SarBussionessStandController.java | 10 ++++- .../impl/SarBussionessStandServiceImpl.java | 45 ++++++++++++++----- .../sarInstitution/dao/TsInstitutionDao.java | 2 + .../adc/da/slrs/sarUser/dao/TsUserDao.java | 3 ++ .../adc/da/utils/util/FieldConvertUtil.java | 2 +- 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index c0d91052..670aa79e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -190,6 +190,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String standCode; + @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index d2a60dbc..a52ac3c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -172,8 +172,14 @@ public class SarBussionessStandController extends BaseController 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); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index e4f4371f..9a6b12bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -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; @@ -71,6 +73,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; 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; @@ -263,6 +268,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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 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("适用车型"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 2bbd36c0..7e6e8c66 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -77,4 +77,6 @@ public interface TsInstitutionDao extends BaseMapper { int clearData(); + @Select("select name from ts_institution where name = #{qcdw} limit 1") + String selectByName(String qcdw); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 1fd546fe..7ea3406f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -75,4 +75,7 @@ public interface TsUserDao extends BaseMapper { @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); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index e5f24a0f..b49ffe02 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -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" + From a74737ccb6e06d08b82584fd25ed48e3acbf4f15 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 19:33:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 5 +++++ .../service/impl/SarBussionessStandServiceImpl.java | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 670aa79e..f763e8e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -190,6 +190,11 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String standCode; + //模块结构单元变型号 + private String dybxhbuss; + + //模块结构单元名称 + private String dymcbuss; @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 6610b3ae..d1684aa3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2509,6 +2509,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl