zhuwei пре 1 година
родитељ
комит
17af85421c

+ 7 - 0
src/main/java/org/springblade/common/config/SwaggerConfiguration.java

@@ -65,4 +65,11 @@ public class SwaggerConfiguration {
 			.build();
 	}
 
+	@Bean
+	public GroupedOpenApi projectApi() {
+		return GroupedOpenApi.builder()
+				.group("数据分析系统")
+				.packagesToScan(AppConstant.BASE_PACKAGES + ".modules.project")
+				.build();
+	}
 }

+ 27 - 8
src/main/java/org/springblade/modules/project/controller/WorkFocusController.java

@@ -39,6 +39,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.project.pojo.excel.WorkFocusExcel;
+import org.springblade.modules.project.pojo.vo.WorkFocusListVO;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -64,7 +65,7 @@ import jakarta.servlet.http.HttpServletResponse;
 @RestController
 @AllArgsConstructor
 @RequestMapping("blade-attach/workfocus")
-@Tag(name = "附件表", description = "附件表接口")
+@Tag(name = "工作要点表", description = "工作要点接口")
 public class WorkFocusController extends BladeController {
 
 	private final IWorkFocusService workfocusService;
@@ -80,7 +81,7 @@ public class WorkFocusController extends BladeController {
 		return R.data(WorkFocusWrapper.build().entityVO(detail));
 	}
 	/**
-	 * 附件表 分页
+	 * 工作要点表 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -91,18 +92,18 @@ public class WorkFocusController extends BladeController {
 	}
 
 	/**
-	 * 附件表 自定义分页
+	 * 工作要点表 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
-	@Operation(summary = "分页", description  = "传入workfocus")
+	@Operation(summary = "自定义分页", description  = "传入workfocus")
 	public R<IPage<WorkFocusVO>> page(WorkFocusVO workfocus, Query query) {
 		IPage<WorkFocusVO> pages = workfocusService.selectWorkFocusPage(Condition.getPage(query), workfocus);
 		return R.data(pages);
 	}
 
 	/**
-	 * 附件表 新增
+	 * 工作要点表 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -112,7 +113,7 @@ public class WorkFocusController extends BladeController {
 	}
 
 	/**
-	 * 附件表 修改
+	 * 工作要点表 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -122,7 +123,7 @@ public class WorkFocusController extends BladeController {
 	}
 
 	/**
-	 * 附件表 新增或修改
+	 * 工作要点表 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -132,7 +133,7 @@ public class WorkFocusController extends BladeController {
 	}
 
 	/**
-	 * 附件表 删除
+	 * 工作要点表 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -159,4 +160,22 @@ public class WorkFocusController extends BladeController {
 		ExcelUtil.export(response, "附件表数据" + DateUtil.time(), "附件表数据表", list, WorkFocusExcel.class);
 	}
 
+
+
+	/**
+	 * 工作要点表 新增或修改
+	 */
+	@PostMapping("/submitList")
+	@ApiOperationSupport(order = 10)
+	@Operation(summary = "新增或修改", description  = "传入workfocus")
+	public R submitList(@Valid @RequestBody WorkFocusListVO workFocusListVO) {
+		if(workFocusListVO!=null && workFocusListVO.getWorkFocusEntityList().size()>=1){
+			List<WorkFocusEntity> workFocusEntityList = workFocusListVO.getWorkFocusEntityList();
+			for(WorkFocusEntity workFocusEntity:workFocusEntityList){
+				workfocusService.saveOrUpdate(workFocusEntity);
+			}
+		}
+		return R.status(true);
+	}
+
 }

+ 162 - 0
src/main/java/org/springblade/modules/project/controller/WorkFocusProgressController.java

