Procházet zdrojové kódy

安全生产-特种设备邮件提醒使用 检验日期,安全附件使用 证书/报告编号

sucheng před 11 měsíci
rodič
revize
7ad03579cf

+ 1 - 1
cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafeAttachmentsServiceImpl.java

@@ -173,7 +173,7 @@ public class AspSafeAttachmentsServiceImpl extends ServiceImpl<AspSafeAttachment
                 //附件类型
                 String attachmenttype = ObjectUtil.isNotEmpty(attachmentsDo.getAttachmenttype()) ? attachmentsDo.getAttachmenttype() : "";
                 //证书/报告编号
-                String number = ObjectUtil.isNotEmpty(attachmentsDo.getNumber()) ? attachmentsDo.getNumber() : "";
+                String number = ObjectUtil.isNotEmpty(attachmentsDo.getCertificatenumber()) ? attachmentsDo.getCertificatenumber() : "";
                 //名称
                 String name = ObjectUtil.isNotEmpty(attachmentsDo.getName()) ? attachmentsDo.getName() : "";
                 //检验日期

+ 1 - 1
cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckItemsServiceImpl.java

@@ -285,7 +285,7 @@ public class CheckItemsServiceImpl extends ServiceImpl<CheckItemsDao, CheckItems
                 //设备名称
                 String checkitemname = ObjectUtil.isNotEmpty(checkItemsDo.getCheckitemname()) ? checkItemsDo.getCheckitemname() : "";
                 //下次检验日期
-                Date devicecheckdate = checkItemsDo.getNextcheckdate();
+                Date devicecheckdate = checkItemsDo.getDevicecheckdate();
                 String checkDate = "";
                 if (ObjectUtil.isNotEmpty(devicecheckdate)) {
                     checkDate = DateUtil.format(devicecheckdate, "yyyy-MM-dd");