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

维修员，库管员配置

This commit is contained in:
hongchao 2025-07-11 09:10:51 +08:00
parent d8d56b2fb4
commit 88923d1b22
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -459,7 +459,7 @@ public class TmTaskServiceImpl implements TmTaskService {
public List<TmTask> getLeaseAuditList(TmTask record) {
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
List<TmTask> tmTaskList;
if (roles.contains(STRING_ADMIN)) {
if (roles.contains(STRING_ADMIN) || roles.contains("sysadmin")) {
tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record);
} else {
long username = SecurityUtils.getLoginUser().getUserid();
@ -705,7 +705,7 @@ public class TmTaskServiceImpl implements TmTaskService {
public List<TmTask> getLeaseOutListByUser(TmTask task) {
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
List<TmTask> tmTaskList;
if (roles.contains(STRING_ADMIN)) {
if (roles.contains(STRING_ADMIN) || roles.contains("sysadmin")) {
tmTaskList = tmTaskMapper.getLeaseOutList(task);
} else {

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java
View File

@ -138,6 +138,13 @@ public class RepairTask {
@Excel(name = "已维修数量",sort = 4)
private int repairFinishNum;
/**
* 待维修数量
*/
@ApiModelProperty(value = "待维修数量")
@Excel(name = "已维修数量",sort = 5)
private int repairNotFinishNum;
/**
* 技术鉴定
*/

3
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaintenanceGangMapper.xml
View File

@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeName != null and typeName != ''">
AND mt2.type_name like concat('%', #{typeName}, '%')
</if>
<if test="userName != null and userName != ''">
AND su.nick_name like concat('%', #{userName}, '%')
</if>
ORDER BY su.user_id DESC, mt.type_id DESC
</select>

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

@ -265,6 +265,7 @@
mt.type_name as typeName,
sum(rd.repair_num) as repairNum,
sum(rd.repaired_num + rd.scrap_num) as repairFinishNum,
sum(rd.repair_num) - sum(rd.repaired_num + rd.scrap_num) as repairNotFinishNum,
GROUP_CONCAT(DISTINCT rd.repair_remark SEPARATOR ',') as repairRemark,
mt.manage_type as manageType
from
@ -282,9 +283,9 @@
<if test="userId != null and userId != ''">
and mtr.user_id = #{userId}
</if>
<if test="companyId != null and companyId != ''">
and rd.company_id = #{companyId}
</if>
<!-- <if test="companyId != null and companyId != ''">-->
<!-- and rd.company_id = #{companyId}-->
<!-- </if>-->
group by mt.type_id
order by mt.type_id
</select>
@ -462,9 +463,9 @@
<if test="userId != null and userId != ''">
and mtr.user_id = #{userId}
</if>
<if test="companyId != null and companyId != ''">
and rad.company_id = #{companyId}
</if>
<!-- <if test="companyId != null and companyId != ''">-->
<!-- and rad.company_id = #{companyId}-->
<!-- </if>-->
<if test="code !=null and code != ''">
AND mm.ma_code like concat('%',#{code},'%')
</if>

3
sgzb-modules/sgzb-material/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
View File

@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeName != null and typeName != ''">
AND mt2.type_name like concat('%', #{typeName}, '%')
</if>
<if test="userName != null and userName != ''">
AND su.nick_name like concat('%', #{userName}, '%')
</if>
ORDER BY su.user_id DESC, mt.type_id DESC
</select>