@@ -0,0 +1,162 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.controller;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import jakarta.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import org.springblade.modules.project.pojo.vo.WorkFocusProgressVO;
+import org.springblade.modules.project.pojo.excel.WorkFocusProgressExcel;
+import org.springblade.modules.project.wrapper.WorkFocusProgressWrapper;
+import org.springblade.modules.project.service.IWorkFocusProgressService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.constant.RoleConstant;
+import java.util.Map;
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+
+/**
+ * 工作要点完成情况表 控制器
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-workFocusProgress/workFocusProgress")
+@Tag(name = "工作要点完成情况表", description = "工作要点完成情况表接口")
+public class WorkFocusProgressController extends BladeController {
+
+	private final IWorkFocusProgressService workFocusProgressService;
+
+	/**
+	 * 工作要点完成情况表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "详情", description  = "传入workFocusProgress")
+	public R<WorkFocusProgressVO> detail(WorkFocusProgressEntity workFocusProgress) {
+		WorkFocusProgressEntity detail = workFocusProgressService.getOne(Condition.getQueryWrapper(workFocusProgress));
+		return R.data(WorkFocusProgressWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 工作要点完成情况表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "分页", description  = "传入workFocusProgress")
+	public R<IPage<WorkFocusProgressVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workFocusProgress, Query query) {
+		IPage<WorkFocusProgressEntity> pages = workFocusProgressService.page(Condition.getPage(query), Condition.getQueryWrapper(workFocusProgress, WorkFocusProgressEntity.class));
+		return R.data(WorkFocusProgressWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 工作要点完成情况表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "分页", description  = "传入workFocusProgress")
+	public R<IPage<WorkFocusProgressVO>> page(WorkFocusProgressVO workFocusProgress, Query query) {
+		IPage<WorkFocusProgressVO> pages = workFocusProgressService.selectWorkFocusProgressPage(Condition.getPage(query), workFocusProgress);
+		return R.data(pages);
+	}
+
+	/**
+	 * 工作要点完成情况表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@Operation(summary = "新增", description  = "传入workFocusProgress")
+	public R save(@Valid @RequestBody WorkFocusProgressEntity workFocusProgress) {
+		return R.status(workFocusProgressService.save(workFocusProgress));
+	}
+
+	/**
+	 * 工作要点完成情况表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@Operation(summary = "修改", description  = "传入workFocusProgress")
+	public R update(@Valid @RequestBody WorkFocusProgressEntity workFocusProgress) {
+		return R.status(workFocusProgressService.updateById(workFocusProgress));
+	}
+
+	/**
+	 * 工作要点完成情况表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@Operation(summary = "新增或修改", description  = "传入workFocusProgress")
+	public R submit(@Valid @RequestBody WorkFocusProgressEntity workFocusProgress) {
+		return R.status(workFocusProgressService.saveOrUpdate(workFocusProgress));
+	}
+
+	/**
+	 * 工作要点完成情况表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@Operation(summary = "逻辑删除", description  = "传入ids")
+	public R remove(@Parameter(name = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(workFocusProgressService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-workFocusProgress")
+	@ApiOperationSupport(order = 9)
+	@Operation(summary = "导出数据", description  = "传入workFocusProgress")
+	public void exportWorkFocusProgress(@Parameter(hidden = true) @RequestParam Map<String, Object> workFocusProgress, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<WorkFocusProgressEntity> queryWrapper = Condition.getQueryWrapper(workFocusProgress, WorkFocusProgressEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(WorkFocusProgress::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(WorkFocusProgressEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<WorkFocusProgressExcel> list = workFocusProgressService.exportWorkFocusProgress(queryWrapper);
+		ExcelUtil.export(response, "工作要点完成情况表数据" + DateUtil.time(), "工作要点完成情况表数据表", list, WorkFocusProgressExcel.class);
+	}
+
+}

+ 63 - 0
src/main/java/org/springblade/modules/project/mapper/WorkFocusProgressMapper.java

@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.mapper;
+
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import org.springblade.modules.project.pojo.excel.WorkFocusProgressExcel;
+import org.springblade.modules.project.pojo.vo.WorkFocusProgressVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 工作要点完成情况表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+public interface WorkFocusProgressMapper extends BaseMapper<WorkFocusProgressEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workFocusProgress
+	 * @return
+	 */
+	List<WorkFocusProgressVO> selectWorkFocusProgressPage(IPage page, WorkFocusProgressVO workFocusProgress);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<WorkFocusProgressExcel> exportWorkFocusProgress(@Param("ew") Wrapper<WorkFocusProgressEntity> queryWrapper);
+
+}

+ 19 - 0
src/main/java/org/springblade/modules/project/mapper/WorkFocusProgressMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.project.mapper.WorkFocusProgressMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="workFocusProgressResultMap" type="org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity">
+    </resultMap>
+
+
+    <select id="selectWorkFocusProgressPage" resultMap="workFocusProgressResultMap">
+        select * from d_work_focus_progress where is_deleted = 0
+    </select>
+
+
+    <select id="exportWorkFocusProgress" resultType="org.springblade.modules.project.pojo.excel.WorkFocusProgressExcel">
+        SELECT * FROM d_work_focus_progress ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 45 - 0
src/main/java/org/springblade/modules/project/pojo/dto/WorkFocusProgressDTO.java

