客户退货任务

根据id查询主任务及子任务信息以及整理createtime

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java

@@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreturnJob.vo.*;
+import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConvert;
+import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO;
+import com.win.module.wms.service.customerreturnJob.CustomerreturnJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +43,9 @@ public class CustomerreturnJobMainController {
     @Resource
     private CustomerreturnJobMainService customerreturnJobMainService;
 
+    @Resource
+    private CustomerreturnJobDetailService customerreturnJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -123,4 +129,22 @@ public class CustomerreturnJobMainController {
         ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getCustomerreturnJobById")
+    @Operation(summary = "APP获得客户退货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')")
+    public CommonResult<CustomerreturnJobMainRespVO> getCustomerreturnJobById(@RequestParam("id") Long id) {
+        CustomerreturnJobMainDO customerreturnJobMain = customerreturnJobMainService.getCustomerreturnJobMain(id);
+        CustomerreturnJobMainRespVO result = CustomerreturnJobMainConvert.INSTANCE.convert(customerreturnJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<CustomerreturnJobDetailDO> customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO);
+        List<CustomerreturnJobDetailExcelVO> customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList);
+        result.setSubList(customerreturnJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java

@@ -71,9 +71,12 @@ public class CustomerreturnJobDetailExportReqVO {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createtime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
     private String creator;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java

@@ -73,7 +73,7 @@ public class CustomerreturnJobDetailPageReqVO extends PageParam {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createtime;
+    private LocalDateTime[] createTime;
 
     @Schema(description = "创建者Id")
     private String creator;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.customerreturnJob.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 客户退货任务主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CustomerreturnJobMainRespVO extends CustomerreturnJobMainBaseVO {
 
+    @Schema(description = "客户退货任务子表job_customerreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java

@@ -109,7 +109,7 @@ public class CustomerreturnJobDetailDO extends BaseDO {
     /**
      * 创建时间
      */
-    private LocalDateTime createtime;
+   //private LocalDateTime createtime;
     /**
      * 地点ID
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java

@@ -40,7 +40,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX<Customerretur
                 .eqIfPresent(CustomerreturnJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(CustomerreturnJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CustomerreturnJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(CustomerreturnJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(CustomerreturnJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CustomerreturnJobDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(CustomerreturnJobDetailDO::getId));
     }
@@ -67,7 +67,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX<Customerretur
                 .eqIfPresent(CustomerreturnJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(CustomerreturnJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(CustomerreturnJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(CustomerreturnJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(CustomerreturnJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(CustomerreturnJobDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(CustomerreturnJobDetailDO::getId));
     }