项目审核

localizer
ljw 2025-09-19 11:53:51 +08:00
parent 615840fe23
commit c9b8f214b0
3 changed files with 19 additions and 3 deletions

View File

@ -30,6 +30,7 @@ public class SearchBizProjectResult {
* Id
*/
private Long userId;
private String nickname;
private Long companyId;
private String companyName;
@ -38,6 +39,8 @@ public class SearchBizProjectResult {
*/
private Long otherUserId;
private String otherNickname;
/**
* Id
*/

View File

@ -1,6 +1,7 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -57,7 +58,9 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
*
*/
public PageResult<SearchBizProjectResult> paging(PageParam pageParam, BizProjectEntity bizProjectEntity) {
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<BizProjectEntity>query(bizProjectEntity)));
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<BizProjectEntity>query()
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
));
}
@Transactional(rollbackFor = Exception.class)
@ -72,7 +75,7 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
}
boolean updated = update(Wrappers.<BizProjectEntity>lambdaUpdate()
.set(BizProjectEntity::getAuditStatus, auditStatus)
.set(BizProjectEntity::getAuditMemo, auditStatus == AuditStatus.TongGuo ? "" : auditMemo)
.set(BizProjectEntity::getAuditMemo, auditMemo)
.eq(BizProjectEntity::getId, id)
.eq(BizProjectEntity::getAuditStatus, AuditStatus.DaiShenHe));
if (!updated) {

View File

@ -35,9 +35,19 @@
a.audit_memo,
b.company_name other_company_name,
c.company_name,
c.id company_id
c.id company_id,
d.nickname,
e.nickname other_nickname
FROM biz_project a
INNER JOIN biz_company b ON b.id = a.other_company_id AND b.deleted = 0
INNER JOIN biz_company c ON c.user_id = a.user_id AND b.deleted = 0
INNER JOIN sys_user d ON a.user_id = d.id AND b.deleted = 0
INNER JOIN sys_user e ON a.other_user_id = e.id AND b.deleted = 0
<where>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</where>
ORDER BY a.modify_time DESC
</select>
</mapper>