diff --git a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/annotation/Condition.java b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/annotation/Condition.java index 5a0fcdd..eb71c77 100644 --- a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/annotation/Condition.java +++ b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/annotation/Condition.java @@ -4,7 +4,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.List; import static com.chushang.common.mybatis.annotation.Condition.ConditionType.*; diff --git a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java index b2259bc..ed4c0fb 100644 --- a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java +++ b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java @@ -16,6 +16,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import java.lang.reflect.Field; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -36,6 +37,13 @@ public class WrapperUtils { // 构造Wrapper queryWrapper = queryWrapper .orderBy(true, "asc".equals(commonParam.getIsAsc()), commonParam.getOrderBy()); + String groupStr = commonParam.getGroupStr(); + if (null != groupStr){ + String[] split = groupStr.split(","); + if (split.length > 0){ + queryWrapper.groupBy(Arrays.asList(split)); + } + } } if (query == null) { return queryWrapper.lambda(); diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/AuditDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/AuditDTO.java similarity index 86% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/AuditDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/AuditDTO.java index 919b663..b6ec3c9 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/AuditDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/AuditDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import lombok.Data; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ContractDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java similarity index 97% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ContractDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java index fe621b1..d1c175b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ContractDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.chushang.common.core.validator.Create; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/Delete.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/Delete.java similarity index 83% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/Delete.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/Delete.java index be0422e..32e4837 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/Delete.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/Delete.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import lombok.Data; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/PageAuditDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/PageAuditDTO.java similarity index 95% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/PageAuditDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/PageAuditDTO.java index 08d8894..d7a4f66 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/PageAuditDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/PageAuditDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import cn.hutool.core.date.DatePattern; import com.chushang.common.mybatis.annotation.Condition; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/PaymentDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/PaymentDTO.java similarity index 94% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/PaymentDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/PaymentDTO.java index 108359c..18e5939 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/PaymentDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/PaymentDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.chushang.common.core.validator.Create; import lombok.Data; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ProjectDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ProjectDTO.java similarity index 95% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ProjectDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ProjectDTO.java index 7fb813a..76a734d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/ProjectDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ProjectDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.chushang.common.core.validator.Create; import com.chushang.common.core.validator.Update; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskDTO.java similarity index 98% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskDTO.java index 3a93c45..c47b285 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.chushang.common.core.validator.Create; import com.chushang.common.core.validator.Update; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskExcelDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskExcelDTO.java similarity index 96% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskExcelDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskExcelDTO.java index 7da0171..d26e384 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskExcelDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskExcelDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.alibaba.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskGraphDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskGraphDTO.java similarity index 94% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskGraphDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskGraphDTO.java index ed025eb..4b17312 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskGraphDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskGraphDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.chushang.common.core.validator.Create; import com.chushang.common.core.validator.Update; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java similarity index 96% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskQuery.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java index 0df8df1..8a49aa0 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/TaskQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.chushang.common.mybatis.annotation.Condition; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/UserAutographDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/UserAutographDTO.java similarity index 94% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/UserAutographDTO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/UserAutographDTO.java index 998032a..c72279d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/dto/UserAutographDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/UserAutographDTO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.dto; +package com.chushang.inspection.project.dto; import com.chushang.common.core.validator.Create; import com.chushang.common.core.validator.Update; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionConfig.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java similarity index 97% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionConfig.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java index db0668a..aa7ed37 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionConfig.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionConfig.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionData.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java similarity index 96% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionData.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java index ba57458..9673ef1 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionData.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionData.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionDetail.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java similarity index 97% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionDetail.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java index 2535c9d..5ad35d3 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/InspectionDetail.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/InspectionDetail.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/PollingTask.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java similarity index 98% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/PollingTask.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java index 8e28183..1b55054 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/PollingTask.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/PollingTaskAutograph.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java similarity index 94% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/PollingTaskAutograph.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java index 78b7000..822f2a2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/PollingTaskAutograph.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTaskAutograph.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/UserAutograph.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java similarity index 94% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/UserAutograph.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java index 731090c..011ae47 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/UserAutograph.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/UserAutograph.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkAudit.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkAudit.java similarity index 97% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkAudit.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkAudit.java index cc809c5..888ab7d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkAudit.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkAudit.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java similarity index 98% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java index 8a14944..0f97b14 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProject.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import cn.hutool.core.date.DatePattern; import com.baomidou.mybatisplus.annotation.*; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectContract.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java similarity index 98% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectContract.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java index 3da41ba..4fd4247 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectContract.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.*; import com.chushang.common.dict.annotation.DictFormat; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectPayment.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java similarity index 97% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectPayment.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java index b293b35..962a7c3 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/po/WrkProjectPayment.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectPayment.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.po; +package com.chushang.inspection.project.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/query/InsConfigQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/InsConfigQuery.java similarity index 91% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/query/InsConfigQuery.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/InsConfigQuery.java index 1557dcb..db809b1 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/query/InsConfigQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/InsConfigQuery.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.query; +package com.chushang.inspection.project.query; import com.chushang.common.mybatis.annotation.Condition; import com.chushang.common.mybatis.page.CommonParam; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/query/InsDetailQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/InsDetailQuery.java similarity index 87% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/query/InsDetailQuery.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/InsDetailQuery.java index aa375ed..9cc7311 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/query/InsDetailQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/InsDetailQuery.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.query; +package com.chushang.inspection.project.query; import com.chushang.common.mybatis.page.CommonParam; import lombok.Data; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/ConfigVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ConfigVO.java similarity index 91% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/ConfigVO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ConfigVO.java index f15387e..9af3216 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/ConfigVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ConfigVO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.vo; +package com.chushang.inspection.project.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/DetailsVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java similarity index 93% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/DetailsVO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java index 01004f0..1b88cbb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/DetailsVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/DetailsVO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.vo; +package com.chushang.inspection.project.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/InsConfigVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/InsConfigVO.java similarity index 93% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/InsConfigVO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/InsConfigVO.java index 475eecc..4029a1c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/InsConfigVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/InsConfigVO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.vo; +package com.chushang.inspection.project.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/TaskVO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TaskVO.java similarity index 96% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/TaskVO.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TaskVO.java index f008f7c..8b786f6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/entity/vo/TaskVO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/TaskVO.java @@ -1,4 +1,4 @@ -package com.chushang.inspection.project.entity.vo; +package com.chushang.inspection.project.vo; import com.chushang.common.core.util.TreeNode; import lombok.Data; diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/dto/ConsumablesTotalDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/dto/ConsumablesTotalDTO.java new file mode 100644 index 0000000..e68dc1c --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/dto/ConsumablesTotalDTO.java @@ -0,0 +1,59 @@ +package com.chushang.inspection.terminal.dto; + +import com.chushang.common.core.validator.Create; +import com.chushang.common.core.validator.Update; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Range; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Null; +import javax.validation.constraints.Size; +import java.io.Serializable; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ConsumablesTotalDTO implements Serializable { + + /** + * 主键 + */ + @Null(message = "id必须为空", groups = Create.class) + @NotNull(message = "id不能为空", groups = Update.class) + private Long totalId; + + /** + * 耗材类型 + */ + @NotNull(message = "耗材类型不能为空", groups = {Create.class, Update.class}) + @Range(min = 1, max = 20, message = "耗材类型错误", groups = {Create.class, Update.class}) + private Integer type; + + /** + * 总数 + */ + @NotNull(message = "入库数量不能为空", groups = {Create.class, Update.class}) + private Integer total; + + /** + * 任务id + */ + @NotNull(message = "任务id不能为空", groups = {Create.class, Update.class}) + private Long taskId; + + /** + * 备注 + */ + @Size(max = 128, message = "备注不能超过128个字符", groups = {Create.class, Update.class}) + private String remark; + + /** + * 来源 + */ + @Range(min = 1, max = 20, message = "来源输入错误", groups = {Create.class, Update.class}) + private Integer source; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/ConsumableDetails.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/ConsumableDetails.java similarity index 62% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/ConsumableDetails.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/ConsumableDetails.java index a18e53e..95f6bd9 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/ConsumableDetails.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/ConsumableDetails.java @@ -1,16 +1,10 @@ -package com.chushang.inspection.terminal; +package com.chushang.inspection.terminal.po; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.chushang.common.dict.annotation.DictFormat; import com.chushang.common.mybatis.base.BaseEntity; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; /** * @auther: zhao @@ -21,19 +15,38 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "consumable_details") +@Builder public class ConsumableDetails extends BaseEntity { + /** + * 详情id + */ @TableField(value = "detail_id") private Long detailId; - + /** + * 部门id + */ @TableField(value = "dept_id") private Long deptId; - + /** + * 总数表id + */ @TableField(value = "total_id") private Long totalId; - + /** + * 出入库类型 （1 是入库 2 出库） + */ @TableField(value = "inbound_and_outbound_type") private Integer inboundAndOutboundType; - + /** + * 数量 + */ @TableField(value = "quantity") private Integer quantity; + + /** + * 耗材类型 + */ + @DictFormat(dictType = "specs") + @TableField(exist = false) + private Integer type; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/ConsumablesTotal.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/ConsumablesTotal.java similarity index 77% rename from chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/ConsumablesTotal.java rename to chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/ConsumablesTotal.java index ea91d68..1af6f42 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/ConsumablesTotal.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/po/ConsumablesTotal.java @@ -1,12 +1,10 @@ -package com.chushang.inspection.terminal; +package com.chushang.inspection.terminal.po; -import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.chushang.common.mybatis.base.BaseEntity; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,24 +20,39 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @TableName(value = "consumables_total") public class ConsumablesTotal extends BaseEntity { + /** + * 数量id + */ @TableId(value = "total_id", type = IdType.ASSIGN_ID) private Long totalId; - + /** + * 部门id + */ @TableField(value = "dept_id") private Long deptId; - + /** + * 耗材类型 + */ @TableField(value = "`type`") private Integer type; - + /** + * 来源 + */ @TableField(value = "`source`") private Integer source; - + /** + * 总数 + */ @TableField(value = "total") - private Long total; - + private Integer total; + /** + * 备注 + */ @TableField(value = "remark") private String remark; - + /** + * 任务id + */ @TableField(value = "task_id") private Long taskId; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/ConsumablesDetailsQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/ConsumablesDetailsQuery.java new file mode 100644 index 0000000..fd42cba --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/ConsumablesDetailsQuery.java @@ -0,0 +1,35 @@ +package com.chushang.inspection.terminal.query; + +import com.chushang.common.mybatis.annotation.Condition; +import com.chushang.common.mybatis.page.CommonParam; +import lombok.*; + +import javax.print.attribute.standard.MediaSize; +import javax.validation.constraints.NotNull; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ConsumablesDetailsQuery extends CommonParam { + + /** + * 任务id + */ + @NotNull(message = "任务id不能为空") + @Condition(name = "task_id", type = Condition.ConditionType.eq) + private Long taskId; + + /** + * 耗材类型 + */ + @Condition(name = "type", type = Condition.ConditionType.eq) + private Integer type; + + /** + * 总数id + */ + @Condition(name = "total_id", type = Condition.ConditionType.eq) + private Long totalId; +} diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/ConsumablesTotalQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/ConsumablesTotalQuery.java new file mode 100644 index 0000000..24e812d --- /dev/null +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/ConsumablesTotalQuery.java @@ -0,0 +1,42 @@ +package com.chushang.inspection.terminal.query; + +import com.chushang.common.mybatis.annotation.Condition; +import com.chushang.common.mybatis.page.CommonParam; +import lombok.*; + +import javax.validation.constraints.NotNull; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ConsumablesTotalQuery extends CommonParam { + + /** + * 任务id + */ + @Condition(name = "task_id") + @NotNull(message = "任务id不能为空") + private Long taskId; + + /** + * 耗材来源 + */ + @Condition(name = "source") + private Integer source; + + /** + * 耗材类型 + */ + @Condition(name = "type") + private Integer type; + + /** + * 总数 + */ + @Condition(name = "total") + private Long total; + + +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsConfigController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsConfigController.java index bd77338..ce0efce 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsConfigController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsConfigController.java @@ -8,8 +8,8 @@ import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.inspection.project.entity.po.InspectionConfig; -import com.chushang.inspection.project.entity.query.InsConfigQuery; +import com.chushang.inspection.project.po.InspectionConfig; +import com.chushang.inspection.project.query.InsConfigQuery; import com.chushang.inspection.project.service.InspectionConfigService; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.security.utils.SecurityUtils; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsDetailController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsDetailController.java index 4be85f8..5abaf03 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsDetailController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/InsDetailController.java @@ -8,9 +8,9 @@ import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.inspection.project.entity.dto.Delete; -import com.chushang.inspection.project.entity.po.InspectionDetail; -import com.chushang.inspection.project.entity.query.InsDetailQuery; +import com.chushang.inspection.project.dto.Delete; +import com.chushang.inspection.project.po.InspectionDetail; +import com.chushang.inspection.project.query.InsDetailQuery; import com.chushang.inspection.project.service.InspectionDetailService; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.security.utils.SecurityUtils; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java index c97dd21..7200620 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java @@ -6,12 +6,12 @@ import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.inspection.project.entity.dto.Delete; -import com.chushang.inspection.project.entity.dto.TaskDTO; -import com.chushang.inspection.project.entity.dto.TaskExcelDTO; -import com.chushang.inspection.project.entity.dto.TaskQuery; -import com.chushang.inspection.project.entity.vo.ConfigVO; -import com.chushang.inspection.project.entity.vo.TaskVO; +import com.chushang.inspection.project.dto.Delete; +import com.chushang.inspection.project.dto.TaskDTO; +import com.chushang.inspection.project.dto.TaskExcelDTO; +import com.chushang.inspection.project.dto.TaskQuery; +import com.chushang.inspection.project.vo.ConfigVO; +import com.chushang.inspection.project.vo.TaskVO; import com.chushang.inspection.project.service.PollingTaskService; import com.chushang.security.annotation.RequiresPermissions; import lombok.extern.slf4j.Slf4j; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollingTaskAutographController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollingTaskAutographController.java index 0a576e2..01d52af 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollingTaskAutographController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollingTaskAutographController.java @@ -5,7 +5,7 @@ import com.chushang.common.core.validator.Update; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; -import com.chushang.inspection.project.entity.dto.TaskGraphDTO; +import com.chushang.inspection.project.dto.TaskGraphDTO; import com.chushang.inspection.project.service.PollingTaskAutographService; import com.chushang.security.annotation.RequiresPermissions; import lombok.RequiredArgsConstructor; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/UserAutographController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/UserAutographController.java index 0185c44..cf9db53 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/UserAutographController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/UserAutographController.java @@ -7,13 +7,12 @@ import com.chushang.common.core.validator.Update; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; -import com.chushang.inspection.project.entity.dto.Delete; -import com.chushang.inspection.project.entity.dto.UserAutographDTO; -import com.chushang.inspection.project.entity.po.UserAutograph; +import com.chushang.inspection.project.dto.Delete; +import com.chushang.inspection.project.dto.UserAutographDTO; +import com.chushang.inspection.project.po.UserAutograph; import com.chushang.inspection.project.service.UserAutographService; import com.chushang.security.annotation.RequiresPermissions; import lombok.RequiredArgsConstructor; -import lombok.extern.java.Log; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java index 3d8e370..63a19a1 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkAuditController.java @@ -3,9 +3,8 @@ package com.chushang.inspection.project.controller; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; -import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.inspection.project.entity.dto.AuditDTO; -import com.chushang.inspection.project.entity.dto.PageAuditDTO; +import com.chushang.inspection.project.dto.AuditDTO; +import com.chushang.inspection.project.dto.PageAuditDTO; import com.chushang.inspection.project.service.WrkAuditService; import com.chushang.security.annotation.RequiresPermissions; import lombok.extern.slf4j.Slf4j; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java index 641a538..904077c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java @@ -8,9 +8,9 @@ import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; -import com.chushang.inspection.project.entity.dto.ContractDTO; -import com.chushang.inspection.project.entity.dto.ProjectDTO; -import com.chushang.inspection.project.entity.po.WrkProject; +import com.chushang.inspection.project.dto.ContractDTO; +import com.chushang.inspection.project.dto.ProjectDTO; +import com.chushang.inspection.project.po.WrkProject; import com.chushang.inspection.project.service.WrkProjectContractService; import com.chushang.inspection.project.service.WrkProjectService; import com.chushang.security.annotation.RequiresPermissions; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java index 0e2e638..8fd93db 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectPaymentController.java @@ -5,11 +5,10 @@ import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.inspection.project.entity.dto.PaymentDTO; +import com.chushang.inspection.project.dto.PaymentDTO; import com.chushang.inspection.project.service.WrkProjectPaymentService; import com.chushang.security.annotation.RequiresPermissions; import lombok.extern.slf4j.Slf4j; -import org.aspectj.weaver.loadtime.Aj; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionConfigMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionConfigMapper.java index b087afa..84508a5 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionConfigMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionConfigMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.InspectionConfig; +import com.chushang.inspection.project.po.InspectionConfig; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java index 98bcd7f..f3f29c2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDataMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.InspectionData; +import com.chushang.inspection.project.po.InspectionData; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDetailMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDetailMapper.java index 4a9c828..514546a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDetailMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/InspectionDetailMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.InspectionDetail; +import com.chushang.inspection.project.po.InspectionDetail; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskAutographMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskAutographMapper.java index b8ca7c0..595c5fe 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskAutographMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskAutographMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.PollingTaskAutograph; +import com.chushang.inspection.project.po.PollingTaskAutograph; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskMapper.java index ce86499..29a8760 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/PollingTaskMapper.java @@ -1,9 +1,8 @@ package com.chushang.inspection.project.mapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.PollingTask; +import com.chushang.inspection.project.po.PollingTask; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/UserAutographMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/UserAutographMapper.java index a0b6ca4..f3464fc 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/UserAutographMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/UserAutographMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.UserAutograph; +import com.chushang.inspection.project.po.UserAutograph; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java index f5254e4..7dcb574 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkAuditMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.WrkAudit; +import com.chushang.inspection.project.po.WrkAudit; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java index b0e597f..d879207 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectContractMapper.java @@ -1,11 +1,9 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.WrkProjectContract; +import com.chushang.inspection.project.po.WrkProjectContract; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @auther: zhao * @date: 2024/6/15 10:51 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java index 5bb9781..10e3538 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.WrkProject; +import com.chushang.inspection.project.po.WrkProject; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java index a403cb8..1c4db27 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.project.entity.po.WrkProjectPayment; +import com.chushang.inspection.project.po.WrkProjectPayment; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionConfigService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionConfigService.java index 76ddd98..2730965 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionConfigService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionConfigService.java @@ -6,13 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.inspection.project.entity.po.InspectionConfig; -import com.chushang.inspection.project.entity.po.WrkProjectContract; -import com.chushang.inspection.project.entity.query.InsConfigQuery; -import com.chushang.inspection.project.entity.vo.InsConfigVO; -import org.springframework.cache.annotation.CacheEvict; - -import java.util.List; +import com.chushang.inspection.project.po.InspectionConfig; +import com.chushang.inspection.project.query.InsConfigQuery; +import com.chushang.inspection.project.vo.InsConfigVO; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java index 695cbec..99a63fb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDataService.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.chushang.inspection.project.entity.po.InspectionData; +import com.chushang.inspection.project.po.InspectionData; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDetailService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDetailService.java index d0cf36b..270e8fb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDetailService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/InspectionDetailService.java @@ -7,9 +7,8 @@ import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.datascope.annotation.DataScope; -import com.chushang.inspection.project.entity.po.InspectionConfig; -import com.chushang.inspection.project.entity.po.InspectionDetail; -import com.chushang.inspection.project.entity.query.InsDetailQuery; +import com.chushang.inspection.project.po.InspectionDetail; +import com.chushang.inspection.project.query.InsDetailQuery; import java.util.List; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskAutographService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskAutographService.java index 39083b1..98343f6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskAutographService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskAutographService.java @@ -2,8 +2,8 @@ package com.chushang.inspection.project.service; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.IService; -import com.chushang.inspection.project.entity.dto.TaskGraphDTO; -import com.chushang.inspection.project.entity.po.PollingTaskAutograph; +import com.chushang.inspection.project.dto.TaskGraphDTO; +import com.chushang.inspection.project.po.PollingTaskAutograph; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskService.java index 04e97f8..e00d4d0 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/PollingTaskService.java @@ -2,12 +2,12 @@ package com.chushang.inspection.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.inspection.project.entity.dto.TaskDTO; -import com.chushang.inspection.project.entity.dto.TaskExcelDTO; -import com.chushang.inspection.project.entity.dto.TaskQuery; -import com.chushang.inspection.project.entity.po.PollingTask; -import com.chushang.inspection.project.entity.vo.ConfigVO; -import com.chushang.inspection.project.entity.vo.TaskVO; +import com.chushang.inspection.project.dto.TaskDTO; +import com.chushang.inspection.project.dto.TaskExcelDTO; +import com.chushang.inspection.project.dto.TaskQuery; +import com.chushang.inspection.project.po.PollingTask; +import com.chushang.inspection.project.vo.ConfigVO; +import com.chushang.inspection.project.vo.TaskVO; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/UserAutographService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/UserAutographService.java index c7ec0c2..829ddff 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/UserAutographService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/UserAutographService.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.chushang.inspection.project.entity.po.UserAutograph; +import com.chushang.inspection.project.po.UserAutograph; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java index bc65bdc..91d399f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkAuditService.java @@ -8,20 +8,19 @@ import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.datascope.annotation.DataScope; -import com.chushang.inspection.project.entity.dto.AuditDTO; -import com.chushang.inspection.project.entity.dto.PageAuditDTO; -import com.chushang.inspection.project.entity.po.WrkProjectContract; +import com.chushang.inspection.project.dto.AuditDTO; +import com.chushang.inspection.project.dto.PageAuditDTO; +import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.WrkAudit; +import com.chushang.inspection.project.po.WrkAudit; import com.chushang.inspection.project.mapper.WrkAuditMapper; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java index 6ae1ae3..6a11162 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java @@ -1,6 +1,5 @@ package com.chushang.inspection.project.service; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -8,19 +7,13 @@ import com.chushang.common.core.exception.utils.AssertUtil; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.inspection.project.entity.dto.ContractDTO; -import com.chushang.inspection.project.entity.po.WrkProject; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.project.mapper.WrkProjectContractMapper; -import com.chushang.inspection.project.entity.po.WrkProjectContract; +import com.chushang.inspection.project.po.WrkProjectContract; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.util.List; - /** * @auther: zhao * @date: 2024/6/15 10:51 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java index 037a742..323520f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java @@ -2,8 +2,6 @@ package com.chushang.inspection.project.service; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.chushang.common.core.exception.ResultException; @@ -13,14 +11,13 @@ import com.chushang.common.mybatis.enums.Operator; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.datascope.annotation.DataScope; -import com.chushang.inspection.project.entity.dto.PaymentDTO; -import com.chushang.inspection.project.entity.po.WrkProject; -import com.chushang.inspection.project.entity.po.WrkProjectContract; +import com.chushang.inspection.project.dto.PaymentDTO; +import com.chushang.inspection.project.po.WrkProject; +import com.chushang.inspection.project.po.WrkProjectContract; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.WrkProjectPayment; +import com.chushang.inspection.project.po.WrkProjectPayment; import com.chushang.inspection.project.mapper.WrkProjectPaymentMapper; import javax.annotation.Resource; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index 0f2e802..6ed8495 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -10,22 +10,21 @@ import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.datascope.annotation.DataScope; -import com.chushang.inspection.project.entity.dto.ContractDTO; -import com.chushang.inspection.project.entity.dto.ProjectDTO; -import com.chushang.inspection.project.entity.po.WrkAudit; -import com.chushang.inspection.project.entity.po.WrkProjectContract; +import com.chushang.inspection.project.dto.ContractDTO; +import com.chushang.inspection.project.dto.ProjectDTO; +import com.chushang.inspection.project.po.WrkAudit; +import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.WrkProject; +import com.chushang.inspection.project.po.WrkProject; import com.chushang.inspection.project.mapper.WrkProjectMapper; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import java.util.stream.Collectors; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionConfigServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionConfigServiceImpl.java index 07b9840..603d10a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionConfigServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionConfigServiceImpl.java @@ -5,20 +5,18 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chushang.common.mybatis.enums.Operator; -import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.inspection.project.entity.po.InspectionDetail; -import com.chushang.inspection.project.entity.vo.DetailsVO; -import com.chushang.inspection.project.entity.vo.InsConfigVO; +import com.chushang.inspection.project.po.InspectionDetail; +import com.chushang.inspection.project.vo.DetailsVO; +import com.chushang.inspection.project.vo.InsConfigVO; import com.chushang.inspection.project.service.InspectionConfigService; import com.chushang.inspection.project.service.InspectionDetailService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.InspectionConfig; +import com.chushang.inspection.project.po.InspectionConfig; import com.chushang.inspection.project.mapper.InspectionConfigMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java index 27a6495..f511508 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDataServiceImpl.java @@ -3,7 +3,7 @@ package com.chushang.inspection.project.service.impl; import com.chushang.inspection.project.service.InspectionDataService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.InspectionData; +import com.chushang.inspection.project.po.InspectionData; import com.chushang.inspection.project.mapper.InspectionDataMapper; /** * @auther: zhao diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDetailServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDetailServiceImpl.java index ec1f868..1931ccc 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDetailServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/InspectionDetailServiceImpl.java @@ -1,16 +1,11 @@ package com.chushang.inspection.project.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.common.mybatis.utils.WrapperUtils; -import com.chushang.datascope.annotation.DataScope; -import com.chushang.inspection.project.entity.query.InsDetailQuery; import com.chushang.inspection.project.service.InspectionDetailService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.InspectionDetail; +import com.chushang.inspection.project.po.InspectionDetail; import com.chushang.inspection.project.mapper.InspectionDetailMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskAutographServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskAutographServiceImpl.java index 7e15754..370ac7e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskAutographServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskAutographServiceImpl.java @@ -4,7 +4,7 @@ import com.chushang.inspection.project.service.PollingTaskAutographService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.project.mapper.PollingTaskAutographMapper; -import com.chushang.inspection.project.entity.po.PollingTaskAutograph; +import com.chushang.inspection.project.po.PollingTaskAutograph; /** * @auther: zhao * @date: 2024/6/18 15:39 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java index 6880842..a2053f0 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java @@ -7,12 +7,10 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.chushang.common.core.constant.SecurityConstants; -import com.chushang.common.core.util.SpringUtils; import com.chushang.common.core.util.TreeUtils; import com.chushang.common.core.web.Result; import com.chushang.common.excel.utils.ExcelUtils; @@ -20,11 +18,11 @@ import com.chushang.common.mybatis.enums.Operator; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.datascope.annotation.DataScope; -import com.chushang.inspection.project.entity.dto.TaskDTO; -import com.chushang.inspection.project.entity.dto.TaskExcelDTO; -import com.chushang.inspection.project.entity.dto.TaskQuery; -import com.chushang.inspection.project.entity.vo.ConfigVO; -import com.chushang.inspection.project.entity.vo.TaskVO; +import com.chushang.inspection.project.dto.TaskDTO; +import com.chushang.inspection.project.dto.TaskExcelDTO; +import com.chushang.inspection.project.dto.TaskQuery; +import com.chushang.inspection.project.vo.ConfigVO; +import com.chushang.inspection.project.vo.TaskVO; import com.chushang.inspection.project.service.PollingTaskService; import com.chushang.security.utils.SecurityUtils; import com.chushang.task.entity.dto.CreateTaskDTO; @@ -37,7 +35,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.project.mapper.PollingTaskMapper; -import com.chushang.inspection.project.entity.po.PollingTask; +import com.chushang.inspection.project.po.PollingTask; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/UserAutographServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/UserAutographServiceImpl.java index b26263b..e54e632 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/UserAutographServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/UserAutographServiceImpl.java @@ -1,7 +1,7 @@ package com.chushang.inspection.project.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.project.entity.po.UserAutograph; +import com.chushang.inspection.project.po.UserAutograph; import com.chushang.inspection.project.mapper.UserAutographMapper; import com.chushang.inspection.project.service.UserAutographService; import lombok.extern.slf4j.Slf4j; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumableDetailsController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumableDetailsController.java index 95d4007..8c1b87b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumableDetailsController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumableDetailsController.java @@ -1,11 +1,14 @@ package com.chushang.inspection.terminal.controller; -import com.chushang.inspection.terminal.ConsumableDetails; +import com.chushang.common.core.web.AjaxResult; +import com.chushang.common.log.annotation.SysLog; +import com.chushang.inspection.terminal.po.ConsumableDetails; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; import com.chushang.inspection.terminal.service.ConsumableDetailsService; -import com.chushang.inspection.terminal.service.impl.ConsumableDetailsServiceImpl; +import com.chushang.security.annotation.RequiresPermissions; +import lombok.extern.java.Log; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; /** @@ -14,23 +17,16 @@ import javax.annotation.Resource; * @author xxxxx */ @RestController -@RequestMapping("/consumable_details") +@RequestMapping("/consumable/details") public class ConsumableDetailsController { -/** -* 服务对象 -*/ @Resource ConsumableDetailsService consumableDetailsService; - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("selectOne") - public ConsumableDetails selectOne(Integer id) { - return consumableDetailsService.getById(id); + * 查询耗材详情 + */ + @PostMapping("/page") + @RequiresPermissions("consumables:details:page") + public AjaxResult findPage(@RequestBody @Validated ConsumablesDetailsQuery query) { + return AjaxResult.success(consumableDetailsService.findPage(query)); } - } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumablesTotalController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumablesTotalController.java index e53ae46..b72a250 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumablesTotalController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/ConsumablesTotalController.java @@ -1,12 +1,22 @@ package com.chushang.inspection.terminal.controller; -import com.chushang.inspection.terminal.ConsumablesTotal; +import cn.hutool.core.bean.BeanUtil; +import com.chushang.common.core.validator.Create; +import com.chushang.common.core.validator.Update; +import com.chushang.common.core.web.AjaxResult; +import com.chushang.common.log.annotation.SysLog; +import com.chushang.common.log.enums.BusinessType; +import com.chushang.inspection.terminal.dto.ConsumablesTotalDTO; +import com.chushang.inspection.terminal.po.ConsumablesTotal; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; +import com.chushang.inspection.terminal.query.ConsumablesTotalQuery; import com.chushang.inspection.terminal.service.ConsumablesTotalService; -import com.chushang.inspection.terminal.service.impl.ConsumablesTotalServiceImpl; +import com.chushang.security.annotation.RequiresPermissions; +import lombok.extern.java.Log; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; - import javax.annotation.Resource; +import javax.validation.constraints.NotNull; /** * (consumables_total)表控制层 @@ -33,4 +43,60 @@ public class ConsumablesTotalController { return consumablesTotalService.getById(id); } + /** + * 查询耗材总数 + * + * @param query 条件 + */ + @GetMapping("/page") + @RequiresPermissions("consumables:total:page") + public AjaxResult findPage(@RequestBody @Validated ConsumablesTotalQuery query) { + return AjaxResult.success(consumablesTotalService.findPage(query)); + } + + + /** + * 查询耗材详情 + */ + @GetMapping("/info/{totalId}") + @RequiresPermissions("consumables:total:info") + public AjaxResult info(@PathVariable Long totalId) { + return AjaxResult.success(consumablesTotalService.getById(totalId)); + } + + + /** + * 入库 + */ + @SysLog(value = "耗材入库", businessType = BusinessType.INSERT) + @PostMapping("/storage") + @RequiresPermissions("consumables:total:storage") + public AjaxResult storage(@RequestBody @Validated(Create.class) ConsumablesTotalDTO total) { + consumablesTotalService.storage(total); + return AjaxResult.success(); + } + + /** + * 出库 + */ + @SysLog(value = "耗材出库", businessType = BusinessType.UPDATE) + @PostMapping("/out") + @RequiresPermissions("consumables:total:out") + public AjaxResult outOfWarehouse(@RequestBody @Validated(Update.class) ConsumablesTotalDTO total) { + consumablesTotalService.outOfWarehouse(total); + return AjaxResult.success(); + } + + /** + * 修改 + */ + @SysLog(value = "耗材", businessType = BusinessType.UPDATE) + @PostMapping("/update") + @RequiresPermissions("consumables:total:update") + public AjaxResult update(@RequestBody @Validated(Update.class) ConsumablesTotalDTO total) { + consumablesTotalService.updateById(BeanUtil.copyProperties(total, ConsumablesTotal.class)); + return AjaxResult.success(); + } + + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumableDetailsMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumableDetailsMapper.java index 78de771..97e0461 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumableDetailsMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumableDetailsMapper.java @@ -1,11 +1,19 @@ package com.chushang.inspection.terminal.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.terminal.ConsumableDetails; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.inspection.terminal.po.ConsumableDetails; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; +import com.chushang.security.entity.po.SysUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @auther: zhao * @date: 2024/6/21 11:47 */ public interface ConsumableDetailsMapper extends BaseMapper { -} \ No newline at end of file + List findPage(@Param("query") ConsumablesDetailsQuery query, + Page page); +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumablesTotalMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumablesTotalMapper.java index d9d3c74..0e1673c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumablesTotalMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/mapper/ConsumablesTotalMapper.java @@ -1,11 +1,20 @@ package com.chushang.inspection.terminal.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.inspection.terminal.ConsumablesTotal; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.inspection.terminal.po.ConsumableDetails; +import com.chushang.inspection.terminal.po.ConsumablesTotal; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; +import com.chushang.security.entity.po.SysUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @auther: zhao * @date: 2024/6/21 11:47 */ public interface ConsumablesTotalMapper extends BaseMapper { -} \ No newline at end of file + List findPage(@Param("query") ConsumablesDetailsQuery query, + Page page); +} diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumableDetailsService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumableDetailsService.java index 3577da2..42d3a5b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumableDetailsService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumableDetailsService.java @@ -1,12 +1,18 @@ package com.chushang.inspection.terminal.service; -import com.chushang.inspection.terminal.ConsumableDetails; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.inspection.terminal.po.ConsumableDetails; import com.baomidou.mybatisplus.extension.service.IService; - /** - * @auther: zhao - * @date: 2024/6/21 11:47 - */ -public interface ConsumableDetailsService extends IService{ +import com.chushang.inspection.terminal.po.ConsumablesTotal; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; +/** + * @auther: zhao + * @date: 2024/6/21 11:47 + */ +public interface ConsumableDetailsService extends IService { + PageResult findPage(ConsumablesDetailsQuery query); + + void saveDetails(ConsumablesTotal consumablesTotal, Integer total, int type); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumablesTotalService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumablesTotalService.java index a3da970..66eba0d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumablesTotalService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/ConsumablesTotalService.java @@ -1,12 +1,21 @@ package com.chushang.inspection.terminal.service; -import com.chushang.inspection.terminal.ConsumablesTotal; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.inspection.terminal.dto.ConsumablesTotalDTO; +import com.chushang.inspection.terminal.po.ConsumablesTotal; import com.baomidou.mybatisplus.extension.service.IService; - /** - * @auther: zhao - * @date: 2024/6/21 11:47 - */ -public interface ConsumablesTotalService extends IService{ +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; +import com.chushang.inspection.terminal.query.ConsumablesTotalQuery; +/** + * @auther: zhao + * @date: 2024/6/21 11:47 + */ +public interface ConsumablesTotalService extends IService { + PageResult findPage(ConsumablesTotalQuery query); + + void storage(ConsumablesTotalDTO total); + + void outOfWarehouse(ConsumablesTotalDTO total); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumableDetailsServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumableDetailsServiceImpl.java index 2f7efa1..7766be4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumableDetailsServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumableDetailsServiceImpl.java @@ -1,11 +1,22 @@ package com.chushang.inspection.terminal.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.common.core.web.AjaxResult; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.datascope.annotation.DataScope; +import com.chushang.inspection.terminal.po.ConsumablesTotal; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; import com.chushang.inspection.terminal.service.ConsumableDetailsService; +import com.chushang.security.entity.po.SysUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.terminal.mapper.ConsumableDetailsMapper; -import com.chushang.inspection.terminal.ConsumableDetails; +import com.chushang.inspection.terminal.po.ConsumableDetails; + +import java.time.LocalDateTime; +import java.util.List; + /** * @auther: zhao * @date: 2024/6/21 11:47 @@ -14,4 +25,28 @@ import com.chushang.inspection.terminal.ConsumableDetails; @Service public class ConsumableDetailsServiceImpl extends ServiceImpl implements ConsumableDetailsService { + @Override + @DataScope(deptAlias = "cd") + public PageResult findPage(ConsumablesDetailsQuery query) { + Page page = new Page<>(query.getPage(),query.getLimit()); + List listAfDataVOList = baseMapper.findPage(query, + page); + return new PageResult( + listAfDataVOList, + page.getTotal(), + page.getPages(), + page.getCurrent()); + } + + @Override + public void saveDetails(ConsumablesTotal consumablesTotal, Integer total, int type) { + ConsumableDetails details = ConsumableDetails + .builder() + .totalId(consumablesTotal.getTotalId()) + .inboundAndOutboundType(type) + .deptId(consumablesTotal.getDeptId()) + .quantity(total) + .build(); + save(details); + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumablesTotalServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumablesTotalServiceImpl.java index 58ffb51..52c75a2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumablesTotalServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/ConsumablesTotalServiceImpl.java @@ -1,11 +1,34 @@ package com.chushang.inspection.terminal.service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.chushang.common.mybatis.enums.Operator; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.common.mybatis.utils.WrapperUtils; +import com.chushang.datascope.annotation.DataScope; +import com.chushang.inspection.project.po.WrkAudit; +import com.chushang.inspection.terminal.dto.ConsumablesTotalDTO; +import com.chushang.inspection.terminal.po.ConsumableDetails; +import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery; +import com.chushang.inspection.terminal.query.ConsumablesTotalQuery; +import com.chushang.inspection.terminal.service.ConsumableDetailsService; import com.chushang.inspection.terminal.service.ConsumablesTotalService; +import com.chushang.security.entity.po.SysUser; +import com.chushang.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.inspection.terminal.ConsumablesTotal; +import com.chushang.inspection.terminal.po.ConsumablesTotal; import com.chushang.inspection.terminal.mapper.ConsumablesTotalMapper; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + /** * @auther: zhao * @date: 2024/6/21 11:47 @@ -14,4 +37,50 @@ import com.chushang.inspection.terminal.mapper.ConsumablesTotalMapper; @Service public class ConsumablesTotalServiceImpl extends ServiceImpl implements ConsumablesTotalService { + @Resource + ConsumableDetailsService detailsService; + + @Override + @DataScope + public PageResult findPage(ConsumablesTotalQuery query) { + CommonParam commonParam = CommonParam.buildPageRequest(); + LambdaQueryWrapper totalSql = WrapperUtils.builder(query, commonParam); + IPage page = this.page( + new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), + totalSql + ); + return new PageResult(page); + } + + @Override + @Transactional + public void storage(ConsumablesTotalDTO total) { + LambdaQueryWrapper totalSql = WrapperUtils.builder(); + totalSql.eq(ConsumablesTotal::getTaskId, total.getTaskId()) + .eq(ConsumablesTotal::getType, total.getType()) + .last(Operator.LIMIT_ONE.getCharacter()); + ConsumablesTotal consumablesTotal = getOne(totalSql); + if (consumablesTotal == null) { + consumablesTotal = BeanUtil.copyProperties(total, ConsumablesTotal.class); + consumablesTotal.setDeptId(SecurityUtils.getDeptId()); + save(consumablesTotal); + } else { + consumablesTotal.setTotal(consumablesTotal.getTotal() + total.getTotal()); + updateById(consumablesTotal); + } + + detailsService.saveDetails(consumablesTotal, total.getTotal(), 1); + } + + @Override + public void outOfWarehouse(ConsumablesTotalDTO total) { + ConsumablesTotal consumablesTotal = getById(total.getTotalId()); + Assert.isTrue(consumablesTotal == null || consumablesTotal.getTotal() < total.getTotal() + , "耗材不存在或耗材总数不够出库的数量"); + assert consumablesTotal != null; + consumablesTotal.setTotal(consumablesTotal.getTotal() - total.getTotal()); + updateById(consumablesTotal); + // 出库 + detailsService.saveDetails(consumablesTotal, total.getTotal(), 2); + } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml index ad2188b..bd9a321 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml @@ -1,7 +1,7 @@ - + @@ -15,10 +15,29 @@ + - detail_id, dept_id, total_id, inbound_and_outbound_type, quantity, version, del_state, - create_by, create_time, update_by, update_time + detail_id, dept_id, total_id, inbound_and_outbound_type, quantity, version, del_state, + create_by, create_time, update_by, update_time, type - \ No newline at end of file + + + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumablesTotalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumablesTotalMapper.xml index 648317d..f683f96 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumablesTotalMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumablesTotalMapper.xml @@ -1,7 +1,7 @@ - + @@ -20,7 +20,9 @@ - total_id, dept_id, `type`, `source`, total, remark, task_id, version, del_state, + total_id, dept_id, `type`, `source`, total, remark, task_id, version, del_state, create_by, create_time, update_by, update_time - \ No newline at end of file + + + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionConfigMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionConfigMapper.xml index 288909d..789837e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionConfigMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionConfigMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml index e9920e7..5e45bc6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDetailMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDetailMapper.xml index 68afdcc..531a3a8 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDetailMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDetailMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskAutographMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskAutographMapper.xml index 6d10b4f..37f2a1d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskAutographMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskAutographMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskMapper.xml index 211abb6..295277e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml index ca85290..658cbca 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml index 61b894b..466cf3b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml index 8229314..471e8f0 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml index 70b0998..9ce1059 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml @@ -1,7 +1,7 @@ - +