试验图表

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ChartOption.java

@@ -0,0 +1,17 @@
+package org.springblade.manager.dto;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author yangyj
+ * @Date 2023/7/12 15:31
+ * @description TODO
+ */
+@Data
+public class ChartOption{
+     private Long pkeyId;
+     private String id;
+     private Map data;
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -498,9 +498,11 @@ public class FormulaController {
         return R.data(map);
     }
 
-    @GetMapping("/chart-init")
+    @PostMapping("/chart-init")
     @ApiOperationSupport(order = 11)
-    public R<Object> chartInit(Long pkeyId,String id){
+    public R<Object> chartInit(@RequestBody ChartOption option){
+            Long pkeyId=option.getPkeyId();
+            String id=option.getId();
             WbsTreePrivate wtp = this.wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getPKeyId,pkeyId));
             if(wtp!=null&&Func.isNotEmpty(id)){
                 /*获取配置*/
@@ -514,7 +516,33 @@ public class FormulaController {
                        String[] rely = Func.toStr(config.get("rely")).split(",");
                        String ky=rely[0].split(":")[1];
                        String kx=rely[1].split(":")[1];
-                       List<Map<String,Object>> dataMap= this.jdbcTemplate.queryForList("select "+ky+","+kx+" from "+wtp.getInitTableName() +" where group_id="+id+" and p_key_id ="+pkeyId);
+                       Map<String,Object> formData = option.getData();
+                       List<Map<String,Object>> dataMap;
+                       if(formData!=null&&formData.size()>0){
+                           dataMap=new ArrayList<>();
+                           Map<String,Object> md= new HashMap<>();
+                           dataMap.add(md);
+                           StringBuilder sy= new StringBuilder();
+                           StringBuilder sx = new StringBuilder();
+                           formData.forEach((k,v)->{
+                               String[] ka=k.split("__");
+                               if(ky.equals(ka[0])){
+                                   sy.append(v).append("_^_").append(ka[1]).append("☆");
+                               }else if(kx.equals(ka[0])){
+                                   sx.append(v).append("_^_").append(ka[1]).append("☆");
+                               }
+                           });
+                           if(sy.length()>1){
+                               sy.deleteCharAt(sy.length()-1);
+                           }
+                           if(sx.length()>1){
+                               sx.deleteCharAt(sx.length()-1);
+                           }
+                           md.put(ky,sy.toString());
+                           md.put(kx,sx.toString());
+                       }else{
+                            dataMap= this.jdbcTemplate.queryForList("select "+ky+","+kx+" from "+wtp.getInitTableName() +" where group_id="+id+" and p_key_id ="+pkeyId);
+                       }
                        if(Func.isNotEmpty(dataMap)){
                            Map<String,Object> data = dataMap.get(0);
                            String dy= Func.toStr(data.get(ky));
@@ -523,7 +551,7 @@ public class FormulaController {
                               Map<String,String> coordsMap = FormulaUtils.getElementCell(wtp.getHtmlUrl());
                               List<ElementData> ly = FormulaUtils.getElementDataList(coordsMap.get(ky),dy);
                               List<ElementData> lx = FormulaUtils.getElementDataList(coordsMap.get(kx),dx);
-                               JSONArray jsonArray =new JSONArray();
+                              JSONArray jsonArray =new JSONArray();
                               for(int i=0;i< Math.min(ly.size(),lx.size());i++){
                                      ElementData edy= ly.get(i);
                                      ElementData edx = lx.get(i);
@@ -534,7 +562,7 @@ public class FormulaController {
                               if(!jsonArray.isEmpty()){
                                   JSONObject chartData= job.getJSONArray("series").getJSONObject(0);
                                   chartData.put("data",jsonArray);
-                                  return R.data(job.toJSONString());
+                                  return R.data(job);
                               }
                            }
                        }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1966,10 +1966,39 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         reData.remove("contractId");
         reData.remove("pkeyId");
         reData.remove("projectId");
+        chart(reData,wbsTreePrivate);
         list.add(reData);
         return list;
     }
-
+    private void  chart(Map<String,Object> reData,WbsTreePrivate wtp){
+        try {
+            if(reData.size()>0&&wtp!=null) {
+                List<Map<String, Object>> configList = this.jdbcTemplate.queryForList("select d.rely ,b.e_key ekey from m_wbs_tree_private a join  m_wbs_form_element b on a.init_table_id=b.f_id join m_element_formula_mapping c on b.id=c.element_id join m_formula d on c.formula_id=d.id  where p_key_id=" + wtp.getPKeyId() + " and b.is_deleted=0 and d.formula like 'FC.chart%' limit 1");
+                if (Func.isNotEmpty(configList)) {
+                    Map<String, Object> config = configList.get(0);
+                    String[] rely = Func.toStr(config.get("rely")).split(",");
+                    String ky = rely[0].split(":")[1];
+                    String kx = rely[1].split(":")[1];
+                    Map<String,String> coordsMap = FormulaUtils.getElementCell(wtp.getHtmlUrl());
+                    List<String> ly= Arrays.stream((coordsMap.get(ky)).split(";")).filter(Func::isNotBlank).map(k->ky+"__"+k).collect(Collectors.toList());
+                    List<String> lx= Arrays.stream((coordsMap.get(ky)).split(";")).filter(Func::isNotBlank).map(k->kx+"__"+k).collect(Collectors.toList());
+                    List<String> fct= new ArrayList<>();
+                    if(ly.size()>0){
+                        fct.addAll(ly);
+                    }
+                    if(lx.size()>0){
+                        fct.addAll(lx);
+                    }
+                    String formChartKey= String.join(",", fct);
+                    if(Func.isNotEmpty(formChartKey)){
+                        reData.put("formChartKey",formChartKey);
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 
     /**
      * 试验 获取填报信息 - 施工关联试验数据

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -2174,24 +2174,28 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         return R.data(table + "");
     }
 
-    private void  chart(  Element table,WbsTreePrivate wtp){
-       List<Map<String,Object>>  configList= this.jdbcTemplate.queryForList("select d.rely ,b.e_key ekey from m_wbs_tree_private a join  m_wbs_form_element b on a.init_table_id=b.f_id join m_element_formula_mapping c on b.id=c.element_id join m_formula d on c.formula_id=d.id  where p_key_id="+wtp.getPKeyId()+" and b.is_deleted=0 and d.formula like 'FC.chart%' limit 1");
-       if(Func.isNotEmpty(configList)){
-           Map<String,Object> config =configList.get(0);
-           String[] rely = Func.toStr(config.get("rely")).split(",");
-           String ky=rely[0].split(":")[1];
-           String kx=rely[1].split(":")[1];
-           String kt=Func.toStr(config.get("ekey"));
-           Element inputElement = table.select("el-input[keyname^="+kt+"__").first();
-           String keyname=inputElement.attr("keyname");
-           Element echartElement = new Element("hc-echart");
-           echartElement.attr(":option", "formData."+keyname);
-           echartElement.attr("id", keyname);
-           echartElement.attr("keyname", keyname);
-           inputElement.replaceWith(echartElement);
-           table.select("el-input[keyname^="+ky+"__").forEach(e->e.attr("chartX","").attr("@blur","setChartData"));
-           table.select("el-input[keyname^="+kx+"__").forEach(e->e.attr("@blur","setChartData").attr("chartY",""));
-       }
+    private void  chart(Element table,WbsTreePrivate wtp){
+        try {
+            List<Map<String, Object>> configList = this.jdbcTemplate.queryForList("select d.rely ,b.e_key ekey from m_wbs_tree_private a join  m_wbs_form_element b on a.init_table_id=b.f_id join m_element_formula_mapping c on b.id=c.element_id join m_formula d on c.formula_id=d.id  where p_key_id=" + wtp.getPKeyId() + " and b.is_deleted=0 and d.formula like 'FC.chart%' limit 1");
+            if (Func.isNotEmpty(configList)) {
+                Map<String, Object> config = configList.get(0);
+                String[] rely = Func.toStr(config.get("rely")).split(",");
+                String ky = rely[0].split(":")[1];
+                String kx = rely[1].split(":")[1];
+                String kt = Func.toStr(config.get("ekey"));
+                Element inputElement = table.select("el-input[keyname^=" + kt + "__").first();
+                String keyname = inputElement.attr("keyname");
+                Element echartElement = new Element("hc-echart");
+                echartElement.attr(":option", "formData." + keyname);
+                echartElement.attr("id", keyname);
+                echartElement.attr("keyname", keyname);
+                inputElement.replaceWith(echartElement);
+                table.select("el-input[keyname^=" + ky + "__").forEach(e -> e.attr("@blur", "getRegularExpression($event,'','请输入字符串',22,1, 'chart', 1, 0)"));
+                table.select("el-input[keyname^=" + kx + "__").forEach(e -> e.attr("@blur", "getRegularExpression($event,'','请输入字符串',22,1, 'chart', 0, 1)"));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
 
     }