更新

src/main/java/org/jeecg/modules/expense/entity/ReExpenseSlipProject.java

@@ -50,6 +50,8 @@ public class ReExpenseSlipProject implements Serializable {
 	private String pkOrg;
 	@ApiModelProperty("删除状态（0，正常，1已删除）")
 	private String delFlag;
+	@ApiModelProperty("排序")
+	private Integer sort;
 
 	public ReExpenseSlipProject() {
 	}

src/main/java/org/jeecg/modules/expense/service/impl/ReExpenseSlipServiceImpl.java

@@ -86,6 +86,7 @@ public class ReExpenseSlipServiceImpl extends ServiceImpl<ReExpenseSlipMapper, R
         QueryWrapper<ReExpenseSlipProject> queryWrapper = new QueryWrapper();
         queryWrapper.eq("del_flag", "0");
         queryWrapper.eq("expense_id", id);
+        queryWrapper.orderByAsc("sort");
         List<ReExpenseSlipProject> list = reExpenseSlipProjectService.list(queryWrapper);
         List<ExpenseSlipProjectListRespDTO> respDTOS = Lists.newArrayList();
         for(ReExpenseSlipProject project : list){
@@ -110,9 +111,11 @@ public class ReExpenseSlipServiceImpl extends ServiceImpl<ReExpenseSlipMapper, R
     private void saveChildren(ExpenseSlipAddReqDTO reqDTO, String id) {
         List<ExpenseSlipProjectAddReqDTO> detailList = reqDTO.getDetailList();
         List<ReExpenseSlipProject> list = Lists.newArrayList();
+        int sort = 1;
         for(ExpenseSlipProjectAddReqDTO detail : detailList){
             ReExpenseSlipProject project = new ReExpenseSlipProject(detail);
             project.setExpenseId(id);
+            project.setSort(sort++);
             list.add(project);
         }
         reExpenseSlipProjectService.saveBatch(list);

src/main/java/org/jeecg/modules/payment/entity/ManagePaymentAndReceiptContent.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.dto.payment.SlipContentAddReqDTO;
@@ -61,6 +62,8 @@ public class ManagePaymentAndReceiptContent implements Serializable {
     private String delFlag;
     @ApiModelProperty("组织")
     private String pkOrg;
+    @ApiModelProperty("排序")
+    private Integer sort;
 
     public ManagePaymentAndReceiptContent() {
     }

src/main/java/org/jeecg/modules/payment/service/impl/ManagerPaymentAndReceiptSlipServiceImpl.java

@@ -148,6 +148,7 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
         QueryWrapper<ManagePaymentAndReceiptContent> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("del_flag", "0");
         queryWrapper.eq("slip_id", id);
+        queryWrapper.orderByAsc("sort");
         List<ManagePaymentAndReceiptContent> list = managePaymentAndReceiptContentService.list(queryWrapper);
         List<SlipContentRespDTO> respDTOS = Lists.newArrayList();
         for(ManagePaymentAndReceiptContent content : list){
@@ -170,9 +171,11 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
      */
     private void saveChildren(SlipAddReqDTO slipAddReqDTO, String id) {
         List<ManagePaymentAndReceiptContent> list = Lists.newArrayList();
+        int sort = 1;
         for(SlipContentAddReqDTO reqDTO : slipAddReqDTO.getDetailList()){
             ManagePaymentAndReceiptContent content = new ManagePaymentAndReceiptContent(reqDTO);
             content.setSlipId(id);
+            content.setSort(sort);
             list.add(content);
         }
         managePaymentAndReceiptContentService.saveBatch(list);