bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

This commit is contained in:
1539530615@qq.com 2024-01-24 15:33:56 +08:00
parent 0c20b4064e 96b479c2f8
commit 15448488d8
12 changed files with 114 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java → sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTaskDetails.java
View File

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

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

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

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

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

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

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

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

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

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

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

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

@ -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,

23
sgzb-modules/sgzb-material/pom.xml
View File

@ -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>

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

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

88
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTaskDetails.java Normal file
View File

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

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

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

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

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