物资-领用单图片下载功能

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -197,10 +197,10 @@ public class FlowTaskService {
                     case "老板审核":
                         TaskComment comment = flow.getComment();
                         if(StringUtils.isNotBlank(comment.getStatus()) && comment.getLevel().equals("success")){
-                            data.put("status",comment.getStatus());
                             if(StringUtils.isNotBlank(flow.getAssigneeName())){
                                 data.put("firstAuditName",flow.getAssigneeName());
                                 data.put("auditTime",histIns.getEndTime());
+                                data.put("message",comment.getMessage());
                             }
                         }
                         break;

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/controller/PsiCollectController.java

@@ -214,7 +214,55 @@ public class PsiCollectController {
      * @param dto
      * @return
      */
-    @ApiOperation(value = "商品入库信息列表查询")
+    @ApiOperation(value = "获取领用单图片模板数据")
+    @GetMapping("/templateImageData")
+    public ResponseEntity<PsiCollectTemplateImageDto> templateImageData(PsiCollectDto dto) throws Exception{
+        PsiCollectDto byId = psiCollectService.exportFileByTemplate(dto);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        PsiCollectTemplateImageDto templateData = new PsiCollectTemplateImageDto();
+        templateData.setCollectDate(byId.getCollectDate() == null ? "" : dateFormat.format(byId.getCollectDate()));
+        templateData.setCollectNo(byId.getCollectNo());
+        templateData.setHandledByName(StringUtils.isNotBlank(byId.getHandledByName()) ? byId.getHandledByName() : byId.getHandledBy());
+        templateData.setHandledByOfficeName(byId.getHandledByOfficeName());
+        templateData.setRemarks(byId.getRemarks());
+
+        List<PsiCollectDetailedRecord> recordList = byId.getRecordList();
+        if (recordList != null) {
+            recordList.forEach(record -> {
+                PsiCollectExportTemplateDto exportDto = new PsiCollectExportTemplateDto();
+                exportDto.setId(byId.getId());
+                exportDto.setCollectNo(byId.getCollectNo());
+                exportDto.setRecipientAgent(record.getRecipientAgent());
+                exportDto.setRecipientOffice(record.getRecipientOffice());
+                exportDto.setCollectType(record.getCollectType());
+                exportDto.setGoodsName(record.getGoodsName());
+                exportDto.setCollectNumber(psiCollectService.formatExportNumber(record.getCollectNumber()));
+                exportDto.setCompany(record.getCompany());
+                exportDto.setDetailRemarks(record.getRemarks());
+                exportDto.setCollectDate(templateData.getCollectDate());
+                templateData.getCollectList().add(exportDto);
+            });
+        }
+
+        Map map = SpringUtil.getBean(IFlowableApi.class).historicTaskList2(byId.getProcInsId());
+        if (map != null) {
+            String message = String.valueOf(map.get("message"));
+            templateData.setStatusMessage(StringUtils.isNotBlank(message) ? message : "已同意");
+            templateData.setAuditUser(safeString(map.get("firstAuditName")));
+            templateData.setAuditTime(safeString(map.get("auditTime")));
+        } else {
+            templateData.setStatusMessage("已同意");
+            templateData.setAuditUser("");
+            templateData.setAuditTime("");
+        }
+        return ResponseEntity.ok(templateData);
+    }
+
+    private String safeString(Object value) {
+        return value == null || "null".equals(String.valueOf(value)) ? "" : String.valueOf(value);
+    }
+
+    @ApiOperation(value = "\u5546\u54c1\u5165\u5e93\u4fe1\u606f\u5217\u8868\u67e5\u8be2")
     @GetMapping("/wareHouseList")
     public ResponseEntity<IPage<PsiWareHouseSummaryDto>> wareHouseList(Page<PsiWareHouseSummaryDto> page, PsiWareHouseSummaryDto dto) throws Exception{
         IPage<PsiWareHouseSummaryDto> iPage = psiCollectService.wareHouseList(page, dto);

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/service/dto/PsiCollectTemplateImageDto.java

@@ -0,0 +1,28 @@
+package com.jeeplus.psimanage.collect.service.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class PsiCollectTemplateImageDto {
+
+    private String collectDate;
+
+    private String collectNo;
+
+    private String handledByName;
+
+    private String handledByOfficeName;
+
+    private String remarks;
+
+    private String auditUser;
+
+    private String auditTime;
+
+    private String statusMessage;
+
+    private List<PsiCollectExportTemplateDto> collectList = new ArrayList<>();
+}