|
|
@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 工单任务Controller
|
|
|
@@ -133,6 +134,34 @@ public class TblTaskController extends BaseController
|
|
|
areamap.put(d.getDictValue(),d.getDictLabel());
|
|
|
}
|
|
|
|
|
|
+ sysDictData = new SysDictData();
|
|
|
+ sysDictData.setDictType("zctype");
|
|
|
+ list1 = sysDictDataService.selectDictDataList(sysDictData);
|
|
|
+ List<String> zctypemap = new ArrayList<>();
|
|
|
+ zctypemap = list1.stream().map(i->i.getDictLabel()).collect(Collectors.toList());
|
|
|
+
|
|
|
+
|
|
|
+ sysDictData = new SysDictData();
|
|
|
+ sysDictData.setDictType("zccz");
|
|
|
+ list1 = sysDictDataService.selectDictDataList(sysDictData);
|
|
|
+ List<String> zcczmap = new ArrayList<>();
|
|
|
+ zcczmap = list1.stream().map(i->i.getDictLabel()).collect(Collectors.toList());
|
|
|
+
|
|
|
+ sysDictData = new SysDictData();
|
|
|
+ sysDictData.setDictType("zcdw");
|
|
|
+ list1 = sysDictDataService.selectDictDataList(sysDictData);
|
|
|
+ List<String> zcdwmap = new ArrayList<>();
|
|
|
+ zcdwmap = list1.stream().map(i->i.getDictLabel()).collect(Collectors.toList());
|
|
|
+
|
|
|
+
|
|
|
+ sysDictData = new SysDictData();
|
|
|
+ sysDictData.setDictType("zcgg");
|
|
|
+ list1 = sysDictDataService.selectDictDataList(sysDictData);
|
|
|
+
|
|
|
+ List<String> zcggmap = new ArrayList<>();
|
|
|
+ zcggmap = list1.stream().map(i->i.getDictLabel()).collect(Collectors.toList());
|
|
|
+
|
|
|
+
|
|
|
List<SysUser> users = userService.selectUserList(new SysUser());
|
|
|
Map<Long,SysUser> usermap = new HashMap<>();
|
|
|
for (SysUser d:users
|
|
|
@@ -230,6 +259,14 @@ public class TblTaskController extends BaseController
|
|
|
" ).hcdes }";
|
|
|
Object hcdes = JSUtils.runjs(runjs);
|
|
|
|
|
|
+ Collection cz = new ArrayList<>();
|
|
|
+ try{
|
|
|
+ runjs= commjs+ "return (( eval(JSON.toJSONString(JSON.parse(taskinfo.tblTaskLogList.filter(function(ii){return ii.taskStatus === 3 })[0].logDes).zcdata)))) }" ;
|
|
|
+ cz = JSON.parseObject(JSON.toJSONString(JSUtils.runjs(runjs)),Map.class).values();
|
|
|
+ }catch (Exception e){}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
Map<String,Object> rw = new HashMap<>();
|
|
|
rw.put("fzr",fzr);
|
|
|
rw.put("zyrs",zyrs);
|
|
|
@@ -240,10 +277,58 @@ public class TblTaskController extends BaseController
|
|
|
rw.put("gzl",gzl);
|
|
|
rw.put("cl1",cl1);
|
|
|
rw.put("cl2",cl2);
|
|
|
+ {
|
|
|
+ List<Object> c = JSONArray.parseArray(JSON.toJSONString(cl1),Object.class);
|
|
|
+ List<Object> c1 = JSONArray.parseArray(JSON.toJSONString(cl2),Object.class);
|
|
|
+ List<List<Object>> c2 = new ArrayList<>();
|
|
|
+ for(int i=0;i<c.size();i++){
|
|
|
+ List<Object> p = new ArrayList<>();
|
|
|
+ p.add(c.get(i));p.add(c1.size()>i?c1.get(i):new Object());
|
|
|
+ c2.add(p);
|
|
|
+ }
|
|
|
+ rw.put("cl3",c2);
|
|
|
+ }
|
|
|
+
|
|
|
rw.put("hc1",hc1);
|
|
|
rw.put("hc2",hc2);
|
|
|
rw.put("hc3",hc3);
|
|
|
+ {
|
|
|
+ List<Object> h1 = JSONArray.parseArray(JSON.toJSONString(hc1),Object.class);
|
|
|
+ List<Object> h2 = JSONArray.parseArray(JSON.toJSONString(hc2),Object.class);
|
|
|
+ List<Object> h3 = JSONArray.parseArray(JSON.toJSONString(hc3),Object.class);
|
|
|
+ List<List<Object>> c2 = new ArrayList<>();
|
|
|
+ for(int i=0;i<h1.size();i++){
|
|
|
+ List<Object> p = new ArrayList<>();
|
|
|
+ p.add(h1.get(i));p.add(h2.size()>i?h2.get(i):new Object());;p.add(h3.size()>i?h3.get(i):new Object());
|
|
|
+ c2.add(p);
|
|
|
+ }
|
|
|
+ rw.put("hc",c2);
|
|
|
+ }
|
|
|
rw.put("hc4",hc4);
|
|
|
+ rw.put("cz1",cz);
|
|
|
+ try{
|
|
|
+ List<Map> h1 = JSONArray.parseArray(JSON.toJSONString(cz),Map.class);
|
|
|
+ List<Map<String,Object>> pp = new ArrayList<>();
|
|
|
+ int c1 = zctypemap.size(),c2=zcczmap.size(),c3=zcdwmap.size(),c4=zcggmap.size()%3==0?zcggmap.size()/3:((zcggmap.size()/3)+1);
|
|
|
+ for (int i=0;i< Math.max(Math.max(c1, c2), Math.max(c3, c4));i++){
|
|
|
+ Map<String,Object> p=new HashMap<>();
|
|
|
+
|
|
|
+ p.put("type",getdui(h1,i>=zctypemap.size()?"":zctypemap.get(i),"type","",true));
|
|
|
+ p.put("cz",getdui(h1,i>=zcczmap.size()?"":zcczmap.get(i),"cz","",true));
|
|
|
+ p.put("dw",getdui(h1,i>=zcdwmap.size()?"":zcdwmap.get(i),"dw","",true));
|
|
|
+
|
|
|
+ List<String> ccc = new ArrayList<>();
|
|
|
+ ccc.add(getdui(h1,zcggmap.size()<=i*3?"":(zcggmap.get(i*3)),"gg","num",false));
|
|
|
+ ccc.add(getdui(h1,zcggmap.size()<=i*3+1?"":(zcggmap.get(i*3+1)),"gg","num",false));
|
|
|
+ ccc.add(getdui(h1,zcggmap.size()<=i*3+2?"":(zcggmap.get(i*3+2)),"gg","num",false));
|
|
|
+ p.put("gg",i>zcggmap.size()/3?"":ccc);
|
|
|
+ pp.add(p);
|
|
|
+ }
|
|
|
+ rw.put("cz1",pp);
|
|
|
+ }catch (Exception e){}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
rw.put("hcsj",hcsj);
|
|
|
rw.put("hcdes",hcdes);
|
|
|
@@ -264,6 +349,16 @@ public class TblTaskController extends BaseController
|
|
|
// util.exportExcel(response, list, "工单任务数据");
|
|
|
}
|
|
|
|
|
|
+ private String getdui(List<Map> h1,String c,String key,String k1,boolean tt){
|
|
|
+ if(tt) {
|
|
|
+ return (h1.stream().filter(ppc -> c.equals(ppc.get(key).toString())).count() > 0 ? '✔' : c.equals("") ? "" : '□') + c;
|
|
|
+ }else{
|
|
|
+ int cp = h1.stream().filter(ppc -> c.equals(ppc.get(key).toString())).mapToInt(i-> Integer.parseInt(i.get(k1).toString())).sum();
|
|
|
+ return (h1.stream().filter(ppc -> c.equals(ppc.get(key).toString())).count() > 0 ? '✔' : c.equals("") ? "" : '□') + c + "( "+ cp +" )";
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 导出工单任务列表
|
