|
@@ -16,7 +16,6 @@ import org.springblade.core.tool.utils.BeanUtil;
|
|
|
import org.springblade.core.tool.utils.CollectionUtil;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.core.tool.utils.RegexUtil;
|
|
|
-import org.springblade.manager.dto.FormulaBean;
|
|
|
import org.springblade.manager.dto.ParamElements;
|
|
|
import org.springblade.manager.dto.WbsParamBean;
|
|
|
import org.springblade.manager.entity.ElementFormulaMapping;
|
|
@@ -26,7 +25,8 @@ import org.springblade.manager.service.IElementFormulaMappingService;
|
|
|
import org.springblade.manager.service.IFormulaService;
|
|
|
import org.springblade.manager.service.IWbsParamService;
|
|
|
import org.springblade.manager.vo.ParamBean;
|
|
|
-import org.springblade.manager.wrapper.FormulaWrapper;
|
|
|
+import org.springblade.manager.vo.TableElementParam;
|
|
|
+import org.springblade.manager.vo.WbsFormElementVO;
|
|
|
import org.springblade.manager.wrapper.WbsParamWrapper;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
@@ -231,14 +231,29 @@ public class WbsParamController {
|
|
|
@GetMapping("/list")
|
|
|
public R<List<WbsParamBean>> list3(@ApiParam(value = "wbs节点id", required = true) Long wbsId) {
|
|
|
LambdaQueryWrapper<WbsParam> queryWrapper = Wrappers.<WbsParam>query().lambda().eq(WbsParam::getNodeId,wbsId).eq(WbsParam::getType,1);
|
|
|
- List<WbsParamBean> list = new ArrayList<>();
|
|
|
List<WbsParam> data = this.service.list(queryWrapper);
|
|
|
if(CollectionUtil.isNotEmpty(data)){
|
|
|
- list = WbsParamWrapper.build().listVO(this.service.list(queryWrapper));
|
|
|
+ return R.data(WbsParamWrapper.build().listVO(this.service.list(queryWrapper)));
|
|
|
}
|
|
|
- return R.data(list);
|
|
|
+ return R.data(Collections.emptyList());
|
|
|
}
|
|
|
|
|
|
+ @ApiOperationSupport(order = 7)
|
|
|
+ @ApiOperation(value = "参数关联元素", notes = "参数关联元素")
|
|
|
+ @GetMapping("/get-param-elements")
|
|
|
+ public R<List<Map<String,Object>>> associated(@ApiParam(value = "节点参数id", required = true) Long paramId,@ApiParam(value = "当前节点id", required = true) Long nodeId) {
|
|
|
+ List<Map<String,Object>> listMap = this.jdbcTemplate.queryForList(
|
|
|
+ "select a.node_name AS tableName,b.e_name as elementName ,c.id as mappingId " +
|
|
|
+ "from m_wbs_tree a " +
|
|
|
+ "left join m_wbs_form_element b on b.f_id=a.init_table_id " +
|
|
|
+ "left join m_element_formula_mapping c on c.element_id=b.id " +
|
|
|
+ "where c.is_deleted=0 and a.is_deleted=0 and a.parent_id="+nodeId+" and c.param_id ="+paramId);
|
|
|
+ if(listMap.size()>0){
|
|
|
+ //R.data(listMap.stream().map(m->BeanUtil.toBean(m, TableElementParam.class)).collect(Collectors.toList()));
|
|
|
+ return R.data(listMap);
|
|
|
+ }
|
|
|
+ return R.data(Collections.emptyList());
|
|
|
+ }
|
|
|
|
|
|
|
|
|
}
|