Merge branch 'dev' into test

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTaskDetails.java

@@ -1,4 +1,4 @@
-package com.bonus.sgzb.base.domain;
+package com.bonus.sgzb.base.api.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java

@@ -51,7 +51,7 @@ public class TokenController {
             // 获取登录token
             return R.ok(tokenService.createToken(userInfo));
         } else {
-            return R.fail("验证码已过期，请刷新验证码");
+            return R.fail("验证码错误");
         }
     }
 

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java

@@ -1,6 +1,7 @@
 package com.bonus.sgzb.base.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.*;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.base.service.RepairService;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java

@@ -3,7 +3,7 @@ package com.bonus.sgzb.base.mapper;
 import com.bonus.sgzb.base.domain.RepairApplyRecord;
 import com.bonus.sgzb.base.domain.RepairPartDetails;
 import com.bonus.sgzb.base.domain.RepairTask;
-import com.bonus.sgzb.base.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.system.api.domain.SysUser;
 import org.apache.ibatis.annotations.Mapper;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java

@@ -2,7 +2,7 @@ package com.bonus.sgzb.base.service;
 
 import com.bonus.sgzb.base.domain.RepairApplyRecord;
 import com.bonus.sgzb.base.domain.RepairTask;
-import com.bonus.sgzb.base.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.system.api.domain.SysUser;

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java

@@ -3,7 +3,7 @@ package com.bonus.sgzb.base.service.impl;
 import com.bonus.sgzb.base.domain.RepairApplyRecord;
 import com.bonus.sgzb.base.domain.RepairPartDetails;
 import com.bonus.sgzb.base.domain.RepairTask;
-import com.bonus.sgzb.base.domain.RepairTaskDetails;
+import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
 import com.bonus.sgzb.base.domain.vo.DictVo;
 import com.bonus.sgzb.base.mapper.RepairMapper;
 import com.bonus.sgzb.base.service.RepairService;

sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml

@@ -178,7 +178,7 @@
             tt.create_time DESC
     </select>
 
-    <select id="getRepairMaTypeList" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
+    <select id="getRepairMaTypeList" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
         select rad.id as id,
                rad.task_id as taskId,
                rad.ma_id as maId,
@@ -213,7 +213,7 @@
         order by rad.create_time desc
     </select>
 
-    <select id="getById" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
+    <select id="getById" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
         select rad.id as id,
                rad.repair_num as repairNum,
                rad.repaired_num as repairedNum,
@@ -248,7 +248,7 @@
         left join sys_dic s2 on s2.p_id = s1.id
         where s1.value = #{value} and s2.status = 0
     </select>
-    <select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
+    <select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
         select id,
                ma_id as maId,
                type_id as typeId,

sgzb-modules/sgzb-material/pom.xml

@@ -107,13 +107,6 @@
             <version>5.8.16</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.bonus.sgzb</groupId>
-            <artifactId>sgzb-modules-base</artifactId>
-            <version>3.6.3</version>
-            <scope>compile</scope>
-        </dependency>
-
     </dependencies>
 
     <properties>
@@ -121,4 +114,20 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java

@@ -5,7 +5,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
-import com.bonus.sgzb.material.domain.ScrapApplyDetails;
 import com.bonus.sgzb.material.service.IRepairAuditDetailsService;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java

@@ -0,0 +1,88 @@
+package com.bonus.sgzb.material.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author c liu
+ * @date 2023/12/11
+ */
+@Data
+@ApiModel(value="维修任务明细")
+public class RepairTaskDetails {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 任务ID
+     */
+    @ApiModelProperty(value = "任务ID")
+    private String taskId;
+    /**
+     * 机具ID
+     */
+    @ApiModelProperty(value = "机具ID")
+    private String maId;
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value = "类型名称")
+    private String typeName;
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty(value = "规格型号")
+    private String type;
+    /**
+     * 编码
+     */
+    @ApiModelProperty(value = "编码")
+    private String code;
+    /**
+     * 维修总量
+     */
+    @ApiModelProperty(value = "维修总量")
+    private int repairNum;
+    /**
+     * 维修合格数量
+     */
+    @ApiModelProperty(value = "维修合格数量")
+    private int repairedNum;
+    /**
+     * 维修报废数量
+     */
+    @ApiModelProperty(value = "维修报废数量")
+    private int scrapNum;
+    /**
+     * 待修状态
+     */
+    @ApiModelProperty(value = "待修状态")
+    private String status;
+    /**
+     * 更新者
+     */
+    @ApiModelProperty(value = "更新者")
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private String updateTime;
+    /**
+     * 维修人
+     */
+    @ApiModelProperty(value = "维修人")
+    private String repairer;
+    private String keyword;
+    private String typeId;
+    private Long companyId;
+    /**
+     * 任务创建人
+     */
+    @ApiModelProperty(value = "任务创建人")
+    private Long createBy;
+
+}

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java

@@ -1,7 +1,7 @@
 package com.bonus.sgzb.material.mapper;
 
-import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairTaskDetails;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
 import org.apache.ibatis.annotations.Mapper;

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.bonus.sgzb.base.domain.RepairTaskDetails;
 import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;