|
@@ -177,7 +177,10 @@ public class FormulaController {
|
|
if(info.verify()){
|
|
if(info.verify()){
|
|
Map<String,List<Object>> map = new HashMap<>();
|
|
Map<String,List<Object>> map = new HashMap<>();
|
|
if(Func.isNotEmpty(info.getPkId())){
|
|
if(Func.isNotEmpty(info.getPkId())){
|
|
- Map<String,Object> data = this.jdbcTemplate.queryForMap("");
|
|
|
|
|
|
+ Map<String,Object> data = this.jdbcTemplate.queryForMap("SELECT a.e_allow_deviation as dev from m_wbs_form_element a left join m_wbs_tree b on a.f_id=b.id left join m_wbs_tree_contract c on c.init_table_name=b.init_table_name where c.p_key_id="+info.getPkId()+" and a.e_key='"+info.getKey()+"'");
|
|
|
|
+ if(Func.isNotEmpty(data.get("dev"))){
|
|
|
|
+ info.setDev(Func.toStr(data.get("dev")));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
List<Object> data = CustomFunction.rangeList(info.getSize(),info.getDesign(),info.getDev(),1,0,1);
|
|
List<Object> data = CustomFunction.rangeList(info.getSize(),info.getDesign(),info.getDev(),1,0,1);
|
|
map.put(info.getKey(),data);
|
|
map.put(info.getKey(),data);
|