维多利亚

hx-service/syringe-management/src/main/java/com/fjhx/controller/working/WorkingProcedureController.java

@@ -31,7 +31,7 @@ public class WorkingProcedureController {
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
-        Page<WorkingProcedure> result = workingProcedureService.getPage(condition);
+        Page<WorkingProcedureVo> result = workingProcedureService.getPage(condition);
         return R.success(result);
     }
 

hx-service/syringe-management/src/main/java/com/fjhx/service/working/WorkingProcedureService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface WorkingProcedureService extends BaseService<WorkingProcedure> {
 
-    Page<WorkingProcedure> getPage(Map<String, String> condition);
+    Page<WorkingProcedureVo> getPage(Map<String, String> condition);
 
     void add(WorkingProcedureVo workingProcedureVo);
 

hx-service/syringe-management/src/main/java/com/fjhx/service/working/impl/WorkingProcedureServiceImpl.java

@@ -5,18 +5,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
+import com.fjhx.base.BaseIdEntity;
+import com.fjhx.entity.FileInfo;
 import com.fjhx.entity.working.WorkingProcedure;
+import com.fjhx.mapper.working.WorkingProcedureMapper;
 import com.fjhx.params.working.WorkingProcedureVo;
+import com.fjhx.service.working.WorkingProcedureService;
 import com.fjhx.utils.FileClientUtil;
+import com.fjhx.utils.PageUtil;
 import com.fjhx.utils.WrapperUtil;
-import com.fjhx.mapper.working.WorkingProcedureMapper;
-import com.fjhx.service.working.WorkingProcedureService;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,7 +34,7 @@ import java.util.Map;
 public class WorkingProcedureServiceImpl extends ServiceImpl<WorkingProcedureMapper, WorkingProcedure> implements WorkingProcedureService {
 
     @Override
-    public Page<WorkingProcedure> getPage(Map<String, String> condition) {
+    public Page<WorkingProcedureVo> getPage(Map<String, String> condition) {
 
         QueryWrapper<WorkingProcedure> wrapper = Wrappers.query();
 
@@ -39,7 +43,22 @@ public class WorkingProcedureServiceImpl extends ServiceImpl<WorkingProcedureMap
                 .eq("whether_packing", "whetherPacking")
                 .createTimeDesc();
 
-        return page(condition, wrapper);
+        Page<WorkingProcedure> page = page(condition, wrapper);
+
+        Page<WorkingProcedureVo> workingProcedureVoPage = PageUtil.copyPage(page, WorkingProcedureVo.class);
+        List<WorkingProcedureVo> records = workingProcedureVoPage.getRecords();
+        if (records.size() == 0) {
+            return workingProcedureVoPage;
+        }
+
+        List<Long> workingProcedureIdList = records.stream().map(BaseIdEntity::getId).collect(Collectors.toList());
+        Map<Long, FileInfo> fileInfoMap = FileClientUtil.getFileInfoMap(workingProcedureIdList);
+
+        for (WorkingProcedureVo workingProcedureVo : records) {
+            workingProcedureVo.setFileInfo(fileInfoMap.get(workingProcedureVo.getId()));
+        }
+
+        return workingProcedureVoPage;
     }
 
     @Transactional(rollbackFor = Exception.class)

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderDetailsServiceImpl.java

@@ -156,7 +156,8 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
      */
     private void updateNotIssuedQuantity(List<OrderDetails> list, List<IssueDto.IssueDetails> orderDetailsList) {
 
-        Map<Long, BigDecimal> map = orderDetailsList.stream().collect(Collectors.toMap(IssueDto.IssueDetails::getOrderDetailsId, IssueDto.IssueDetails::getChangeQuantity));
+        Map<Long, BigDecimal> map = orderDetailsList.stream().collect(
+                Collectors.toMap(IssueDto.IssueDetails::getOrderDetailsId, IssueDto.IssueDetails::getChangeQuantity));
 
         for (OrderDetails orderDetails : list) {
             Long id = orderDetails.getId();
@@ -165,7 +166,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
                 continue;
             }
             BigDecimal notIssuedQuantity = orderDetails.getNotIssuedQuantity().subtract(changeQuantity);
-            Assert.eqTrue(notIssuedQuantity.compareTo(BigDecimal.ZERO) > 0, "出库数量不能超过待出库数量");
+            Assert.eqTrue(notIssuedQuantity.compareTo(BigDecimal.ZERO) >= 0, "出库数量不能超过待出库数量");
             // 重新赋值未出库数量
             orderDetails.setNotIssuedQuantity(notIssuedQuantity);
         }