Browse Source

退窗按钮只能是内审单位才能看到

master
buaixuexideshitongxue 2 weeks ago
parent
commit
38ba73e70e
  1. 14
      src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java
  2. 20
      src/main/java/com/biutag/supervision/pojo/dto/QuerySecondDTO.java
  3. 3
      src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java
  4. 16
      src/main/java/com/biutag/supervision/service/SupDepartService.java

14
src/main/java/com/biutag/supervision/controller/report/ReportProjectController.java

@ -19,6 +19,7 @@ import com.biutag.supervision.constants.enums.DeleteStatusEnum;
import com.biutag.supervision.constants.enums.RoleCodeEnum; import com.biutag.supervision.constants.enums.RoleCodeEnum;
import com.biutag.supervision.mapper.Recessed.RecessedLogMapper; import com.biutag.supervision.mapper.Recessed.RecessedLogMapper;
import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.dto.QuerySecondDTO;
import com.biutag.supervision.pojo.entity.InformMessage; import com.biutag.supervision.pojo.entity.InformMessage;
import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.SupDepart;
import com.biutag.supervision.pojo.entity.recessed.RecessedLog; import com.biutag.supervision.pojo.entity.recessed.RecessedLog;
@ -169,6 +170,19 @@ public class ReportProjectController {
}else { }else {
s.setProjectUnitStr(projectById.getShortName() +"/"); s.setProjectUnitStr(projectById.getShortName() +"/");
} }
if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())){
QuerySecondDTO querySecondDTO = new QuerySecondDTO();
querySecondDTO.setDepartId(s.getAuditUnitId());
// 项目的二级机构
SupDepart auditUnitSecondSupDepart = departService.getSecondSupDepart(querySecondDTO);
querySecondDTO.setDepartId(UserContextHolder.getCurrentUser().getDepartId());
// 账号的二级机构
SupDepart secondSupDepart = departService.getSecondSupDepart(querySecondDTO);
// 是否内审
s.setIsSelfData(auditUnitSecondSupDepart.getId().equals(secondSupDepart.getId())? "1": "0");
}else {
s.setIsSelfData("1");
}
}); });
return Result.success(vo); return Result.success(vo);
} }

20
src/main/java/com/biutag/supervision/pojo/dto/QuerySecondDTO.java

@ -0,0 +1,20 @@
package com.biutag.supervision.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
/**
* @ClassName QuerySecondDTO
* @Description 查询二级单位信息DTO
* @Author shihao
* @Date 2026/1/21 11:14
*/
@Getter
@Setter
@Schema(description = "查询二级单位信息DTO")
public class QuerySecondDTO {
@Schema(description = "单位id")
private String departId;
}

3
src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java

@ -28,4 +28,7 @@ public class EntryWindowVo extends ReportProject {
@Schema(description = "项目单位字符串 带父级单位") @Schema(description = "项目单位字符串 带父级单位")
private String projectUnitStr; private String projectUnitStr;
@Schema(description = "是否是本单位的数据, 1是, 0否")
private String isSelfData;
} }

16
src/main/java/com/biutag/supervision/service/SupDepartService.java

@ -9,6 +9,7 @@ import com.biutag.supervision.constants.AppConstants;
import com.biutag.supervision.constants.enums.RoleCodeEnum; import com.biutag.supervision.constants.enums.RoleCodeEnum;
import com.biutag.supervision.constants.enums.StatusEnum; import com.biutag.supervision.constants.enums.StatusEnum;
import com.biutag.supervision.mapper.SupDepartMapper; import com.biutag.supervision.mapper.SupDepartMapper;
import com.biutag.supervision.pojo.dto.QuerySecondDTO;
import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.SupDepart;
import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.model.UserAuth;
import com.biutag.supervision.pojo.param.DepartQueryParam; import com.biutag.supervision.pojo.param.DepartQueryParam;
@ -309,4 +310,19 @@ public class SupDepartService extends ServiceImpl<SupDepartMapper, SupDepart> {
} }
} }
/**
* 传入3级或2级单位 获取二级单位信息
* @return
*/
public SupDepart getSecondSupDepart(QuerySecondDTO querySecondDTO){
SupDepart res = new SupDepart();
String departId = querySecondDTO.getDepartId();
res = getById(departId);
if (3==res.getLevel()){
res = getById(res.getPid());
}
return res;
}
} }

Loading…
Cancel
Save