|
|
|
|
@ -1229,12 +1229,12 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
result.put("10", examineResult.getSimpleStatus()); |
|
|
|
|
result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); |
|
|
|
|
// 操作程序内容
|
|
|
|
|
result.put("12", examineResult.getOperateContent().replace("$", "\r")); |
|
|
|
|
result.put("12", examineResult.getOperateContent().replace("#", "\r")); |
|
|
|
|
// if (examineBasis != null) {
|
|
|
|
|
// result.put("13", examineBasis.getContent().replace("$", "(char)11"));
|
|
|
|
|
// }
|
|
|
|
|
// 结果判定方法和依据
|
|
|
|
|
result.put("13", examineResult.getExamineBasisContent().replace("$", "\r")); |
|
|
|
|
result.put("13", examineResult.getExamineBasisContent().replace("#", "\r")); |
|
|
|
|
String path = sysClient.getParamValue("electronic_signature_real_path").getData(); |
|
|
|
|
// 检测人
|
|
|
|
|
if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) { |
|
|
|
|
|