zhoulisky 9 months ago
parent
commit
a916dc3ed0

+ 5 - 5
kd-ops/kd-resource/src/main/resources/application.yml

@@ -8,17 +8,17 @@ oss:
   enabled: true
   #开启oss类型
   #minio、s3、qiniu、alioss、huaweiobs、tencentcos
-  name: qiniu
+  name: minio
   #租户模式
   tenant-mode: true
   #oss服务地址
-  endpoint: http://sxdhyig3c.hn-bkt.clouddn.com
+  endpoint: http://116.62.106.199:9000
   #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址
   transform-endpoint:
 #  http://localhost:9000
   #访问key
-  access-key: kQt3hHMjZOsFMiOP0lt-D5k-aATvLXsd0lFztBjC
+  access-key: mcJxybRgTQ0TYHXqGADZ
   #密钥key
-  secret-key: U9Up4ptNIJ26k8oidu7slcmfy4fLgWNXsYdi5mN_
+  secret-key: GmgbIIIskf2yjMWikzLEoZcs6ofrjSRk3K2O7iP5
   #存储桶
-  bucket-name: kd-dev
+  bucket-name: kd-kypt

+ 10 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/TechnicianController.java

@@ -27,6 +27,7 @@ import org.sky.scientific.service.ITechnicianService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -97,6 +98,15 @@ public class TechnicianController extends KdController {
 		technicianService.exportTechnician(response,technician);
 	}
 
+
+	@GetMapping("export-template")
+	@ApiOperationSupport(order = 8)
+	@Operation(summary = "导出模板")
+	public void exportTechnicianTemplate(HttpServletResponse response) {
+		List<TechnicianExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "技术人员花名册模板", "用户数据表", list, TechnicianExcel.class);
+	}
+
 	@GetMapping("/fetchLastMonthData")
 	@ApiOperationSupport(order = 10)
 	@Operation(summary = "读取上个月人员名单", description = "传入选中的年月,比如2025-06,则读取2025-05的数据到06月")
@@ -174,6 +184,4 @@ public class TechnicianController extends KdController {
 	public R<IPage<XmSalaryVO>> meiyueyanfaxiangmurengongfenpeihuizongbiao(XmSalaryDto dto, Query query){
 		return R.data(technicianService.meiyueyanfaxiangmurengongfenpeihuizongbiao(Condition.getPage(query), dto));
 	}
-
-
 }

+ 16 - 45
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/TechnicianExcel.java

@@ -24,6 +24,9 @@ public class TechnicianExcel implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	@ExcelProperty("序号")
+	private Integer xh;
+
 	@ExcelProperty("姓名")
 	private String name;
 
@@ -46,95 +49,63 @@ public class TechnicianExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("民族")
 	private String ethnic;
-	/**
-	 * 所属二级单位
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("所属二级单位")
 	private String secondaryUnit;
-	/**
-	 * 部门/科室/项目部
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("部门/科室/项目部")
 	private String department;
-	/**
-	 * 岗位职务
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("岗位职务")
 	private String post;
-	/**
-	 * 岗位所在地
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("岗位所在地")
 	private String postLocation;
-	/**
-	 * 用工性质
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("用工性质")
 	private String nature;
-	/**
-	 * 入职时间
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("入职时间")
 	private Date hireDate;
-	/**
-	 * 最高学历
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("最高学历")
 	private String education;
-	/**
-	 * 最高学位
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("最高学位")
 	private String degree;
-	/**
-	 * 最高学历学校
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("最高学历学校")
 	private String schoolName;
-	/**
-	 * 最高学历专业名称
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("最高学历专业名称")
 	private String major;
-	/**
-	 * 职称
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("职称")
 	private String rank;
-	/**
-	 * 执业资格
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("执业资格")
 	private String practicingRequirement;
 
-	/**
-	 * 其他说明
-	 */
 	@ColumnWidth(50)
 	@ExcelProperty("情况说明")
 	private String remark;
 
-	/**
-	 * 参研情况
-	 */
 	@ColumnWidth(20)
 	@ExcelProperty("参研情况")
 	private String situation;
-	/**
-	 * 人员类型
-	 */
+
 	@ColumnWidth(20)
 	@ExcelProperty("人员类型")
 	private String personnelType;