xiongchao 3 years ago
parent
commit
b63828592f

+ 9 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobVO.java

@@ -176,4 +176,13 @@ public class CheckJobVO implements Serializable{
      * 完成图片
      */
     private List<SysFile> imgList;
+
+    /**
+     * 保养标准图片
+     * */
+    private List<SysFile> checkImgList;
+    /**
+     * 保养标准手册
+     */
+    private List<SysFile> checkFileList;
 }

+ 2 - 2
platform-rest/src/main/resources/templates/repairCheckEmail.ftl

@@ -1,5 +1,5 @@
-<div>维修完成验收通知</div>
-<div>有新的报修单已经完成,等待您的审批处理:
+<div>维修审核通知</div>
+<div>报修单已经完成,等待您的审批处理:
     <table border="1">
         <tr>
             <td>维修单号</td>

+ 1 - 1
platform-rest/src/main/resources/templates/repairEmailFirst.ftl

@@ -1,4 +1,4 @@
-<div>维修一级上报预警通知</div>
+<div>维修一级上报预警</div>
 <div>有新的报修单第一维修员超时未接单,等待您的处理:
     <table border="1">
         <tr>

+ 1 - 1
platform-rest/src/main/resources/templates/repairEmailOverTimeThird.ftl

@@ -1,4 +1,4 @@
-<div>维修超过小时未完成</div>
+<div>维修超过24小时未完成</div>
 <div>有报修单维修超过24小时未完成,等待您的处理:
     <table border="1">
         <tr>

+ 1 - 1
platform-rest/src/main/resources/templates/repairEmailSecond.ftl

@@ -1,4 +1,4 @@
-<div>维修二级上报预警通知</div>
+<div>维修二级上报预警</div>
 <div>有新的报修单第二维修员超时未接单,等待您的处理:
     <table border="1">
         <tr>

+ 19 - 2
platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -629,11 +629,28 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     @Override
     public CheckJobVO getDetail(Object id) {
         CheckJobVO vo = mapper.selectDetail(id);
+
+        Weekend<SysFile> weekendFile = new Weekend<>(SysFile.class);
+        weekendFile.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getStandardId());
+        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekendFile);
+        List<SysFile> checkImgList = ListUtils.newArrayList();
+        List<SysFile> checkFileList = ListUtils.newArrayList();
+        sysFiles.forEach(item -> {
+            if (item.getType().equals( SysFileTypeEnum.CHECK_STANDARD_IMGS.getValue())) {
+                checkImgList.add(item);
+            }
+            if (item.getType().equals( SysFileTypeEnum.CHECK_STANDARD_FILES.getValue())) {
+                checkFileList.add(item);
+            }
+        });
+        vo.setCheckImgList(checkImgList);
+        vo.setCheckFileList(checkFileList);
+
         Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
         weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getId());
-        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekend);
+        List<SysFile> sysFiles2 = sysFileMapper.selectByExample(weekend);
         List<SysFile> sbFileList = ListUtils.newArrayList();
-        sysFiles.forEach(item -> {
+        sysFiles2.forEach(item -> {
             if (item.getType().equals( SysFileTypeEnum.CHECK_JOB_FILES.getValue())) {
                 sbFileList.add(item);
             }