diff --git a/core/src/main/java/com/dite/znpt/constant/Message.java b/core/src/main/java/com/dite/znpt/constant/Message.java index e2fafa6..842c55e 100644 --- a/core/src/main/java/com/dite/znpt/constant/Message.java +++ b/core/src/main/java/com/dite/znpt/constant/Message.java @@ -79,5 +79,4 @@ public class Message implements Serializable { public static final String EQUIPMENT_USE_RECORD_STATUS_ERROR = "设备使用记录状态不合法"; public static final String EQUIPMENT_IS_USED = "设备已被使用"; public static final String EQUIPMENT_IS_RETURN = "设备已归还"; - public static final String DAILY_REPORT_EXISTS = "当日已提交日报"; } diff --git a/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java b/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java index 094855a..0eb68a1 100644 --- a/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java @@ -1,16 +1,20 @@ package com.dite.znpt.domain; import com.alibaba.excel.annotation.ExcelIgnore; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** * @description: 统一定义顶层Entity实体审计 基类 @@ -37,6 +41,11 @@ public class AuditableEntity implements Serializable { @ApiModelProperty(value = "修改人id", hidden = true) private LocalDateTime updateTime; + @ExcelIgnore + @ApiModelProperty(value = "id集合", example = "[]", notes = "id集合") + @TableField(exist = false) + private List idList; + @ExcelIgnore @ApiModelProperty(value = "当前页", example = "1", notes = "0") @TableField(exist = false) diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectDailyReportEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectDailyReportEntity.java deleted file mode 100644 index f995b26..0000000 --- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectDailyReportEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.dite.znpt.domain.entity; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.dite.znpt.domain.AuditableEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDate; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息表实体类 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("project_daily_report") -@ApiModel(value="ProjectDailyReportEntity对象", description="项目日报信息表") -public class ProjectDailyReportEntity extends AuditableEntity implements Serializable { - - @Serial - private static final long serialVersionUID = -88597301057742621L; - - @ExcelProperty("主键") - @ApiModelProperty("主键") - @TableId(value = "report_id", type = IdType.ASSIGN_ID) - private String reportId; - - @ExcelProperty("项目id") - @ApiModelProperty("项目id") - @TableField("project_id") - private String projectId; - - @ExcelProperty("日报日期") - @ApiModelProperty("日报日期") - @TableField("report_date") - private LocalDate reportDate; - - @ExcelProperty("日报提交人") - @ApiModelProperty("日报提交人") - @TableField("submit_user") - private String submitUser; -} - diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java index 0060dc2..c044195 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java @@ -1,19 +1,18 @@ package com.dite.znpt.domain.entity; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; import com.dite.znpt.domain.AuditableEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.time.LocalDate; +import com.alibaba.excel.annotation.ExcelProperty; /** * @author huise23 @@ -159,7 +158,7 @@ public class ProjectEntity extends AuditableEntity implements Serializable { @ApiModelProperty(value = "开始时间") private LocalDate startDate; -// 施工人员,安全经理,项目经理,商务,财务,高级管理员,项目远程顾问外部协作者,质量经理、现场经理及工作组长。 + @ApiModelProperty(value = "结束时间") private LocalDate endDate; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoImportReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoImportReq.java new file mode 100644 index 0000000..18d93a7 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectBudgetInfoImportReq.java @@ -0,0 +1,38 @@ +package com.dite.znpt.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.io.Serializable; +/** + * @author huise23 + * @date 2025/07/17 21:58 + * @Description: 项目预算信息表导入请求类 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ProjectBudgetInfo导入请求对象", description="项目预算信息表") +public class ProjectBudgetInfoImportReq implements Serializable { + + @Serial + private static final long serialVersionUID = 580212651388155611L; + + + @ExcelProperty(value = "项目名称") + private String projectName; + + @ExcelProperty(value = "预算名称") + private String budgetName; + + @ExcelProperty(value = "预算类型") + private String budgetType; + + @ExcelProperty(value = "预算金额(万元)") + private Double budgetAmount; + + @ExcelProperty(value = "预算说明") + private String budgetDesc; +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportListReq.java deleted file mode 100644 index 17aff44..0000000 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportListReq.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.dite.znpt.domain.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDate; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息请求实体 - */ -@Data -@ApiModel("项目日报信息列表请求实体") -public class ProjectDailyReportListReq implements Serializable { - - @Serial - private static final long serialVersionUID = 913060537944500760L; - - @ApiModelProperty("查询关键字") - private String keyword; - - @ApiModelProperty("项目日报信息Id") - private String reportId; - - @ApiModelProperty("项目id") - private String projectId; - - @ApiModelProperty("日报日期") - private LocalDate reportDate; - - @ApiModelProperty("日报提交人") - private String submitUser; - -} - diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportReq.java deleted file mode 100644 index 53b2aad..0000000 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportReq.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.dite.znpt.domain.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDate; -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息表请求类 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="ProjectDailyReport请求对象", description="项目日报信息表") -public class ProjectDailyReportReq implements Serializable { - - @Serial - private static final long serialVersionUID = -35936236241363317L; - - @ApiModelProperty("主键") - private String reportId; - - @NotNull(message = "项目id不能为空") - @ApiModelProperty("项目id") - private String projectId; - - @NotNull(message = "日报日期不能为空") - @ApiModelProperty("日报日期") - private LocalDate reportDate; - - @NotBlank(message = "日报提交人不能为空") - @Size(max = 32, message = "日报提交人长度不能超过32字符") - @ApiModelProperty("日报提交人") - private String submitUser; - - @NotBlank(message = "日报附件id不能为空") - @ApiModelProperty("日报附件id") - private String reportAttachId; -} - diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportResp.java deleted file mode 100644 index c41bdff..0000000 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectDailyReportResp.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.dite.znpt.domain.vo; - -import com.dite.znpt.domain.entity.AttachInfoEntity; -import com.dite.znpt.domain.entity.ProjectDailyReportEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息响应实体 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel("项目日报信息响应实体") -public class ProjectDailyReportResp extends ProjectDailyReportEntity { - - @ApiModelProperty("日报附件") - private AttachInfoEntity reportAttach; -} - diff --git a/core/src/main/java/com/dite/znpt/enums/AttachBusinessTypeEnum.java b/core/src/main/java/com/dite/znpt/enums/AttachBusinessTypeEnum.java index ac53840..4e008b3 100644 --- a/core/src/main/java/com/dite/znpt/enums/AttachBusinessTypeEnum.java +++ b/core/src/main/java/com/dite/znpt/enums/AttachBusinessTypeEnum.java @@ -19,7 +19,6 @@ public enum AttachBusinessTypeEnum { DEFECT_MARK_PIC("defect_mark_pic", "缺陷标注图片"), REPORT("report", "报告"), PROJECT_BUDGE("project_budge", "预算文件"), - PROJECT_DAILY_REPORT("project_daily_report", "项目日报文件"), ; private final String code; private final String desc; diff --git a/core/src/main/java/com/dite/znpt/mapper/ProjectDailyReportMapper.java b/core/src/main/java/com/dite/znpt/mapper/ProjectDailyReportMapper.java deleted file mode 100644 index be32858..0000000 --- a/core/src/main/java/com/dite/znpt/mapper/ProjectDailyReportMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dite.znpt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dite.znpt.domain.entity.ProjectDailyReportEntity; -import com.dite.znpt.domain.vo.ProjectDailyReportListReq; -import com.dite.znpt.domain.vo.ProjectDailyReportResp; - -import java.util.List; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息表数据库访问层 - */ -public interface ProjectDailyReportMapper extends BaseMapper { - List queryBySelective(ProjectDailyReportListReq projectDailyReportReq); -} - diff --git a/core/src/main/java/com/dite/znpt/service/AttachInfoService.java b/core/src/main/java/com/dite/znpt/service/AttachInfoService.java index d8cdeb6..3c4987f 100644 --- a/core/src/main/java/com/dite/znpt/service/AttachInfoService.java +++ b/core/src/main/java/com/dite/znpt/service/AttachInfoService.java @@ -23,7 +23,7 @@ public interface AttachInfoService extends IService { * @author huise23 * @date 2025/04/11 23:17 **/ - List listByBusinessIds(List businessIds, AttachBusinessTypeEnum businessType); + List listByBusinessIds(List businessIds, String businessType); /** * 功能描述:新增附件信息 diff --git a/core/src/main/java/com/dite/znpt/service/ProjectDailyReportService.java b/core/src/main/java/com/dite/znpt/service/ProjectDailyReportService.java deleted file mode 100644 index e11a964..0000000 --- a/core/src/main/java/com/dite/znpt/service/ProjectDailyReportService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.dite.znpt.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.dite.znpt.domain.entity.ProjectDailyReportEntity; -import com.dite.znpt.domain.vo.ProjectDailyReportListReq; -import com.dite.znpt.domain.vo.ProjectDailyReportReq; -import com.dite.znpt.domain.vo.ProjectDailyReportResp; - -import java.util.List; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息表服务接口 - */ -public interface ProjectDailyReportService extends IService { - - /** - * 功能描述:查询项目日报信息列表 - * - * @param projectDailyReportReq 项目日报信息 - * @return {@link List }<{@link ProjectDailyReportResp }> - * @author huise23 - * @date 2025/07/27 19:51 - **/ - List selectList(ProjectDailyReportListReq projectDailyReportReq); - - /** - * 功能描述:查询单条项目日报信息 - * - * @param reportId 项目日报信息Id - * @return {@link ProjectDailyReportResp } - * @author huise23 - * @date 2025/07/27 19:51 - **/ - ProjectDailyReportResp selectById(String reportId); - - /** - * 功能描述:新增项目日报信息 - * - * @param projectDailyReportReq 项目日报信息 - * @author huise23 - * @date 2025/07/27 19:51 - **/ - void saveData(ProjectDailyReportReq projectDailyReportReq); - - /** - * 功能描述:更新项目日报信息 - * - * @param projectDailyReportReq 项目日报信息 - * @author huise23 - * @date 2025/07/27 19:51 - **/ - void updateData(ProjectDailyReportReq projectDailyReportReq); - - /** - * 功能描述:删除项目日报信息 - * - * @param reportId 项目日报信息Id - * @author huise23 - * @date 2025/07/27 19:51 - **/ - void deleteById(String reportId); - - /** - * 功能描述:我今天 - * - * @return {@link ProjectDailyReportResp } - * @author cuizhibin - * @date 2025/07/27 19:53 - **/ - ProjectDailyReportResp myToday(String projectId); -} - diff --git a/core/src/main/java/com/dite/znpt/service/impl/AttachInfoServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/AttachInfoServiceImpl.java index f95311f..93c77dd 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/AttachInfoServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/AttachInfoServiceImpl.java @@ -30,7 +30,6 @@ import java.net.URLEncoder; import java.rmi.ServerException; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -52,9 +51,9 @@ public class AttachInfoServiceImpl extends ServiceImpl listByBusinessIds(List businessIds, AttachBusinessTypeEnum businessType) { + public List listByBusinessIds(List businessIds, String businessType) { return lambdaQuery().in(AttachInfoEntity::getBusinessId, businessIds) - .eq(Objects.nonNull(businessType), AttachInfoEntity::getBusinessType, businessType.getCode()) + .eq(StrUtil.isNotEmpty(businessType), AttachInfoEntity::getBusinessType, businessType) .list(); } diff --git a/core/src/main/java/com/dite/znpt/service/impl/ProjectDailyReportServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectDailyReportServiceImpl.java deleted file mode 100644 index f04dfca..0000000 --- a/core/src/main/java/com/dite/znpt/service/impl/ProjectDailyReportServiceImpl.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.dite.znpt.service.impl; - -import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dite.znpt.constant.Message; -import com.dite.znpt.domain.entity.AttachInfoEntity; -import com.dite.znpt.domain.entity.ProjectDailyReportEntity; -import com.dite.znpt.domain.vo.ProjectDailyReportListReq; -import com.dite.znpt.domain.vo.ProjectDailyReportReq; -import com.dite.znpt.domain.vo.ProjectDailyReportResp; -import com.dite.znpt.enums.AttachBusinessTypeEnum; -import com.dite.znpt.exception.ServiceException; -import com.dite.znpt.mapper.ProjectDailyReportMapper; -import com.dite.znpt.service.AttachInfoService; -import com.dite.znpt.service.ProjectDailyReportService; -import com.dite.znpt.util.PageUtil; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.time.LocalDate; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - * @Description: 项目日报信息表服务实现类 - */ -@Service -@RequiredArgsConstructor -public class ProjectDailyReportServiceImpl extends ServiceImpl implements ProjectDailyReportService { - - private final AttachInfoService attachInfoService; - - /** - * 功能描述:查询项目日报信息列表 - * - * @param projectDailyReportReq 项目日报信息信息 - * @return {@link List }<{@link ProjectDailyReportResp }> - * @author huise23 - * @date 2025/07/27 19:51 - **/ - @Override - public List selectList(ProjectDailyReportListReq projectDailyReportReq) { - PageUtil.startPage(); - List respList= this.baseMapper.queryBySelective(projectDailyReportReq); - if (CollUtil.isNotEmpty(respList)) { - List reportIds = respList.stream().map(ProjectDailyReportResp::getReportId).toList(); - Map attachMap = attachInfoService.listByBusinessIds(reportIds, AttachBusinessTypeEnum.PROJECT_DAILY_REPORT) - .stream().collect(Collectors.toMap(AttachInfoEntity::getBusinessId, Function.identity())); - respList.forEach(resp -> { - resp.setReportAttach(attachMap.get(resp.getReportId())); - }); - } - return respList; - } - - /** - * 功能描述:查询单条项目日报信息 - * - * @param reportId 项目日报信息Id - * @return {@link ProjectDailyReportResp } - * @author huise23 - * @date 2025/07/27 19:51 - **/ - @Override - public ProjectDailyReportResp selectById(String reportId) { - ProjectDailyReportListReq projectDailyReportReq = new ProjectDailyReportListReq(); - projectDailyReportReq.setReportId(reportId); - - List list = selectList(projectDailyReportReq); - return CollUtil.isNotEmpty(list) ? CollUtil.getFirst(list) : new ProjectDailyReportResp(); - } - - /** - * 功能描述:新增项目日报信息 - * - * @param projectDailyReportReq 项目日报信息 - * @author huise23 - * @date 2025/07/27 19:51 - **/ - @Override - public void saveData(ProjectDailyReportReq projectDailyReportReq) { - ProjectDailyReportResp myToday = myToday(projectDailyReportReq.getProjectId()); - if (Objects.nonNull(myToday)) { - throw new ServiceException(Message.DAILY_REPORT_EXISTS); - } - ProjectDailyReportEntity entity = BeanUtil.copyProperties(projectDailyReportReq, ProjectDailyReportEntity.class); - save(entity); - attachInfoService.updateBusinessIdByAttachIds(entity.getReportId(), ListUtil.of(projectDailyReportReq.getReportAttachId()), AttachBusinessTypeEnum.PROJECT_DAILY_REPORT); - } - - /** - * 功能描述:更新项目日报信息 - * - * @param projectDailyReportReq 项目日报信息 - * @author huise23 - * @date 2025/07/27 19:51 - **/ - @Override - public void updateData(ProjectDailyReportReq projectDailyReportReq) { - ProjectDailyReportEntity entity = BeanUtil.copyProperties(projectDailyReportReq, ProjectDailyReportEntity.class); - updateById(entity); - attachInfoService.updateBusinessIdByAttachIds(entity.getReportId(), ListUtil.of(projectDailyReportReq.getReportAttachId()), AttachBusinessTypeEnum.PROJECT_DAILY_REPORT); - } - - /** - * 功能描述:删除项目日报信息 - * - * @param reportId 项目日报信息Id - * @author huise23 - * @date 2025/07/27 19:51 - **/ - @Override - public void deleteById(String reportId) { - removeById(reportId); - } - - @Override - public ProjectDailyReportResp myToday(String projectId) { - ProjectDailyReportListReq req = new ProjectDailyReportListReq(); - req.setProjectId(projectId); - req.setSubmitUser(StpUtil.getLoginIdAsString()); - req.setReportDate(LocalDate.now()); - List list = selectList(req); - if (CollUtil.isNotEmpty(list)){ - return CollUtil.getFirst(list); - } - return null; - } - -} diff --git a/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java index c7b3038..faf5a4a 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java @@ -5,20 +5,20 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dite.znpt.constant.Message; import com.dite.znpt.converts.Converts; -import com.dite.znpt.domain.entity.ProjectEntity; import com.dite.znpt.domain.entity.UserEntity; +import com.dite.znpt.domain.entity.ProjectEntity; import com.dite.znpt.domain.vo.ProjectListReq; import com.dite.znpt.domain.vo.ProjectListResp; import com.dite.znpt.domain.vo.ProjectReq; import com.dite.znpt.domain.vo.ProjectResp; import com.dite.znpt.enums.ProjectStatusEnum; import com.dite.znpt.exception.ServiceException; -import com.dite.znpt.mapper.ProjectMapper; -import com.dite.znpt.service.ProjectService; import com.dite.znpt.service.UserService; -import com.dite.znpt.util.PageUtil; -import lombok.RequiredArgsConstructor; +import com.dite.znpt.service.ProjectService; +import com.dite.znpt.mapper.ProjectMapper; import org.springframework.stereotype.Service; +import lombok.RequiredArgsConstructor; +import com.dite.znpt.util.PageUtil; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -59,7 +59,6 @@ public class ProjectServiceImpl extends ServiceImpl list= this.baseMapper.queryBySelective(req); list.forEach(resp -> { resp.setStatusLabel(ProjectStatusEnum.getDescByCode(resp.getStatus())); -// 判断人员类型 }); return list; } diff --git a/core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java index 1bc85e5..16939d8 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java @@ -20,6 +20,7 @@ import com.dite.znpt.mapper.ProjectTaskGroupMapper; import com.dite.znpt.mapper.ProjectTaskMapper; import com.dite.znpt.service.AttachInfoService; import com.dite.znpt.service.ProjectTaskService; +import com.dite.znpt.util.PageUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,7 +55,7 @@ public class ProjectTaskServiceImpl extends ServiceImpl projectTaskList = this.baseMapper.queryBySelective(projectTaskReq); Map> attachMap; if (!BooleanUtil.isTrue(projectTaskReq.getIsExport())) { - attachMap = attachInfoService.listByBusinessIds(projectTaskList.stream().map(ProjectTaskResp::getTaskId).collect(Collectors.toList()), AttachBusinessTypeEnum.PROJECT_TASK) + attachMap = attachInfoService.listByBusinessIds(projectTaskList.stream().map(ProjectTaskResp::getTaskId).collect(Collectors.toList()), null) .stream().collect(Collectors.groupingBy(AttachInfoEntity::getBusinessId)); } else { attachMap = new HashMap<>(); diff --git a/core/src/main/resources/mapper/ProjectDailyReportMapper.xml b/core/src/main/resources/mapper/ProjectDailyReportMapper.xml deleted file mode 100644 index 3102523..0000000 --- a/core/src/main/resources/mapper/ProjectDailyReportMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - a.report_id, a.project_id, a.report_date, a.submit_user, - a.update_by, a.create_time, a.create_by, a.update_time - - - - - diff --git a/web/src/main/java/com/dite/znpt/web/controller/ProjectDailyReportController.java b/web/src/main/java/com/dite/znpt/web/controller/ProjectDailyReportController.java deleted file mode 100644 index b49bf8f..0000000 --- a/web/src/main/java/com/dite/znpt/web/controller/ProjectDailyReportController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.dite.znpt.web.controller; - -import com.dite.znpt.domain.PageResult; -import com.dite.znpt.domain.Result; -import com.dite.znpt.domain.vo.ProjectDailyReportListReq; -import com.dite.znpt.domain.vo.ProjectDailyReportReq; -import com.dite.znpt.domain.vo.ProjectDailyReportResp; -import com.dite.znpt.service.ProjectDailyReportService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @author huise23 - * @date 2025/07/27 19:51 - */ -@Api(tags = "项目日报信息") -@RestController -@RequestMapping("/project-daily-report") -public class ProjectDailyReportController { - @Resource - private ProjectDailyReportService projectDailyReportService; - - @ApiOperation(value = "获取项目日报信息列表", httpMethod = "GET") - @GetMapping("/list") - public PageResult list(ProjectDailyReportListReq projectDailyReportReq) { - return PageResult.ok(projectDailyReportService.selectList(projectDailyReportReq)); - } - - @ApiOperation(value = "根据项目日报信息Id获取详细信息", httpMethod = "GET") - @GetMapping("/{reportId}") - public Result getInfo(@PathVariable String reportId) { - return Result.ok(projectDailyReportService.selectById(reportId)); - } - - @ApiOperation(value = "获取登录人当日日报", httpMethod = "GET") - @GetMapping("/my-today/{projectId}") - public Result myToday(@PathVariable String projectId) { - return Result.ok(projectDailyReportService.myToday(projectId)); - } - - @ApiOperation(value = "新增项目日报信息", httpMethod = "POST") - @PostMapping - public Result add(@Validated @RequestBody ProjectDailyReportReq projectDailyReportReq) { - projectDailyReportService.saveData(projectDailyReportReq); - return Result.ok(); - } - - @ApiOperation(value = "修改项目日报信息", httpMethod = "PUT") - @PutMapping - public Result edit(@Validated @RequestBody ProjectDailyReportReq projectDailyReportReq) { - projectDailyReportService.updateData(projectDailyReportReq); - return Result.ok(); - } - - @ApiOperation(value = "删除项目日报信息", httpMethod = "DELETE") - @DeleteMapping("/{reportId}") - public Result remove(@PathVariable String reportId) { - projectDailyReportService.deleteById(reportId); - return Result.ok(); - } -} -