|
@@ -195,11 +195,13 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
|
|
|
vo.setSignatureInfoText(text2);
|
|
|
|
|
|
//[{"birthday":"2024-10-15T16:00:00.000Z","address":"dfsdfdsdsdsdsds","sex":0}]
|
|
|
- String witnessInfo = "本人签名 性别 %s 出生日期 %s 住址 %s\n";
|
|
|
+ //[{"sex":0,"birthday":"","address":""},{"sex":0,"birthday":"","address":""}]
|
|
|
+ String witnessInfo = "本人签名: 性别 %s 出生日期 %s 住址 %s\n";
|
|
|
StringBuilder witnessInfoMsg = new StringBuilder();
|
|
|
for (Object object : vo.getWitnessInfo()) {
|
|
|
JSONObject obj = (JSONObject) object;
|
|
|
- String format = String.format(witnessInfo, XwpTemplateUtils.getSexStr(obj.getInteger("sex")), DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT),obj.getString("address"));
|
|
|
+ String birthday = DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT) == null?"":DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT);
|
|
|
+ String format = String.format(witnessInfo, XwpTemplateUtils.getSexStr(obj.getInteger("sex")), birthday,obj.getString("address"));
|
|
|
witnessInfoMsg.append(format);
|
|
|
}
|
|
|
TextRenderData text3 = new TextRenderData("000000",witnessInfoMsg.toString());
|