|
@@ -1,13 +1,18 @@
|
|
|
package com.miniframe.bisiness.ac;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import ac.template.TemplateGenerator;
|
|
|
import ac.template.TemplateServer;
|
|
|
import ac.template.model.gui.AttVo;
|
|
|
import com.miniframe.core.ExecProcessFlow;
|
|
|
+import com.miniframe.core.ext.UtilTools;
|
|
|
import com.miniframe.generate.business.ac.model.AC00009BaseModel;
|
|
|
+import com.miniframe.mappers.ac.dao.ExtAcMapper;
|
|
|
+import com.miniframe.mappers.ac.model.ProAttVo;
|
|
|
import com.miniframe.tools.XiJsonUtil;
|
|
|
import net.sf.jasperreports.engine.xml.TemplateSaxParserFactory;
|
|
|
|
|
@@ -24,7 +29,21 @@ public class AC00009Service extends AC00009BaseModel implements ExecProcessFlow
|
|
|
public void transExecute() throws Exception {
|
|
|
String pid = this.getA_ac00009().getPid();
|
|
|
Integer type =this.getA_ac00009().getType();
|
|
|
- List<AttVo> attvos = TemplateServer.getProAttList(pid,type);
|
|
|
+// List<AttVo> attvos = TemplateServer.getProAttList(pid,type);
|
|
|
+ ExtAcMapper dao = UtilTools.getBean(ExtAcMapper.class);
|
|
|
+ List<ProAttVo> pvs = dao.getProAttList(pid,type);
|
|
|
+ for (ProAttVo pv:pvs
|
|
|
+ ) {
|
|
|
+ if(pv.getVal()==null){
|
|
|
+ pv.setVal("");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<AttVo> attvos = new ArrayList<>();
|
|
|
+ List<ProAttVo> gvs=pvs.stream().filter(v-> v.getFatId().equals("0")).collect(Collectors.toList());//根数据
|
|
|
+ for (ProAttVo gv:gvs) {
|
|
|
+ AttVo vo =TemplateServer.getAttVo(gv,pvs);
|
|
|
+ attvos.add(vo);
|
|
|
+ }
|
|
|
String jsonstr =XiJsonUtil.objectToJson(attvos);
|
|
|
this.getD_ac00009().setPattJson(jsonstr);
|
|
|
}
|