WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-16 15:42:50 +08:00
parent 06fdebeaf2 f7fe956cc7
commit 1a4df297ea
11 changed files with 198 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+28 -6
View File
@@ -162,8 +162,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-查询工程接口人列表")
@ApiOperation(value="参数项收集清单-查询工程接口人列表", notes="参数项收集清单-查询工程接口人列表")
@GetMapping(value = "/querySdtList")
public Result<List<SysUser>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<SysUser> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO);
public Result<List<Map<String,String>>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String,String>> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO);
return Result.OK(sdtList);
}
@@ -260,7 +260,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
* @return
*/
@AutoLog(value = "参数项收集清单-分配填写人")
@ApiOperation(value="参数项收集清单-分配工程接口人", notes="参数项收集清单-分配工程接口人")
@ApiOperation(value="参数项收集清单-分配填写人", notes="参数项收集清单-分配填写人")
@PostMapping(value = "/updateDreBatch")
public Result<?> updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateDreBatch(paramsCollectManifestVO);
@@ -290,13 +290,13 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
/**
* 冻结配置-下拉选项
* 冻结配置，引用参数-下拉选项
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-冻结配置-下拉选项")
@ApiOperation(value="参数项收集清单-冻结配置-下拉选项", notes="参数项收集清单-冻结配置-下拉选项")
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@PostMapping(value = "/getConfigLableList")
public Result<?> getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
@@ -321,6 +321,28 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 引用参数
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-引用参数")
@ApiOperation(value="参数项收集清单-引用参数", notes="参数项收集清单-引用参数")
@PostMapping(value = "/referParams")
public Result<?> referParams(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("引用参数成功！");
} else {
return Result.error("引用参数失败！");
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+3 -1
View File
@@ -26,7 +26,6 @@
<result column="dre" property="dre" />
<result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="is_lock" property="isLock" />
</resultMap>
<sql id="BaseQuerySql">
<where>
@@ -60,6 +59,9 @@
<when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) AND state != '1'
</when>
<when test="paramsCollectManifestEO.userTypes == 'guest'">
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre})
</when>
</choose>
</if>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml
+1
View File
@@ -15,6 +15,7 @@
<result column="motor" property="motor" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="display_seq" property="displaySeq" />
<result column="is_lock" property="isLock" />
</resultMap>
<update id="updateForeach" parameterType="java.util.List">
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigHistoryEOMapper.xml
+2
View File
@@ -14,5 +14,7 @@
<result column="battery" property="battery" />
<result column="motor" property="motor" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="display_seq" property="displaySeq" />
<result column="is_lock" property="isLock" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+5 -3
View File
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import com.jero.modules.system.entity.SysUser;
import java.util.List;
import java.util.Map;
@@ -88,7 +87,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
*/
List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
List<SysUser> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
String getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO);
@@ -112,9 +111,12 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 下发收集
boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO);
// 冻结配置-下拉选项
// 配置-下拉选项
List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO);
// 冻结配置
boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO);
// 引用参数
boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+94 -23
View File
@@ -8,6 +8,7 @@ import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.MessageTypeEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
@@ -203,16 +204,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
// String userTypes = paramsCollectManifestEO.getUserTypes();
// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
// if ("sdt".equals(userTypes)) {
// paramsCollectManifestEO.setSdt(loginUser.getUsername());
// } else if ("dre".equals(userTypes)) {
// paramsCollectManifestEO.setDre(loginUser.getUsername());
// } else if ("sdt,dre".equals(userTypes)) {
// paramsCollectManifestEO.setSdt(loginUser.getUsername());
// paramsCollectManifestEO.setDre(loginUser.getUsername());
// }
String userTypes = paramsCollectManifestEO.getUserTypes();
if (StringUtils.isBlank(userTypes)) {
throw new JeroBootException("用户类型参数不能为空！");
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
if ("sdt".equals(userTypes)) {
paramsCollectManifestEO.setSdt(loginUser.getUsername());
} else if ("dre".equals(userTypes)) {
paramsCollectManifestEO.setDre(loginUser.getUsername());
} else if ("sdt,dre".equals(userTypes)) {
paramsCollectManifestEO.setSdt(loginUser.getUsername());
paramsCollectManifestEO.setDre(loginUser.getUsername());
} else if ("guest".equals(userTypes)) {
paramsCollectManifestEO.setSdt(loginUser.getUsername());
paramsCollectManifestEO.setDre(loginUser.getUsername());
}
List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
@@ -230,7 +237,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
list.forEach(collectManifestEO -> { // 参数收集清单
// 处理数据字典字段 中英文切换 认证类型，责任领域
List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(",")); // 单选
String certCategoryName = "";
String dutyTerritoryName = "";
if (CutEnum.CN.getValue().equals(cut)) {
@@ -284,6 +291,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
});
}
// 处理工程接口人
Map<String, Object> sdtMap = new HashMap<>();
sdtMap.put("controlType", controlType);
sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
sdtMap.put("dataValue", collectManifestEO.getSdt());
manifestMap.put("sdt", sdtMap);
listMap.add(manifestMap);
});
@@ -645,15 +659,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
@Override
public List<SysUser> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<SysUser> sdtList = new ArrayList<>();
public List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String,String>> sdtList = new ArrayList<>();
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsCollectManifestVO.getProjectId(), paramsCollectManifestVO.getDutyTerritory());
if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
if (StringUtils.isNotBlank(sdtId)) {
SysUser sysUser = sysUserService.getById(sdtId);
if (ObjectUtil.isNotEmpty(sysUser)) {
sdtList.add(sysUser);
String sdtIds = projectRelatedPersonnel.getEngineeringInterfacePerson();
if (StringUtils.isNotBlank(sdtIds)) {
String[] sdtIdStr = sdtIds.split(",");
for (int i=0; i<sdtIdStr.length; i++) {
SysUser sysUser = sysUserService.getById(sdtIdStr[i]);
if (ObjectUtil.isNotEmpty(sysUser)) {
Map<String, String> userMap = new HashMap<>();
userMap.put("label", sysUser.getUsername());
userMap.put("value", sysUser.getUsername());
sdtList.add(userMap);
}
}
}
}
@@ -929,11 +949,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override
public List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String configFlag = paramsCollectManifestVO.getConfigFlag();
// 查询未冻结配置列
// 查询配置列
LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.NO.getValue());
if ("2".equals(configFlag)) { // 指定查询非冻结配置
queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.NO.getValue());
}
queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.list(queryWrapper);
@@ -952,19 +977,65 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override
public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String paramsConfigIds = paramsCollectManifestVO.getParamsConfigIds();
String[] paramsConfigIdStr = paramsConfigIds.split(",");
List<String> paramsConfigIdList = Arrays.asList(paramsConfigIds.split(","));
List<ParamsConfigEO> updateConfigEOList = new ArrayList<>();
for (int i=0; i<paramsConfigIdStr.length; i++) {
// 将之前被冻结的列 解冻
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
paramsConfigEOList = paramsConfigEOList.stream().filter(e-> !paramsConfigIdList.contains(e.getId())).collect(Collectors.toList());
paramsConfigEOList.forEach(paramsConfigEO -> {
if (ConfigLockEnum.YES.getValue().equals(paramsConfigEO.getIsLock())) {
ParamsConfigEO updateConfigEO = new ParamsConfigEO();
updateConfigEO.setId(paramsConfigEO.getId());
updateConfigEO.setIsLock(ConfigLockEnum.NO.getValue());
updateConfigEOList.add(updateConfigEO);
}
});
// 冻结选择的配置列
for (String paramsConfigId : paramsConfigIdList) {
ParamsConfigEO updateConfigEO = new ParamsConfigEO();
updateConfigEO.setId(paramsConfigIdStr[i]);
updateConfigEO.setId(paramsConfigId);
updateConfigEO.setIsLock(ConfigLockEnum.YES.getValue());
updateConfigEOList.add(updateConfigEO);
}
return paramsConfigEOService.updateBatchById(updateConfigEOList);
}
@Override
public boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String sourceConfigId = paramsCollectManifestVO.getSourceConfigId();
String targetConfigIds = paramsCollectManifestVO.getTargetConfigIds();
if (targetConfigIds.contains(sourceConfigId)) {
throw new JeroBootException("引用到的配置不能包含被引用配置！");
}
String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
String[] targetConfigIdStr = targetConfigIds.split(",");
ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.getById(sourceConfigId);
List<ParamsConfigDataEO> updateConfigDataEOList = new ArrayList<>();
for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
for (int j=0; j<targetConfigIdStr.length; j++) {
ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
updateConfigDataEO.setId(targetConfigDataEO.getId());
updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
updateConfigDataEOList.add(updateConfigDataEO);
}
}
}
return paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
}
/**
* 实体对象转成Map
* @param obj 实体对象
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+4
View File
@@ -34,4 +34,8 @@ public class ParamsCollectManifestVO {
private String sdt; // 工程接口人
private String dre; // 填写人
private String paramsConfigIds; // 参数配置ids
private String configFlag; // 1-全部配置 2-非冻结配置
private String sourceConfigId; // 引用参数专用
private String targetConfigIds; // 引用参数专用
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+2 -2
View File
@@ -4,9 +4,9 @@ public enum ProjectTaskPlanningNameEnum {
LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"),
LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"),
DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"),
PREHOMO_DEADLINE("PreHomo确认","Pre-homo Check"),
PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"),
ATTESTATION_START_TIME("认证开始","Certification start"),
ATTESTATION_END_TIME("认证结束"," Certification end\n"),
ATTESTATION_END_TIME("认证结束"," Certification end"),
VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"),
;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+24 -31
View File
@@ -366,7 +366,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if (ObjectUtils.isNotEmpty(value)) {
if("add".equals(type) || "import".equals(type)) {
String valueTemp = UUID.randomUUID().toString().replace("-", "");
// value = valueTemp;
//修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>();
for (String fileId : value.toString().split(",")) {
@@ -381,9 +380,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
valuesBuilder.append("," + "'" + value + "'");
} else if("update".equals(type)){
// 前端标识 key_flag 0-未修改, 1-已修改
if(value.toString().contains(",")){
if(value.toString().contains(",")){ // 新加了多个文件
String valueTemp = UUID.randomUUID().toString().replace("-", "");
// value = valueTemp;
//修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>();
for (String fileId : value.toString().split(",")) {
@@ -396,11 +394,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
valuesBuilder.append("," + "'" + valueTemp + "'");
} else {
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(value.toString());
if(CollectionUtil.isNotEmpty(ossFiles)){
if(CollectionUtil.isNotEmpty(ossFiles)){ // 没有修改文件
valuesBuilder.append("," + "'" + value + "'");
} else {
} else { // 新加了一个文件
String valueTemp = UUID.randomUUID().toString().replace("-", "");
// value = valueTemp;
//修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>();
for (String fileId : value.toString().split(",")) {
@@ -418,7 +415,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
valuesBuilder.append("," + "'" + value + "'");
}
} else if(fieldPersonList.contains(key) || fieldStanList.contains(key)){
} else if(fieldPersonList.contains(key)){ // || fieldStanList.contains(key)
// 人员选择类型 标准选择类型
if(ObjectUtil.isNotNull(parameter.get(key+"_id"))) {
value = parameter.get(key + "_id");
@@ -902,7 +899,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
itemsMap.put(dbFieldName, valuesList);
}
}
// 人员选择
// 人员选择 存id（文档库存的账号）
if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")));
@@ -924,43 +921,39 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}
}
}
// 标准选择
if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) {
// 标准选择 存编号（不用返回id）
/*if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
if (itemsMap.get(dbFieldName).toString().split(",").length > 0) {
List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.getListBySerialNumber(itemsMap.get(dbFieldName).toString());
documentLibraryEOList = documentLibraryEOList.stream()
.collect(Collectors.collectingAndThen(Collectors
.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.get("serial_number").toString()))), ArrayList::new)); // 根据编号去重
Map<String, String> idSerialNumberMap = new HashMap<>();
List<String> idList = new ArrayList<>();
List<String> nameList = new ArrayList<>();
for (Map<String, Object> map : documentLibraryEOList) {
String serialNumber = (String) map.get("serial_number");
String serialNumber = (String) map.get("serial_number"); // TODO 可能存在编号相同的情况
String documentLibraryEOId = (String) map.get("id");
idSerialNumberMap.put(documentLibraryEOId, serialNumber);
idList.add(documentLibraryEOId);
idSerialNumberMap.put(serialNumber, documentLibraryEOId);
nameList.add(serialNumber);
}
List<String> valueList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(","));
List<String> newValueList = new ArrayList<>();
List<String> valueList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")).stream().distinct().collect(Collectors.toList());
for(String value : valueList) {
if (idList.contains(value)) {
newValueList.add(idSerialNumberMap.get(value));
if (nameList.contains(value)) {
idList.add(idSerialNumberMap.get(value));
} else {
newValueList.add(value);
idList.add(value);
}
}
String names = StringUtils.join(newValueList, ",");
itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
itemsMap.put(dbFieldName, names);
String ids = StringUtils.join(idList, ",");
itemsMap.put(dbFieldName+"_id", ids);
itemsMap.put(dbFieldName, itemsMap.get(dbFieldName).toString());
}
// List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
// if(CollectionUtil.isNotEmpty(documentLibraryEOList)){
// String names = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),",");
// itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
// itemsMap.put(dbFieldName, names);
//
// }
}
}
}*/
}
return itemsMap;
}
jero-web/src/components/tableCollection/index.vue
+34 -1
View File
@@ -13,6 +13,10 @@
@change="tableOnChange"
@onHeaderRow='onHeaderRow'
>
<span slot="operationbtn" slot-scope="record">
<span v-if='homo'>按钮 </span>
<span>{{ record }}</span>
</span>
<span slot="operation" slot-scope="record">
<a v-for="(ol,index) in OperationList"
@click="OperationClick(ol,record)">
@@ -76,7 +80,10 @@ export default {
searchParmes: {},
loading: false,
orderBy: '1',
orderByField: ''
orderByField: '',
homo: 0, // 认证工程师
sdt: 0, // 工程接口人
dre: 0, // 填写人
}
},
mounted() {},
@@ -84,6 +91,25 @@ export default {
onHeaderRow(column, index) {
console.log(column, index)
},
getLoginUserType() {
let params = {
paramsManifestId: this.paramsManifest.id,
projectId: this.$route.query.id
}
getAction(this.url.getLoginUserType, params).then((res) => {
if (res.success) {
res.result.split(',').forEach((item,index) => {
if(item === 'homo') {
this.homo = 1
} else if(item === 'sdt') {
this.sdt = 1
} else if(item === 'dre') {
this.dre = 1
}
})
}
})
},
getData() {
let params = {
paramsManifestId: this.paramsManifest.id,
@@ -106,6 +132,12 @@ export default {
customRender: 'detailClick'
}
}
if(res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
})
if (this.showAction) {
this.columns.push({
@@ -173,6 +205,7 @@ export default {
watch: {
paramsManifest(newVal, oldVal) {
this.getData()
this.getLoginUserType()
this.getTableList()
}
}
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1
View File
@@ -196,6 +196,7 @@ export default {
tableHeader: 'params/collectManifest/getHeader',
tableList: 'params/collectManifest/list',
add: 'params/collectManifest/submit',
getLoginUserType: 'params/collectManifest/getLoginUserType',
// edit: 'params/manifest/edit',
// queryById: 'params/manifest/queryById',
deleteBatch: 'params/collectManifest/deleteBatch',