|
|
@@ -354,7 +354,15 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
|
|
|
for (ZhcxCommissionCheckDetailDo detailDo:detailDos){
|
|
|
ZhcxCommissionCheckDetailWordVO checkDetailWordVO = new ZhcxCommissionCheckDetailWordVO();
|
|
|
checkDetailWordVO.setChapterno(detailDo.getChapterno());
|
|
|
- checkDetailWordVO.setContent(detailDo.getChtestcontent()+detailDo.getEntitle());
|
|
|
+ String chtestcontent = "";
|
|
|
+ String entitle = "";
|
|
|
+ if (StringUtils.isNotBlank(detailDo.getChtestcontent())){
|
|
|
+ chtestcontent = detailDo.getChtestcontent();
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(detailDo.getEntitle())){
|
|
|
+ entitle = detailDo.getEntitle();
|
|
|
+ }
|
|
|
+ checkDetailWordVO.setContent(chtestcontent+entitle);
|
|
|
String testresult = "";
|
|
|
String testdata = "";
|
|
|
if (StringUtils.isNotBlank(detailDo.getTestresult())){
|
