更新

src/main/java/org/jeecg/common/dto/invoice/PurchaseRespDTO.java

@@ -1,12 +1,14 @@
 package org.jeecg.common.dto.invoice;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.modules.invoice.entity.InvoiceManagePurchase;
-
+import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotEmpty;
+import java.util.Date;
 import java.util.List;
 
 @ApiModel("采购，销售发票返回参数")
@@ -32,6 +34,10 @@ public class PurchaseRespDTO {
     private String currentUser;
     @ApiModelProperty("组织")
     private String pkOrg;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     private List<PurchaseDetailListRespDTO> detailList;
 
@@ -47,5 +53,6 @@ public class PurchaseRespDTO {
         this.proName = purchase.getProName();
         this.currentUser = purchase.getCurrentUser();
         this.pkOrg = purchase.getPkOrg();
+        this.createTime = purchase.getCreateTime();
     }
 }

src/main/java/org/jeecg/modules/invoice/entity/InvoiceManagePurchaseDetail.java

@@ -57,6 +57,8 @@ public class InvoiceManagePurchaseDetail implements Serializable {
 	private String delFlag;
 	@ApiModelProperty("组织")
 	private String pkOrg;
+	 @ApiModelProperty("排序")
+	 private Integer sort;
 
 	public InvoiceManagePurchaseDetail() {
 	}

src/main/java/org/jeecg/modules/invoice/service/impl/InvoiceManagePurchaseServiceImpl.java

@@ -1,16 +1,13 @@
 package org.jeecg.modules.invoice.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiModel;
 import org.jeecg.common.dto.invoice.PurchaseAddReqDTO;
 import org.jeecg.common.dto.invoice.PurchaseDetailAddReqDTO;
 import org.jeecg.common.dto.invoice.PurchaseDetailListRespDTO;
 import org.jeecg.common.dto.invoice.PurchaseRespDTO;
 import org.jeecg.modules.invoice.entity.InvoiceManagePurchase;
 import org.jeecg.modules.invoice.entity.InvoiceManagePurchaseDetail;
-import org.jeecg.modules.invoice.mapper.InvoiceManagePurchaseDetailMapper;
 import org.jeecg.modules.invoice.mapper.InvoiceManagePurchaseMapper;
 import org.jeecg.modules.invoice.service.InvoiceManagePurchaseDetailService;
 import org.jeecg.modules.invoice.service.InvoiceManagePurchaseService;
@@ -20,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.List;
 
 /**
@@ -53,10 +49,12 @@ public class InvoiceManagePurchaseServiceImpl extends ServiceImpl<InvoiceManageP
             throw new RuntimeException("获取编号失败");
         }
         invoiceManagePurchase.setBillcode(nextSerial.getContent());
+        int sort = 1;
         save(invoiceManagePurchase);
         for(PurchaseDetailAddReqDTO detail : reqDTO.getDetailList()){
             detail.setPurchaseId(invoiceManagePurchase.getId());
             InvoiceManagePurchaseDetail invoiceManagePurchaseDetail = new InvoiceManagePurchaseDetail(detail);
+            invoiceManagePurchaseDetail.setSort(sort++);
             invoiceManagePurchaseDetailService.save(invoiceManagePurchaseDetail);
         }
 
@@ -109,6 +107,7 @@ public class InvoiceManagePurchaseServiceImpl extends ServiceImpl<InvoiceManageP
         QueryWrapper<InvoiceManagePurchaseDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("del_flag", "0");
         queryWrapper.eq("purchase_id", id);
+        queryWrapper.orderByAsc("sort");
         List<InvoiceManagePurchaseDetail> details  = invoiceManagePurchaseDetailService.list(queryWrapper);
         List<PurchaseDetailListRespDTO> list = Lists.newArrayList();
         for(InvoiceManagePurchaseDetail detail : details){