From fe5e14002f6eedb9f27ac239007898ff61677a62 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 30 Sep 2025 17:54:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=9F=E8=AE=A1=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E3=80=81=E6=A0=A1=E9=AA=8C=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8?= =?UTF-8?q?common=E6=A8=A1=E5=9D=97=EF=BC=9B2=E3=80=81=E6=97=A7=E8=B6=85?= =?UTF-8?q?=E7=AE=A1=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/OrderStatisticsUnit.java | 34 ----------- .../util/time/StatisticsChangeUtils.java | 13 ++--- .../executor/enums/OrderStatisticsUnit.java | 34 ----------- .../order/OrderSupStatisticsController.java | 41 -------------- .../mysql/order/OrderSupStatisticsMapper.java | 30 ---------- .../order/OrderStatisticsServiceImpl.java | 6 +- .../order/OrderSupStatisticsService.java | 19 ------- .../order/OrderSupStatisticsServiceImpl.java | 56 ------------------- .../order/OrderStatisticsUnitInEnum.java | 36 ------------ .../OrderStatisticsUnitInEnumValidator.java | 36 ------------ .../mapper/order/OrderStatisticsMapper.xml | 8 +-- .../mapper/order/OrderSupStatisticsMapper.xml | 47 ---------------- .../main/resources/mapper/plan/PlanMapper.xml | 16 +++--- .../plate/OrderPlateStatisticsMapper.xml | 16 +++--- .../api/organ/dto/OrgStatisticsReqDTO.java | 4 +- .../org/OrgStatisticsUnitInEnum.java | 35 ------------ .../org/OrgStatisticsUnitInEnumValidator.java | 32 ----------- .../organamount/OrganAmountServiceImpl.java | 2 - .../FundsStatisticsUnitInEnumValidator.java | 4 +- .../mapper/funds/amount/OrganAmountMapper.xml | 8 +-- .../mapper/funds/pay/PayOrderMapper.xml | 8 +-- .../mapper/funds/purchase/PurchaseMapper.xml | 8 +-- .../resources/mapper/organ/OrganMapper.xml | 16 +++--- .../mapper/process/AdminUserMapper.xml | 16 +++--- 24 files changed, 61 insertions(+), 464 deletions(-) delete mode 100644 cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderStatisticsUnit.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderStatisticsUnit.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderSupStatisticsMapper.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsService.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsServiceImpl.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnum.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnumValidator.java delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderSupStatisticsMapper.xml delete mode 100644 cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/validation/org/OrgStatisticsUnitInEnum.java delete mode 100644 cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/validation/org/OrgStatisticsUnitInEnumValidator.java diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderStatisticsUnit.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderStatisticsUnit.java deleted file mode 100644 index efeec02b4..000000000 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/OrderStatisticsUnit.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.framework.common.enums; - -/** - * 生产单统计维度单位 - * @author Gqr - * @since 2024/8/6 10:04 - */ -public enum OrderStatisticsUnit { - //季度、月、周、日 - QUARTER(0), - MONTH(1), - WEEK(2), - DAY(3); - - OrderStatisticsUnit(Integer value) { - this.value = value; - } - - private Integer value; - - public Integer getValue() { - return value; - } - - // from value - public static OrderStatisticsUnit fromValue(Integer value) { - for (OrderStatisticsUnit unit : OrderStatisticsUnit.values()) { - if (unit.getValue().equals(value)) { - return unit; - } - } - return null; - } -} diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java index f480064c8..5519984f2 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/time/StatisticsChangeUtils.java @@ -2,7 +2,6 @@ package com.cf.imes.framework.common.util.time; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.framework.common.enums.OrderStatisticsUnit; import com.cf.imes.framework.common.enums.StatisticsUnit; import com.cf.imes.framework.common.pojo.CommonStatisticsReqVO; @@ -88,9 +87,9 @@ public class StatisticsChangeUtils { startDate = ObjectUtil.clone(reqVO.getCreateTime()[1]); endDate = ObjectUtil.clone(reqVO.getCreateTime()[0]); } - LocalDate first = startDate; - LocalDate end = endDate; - switch (OrderStatisticsUnit.fromValue(unit)) { + LocalDate first; + LocalDate end; + switch (StatisticsUnit.fromValue(unit)) { case QUARTER -> { first = firstDayOfQuarter(startDate); end = lastDayOfQuarter(endDate); @@ -126,7 +125,7 @@ public class StatisticsChangeUtils { List dates = new ArrayList<>(); while (!startDate.isAfter(endDate)) { String dateStr; - switch (OrderStatisticsUnit.fromValue(unit)) { + switch (StatisticsUnit.fromValue(unit)) { case QUARTER: dateStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-Q")); // 加一季度（3个月） @@ -169,10 +168,10 @@ public class StatisticsChangeUtils { * @return */ public static String generateDateRangeAxis(String date, Integer unit) { - OrderStatisticsUnit orderStatisticsUnit = OrderStatisticsUnit.fromValue(unit); + StatisticsUnit statisticsUnit = StatisticsUnit.fromValue(unit); StringBuilder newDateStrBuffer = new StringBuilder(); String[] dateSplit = date.split("-"); - switch (orderStatisticsUnit) { + switch (statisticsUnit) { case QUARTER: newDateStrBuffer.append("第").append(dateSplit[1]).append("季度"); break; diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderStatisticsUnit.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderStatisticsUnit.java deleted file mode 100644 index f02c40c1d..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/OrderStatisticsUnit.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cf.imes.module.executor.enums; - -/** - * 生产单统计维度单位 - * @author Gqr - * @since 2024/8/6 10:04 - */ -public enum OrderStatisticsUnit { - //季度、月、周、日 - QUARTER(0), - MONTH(1), - WEEK(2), - DAY(3); - - OrderStatisticsUnit(Integer value) { - this.value = value; - } - - private Integer value; - - public Integer getValue() { - return value; - } - - // from value - public static OrderStatisticsUnit fromValue(Integer value) { - for (OrderStatisticsUnit unit : OrderStatisticsUnit.values()) { - if (unit.getValue().equals(value)) { - return unit; - } - } - return null; - } -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java deleted file mode 100644 index c56df4c4d..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderSupStatisticsController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.order; - -import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.module.executor.service.order.OrderSupStatisticsService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import jakarta.annotation.Resource; -import java.util.Map; - -import static com.cf.imes.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 超管-生产单统计管理") -@RestController -@RequestMapping("/executor/order/supStatistics") -@Validated -@Slf4j -public class OrderSupStatisticsController { - - @Resource - private OrderSupStatisticsService orderSupStatisticsService; - - @GetMapping("/total/order") - @Operation(summary = "生产单总数") - @PreAuthorize("@ss.hasPermission('homePage:analysis:org-statistic')") - public CommonResult> getOrderTotal() { - return success(orderSupStatisticsService.orderTotal()); - } - - @GetMapping("/total/plateArea") - @Operation(summary = "拆单板件平方数") - public CommonResult> getPlateAreaTotal() { - return success(orderSupStatisticsService.plateAreaTotal()); - } -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderSupStatisticsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderSupStatisticsMapper.java deleted file mode 100644 index 516b44db6..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderSupStatisticsMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cf.imes.module.executor.dal.mysql.order; - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderStatisticsIsLapseRespVO; -import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderStatisticsReqVO; -import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.time.LocalDateTime; -import java.util.List; - -@Mapper -public interface OrderSupStatisticsMapper extends BaseMapperX { - - /** - * 当日生产单板件平方数 - */ - Double selectOrderSquareProduceToday(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime); - - /** - * 生产单按时间统计失效数量 - */ - List selectOrderCountLapseByOrderDate(@Param("req") OrderStatisticsReqVO reqVO); - - /** - * 生产单按时间分组统计未失效数量 - */ - List selectOrderCountNotLapseByOrderDate(@Param("req") OrderStatisticsReqVO reqVO); -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java index 3c8c5649f..bfdbdf0f9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderStatisticsServiceImpl.java @@ -12,6 +12,7 @@ import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.SearchResponse; import co.elastic.clients.util.NamedValue; import com.cf.imes.framework.common.enums.OrderStatusEnum; +import com.cf.imes.framework.common.enums.StatisticsUnit; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderGoodsPlateRespVO; @@ -25,7 +26,6 @@ import com.cf.imes.module.executor.dal.mysql.order.OrderStatisticsMapper; import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.OrderPlateStatisticsMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateGoodMapper; -import com.cf.imes.module.executor.enums.OrderStatisticsUnit; import com.cf.imes.module.system.api.dict.DictDataApi; import com.cf.imes.module.system.api.dict.dto.DictDataRespDTO; import com.cf.imes.module.system.enums.DictTypeConstants; @@ -593,7 +593,7 @@ public class OrderStatisticsServiceImpl implements OrderStatisticsService { * @return */ private DateHistogramAggregation.Builder getDateHistogram(Integer unit, DateHistogramAggregation.Builder builder) { - switch (OrderStatisticsUnit.fromValue(unit)) { + switch (StatisticsUnit.fromValue(unit)) { case QUARTER: return builder.calendarInterval(CalendarInterval.Quarter).format("yyyy-Q"); case MONTH: @@ -612,7 +612,7 @@ public class OrderStatisticsServiceImpl implements OrderStatisticsService { * @return */ private String dateToWeekMonth(String dateStr, Integer unit) { - if (OrderStatisticsUnit.WEEK.getValue().equals(unit)) { + if (StatisticsUnit.WEEK.getValue().equals(unit)) { LocalDate date = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern(DATE_TIME_FORMATTER_PATTERN_YEAR_MONTH_DAY)); // 年月 String outDateStr = date.format(DateTimeFormatter.ofPattern(DATE_TIME_FORMATTER_PATTERN_YEAR_MONTH)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsService.java deleted file mode 100644 index d60e8781f..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cf.imes.module.executor.service.order; - -import java.util.Map; - -/** - * 生产单统计 —— 超管 - */ -public interface OrderSupStatisticsService { - - /** - * 生产单总数统计 - */ - Map orderTotal(); - - /** - * 拆单板件平方数统计 - */ - Map plateAreaTotal(); -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsServiceImpl.java deleted file mode 100644 index 1dfdc06a9..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderSupStatisticsServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.cf.imes.module.executor.service.order; - -import com.cf.imes.framework.organ.core.aop.OrganIgnore; -import com.cf.imes.module.executor.dal.mysql.order.OrderStatisticsMapper; -import com.cf.imes.module.executor.dal.mysql.order.OrderSupStatisticsMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import jakarta.annotation.Resource; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.*; - - -@Service -@Validated -public class OrderSupStatisticsServiceImpl implements OrderSupStatisticsService{ - @Resource - private OrderStatisticsMapper orderStatisticsMapper; - - @Resource - private OrderSupStatisticsMapper orderSupStatisticsMapper; - - @Override - @OrganIgnore - public Map orderTotal() { - Map resultMap = new LinkedHashMap<>(); - // 生产单总数 - Integer total = orderStatisticsMapper.selectOrderCount(); - resultMap.put("total", total); - - // 日增长量 - Integer today = orderStatisticsMapper.selectOrderCountToday(); - resultMap.put("today", today); - return resultMap; - } - - @Override - public Map plateAreaTotal() { - Map resultMap = new LinkedHashMap<>(); - - // 生产单板件平方数 - Double total = orderStatisticsMapper.selectOrderSquareProduce(); - resultMap.put("total", total); - - // 当日生产单板件平方数 - LocalDate date = LocalDate.now(); - LocalDateTime startTime = LocalDateTime.of(date, LocalTime.MIDNIGHT); - LocalDateTime endTime = LocalDateTime.of(date, LocalTime.MAX); - Double today = orderSupStatisticsMapper.selectOrderSquareProduceToday(startTime, endTime); - resultMap.put("today", today); - - return resultMap; - } -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnum.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnum.java deleted file mode 100644 index f5c9600a2..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.executor.validation.order; - -import jakarta.validation.Constraint; -import jakarta.validation.Payload; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 生产单统计维度单位入参校验注解 - * - * @author Gqr - * @since 2024/7/17 9:33 - */ -@Target({ - ElementType.METHOD, - ElementType.FIELD, - ElementType.ANNOTATION_TYPE, - ElementType.CONSTRUCTOR, - ElementType.PARAMETER, - ElementType.TYPE_USE -}) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Constraint( - validatedBy = {OrderStatisticsUnitInEnumValidator.class} -) -public @interface OrderStatisticsUnitInEnum { - String message() default "生产单统计维度单位[unit]错误，请检查"; - - Class[] groups() default {}; - - Class[] payload() default {}; -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnumValidator.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnumValidator.java deleted file mode 100644 index 736146de4..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/validation/order/OrderStatisticsUnitInEnumValidator.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cf.imes.module.executor.validation.order; - -import cn.hutool.core.util.ObjectUtil; -import com.cf.imes.module.executor.enums.OrderStatisticsUnit; - -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; - -/** - * 生产单统计维度单位入参校验器 - * - * @author Gqr - * @since 2024/7/17 9:33 - */ -public class OrderStatisticsUnitInEnumValidator implements ConstraintValidator { - - @Override - public void initialize(OrderStatisticsUnitInEnum constraintAnnotation) { - ConstraintValidator.super.initialize(constraintAnnotation); - } - - @Override - public boolean isValid(Integer value, ConstraintValidatorContext context) { - if (ObjectUtil.isNull(value)) { - return true; - } - OrderStatisticsUnit unit = OrderStatisticsUnit.fromValue(value); - if (ObjectUtil.isNotNull(unit)) { - return true; - } else { - return false; - } - } - -} - diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderStatisticsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderStatisticsMapper.xml index e80f3f165..99dcb71d0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderStatisticsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderStatisticsMapper.xml @@ -8,16 +8,16 @@ - + ,CONCAT(YEAR(o.order_date), '-', QUARTER(o.order_date)) as date - + ,CONCAT(YEAR(o.order_date), '-', MONTH(o.order_date)) as date - + ,CONCAT(YEAR(o.order_date), '-', MONTH(o.order_date), '-', WEEK(o.order_date, 1)) AS date - + ,CONCAT(YEAR(o.order_date), '-', MONTH(o.order_date), '-', DAY(o.order_date)) as date diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderSupStatisticsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderSupStatisticsMapper.xml deleted file mode 100644 index 043aaf8cd..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderSupStatisticsMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - ,CONCAT(YEAR(o.order_date), '-', QUARTER(o.order_date)) as date - - - ,CONCAT(YEAR(o.order_date), '-', MONTH(o.order_date)) as date - - - ,CONCAT(YEAR(o.order_date), '-', MONTH(o.order_date), '-', FLOOR((DayOfMonth(o.order_date)-1)/7)+1) AS date - - - ,CONCAT(YEAR(o.order_date), '-', MONTH(o.order_date), '-', DAY(o.order_date)) as date - - - - - - - - - - \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml index 48c0d6bb7..397a86016 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml @@ -45,16 +45,16 @@ resultType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderPlanStatisticsCountRespVO"> select count(p.id) as count - + ,CONCAT(YEAR(p.create_time), '-', QUARTER(p.create_time)) as date - + ,CONCAT(YEAR(p.create_time), '-', MONTH(p.create_time)) as date - + ,CONCAT(YEAR(p.create_time), '-', MONTH(p.create_time), '-', FLOOR((DayOfMonth(p.create_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(p.create_time), '-', MONTH(p.create_time), '-', DAY(p.create_time)) as date from order_plan p @@ -66,16 +66,16 @@ - + ,CONCAT(YEAR(o.notify_time), '-', QUARTER(o.notify_time)) as date - + ,CONCAT(YEAR(o.notify_time), '-', MONTH(o.notify_time)) as date - + ,CONCAT(YEAR(o.notify_time), '-', MONTH(o.notify_time), '-', FLOOR((DayOfMonth(o.notify_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(o.notify_time), '-', MONTH(o.notify_time), '-', DAY(o.notify_time)) as date diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml index 0a1364f43..f4b547897 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml @@ -78,17 +78,17 @@ - + ,CONCAT(YEAR(o.create_time), '-', QUARTER(o.create_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', FLOOR((DayOfMonth(o.create_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', DAY(o.create_time)) as date diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml index 3602c699c..2a18d7e68 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/organ/OrganMapper.xml @@ -24,16 +24,16 @@ - + ,CONCAT(YEAR(o.update_time), '-', QUARTER(o.update_time)) as date - + ,CONCAT(YEAR(o.update_time), '-', MONTH(o.update_time)) as date - + ,CONCAT(YEAR(o.update_time), '-', MONTH(o.update_time), '-', FLOOR((DayOfMonth(o.update_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(o.update_time), '-', MONTH(o.update_time), '-', DAY(o.update_time)) as date @@ -49,16 +49,16 @@ - + ,CONCAT(YEAR(o.create_time), '-', QUARTER(o.create_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', FLOOR((DayOfMonth(o.create_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', DAY(o.create_time)) as date diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml index 00cae70fc..1f840ff2f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/AdminUserMapper.xml @@ -55,32 +55,32 @@ - + ,CONCAT(YEAR(o.update_time), '-', QUARTER(o.update_time)) as date - + ,CONCAT(YEAR(o.update_time), '-', MONTH(o.update_time)) as date - + ,CONCAT(YEAR(o.update_time), '-', MONTH(o.update_time), '-', FLOOR((DayOfMonth(o.update_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(o.update_time), '-', MONTH(o.update_time), '-', DAY(o.update_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', QUARTER(o.create_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time)) as date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', FLOOR((DayOfMonth(o.create_time)-1)/7)+1) AS date - + ,CONCAT(YEAR(o.create_time), '-', MONTH(o.create_time), '-', DAY(o.create_time)) as date