diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 3ef40cfd..ffabff7b 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -12,9 +12,9 @@ public interface LauncherConstant { /** * nacos 命名空间 */ -// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; + String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java new file mode 100644 index 00000000..c798085d --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java @@ -0,0 +1,36 @@ +package org.springblade.desk.order.pojo.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.YieldOrder; + +import java.io.Serial; + +/** + * 生产订单-视图类 + * + * @author lqk + */ +@Data +public class YieldOrderDto extends YieldOrder { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 排序字段 + */ + private String orderByField; + /** + * true: 升序,false: 降序 + */ + private boolean isAsc; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldPlanDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldPlanDto.java new file mode 100644 index 00000000..3f7905b4 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldPlanDto.java @@ -0,0 +1,35 @@ +package org.springblade.desk.order.pojo.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.YieldPlan; + +import java.io.Serial; + +/** + * 生产计划-视图类 + * + * @author lqk + */ +@Data +public class YieldPlanDto extends YieldPlan { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 排序字段 + */ + private String orderByField; + /** + * true: 升序,false: 降序 + */ + private boolean isAsc; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 379874ce..14b9e6b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -36,7 +36,9 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.SpringUtil; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; import org.springblade.desk.basic.service.ICraftAbilityService; +import org.springblade.desk.basic.service.ILocallyPlatedPartService; import org.springblade.desk.common.constant.BizTypeConstant; import org.springblade.desk.common.service.IMesNotifyMessageService; import org.springblade.desk.dashboard.constant.DsPartConstant; @@ -166,6 +168,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl selectAssignList(IPage page, DsTaskingVO dsTasking) { List dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking); @@ -787,6 +792,11 @@ public class DsTaskingServiceImpl extends BaseServiceImpl> pageElectroplate(@Parameter(hidden = true) YieldOrder entity, Query query) { + public R> pageElectroplate(@Parameter(hidden = true) YieldOrderDto entity, Query query) { IPage page = yieldOrderService.selectPageElectroplate(Condition.getPage(query), entity); return R.data(YieldOrderWrapper.build().pageVO(page)); } @@ -85,7 +87,7 @@ public class YieldOrderController extends BladeController { @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) }) @Operation(summary = "分页查询列表-烧结", description = "") - public R> pageSintering(@Parameter(hidden = true) YieldOrder entity, Query query) { + public R> pageSintering(@Parameter(hidden = true) YieldOrderDto entity, Query query) { IPage page = yieldOrderService.selectPageSintering(Condition.getPage(query), entity); return R.data(YieldOrderWrapper.build().pageVO(page)); } @@ -101,7 +103,7 @@ public class YieldOrderController extends BladeController { in = ParameterIn.QUERY, schema = @Schema(type = "string")) }) @Operation(summary = "分页-异常订单", description = "") - public R> pageException(@Parameter(hidden = true) YieldOrder entity, Query query) { + public R> pageException(@Parameter(hidden = true) YieldOrderDto entity, Query query) { IPage page = Condition.getPage(query); page.setRecords(new ArrayList<>()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java index 2d0e086b..f72f8e05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java @@ -15,6 +15,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.order.pojo.dto.YieldPlanDto; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.pojo.enums.YieldPlanEnum; import org.springblade.desk.order.pojo.vo.YieldPlanVo; @@ -51,7 +52,7 @@ public class YieldPlanController extends BladeController { @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) }) @Operation(summary = "分页查询列表-电镀", description = "") - public R> pageElectroplate(@Parameter(hidden = true) YieldPlan entity, Query query) { + public R> pageElectroplate(@Parameter(hidden = true) YieldPlanDto entity, Query query) { IPage page = yieldPlanService.selectPageElectroplate(Condition.getPage(query), entity); return R.data(YieldPlanWrapper.build().pageVO(page)); } @@ -66,7 +67,7 @@ public class YieldPlanController extends BladeController { @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) }) @Operation(summary = "分页查询列表-烧结", description = "") - public R> pageSintering(@Parameter(hidden = true) YieldPlan entity, Query query) { + public R> pageSintering(@Parameter(hidden = true) YieldPlanDto entity, Query query) { IPage page = yieldPlanService.selectPageSintering(Condition.getPage(query), entity); return R.data(YieldPlanWrapper.build().pageVO(page)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java index 5fec8f8c..520ea692 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java @@ -2,8 +2,11 @@ package org.springblade.desk.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.order.pojo.dto.YieldOrderDto; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.enums.YieldOrderEnum; +import org.springblade.desk.order.pojo.vo.YieldOrderVo; import java.util.List; @@ -23,7 +26,7 @@ public interface YieldOrderMapper extends BaseMapper { * @param yieldTypeList * @return */ - List selectPage(IPage page, YieldOrder entity, List yieldTypeList); + List selectPage(IPage page, @Param("entity") YieldOrderDto entity, List yieldTypeList); /** * 自定义分页 - 用于需求申报 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index f1d7e63e..09f72f9b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -67,7 +67,17 @@ AND release_date to_date(concat(#{entity.releaseDateEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS') - order by CREATE_TIME desc + + + + ORDER BY ${entity.orderByField} + ASC + DESC + + + ORDER BY CREATE_TIME DESC + +