调基、导出相关tsocialfundinfo-export

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java

@@ -144,20 +144,24 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 
 	@ExcelAttribute(name = "合同类型", maxLength = 32, needExport = true)
 	@Schema(description = "合同类型", name = "contractName")
+	@ExcelProperty("合同类型")
 	private String contractName;
 
 	@ExcelAttribute(name = "业务细分", maxLength = 32)
 	@Schema(description = "业务细分", name = "contractSubName")
+	@ExcelProperty("业务细分")
 	private String contractSubName;
 
 	// 社保户——2022-7-26 15:02:00 倩倩告诉房工，社保户就是合同甲方
 	@ExcelAttribute(name = "合同甲方", maxLength = 50, needExport = true)
 	@Schema(description = "合同甲方")
 	@Size(max = 50, message = "合同甲方不可超过50位")
+	@ExcelProperty("合同甲方")
 	private String contractParty;
 
 	@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
 	@Schema(description = "签订期限", name = "contractType")
+	@ExcelProperty("签订期限")
 	private String contractType;
 
 	@DateTimeFormat("yyyy-MM-dd")
@@ -179,6 +183,7 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 
 	@ExcelAttribute(name = "学历", maxLength = 32)
 	@Schema(description = "学历", name = "contractName")
+	@ExcelProperty("学历")
 	private String educationName;
 
 	@ExcelAttribute(name = "备案基数", maxLength = 255)

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundInfoController.java

@@ -80,7 +80,7 @@ public class TSocialFundInfoController {
      * @param id id
      * @return R
      */
-    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('demo_tsocialfundinfo_get')")
+    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('tsocialfundinfo_get')")
     @GetMapping("/{id}" )
     @PreAuthorize("@pms.hasPermission('tsocialfundinfo_get')" )
     public R<TSocialFundInfo> getById(@PathVariable("id" ) String id) {
@@ -94,7 +94,7 @@ public class TSocialFundInfoController {
      * @date 2022-07-15 11:38:05
 	 **/
     @SneakyThrows
-    @Operation(description = "批量调基 hasPermission('demo_tsocialfundinfo-batch-import')")
+    @Operation(description = "批量调基 hasPermission('tsocialfundinfo-batch-import')")
     @SysLog("批量调基")
     @PostMapping("/importListAdd")
     @PreAuthorize("@pms.hasPermission('tsocialfundinfo-batch-import')")
@@ -107,9 +107,9 @@ public class TSocialFundInfoController {
      * @author fxj
      * @date 2022-07-15 11:38:05
      **/
-    @Operation(description = "导出社保公积金查询表 hasPermission('demo_tsocialfundinfo-export')")
+    @Operation(description = "导出社保公积金查询表 hasPermission('tsocialfundinfo-export')")
     @PostMapping("/export")
-    @PreAuthorize("@pms.hasPermission('demo_tsocialfundinfo-export')")
+    @PreAuthorize("@pms.hasPermission('tsocialfundinfo-export')")
     public void export(HttpServletResponse response, @RequestBody TSocialFundInfoSearchVo searchVo) {
             tSocialFundInfoService.listExport(response,searchVo);
     }