1. 耗材 相关接口

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.*;
 

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();

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;

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;

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;

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;

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;

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;

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;

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;

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;

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;
+}

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.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 /**
   * @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;
 }

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;
 }

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;
+}

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;
+
+
+}

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.po.InspectionConfig;
-import com.chushang.inspection.project.entity.query.InsConfigQuery;
+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;

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.dto.Delete;
-import com.chushang.inspection.project.entity.po.InspectionDetail;
+import com.chushang.inspection.project.po.InspectionDetail;
-import com.chushang.inspection.project.entity.query.InsDetailQuery;
+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;

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.dto.Delete;
-import com.chushang.inspection.project.entity.dto.TaskDTO;
+import com.chushang.inspection.project.dto.TaskDTO;
-import com.chushang.inspection.project.entity.dto.TaskExcelDTO;
+import com.chushang.inspection.project.dto.TaskExcelDTO;
-import com.chushang.inspection.project.entity.dto.TaskQuery;
+import com.chushang.inspection.project.dto.TaskQuery;
-import com.chushang.inspection.project.entity.vo.ConfigVO;
+import com.chushang.inspection.project.vo.ConfigVO;
-import com.chushang.inspection.project.entity.vo.TaskVO;
+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;

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;

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.dto.Delete;
-import com.chushang.inspection.project.entity.dto.UserAutographDTO;
+import com.chushang.inspection.project.dto.UserAutographDTO;
-import com.chushang.inspection.project.entity.po.UserAutograph;
+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.*;

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.dto.AuditDTO;
-import com.chushang.inspection.project.entity.dto.AuditDTO;
+import com.chushang.inspection.project.dto.PageAuditDTO;
-import com.chushang.inspection.project.entity.dto.PageAuditDTO;
 import com.chushang.inspection.project.service.WrkAuditService;
 import com.chushang.security.annotation.RequiresPermissions;
 import lombok.extern.slf4j.Slf4j;

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.dto.ContractDTO;
-import com.chushang.inspection.project.entity.dto.ProjectDTO;
+import com.chushang.inspection.project.dto.ProjectDTO;
-import com.chushang.inspection.project.entity.po.WrkProject;
+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;

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.*;
 

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

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

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

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

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

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

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

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

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

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

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.po.InspectionConfig;
-import com.chushang.inspection.project.entity.po.WrkProjectContract;
+import com.chushang.inspection.project.query.InsConfigQuery;
-import com.chushang.inspection.project.entity.query.InsConfigQuery;
+import com.chushang.inspection.project.vo.InsConfigVO;
-import com.chushang.inspection.project.entity.vo.InsConfigVO;
-import org.springframework.cache.annotation.CacheEvict;
-
-import java.util.List;
 
 /**
   * @auther: zhao

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

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.po.InspectionDetail;
-import com.chushang.inspection.project.entity.po.InspectionDetail;
+import com.chushang.inspection.project.query.InsDetailQuery;
-import com.chushang.inspection.project.entity.query.InsDetailQuery;
 
 import java.util.List;
 

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.dto.TaskGraphDTO;
-import com.chushang.inspection.project.entity.po.PollingTaskAutograph;
+import com.chushang.inspection.project.po.PollingTaskAutograph;
 
 /**
   * @auther: zhao

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.dto.TaskDTO;
-import com.chushang.inspection.project.entity.dto.TaskExcelDTO;
+import com.chushang.inspection.project.dto.TaskExcelDTO;
-import com.chushang.inspection.project.entity.dto.TaskQuery;
+import com.chushang.inspection.project.dto.TaskQuery;
-import com.chushang.inspection.project.entity.po.PollingTask;
+import com.chushang.inspection.project.po.PollingTask;
-import com.chushang.inspection.project.entity.vo.ConfigVO;
+import com.chushang.inspection.project.vo.ConfigVO;
-import com.chushang.inspection.project.entity.vo.TaskVO;
+import com.chushang.inspection.project.vo.TaskVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;

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

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.dto.AuditDTO;
-import com.chushang.inspection.project.entity.dto.PageAuditDTO;
+import com.chushang.inspection.project.dto.PageAuditDTO;
-import com.chushang.inspection.project.entity.po.WrkProjectContract;
+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;

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

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.dto.PaymentDTO;
-import com.chushang.inspection.project.entity.dto.PaymentDTO;
+import com.chushang.inspection.project.po.WrkProject;
-import com.chushang.inspection.project.entity.po.WrkProject;
+import com.chushang.inspection.project.po.WrkProjectContract;
-import com.chushang.inspection.project.entity.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;

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.dto.ContractDTO;
-import com.chushang.inspection.project.entity.dto.ProjectDTO;
+import com.chushang.inspection.project.dto.ProjectDTO;
-import com.chushang.inspection.project.entity.po.WrkAudit;
+import com.chushang.inspection.project.po.WrkAudit;
-import com.chushang.inspection.project.entity.po.WrkProjectContract;
+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

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.po.InspectionDetail;
-import com.chushang.inspection.project.entity.vo.DetailsVO;
+import com.chushang.inspection.project.vo.DetailsVO;
-import com.chushang.inspection.project.entity.vo.InsConfigVO;
+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;
 

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

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;
 

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

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.dto.TaskDTO;
-import com.chushang.inspection.project.entity.dto.TaskExcelDTO;
+import com.chushang.inspection.project.dto.TaskExcelDTO;
-import com.chushang.inspection.project.entity.dto.TaskQuery;
+import com.chushang.inspection.project.dto.TaskQuery;
-import com.chushang.inspection.project.entity.vo.ConfigVO;
+import com.chushang.inspection.project.vo.ConfigVO;
-import com.chushang.inspection.project.entity.vo.TaskVO;
+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;
 

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;

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 主键
+    @PostMapping("/page")
-    * @return 单条数据
+    @RequiresPermissions("consumables:details:page")
-    */
+    public AjaxResult findPage(@RequestBody @Validated ConsumablesDetailsQuery query) {
-    @GetMapping("selectOne")
+        return AjaxResult.success(consumableDetailsService.findPage(query));
-    public ConsumableDetails selectOne(Integer id) {
-    return consumableDetailsService.getById(id);
     }
-
 }

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();
+    }
+
+
 }

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<ConsumableDetails> {
-}
+    List<ConsumableDetails> findPage(@Param("query") ConsumablesDetailsQuery query,
+                                     Page<SysUser> page);
+}

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<ConsumablesTotal> {
-}
+    List<ConsumableDetails> findPage(@Param("query") ConsumablesDetailsQuery query,
+                                     Page<SysUser> page);
+}

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;
-    /**
+import com.chushang.inspection.terminal.po.ConsumablesTotal;
-  * @auther: zhao
+import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery;
-  * @date: 2024/6/21 11:47
-  */
-public interface ConsumableDetailsService extends IService<ConsumableDetails>{
 
+/**
+ * @auther: zhao
+ * @date: 2024/6/21 11:47
+ */
+public interface ConsumableDetailsService extends IService<ConsumableDetails> {
 
+    PageResult findPage(ConsumablesDetailsQuery query);
+
+    void saveDetails(ConsumablesTotal consumablesTotal, Integer total, int type);
 }

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;
-    /**
+import com.chushang.inspection.terminal.query.ConsumablesDetailsQuery;
-  * @auther: zhao
+import com.chushang.inspection.terminal.query.ConsumablesTotalQuery;
-  * @date: 2024/6/21 11:47
-  */
-public interface ConsumablesTotalService extends IService<ConsumablesTotal>{
 
+/**
+ * @auther: zhao
+ * @date: 2024/6/21 11:47
+ */
+public interface ConsumablesTotalService extends IService<ConsumablesTotal> {
 
+    PageResult findPage(ConsumablesTotalQuery query);
+
+    void storage(ConsumablesTotalDTO total);
+
+    void outOfWarehouse(ConsumablesTotalDTO total);
 }

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<ConsumableDetailsMapper, ConsumableDetails> implements ConsumableDetailsService {
 
+    @Override
+    @DataScope(deptAlias = "cd")
+    public PageResult findPage(ConsumablesDetailsQuery query) {
+        Page<SysUser> page = new Page<>(query.getPage(),query.getLimit());
+        List<ConsumableDetails> 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);
+    }
 }

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<ConsumablesTotalMapper, ConsumablesTotal> implements ConsumablesTotalService {
 
+    @Resource
+    ConsumableDetailsService detailsService;
+
+    @Override
+    @DataScope
+    public PageResult findPage(ConsumablesTotalQuery query) {
+        CommonParam commonParam = CommonParam.buildPageRequest();
+        LambdaQueryWrapper<ConsumablesTotal> totalSql = WrapperUtils.builder(query, commonParam);
+        IPage<ConsumablesTotal> 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<ConsumablesTotal> 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);
+    }
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.terminal.mapper.ConsumableDetailsMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.terminal.ConsumableDetails">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.terminal.po.ConsumableDetails">
     <!--@mbg.generated-->
     <!--@Table consumable_details-->
     <result column="detail_id" jdbcType="BIGINT" property="detailId" />
@@ -15,10 +15,29 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="type" property="type" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    detail_id, dept_id, total_id, inbound_and_outbound_type, quantity, version, del_state, 
+    detail_id, dept_id, total_id, inbound_and_outbound_type, quantity, version, del_state,
-    create_by, create_time, update_by, update_time
+    create_by, create_time, update_by, update_time, type
   </sql>
-</mapper>
+
+  <select id="findPage" resultMap="BaseResultMap">
+    SELECT cd.*, ct.type FROM consumable_details cd
+    LEFT JOIN consumables_total ct ON ct.total_id = cd.total_id
+    <where>
+      <if test="query.taskId != null">
+        AND ct.task_id = #{query.taskId}
+      </if>
+      <if test="query.type != null">
+        AND ct.type = #{query.type}
+      </if>
+      <if test="query.totalId != null">
+        AND cd.total_id = #{query.totalId}
+      </if>
+    </where>
+    <!-- 数据范围过滤 -->
+    ${query.sqlParam.dataScope}
+  </select>
+</mapper>

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumablesTotalMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.terminal.mapper.ConsumablesTotalMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.terminal.ConsumablesTotal">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.terminal.po.ConsumablesTotal">
     <!--@mbg.generated-->
     <!--@Table consumables_total-->
     <result column="total_id" jdbcType="BIGINT" property="totalId" />
@@ -20,7 +20,9 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    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
   </sql>
-</mapper>
+
+
+</mapper>

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionConfigMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.InspectionConfigMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.InspectionConfig">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.InspectionConfig">
     <!--@mbg.generated-->
     <!--@Table inspection_config-->
     <id column="config_id" jdbcType="BIGINT" property="configId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDataMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.InspectionDataMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.InspectionData">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.InspectionData">
     <!--@mbg.generated-->
     <!--@Table inspection_data-->
     <id column="data_id" jdbcType="BIGINT" property="dataId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/InspectionDetailMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.InspectionDetailMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.InspectionDetail">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.InspectionDetail">
     <!--@mbg.generated-->
     <!--@Table inspection_detail-->
     <id column="config_id" jdbcType="BIGINT" property="configId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskAutographMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.PollingTaskAutographMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.PollingTaskAutograph">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.PollingTaskAutograph">
     <!--@mbg.generated-->
     <!--@Table polling_task_autograph-->
     <id column="task_id" jdbcType="BIGINT" property="taskId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/PollingTaskMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.PollingTaskMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.PollingTask">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.PollingTask">
     <!--@mbg.generated-->
     <!--@Table polling_task-->
     <id column="id" jdbcType="BIGINT" property="id" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkAuditMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.WrkAuditMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkAudit">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.WrkAudit">
     <!--@mbg.generated-->
     <!--@Table wrk_audit-->
     <id column="audit_id" jdbcType="BIGINT" property="auditId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.WrkProjectContractMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkProjectContract">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.WrkProjectContract">
     <!--@mbg.generated-->
     <!--@Table wrk_project_contract-->
     <id column="contract_id" jdbcType="BIGINT" property="contractId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.WrkProjectMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkProject">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.WrkProject">
     <!--@mbg.generated-->
     <!--@Table wrk_project-->
     <id column="project_id" jdbcType="BIGINT" property="projectId" />

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chushang.inspection.project.mapper.WrkProjectPaymentMapper">
-  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.entity.po.WrkProjectPayment">
+  <resultMap id="BaseResultMap" type="com.chushang.inspection.project.po.WrkProjectPayment">
     <!--@mbg.generated-->
     <!--@Table wrk_project_payment-->
     <result column="payment_id" jdbcType="BIGINT" property="paymentId" />