封仓确认单-审批详情

src/main/java/com/chinaitop/depot/grainSituationCard/controller/StorageSealedConfirmationController.java

@@ -47,7 +47,7 @@ public class StorageSealedConfirmationController {
 
     @PostMapping("/saveData")
     @ApiOperation(value = "新增", notes = "新增保存")
-//    @ApiImplicitParam(name = "data", value = "json对象", paramType = "body")
+    @ApiImplicitParam(name = "data", value = "json对象", paramType = "body")
     public ResponseEntity saveData(@RequestBody @Valid StorageSealedConfirmation data) {
         try {
             return ResponseEntity.ok(confirmationService.saveData(data));

src/main/java/com/chinaitop/depot/grainSituationCard/model/StorageSealedConfirmation.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class StorageSealedConfirmation implements Serializable {
@@ -63,4 +64,5 @@ public class StorageSealedConfirmation implements Serializable {
 
     // -----------------审批流程----------------
     BusinessApprovalProcess saveProcess;
+    List<BusinessApprovalProcess> processList;
 }

src/main/java/com/chinaitop/depot/grainSituationCard/service/impl/StorageSealedConfirmationImpl.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.grainSituationCard.service.impl;
 import com.chinaitop.depot.grainSituationCard.mapper.BusinessApprovalProcessMapper;
 import com.chinaitop.depot.grainSituationCard.mapper.StorageSealedConfirmationMapper;
 import com.chinaitop.depot.grainSituationCard.model.BusinessApprovalProcess;
+import com.chinaitop.depot.grainSituationCard.model.BusinessApprovalProcessExample;
 import com.chinaitop.depot.grainSituationCard.model.StorageSealedConfirmation;
 import com.chinaitop.depot.grainSituationCard.model.StorageSealedConfirmationExample;
 import com.chinaitop.depot.grainSituationCard.service.StorageSealedConfirmationService;
@@ -10,6 +11,7 @@ import com.chinaitop.depot.param.BasicStorageAndTankParam;
 import com.chinaitop.depot.param.StorageSealedConfirmationPageParam;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
@@ -98,7 +100,16 @@ public class StorageSealedConfirmationImpl implements StorageSealedConfirmationS
 
     @Override
     public StorageSealedConfirmation getDataById(String id) {
-        return confirmationMapper.selectByPrimaryKey(id);
+        StorageSealedConfirmation confirmation = confirmationMapper.selectByPrimaryKey(id);
+        // 审批信息
+        BusinessApprovalProcessExample example = new BusinessApprovalProcessExample();
+        BusinessApprovalProcessExample.Criteria criteria = example.createCriteria();
+        criteria.andTaskIdEqualTo(id);
+        List<BusinessApprovalProcess> businessApprovalProcesses = processMapper.selectByExample(example);
+        if (!CollectionUtils.isEmpty(businessApprovalProcesses)) {
+            confirmation.setProcessList(businessApprovalProcesses);
+        }
+        return confirmation;
     }
 
     @Override