Quella/projectSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug

Browse Source
This commit is contained in:
Quella
2025-09-09 10:24:33 +08:00
parent 363f7d1a2f
commit 35ebacc326
6 changed files with 158 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/models/domain/BizModule.java
View File

@@ -37,13 +37,13 @@ public class BizModule extends BaseEntity
private String assignee;
/** 接取时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "接取时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "接取时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date assignTime;
/** 完成时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;
/** 删除标志0=正常,2=软删除 */

19
ruoyi-admin/src/main/java/com/ruoyi/models/service/impl/BizModuleServiceImpl.java
View File

@@ -11,6 +11,8 @@ import com.ruoyi.models.domain.BizModule;
import com.ruoyi.models.service.IBizModuleService;
import com.ruoyi.project.domain.BizProject;
import com.ruoyi.project.service.IBizProjectService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.common.core.domain.entity.SysUser;
/**
* 模块Service业务层处理
@@ -26,6 +28,9 @@ public class BizModuleServiceImpl implements IBizModuleService {
@Autowired
private IBizProjectService projectService;
@Autowired
private ISysUserService sysUserService;
/**
* 查询模块
*
@@ -140,9 +145,17 @@ public class BizModuleServiceImpl implements IBizModuleService {
}
module.setStatus("1"); // 进行中
// 这里需要设置用户名而不是用户ID，但我们需要查询用户名
// 暂时设置为用户ID，后续需要优化
module.setAssignee(String.valueOf(userId));
// 设置接取人为用户名（非ID）
try {
SysUser u = sysUserService.selectUserById(userId);
if (u != null && u.getUserName() != null) {
module.setAssignee(u.getUserName());
} else {
module.setAssignee(String.valueOf(userId));
}
} catch (Exception ex) {
module.setAssignee(String.valueOf(userId));
}
module.setAssignTime(DateUtils.getNowDate());
return updateBizModule(module);
}

33
ruoyi-admin/src/main/resources/mapper/models/BizModuleMapper.xml
View File

@@ -20,10 +20,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBizModuleVo">
select m.module_id, m.project_id, m.module_name, m.status, m.assignee, m.assign_time, m.finish_time,
m.del_flag, m.create_by, m.create_time, m.designated_user, p.project_name
select m.module_id,
m.project_id,
m.module_name,
m.status,
COALESCE(u1.nick_name, u1.user_name, u2.nick_name, u2.user_name, m.assignee) as assignee,
m.assign_time,
m.finish_time,
m.del_flag,
m.create_by,
m.create_time,
m.designated_user,
p.project_name
from biz_module m
left join biz_project p on m.project_id = p.project_id
left join sys_user u1 on u1.user_id = CAST(m.assignee AS UNSIGNED)
left join sys_user u2 on u2.user_name = m.assignee
</sql>
<select id="selectBizModuleList" parameterType="BizModule" resultMap="BizModuleResult">
@@ -129,11 +141,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<select id="selectAssignedModules" parameterType="Long" resultMap="BizModuleResult">
select m.module_id, m.project_id, m.module_name, m.status, m.assignee, m.assign_time, m.finish_time,
m.del_flag, m.create_by, m.create_time, m.designated_user, m.update_by, m.update_time,
select m.module_id,
m.project_id,
m.module_name,
m.status,
COALESCE(u1.nick_name, u1.user_name, u2.nick_name, u2.user_name, m.assignee) as assignee,
m.assign_time,
m.finish_time,
m.del_flag,
m.create_by,
m.create_time,
m.designated_user,
m.update_by,
m.update_time,
p.project_name
from biz_module m
left join biz_project p on m.project_id = p.project_id
left join sys_user u1 on u1.user_id = CAST(m.assignee AS UNSIGNED)
left join sys_user u2 on u2.user_name = m.assignee
where m.designated_user = #{userId} and m.del_flag = '0'
order by m.create_time desc
</select>