|
|
|
|
@ -2994,7 +2994,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
result.put("num", entrust.getAcceptanceNum()); |
|
|
|
|
result.put("name", entrust.getSimpleName()); |
|
|
|
|
result.put("count", entrust.getSimpleCount()); |
|
|
|
|
result.put("1", "李玉杰"); |
|
|
|
|
// 将样品编号对应表里的制样人名称用接样人的电子签名代替
|
|
|
|
|
String path = sysClient.getParamValue("electronic_signature_real_path").getData(); |
|
|
|
|
User user = userClient.userInfoById(Long.parseLong(entrust.getSampleReceiverId())).getData(); |
|
|
|
|
ImageEntity farView = new ImageEntity(); |
|
|
|
|
farView.setHeight(50);//设置高度
|
|
|
|
|
farView.setWidth(90);//设置宽度
|
|
|
|
|
farView.setType(ImageEntity.Data);//类型
|
|
|
|
|
String s1 = path + user.getElectronicSignature(); |
|
|
|
|
FileInputStream fis = null; |
|
|
|
|
try { |
|
|
|
|
fis = new FileInputStream(new File(s1)); |
|
|
|
|
byte[] bytes = readInputStream(fis); |
|
|
|
|
farView.setData(bytes); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
} |
|
|
|
|
result.put("sampleReceiverName", farView); |
|
|
|
|
result.put("1", farView); |
|
|
|
|
result.put("2", format.format(new Date())); |
|
|
|
|
List<Map<String, Object>> resultList1 = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|