Commit 5a3fba48 by MMF

MMF 2026-04-07 钻井液导出增加区域信息内容

parent 32b1099c
...@@ -2598,6 +2598,9 @@ public class SjDjjcController extends BaseController { ...@@ -2598,6 +2598,9 @@ public class SjDjjcController extends BaseController {
.bind("sjFdsgcsZjyFdxnbList", policyCol)//列策略 .bind("sjFdsgcsZjyFdxnbList", policyCol)//列策略
.bind("gcfzqk", htmlRenderPolicy)//列策略 .bind("gcfzqk", htmlRenderPolicy)//列策略
.bind("zjyfzqk", htmlRenderPolicy)//列策略 .bind("zjyfzqk", htmlRenderPolicy)//列策略
.bind("ljzsqqk", htmlRenderPolicy)//富文本策略
.bind("fjdzjyxn_t", htmlRenderPolicy)//富文本策略
.bind("fjdzjytx", htmlRenderPolicy)//富文本策略
.build(); .build();
XWPFTemplate compile = XWPFTemplate.compile(in, config); XWPFTemplate compile = XWPFTemplate.compile(in, config);
// 加载模板并填充数据 // 加载模板并填充数据
...@@ -3057,6 +3060,9 @@ public class SjDjjcController extends BaseController { ...@@ -3057,6 +3060,9 @@ public class SjDjjcController extends BaseController {
dataModel.put("fjdcljdjl", sjJkzp1.getFjdcljdjl()); dataModel.put("fjdcljdjl", sjJkzp1.getFjdcljdjl());
dataModel.put("fjdzjywhycl", sjJkzp1.getFjdzjywhycl()); dataModel.put("fjdzjywhycl", sjJkzp1.getFjdzjywhycl());
dataModel.put("qtyq", sjJkzp1.getQtyq()); dataModel.put("qtyq", sjJkzp1.getQtyq());
dataModel.put("ljzsqqk", sjJkzp1.getLjzsqqk());
dataModel.put("fjdzjyxn_t", sjJkzp1.getFjdzjyxn_t());
dataModel.put("fjdzjytx", sjJkzp1.getFjdzjytx());
} else { } else {
dataModel.put("zjkzz", sjJkzp.getZjkzz()); dataModel.put("zjkzz", sjJkzp.getZjkzz());
...@@ -3076,6 +3082,9 @@ public class SjDjjcController extends BaseController { ...@@ -3076,6 +3082,9 @@ public class SjDjjcController extends BaseController {
dataModel.put("fjdcljdjl", sjJkzp.getFjdcljdjl()); dataModel.put("fjdcljdjl", sjJkzp.getFjdcljdjl());
dataModel.put("fjdzjywhycl", sjJkzp.getFjdzjywhycl()); dataModel.put("fjdzjywhycl", sjJkzp.getFjdzjywhycl());
dataModel.put("qtyq", sjJkzp.getQtyq()); dataModel.put("qtyq", sjJkzp.getQtyq());
dataModel.put("ljzsqqk", sjJkzp.getLjzsqqk());
dataModel.put("fjdzjyxn_t", sjJkzp.getFjdzjyxn_t());
dataModel.put("fjdzjytx", sjJkzp.getFjdzjytx());
} }
SjHse sjHse = new SjHse(); SjHse sjHse = new SjHse();
sjHse.setJh(jh); sjHse.setJh(jh);
......
...@@ -332,6 +332,19 @@ public class SjJkzpServiceImpl implements ISjJkzpService ...@@ -332,6 +332,19 @@ public class SjJkzpServiceImpl implements ISjJkzpService
if(StringUtils.isNotEmpty(sjJkzp.getQtyq())){ if(StringUtils.isNotEmpty(sjJkzp.getQtyq())){
sjJkzp.setQtyq(new String(Base64.decode(sjJkzp.getQtyq()), StandardCharsets.UTF_8)); sjJkzp.setQtyq(new String(Base64.decode(sjJkzp.getQtyq()), StandardCharsets.UTF_8));
} }
if (StringUtils.isNotEmpty(sjJkzp.getLjzsqqk())) {
sjJkzp.setLjzsqqk(new String(Base64.decode(sjJkzp.getLjzsqqk()), StandardCharsets.UTF_8));
}
if (StringUtils.isNotEmpty(sjJkzp.getFjdzjyxn_t())) {
sjJkzp.setFjdzjyxn_t(new String(Base64.decode(sjJkzp.getFjdzjyxn_t()), StandardCharsets.UTF_8));
}
if (StringUtils.isNotEmpty(sjJkzp.getFjdzjytx())) {
sjJkzp.setFjdzjytx(new String(Base64.decode(sjJkzp.getFjdzjytx()), StandardCharsets.UTF_8));
}
sjJkzp.setUpdateTime(DateUtils.getNowDate()); sjJkzp.setUpdateTime(DateUtils.getNowDate());
return sjJkzpMapper.updateSjJkzp(sjJkzp); return sjJkzpMapper.updateSjJkzp(sjJkzp);
} }
......
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