移装告知打印告知单

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml

@@ -25,6 +25,8 @@
         tjtn.create_user_id as createUserId,
         tjtn.next_execute_user_ids as nextExecuteUserIds,
         tjtn.next_task_id AS nextTaskId,
+        tjtn.equ_category AS equCategory,
+        tjtn.equ_list AS equList,
         DATE_FORMAT(tjtn.notice_date,'%Y-%m-%d') AS noticeDate,
         DATE_FORMAT(tjtn.handle_date,'%Y-%m-%d') AS handleDate,
         DATE_FORMAT(tjtn.plan_date,'%Y-%m-%d') AS planDate
@@ -125,7 +127,7 @@
             tjtn.plan_date AS installStartDate,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
-            tjtn.inform_number AS informNumber,
+            re.inform_number AS informNumber,
             re.equ_id as equId,
             ri.EQU_CODE AS equRegisterCode,
             ri.PRODUCT_NAME AS productName,
@@ -176,7 +178,6 @@
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
         WHERE
             tjtn.sequence_nbr = #{sequenceNbr}
-            LIMIT 1
     </select>
     <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
         select

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -17,7 +17,9 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeEqMapper;
@@ -283,52 +285,24 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @return pdf文件路径
      */
     @Override
-//    public void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response) {
-//        if (Objects.isNull(sequenceNbr)) {
-//            throw new IllegalArgumentException("参数不能为空");
-//        }
-//
-//        JgTransferNotice jgTransferNotice = this.getById(sequenceNbr);
-//        List<Map<String, Object>> informationList = jgTransferNoticeMapper.queryEquipInformation(sequenceNbr);
-//        if (Objects.isNull(jgTransferNotice) || CollectionUtils.isEmpty(informationList)) {
-//            throw new IllegalArgumentException("移装告知单不存在");
-//        }
-//
-//        Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
-//
-//        String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp";
-//        // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
-//        //
-//        // // 更新到数据库
-//        // jgTransferNotice.setNoticeReportUrl(url);
-//        // this.updateById(jgTransferNotice);
-//
-//        WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
-//    }
-
     public void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response) {
         if (Objects.isNull(sequenceNbr)) {
             throw new IllegalArgumentException("参数不能为空");
         }
         JgTransferNotice notice = this.getById(sequenceNbr);
-        List<JgTransferNoticeEq> equList = jgTransferNoticeEqService.lambdaQuery().eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr()).list();
         HashMap<String, Object> map = new HashMap<>();
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
-        equList.forEach(equ ->{
-            List<Map<String, Object>> informationList = this.getBaseMapper().queryEquipInformation(equ.getSequenceNbr());
-            if (Objects.isNull(notice) || CollectionUtils.isEmpty(informationList)) {
-                throw new IllegalArgumentException("移装告知单不存在");
-            }
-            Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
+        List<Map<String, Object>> informationList = this.getBaseMapper().queryEquipInformation(notice.getSequenceNbr());
+        if (CollectionUtils.isEmpty(informationList)) {
+            throw new IllegalArgumentException("移装告知单不存在");
+        }
+        for (Map<String, Object> objectMap : informationList) {
+            List<Map<String, Object>> temp = new ArrayList<>();
+            temp.add(objectMap);
+            Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(temp, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
             maps.add(placeholders);
-        });
-
+        }
         String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp";
-//        String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
-//
-//        // 更新到数据库
-//        jgInstallationNotice.setNoticeReportUrl(url);
-//        this.updateById(jgInstallationNotice);
         map.put("equipBasicInfoList", maps);
         WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", map, response);
     }