@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.pojo.dto;
+
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+
+/**
+ * 工作要点完成情况表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkFocusProgressDTO extends WorkFocusProgressEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

+ 48 - 0
src/main/java/org/springblade/modules/project/pojo/entity/WorkFocusProgressEntity.java

@@ -0,0 +1,48 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 工作要点完成情况表 实体类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@Data
+@TableName("d_work_focus_progress")
+@Schema(description = "WorkFocusProgress对象")
+@EqualsAndHashCode(callSuper = true)
+public class WorkFocusProgressEntity extends TenantEntity {
+
+
+}

+ 55 - 0
src/main/java/org/springblade/modules/project/pojo/excel/WorkFocusProgressExcel.java

@@ -0,0 +1,55 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.pojo.excel;
+
+
+import lombok.Data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+import java.io.Serial;
+
+
+/**
+ * 工作要点完成情况表 Excel实体类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class WorkFocusProgressExcel implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+}

+ 47 - 0
src/main/java/org/springblade/modules/project/pojo/vo/WorkFocusListVO.java

@@ -0,0 +1,47 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.project.pojo.entity.WorkFocusEntity;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * 附件表 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@Data
+public class WorkFocusListVO {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	public List<WorkFocusEntity> workFocusEntityList;
+}

+ 46 - 0
src/main/java/org/springblade/modules/project/pojo/vo/WorkFocusProgressVO.java

@@ -0,0 +1,46 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.pojo.vo;
+
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serial;
+
+/**
+ * 工作要点完成情况表 视图实体类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkFocusProgressVO extends WorkFocusProgressEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+}

+ 61 - 0
src/main/java/org/springblade/modules/project/service/IWorkFocusProgressService.java

@@ -0,0 +1,61 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import org.springblade.modules.project.pojo.vo.WorkFocusProgressVO;
+import org.springblade.modules.project.pojo.excel.WorkFocusProgressExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 工作要点完成情况表 服务类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+public interface IWorkFocusProgressService extends BaseService<WorkFocusProgressEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workFocusProgress
+	 * @return
+	 */
+	IPage<WorkFocusProgressVO> selectWorkFocusProgressPage(IPage<WorkFocusProgressVO> page, WorkFocusProgressVO workFocusProgress);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<WorkFocusProgressExcel> exportWorkFocusProgress(Wrapper<WorkFocusProgressEntity> queryWrapper);
+
+}

+ 63 - 0
src/main/java/org/springblade/modules/project/service/impl/WorkFocusProgressServiceImpl.java

@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.service.impl;
+
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import org.springblade.modules.project.pojo.vo.WorkFocusProgressVO;
+import org.springblade.modules.project.pojo.excel.WorkFocusProgressExcel;
+import org.springblade.modules.project.mapper.WorkFocusProgressMapper;
+import org.springblade.modules.project.service.IWorkFocusProgressService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 工作要点完成情况表 服务实现类
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+@Service
+public class WorkFocusProgressServiceImpl extends BaseServiceImpl<WorkFocusProgressMapper, WorkFocusProgressEntity> implements IWorkFocusProgressService {
+
+	@Override
+	public IPage<WorkFocusProgressVO> selectWorkFocusProgressPage(IPage<WorkFocusProgressVO> page, WorkFocusProgressVO workFocusProgress) {
+		return page.setRecords(baseMapper.selectWorkFocusProgressPage(page, workFocusProgress));
+	}
+
+
+	@Override
+	public List<WorkFocusProgressExcel> exportWorkFocusProgress(Wrapper<WorkFocusProgressEntity> queryWrapper) {
+		List<WorkFocusProgressExcel> workFocusProgressList = baseMapper.exportWorkFocusProgress(queryWrapper);
+		//workFocusProgressList.forEach(workFocusProgress -> {
+		//	workFocusProgress.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkFocusProgress.getType()));
+		//});
+		return workFocusProgressList;
+	}
+
+}

+ 59 - 0
src/main/java/org/springblade/modules/project/wrapper/WorkFocusProgressWrapper.java

@@ -0,0 +1,59 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.modules.project.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.project.pojo.entity.WorkFocusProgressEntity;
+import org.springblade.modules.project.pojo.vo.WorkFocusProgressVO;
+import java.util.Objects;
+
+/**
+ * 工作要点完成情况表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2024-04-09
+ */
+public class WorkFocusProgressWrapper extends BaseEntityWrapper<WorkFocusProgressEntity, WorkFocusProgressVO>  {
+
+	public static WorkFocusProgressWrapper build() {
+		return new WorkFocusProgressWrapper();
+ 	}
+
+	@Override
+	public WorkFocusProgressVO entityVO(WorkFocusProgressEntity workFocusProgress) {
+		WorkFocusProgressVO workFocusProgressVO = Objects.requireNonNull(BeanUtil.copyProperties(workFocusProgress, WorkFocusProgressVO.class));
+
+		//User createUser = UserCache.getUser(workFocusProgress.getCreateUser());
+		//User updateUser = UserCache.getUser(workFocusProgress.getUpdateUser());
+		//workFocusProgressVO.setCreateUserName(createUser.getName());
+		//workFocusProgressVO.setUpdateUserName(updateUser.getName());
+
+		return workFocusProgressVO;
+	}
+
+
+}