Commit c08a7e1d by jiang'yun

修改

parent 9db85389
...@@ -2193,7 +2193,7 @@ public class SjDjjcController extends BaseController ...@@ -2193,7 +2193,7 @@ public class SjDjjcController extends BaseController
InputStream in = null; InputStream in = null;
XWPFTemplate template = null; XWPFTemplate template = null;
OutputStream os = null; OutputStream os = null;
// try { try {
in = this.getClass().getResourceAsStream("/static/excel/sgfamb.docx"); in = this.getClass().getResourceAsStream("/static/excel/sgfamb.docx");
os = response.getOutputStream(); os = response.getOutputStream();
String fileName = sjDjjc.getJh() + "井施工方案"; String fileName = sjDjjc.getJh() + "井施工方案";
...@@ -2271,21 +2271,21 @@ public class SjDjjcController extends BaseController ...@@ -2271,21 +2271,21 @@ public class SjDjjcController extends BaseController
template = compile.render(data); template = compile.render(data);
template.write(os); template.write(os);
os.flush(); os.flush();
// } catch (Exception e) { } catch (Exception e) {
// throw e; throw e;
// } finally { } finally {
// if (in != null) { if (in != null) {
// in.close(); in.close();
// } }
// if (template != null) { if (template != null) {
// template.close(); template.close();
// } }
//
// if (os != null) { if (os != null) {
// os.close(); os.close();
// } }
//
// } }
} }
public Map<String, Object> buildDataModel(SjDjjc sjDjjc) { public Map<String, Object> buildDataModel(SjDjjc sjDjjc) {
...@@ -2787,6 +2787,9 @@ public class SjDjjcController extends BaseController ...@@ -2787,6 +2787,9 @@ public class SjDjjcController extends BaseController
sjFdsgcsZjyFdxnb.setJh(jh); sjFdsgcsZjyFdxnb.setJh(jh);
sjFdsgcsZjyFdxnb.setKc(kc); sjFdsgcsZjyFdxnb.setKc(kc);
List<SjFdsgcsZjyFdxnb> sjFdsgcsZjyFdxnbList = sjFdsgcsZjyFdxnbMapper.selectSjFdsgcsZjyFdxnbList(sjFdsgcsZjyFdxnb); List<SjFdsgcsZjyFdxnb> sjFdsgcsZjyFdxnbList = sjFdsgcsZjyFdxnbMapper.selectSjFdsgcsZjyFdxnbList(sjFdsgcsZjyFdxnb);
if(sjFdsgcsZjyFdxnbList.size()==0){
sjFdsgcsZjyFdxnbList.add(new SjFdsgcsZjyFdxnb());
}
map.put("sjFdsgcsZjyFdxnbList", sjFdsgcsZjyFdxnbList); map.put("sjFdsgcsZjyFdxnbList", sjFdsgcsZjyFdxnbList);
fdsgcsList.add(map); fdsgcsList.add(map);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment