格式化数据

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/InformationQuery.java

@@ -125,7 +125,6 @@ public class InformationQuery extends BaseEntity {
     @ApiModelProperty("首件关联工序资料ids")
     private String sjRecordIds;
 
-
     @ApiModelProperty("业务时间")
     private String businessTime;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/UserFilesInfoDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.dto;
+
+import org.springblade.control.entity.UserFilesInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 档案职工信息表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserFilesInfoDTO extends UserFilesInfo {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserContractInfo.java

@@ -19,12 +19,15 @@ package org.springblade.control.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 员工合同信息表实体类
@@ -52,13 +55,27 @@ public class UserContractInfo extends BaseEntity {
     /**
      * 开始日期
      */
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
     @ApiModelProperty(value = "开始日期")
-    private LocalDateTime startDate;
+    private LocalDate startDate;
     /**
      * 结束日期
      */
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
     @ApiModelProperty(value = "结束日期")
-    private LocalDateTime endDate;
+    private LocalDate endDate;
     /**
      * 文件路径
      */
@@ -74,6 +91,13 @@ public class UserContractInfo extends BaseEntity {
      * 离职原因
      */
     @ApiModelProperty(value = "离职原因")
-    private String desc;
+    private String leReasion;
+
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty(value = "文件名称")
+    private String conFileName;
+
 
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserFilesInfo.java

@@ -0,0 +1,128 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 档案职工信息表实体类
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+@Data
+@TableName("c_user_files_info")
+@EqualsAndHashCode(callSuper = true)
+public class UserFilesInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 用户id主键
+	*/
+		private Long userId;
+	/**
+	* 年龄
+	*/
+		private Integer userAge;
+	/**
+	* 身份证姓名
+	*/
+		private String carName;
+	/**
+	* 民族
+	*/
+		private String nation;
+	/**
+	* 试用期 单位月
+	*/
+		private Integer periodMoth;
+	/**
+	* 身份证地址
+	*/
+		private String carAddr;
+	/**
+	* 身份证照片路径(人面)
+	*/
+		private String carAimgUrl;
+	/**
+	* 身份证图片(国徽)
+	*/
+		private String carBimgUrl;
+	/**
+	* 1 已婚 2未婚
+	*/
+		private Integer marriageStatus;
+	/**
+	* 续签约次数
+	*/
+		private Integer renewalCount;
+	/**
+	* 户籍所在
+	*/
+		private String domicileAddr;
+	/**
+	* 1:小学/初中 2高中 3 专科 4 本科 5研究生 6 博士 7 硕士
+	*/
+		private Integer educationType;
+	/**
+	* 紧急联系人姓名
+	*/
+		private String emergencyName;
+	/**
+	* 紧急联系人电话
+	*/
+		private String emergencyPhone;
+	/**
+	* 与紧急联系人关系
+	*/
+		private String emergencyRelation;
+	/**
+	* 专业
+	*/
+		private String speciality;
+	/**
+	* 政治面貌
+	*/
+		private String political;
+	/**
+	* 开户行名称
+	*/
+		private String bankName;
+	/**
+	* 员工状态
+	*/
+		private String userStatus;
+	/**
+	* 银行卡号
+	*/
+		private String bankNum;
+	/**
+	* 员工类型
+	*/
+		private Integer userType;
+	/**
+	* 员工照片路径
+	*/
+		private String userImgUrl;
+
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserpayInfo.java

@@ -59,12 +59,12 @@ public class UserpayInfo extends BaseEntity {
      * 应出勤天数
      */
     @ApiModelProperty(value = "应出勤天数")
-    private Integer yAllDays;
+    private Integer yaAllDays;
     /**
      * 实际出勤天数
      */
     @ApiModelProperty(value = "实际出勤天数")
-    private Integer sAllDays;
+    private Integer saAllDays;
     /**
      * 年假
      */
@@ -74,7 +74,7 @@ public class UserpayInfo extends BaseEntity {
      * 调休假
      */
     @ApiModelProperty(value = "调休假")
-    private Integer cLeaveDays;
+    private Integer caLeaveDays;
     /**
      * 病假
      */
@@ -120,6 +120,13 @@ public class UserpayInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "考勤扣款")
     private BigDecimal attendDuction;
+
+    /**
+     * 考勤扣款
+     */
+    @ApiModelProperty(value = "考勤扣款")
+    private BigDecimal absDuction;
+
     /**
      * 其他扣款
      */

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserContractInfoVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.control.entity.UserContractInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,4 +32,17 @@ import lombok.EqualsAndHashCode;
 public class UserContractInfoVO extends UserContractInfo {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "职位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "合同类型名称")
+    private String conTypeName;
+
+
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserFilesInfoVO.java

@@ -0,0 +1,102 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.control.entity.UserFilesInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * 档案职工信息表视图实体类
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserFilesInfoVO extends UserFilesInfo {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户姓名")
+	private String name;
+
+	@ApiModelProperty(value = "用户手机号")
+	private String phone;
+
+	@ApiModelProperty(value = "身份证号码姓名")
+	private String carName;
+
+	@ApiModelProperty(value = "性别")
+	private String sex;
+
+	@ApiModelProperty(value = "性别中文")
+	private String sexName;
+
+	@ApiModelProperty(value = "民族")
+	private String nation;
+
+	@ApiModelProperty(value = "身份证号码")
+	private String idNumber;
+
+	@ApiModelProperty(value = "出生日期")
+	private String birthday;
+
+	@ApiModelProperty(value = "入职时间")
+	private LocalDate entryTime;
+
+	@ApiModelProperty(value = "合同类型")
+	private Integer conType;
+
+	@ApiModelProperty(value = "合同类型名称")
+	private String conTypeName;
+
+	@ApiModelProperty(value = "司龄")
+	private double cyear;
+
+	@ApiModelProperty(value = "合同开始日期")
+	private LocalDate conStartDate;
+
+	@ApiModelProperty(value = "职位Id")
+	private long postId;
+
+	@ApiModelProperty(value = "职位名称")
+	private String postName;
+
+	@ApiModelProperty(value = "合同结束日期")
+	private LocalDate conEndDate;
+
+	@ApiModelProperty(value = "邮箱信息")
+	private String  email;
+
+	@ApiModelProperty(value = "部门Id")
+	private long deptId;
+
+	@ApiModelProperty(value = "部门名称")
+	private String deptName;
+
+	@ApiModelProperty(value = "合同附件名称")
+	private String conFileUrl;
+
+	@ApiModelProperty(value = "学历中文")
+	private String educationName;
+
+	@ApiModelProperty(value = "直接主管")
+	private String leaderName;
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserpayInfoVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.control.entity.UserpayInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,4 +32,6 @@ import lombok.EqualsAndHashCode;
 public class UserpayInfoVO extends UserpayInfo {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "用户姓名")
+    private String name;
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/DefaultConfigController.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.apache.commons.lang.StringUtils;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -38,8 +39,9 @@ public class DefaultConfigController extends BladeController {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "详情", notes = "传入defaultConfig")
-    public R<DefaultConfig> detail() {
-        return R.data(this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery().eq(DefaultConfig::getCreateUser, AuthUtil.getUserId())));
+    public R<DefaultConfig> detail(BladeUser user) {
+        DefaultConfig one = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery().eq(DefaultConfig::getCreateUser, AuthUtil.getUserId()));
+        return R.data(one);
     }
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/mapper/DefaultConfigMapper.xml

@@ -4,14 +4,6 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="defaultConfigResultMap" type="org.springblade.business.entity.DefaultConfig">
-        <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_dept" property="createDept"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
         <result column="theme" property="theme"/>
         <result column="color" property="color"/>
         <result column="home_theme" property="homeTheme"/>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -4,14 +4,6 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="informationQueryResultMap" type="org.springblade.business.entity.InformationQuery">
-        <result column="id" property="id"/>
-        <result column="create_user" property="createUser"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_dept" property="createDept"/>
-        <result column="update_user" property="updateUser"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="status" property="status"/>
-        <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
         <result column="number" property="number"/>
         <result column="category" property="category"/>
@@ -35,10 +27,11 @@
         <result column="sj_record_ids" property="sjRecordIds"/>
         <result column="sort" property="sort"/>
         <result column="pdf_trial_url" property="pdfTrialUrl"/>
+        <result column="source_type" property="sourceType"/>
         <result column="pdf_trial_url_position" property="pdfTrialUrlPosition"/>
        <result column="business_time" property="businessTime"/>
-        <result column="e_visa_pdf_page" property="eVisaPdfPage"/>
-        <result column="e_visa_pdf_size" property="eVisaPdfSize"/>
+        <result column="e_visa_pdf_page" property="eVisaPdfSize"/>
+        <result column="e_visa_pdf_size" property="eVisaPdfPage"/>
     </resultMap>
 
     <resultMap id="queryProcessDataMap" type="org.springblade.business.vo.QueryProcessDataVO">

blade-service/blade-control/src/main/java/org/springblade/control/controller/CorporationInfoController.java

@@ -187,7 +187,11 @@ public class CorporationInfoController extends BladeController {
         }
 
         boolean b = corporationInfoService.saveOrUpdate(corporationInfo);
-        return R.status(b);
+        if (b){
+           return R.success("操作成功");
+        }else{
+            return  R.fail("操作失败");
+        }
     }
 
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/UserFilesInfoController.java

@@ -0,0 +1,117 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+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 org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.control.entity.UserFilesInfo;
+import org.springblade.control.vo.UserFilesInfoVO;
+import org.springblade.control.service.IUserFilesInfoService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 档案职工信息表 控制器
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/userfilesinfo")
+@Api(value = "档案职工信息表", tags = "档案职工信息表接口")
+public class UserFilesInfoController extends BladeController {
+
+	private final IUserFilesInfoService userFilesInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入userFilesInfo")
+	public R<UserFilesInfo> detail(UserFilesInfo userFilesInfo) {
+		UserFilesInfo detail = userFilesInfoService.getOne(Condition.getQueryWrapper(userFilesInfo));
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 自定义分页 档案职工信息表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入userFilesInfo")
+	public R<IPage<UserFilesInfoVO>> page(UserFilesInfoVO userFilesInfo, Query query) {
+		IPage<UserFilesInfoVO> pages = userFilesInfoService.selectUserFilesInfoPage(Condition.getPage(query), userFilesInfo);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 档案职工信息表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入userFilesInfo")
+	public R save(@Valid @RequestBody UserFilesInfo userFilesInfo) {
+		return R.status(userFilesInfoService.save(userFilesInfo));
+	}
+
+	/**
+	 * 修改 档案职工信息表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入userFilesInfo")
+	public R update(@Valid @RequestBody UserFilesInfo userFilesInfo) {
+		return R.status(userFilesInfoService.updateById(userFilesInfo));
+	}
+
+	/**
+	 * 新增或修改 档案职工信息表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入userFilesInfo")
+	public R submit(@Valid @RequestBody UserFilesInfo userFilesInfo) {
+		return R.status(userFilesInfoService.saveOrUpdate(userFilesInfo));
+	}
+
+	
+	/**
+	 * 删除 档案职工信息表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(userFilesInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/blade-control/src/main/java/org/springblade/control/controller/UserpayInfoController.java

@@ -16,15 +16,14 @@
  */
 package org.springblade.control.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import lombok.SneakyThrows;
 import org.springblade.control.excel.UserpayExcel;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -123,17 +122,22 @@ public class UserpayInfoController extends BladeController {
     }
 
 
+
+
+
+
     /**
      * 导入薪酬管理
      */
     @PostMapping("import-userpay")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "导入薪酬管理", notes = "传入excel")
-    public R importUserpayInfo(MultipartFile file) {
-        List<UserpayExcel> list = ExcelUtil.read(file, UserpayExcel.class);
-
-        //userpayInfoService.saveBatch();
-        return R.success("操作成功");
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "file", value = "文件源", required = true),
+            @ApiImplicitParam(name = "dateInfo", value = "时间yyyy-mm", required = true)
+    })
+    public R importUserpayInfo(@RequestParam("file") MultipartFile file,String dateInfo) {
+        return userpayInfoService.importUserpayInfo(file,dateInfo);
     }
 
     /**

blade-service/blade-control/src/main/java/org/springblade/control/excel/UserpayExcel.java

@@ -41,13 +41,18 @@ public class UserpayExcel implements Serializable {
     @ExcelProperty("姓名")
     private String userName;
 
+/*    @ColumnWidth(15)
+    @ExcelProperty("薪酬时间")
+    private String costTime;*/
+
+
     @ColumnWidth(15)
     @ExcelProperty(value = "应出勤天数")
-    private Integer yAllDays;
+    private Integer yaAllDays;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "实际出勤天数")
-    private Integer sAllDays;
+    private Integer saAllDays;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "年假")
@@ -55,7 +60,7 @@ public class UserpayExcel implements Serializable {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "调休假")
-    private Integer cLeaveDays;
+    private Integer caLeaveDays;
 
     @ColumnWidth(15)
     @ExcelProperty(value = "病假")

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserContractInfoMapper.xml

@@ -5,20 +5,42 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="userContractInfoResultMap" type="org.springblade.control.entity.UserContractInfo">
         <result column="id" property="id"/>
-        <result column="is_deleted" property="isDeleted"/>
         <result column="user_id" property="userId"/>
         <result column="con_type" property="conType"/>
         <result column="start_date" property="startDate"/>
         <result column="end_date" property="endDate"/>
         <result column="file_url" property="fileUrl"/>
         <result column="type" property="type"/>
+        <result column="le_reasion" property="leReasion"/>
+        <result column="con_file_name" property="conFileName"/>
+    </resultMap>
+
+    <resultMap id="userContractInfoVOResultMap" type="org.springblade.control.vo.UserContractInfoVO">
+        <result column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="con_type" property="conType"/>
+        <result column="start_date" property="startDate"/>
+        <result column="end_date" property="endDate"/>
+        <result column="file_url" property="fileUrl"/>
+        <result column="type" property="type"/>
+        <result column="le_reasion" property="leReasion"/>
+        <result column="userName" property="userName"/>
+        <result column="conTypeName" property="conTypeName"/>
+        <result column="deptName" property="deptName"/>
+        <result column="postName" property="postName"/>
     </resultMap>
 
 
-    <select id="selectUserContractInfoPage" resultMap="userContractInfoResultMap">
-        select *
-        from c_user_contract_info
-        where is_deleted = 0
+    <select id="selectUserContractInfoPage" resultMap="userContractInfoVOResultMap">
+        select a.*,
+        (SELECT name from blade_user b where a.user_id = b.id) as userName,
+        (SELECT GROUP_CONCAT(c.dept_name) from blade_dept c where c.id in(SELECT dept_id from blade_user d where d.id=a.user_id) ) as deptName,
+        (SELECT GROUP_CONCAT(c.dept_name) from blade_dept c where c.id in(SELECT post_id from blade_user d where d.id=a.user_id) ) as postName,
+        (SELECT dict_name from c_dict_info where code='con_type' and parent_id!=0 and dict_value = a.con_type) as conTypeName
+        from c_user_contract_info a where is_deleted = 0
+        <if test="param2.type!=null and param2.type!=''">
+            and type = #{userContractInfo.type}
+        </if>
     </select>
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserFilesInfoMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.mapper;
+
+import org.springblade.control.entity.UserFilesInfo;
+import org.springblade.control.vo.UserFilesInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 档案职工信息表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+public interface UserFilesInfoMapper extends BaseMapper<UserFilesInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param userFilesInfo
+	 * @return
+	 */
+	List<UserFilesInfoVO> selectUserFilesInfoPage(IPage page, UserFilesInfoVO userFilesInfo);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserFilesInfoMapper.xml

@@ -0,0 +1,37 @@
+<?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.control.mapper.UserFilesInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="userFilesInfoResultMap" type="org.springblade.control.entity.UserFilesInfo">
+        <result column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="user_age" property="userAge"/>
+        <result column="car_name" property="carName"/>
+        <result column="nation" property="nation"/>
+        <result column="period_moth" property="periodMoth"/>
+        <result column="car_addr" property="carAddr"/>
+        <result column="car_aimg_url" property="carAimgUrl"/>
+        <result column="car_bimg_url" property="carBimgUrl"/>
+        <result column="marriage_status" property="marriageStatus"/>
+        <result column="renewal_count" property="renewalCount"/>
+        <result column="domicile_addr" property="domicileAddr"/>
+        <result column="education_type" property="educationType"/>
+        <result column="emergency_name" property="emergencyName"/>
+        <result column="emergency_phone" property="emergencyPhone"/>
+        <result column="emergency_relation" property="emergencyRelation"/>
+        <result column="speciality" property="speciality"/>
+        <result column="political" property="political"/>
+        <result column="bank_name" property="bankName"/>
+        <result column="user_status" property="userStatus"/>
+        <result column="bank_num" property="bankNum"/>
+        <result column="user_type" property="userType"/>
+        <result column="user_img_url" property="userImgUrl"/>
+    </resultMap>
+
+
+    <select id="selectUserFilesInfoPage" resultMap="userFilesInfoResultMap">
+        select * from c_user_files_info where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.java

@@ -40,4 +40,6 @@ public interface UserpayInfoMapper extends BaseMapper<UserpayInfo> {
      */
     List<UserpayInfoVO> selectUserpayInfoPage(IPage page, UserpayInfoVO userpayInfo);
 
+    boolean delUserPayInoByDate(String date);
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.xml

@@ -7,10 +7,10 @@
         <result column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="cost_time" property="costTime"/>
-        <result column="y_all_days" property="yAllDays"/>
-        <result column="s_all_days" property="sAllDays"/>
+        <result column="y_all_days" property="yaAllDays"/>
+        <result column="s_all_days" property="saAllDays"/>
         <result column="year_days" property="yearDays"/>
-        <result column="c_leave_days" property="cLeaveDays"/>
+        <result column="c_leave_days" property="caLeaveDays"/>
         <result column="sick_leave_days" property="sickLeaveDays"/>
         <result column="absence_days" property="absenceDays"/>
         <result column="basic_salary" property="basicSalary"/>
@@ -18,6 +18,7 @@
         <result column="merit_salary" property="meritSalary"/>
         <result column="bonus_salary" property="bonusSalary"/>
         <result column="meal_wance" property="mealWance"/>
+        <result column="abs_duction" property="absDuction"/>
         <result column="other_wance" property="otherWance"/>
         <result column="attend_duction" property="attendDuction"/>
         <result column="other_duction" property="otherDuction"/>
@@ -28,11 +29,43 @@
         <result column="desc" property="desc"/>
     </resultMap>
 
+    <resultMap id="userpayInfoResultVOMap" type="org.springblade.control.vo.UserpayInfoVO">
+        <result column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="cost_time" property="costTime"/>
+        <result column="y_all_days" property="yaAllDays"/>
+        <result column="s_all_days" property="saAllDays"/>
+        <result column="year_days" property="yearDays"/>
+        <result column="c_leave_days" property="caLeaveDays"/>
+        <result column="sick_leave_days" property="sickLeaveDays"/>
+        <result column="absence_days" property="absenceDays"/>
+        <result column="basic_salary" property="basicSalary"/>
+        <result column="post_salary" property="postSalary"/>
+        <result column="merit_salary" property="meritSalary"/>
+        <result column="bonus_salary" property="bonusSalary"/>
+        <result column="meal_wance" property="mealWance"/>
+        <result column="abs_duction" property="absDuction"/>
+        <result column="other_wance" property="otherWance"/>
+        <result column="attend_duction" property="attendDuction"/>
+        <result column="other_duction" property="otherDuction"/>
+        <result column="gross_pay" property="grossPay"/>
+        <result column="personal_tax" property="personalTax"/>
+        <result column="social_sec" property="socialSec"/>
+        <result column="net_salary" property="netSalary"/>
+        <result column="desc" property="desc"/>
+        <result column="name" property="name"/>
+    </resultMap>
+
 
-    <select id="selectUserpayInfoPage" resultMap="userpayInfoResultMap">
-        select *
-        from c_user_pay_info
-        where is_deleted = 0
+    <select id="selectUserpayInfoPage" resultMap="userpayInfoResultVOMap">
+        select *,(SELECT name from blade_user b where a.user_id = b.id) as name from c_user_pay_info a
+        where a.is_deleted = 0
     </select>
 
+
+
+    <delete id="delUserPayInoByDate">
+        delete from m_role_post where cost_time = #{date}
+    </delete>
+
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/IUserFilesInfoService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.service;
+
+import org.springblade.control.entity.UserFilesInfo;
+import org.springblade.control.vo.UserFilesInfoVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 档案职工信息表 服务类
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+public interface IUserFilesInfoService extends BaseService<UserFilesInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param userFilesInfo
+	 * @return
+	 */
+	IPage<UserFilesInfoVO> selectUserFilesInfoPage(IPage<UserFilesInfoVO> page, UserFilesInfoVO userFilesInfo);
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/IUserpayInfoService.java

@@ -20,6 +20,8 @@ import org.springblade.control.entity.UserpayInfo;
 import org.springblade.control.vo.UserpayInfoVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 薪酬管理 服务类
@@ -38,4 +40,7 @@ public interface IUserpayInfoService extends BaseService<UserpayInfo> {
      */
     IPage<UserpayInfoVO> selectUserpayInfoPage(IPage<UserpayInfoVO> page, UserpayInfoVO userpayInfo);
 
+    boolean delUserPayInoByDate(String date);
+
+    R importUserpayInfo(MultipartFile file, String dateInfo);
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/UserFilesInfoServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.control.service.impl;
+
+import org.springblade.control.entity.UserFilesInfo;
+import org.springblade.control.vo.UserFilesInfoVO;
+import org.springblade.control.mapper.UserFilesInfoMapper;
+import org.springblade.control.service.IUserFilesInfoService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 档案职工信息表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-07-07
+ */
+@Service
+public class UserFilesInfoServiceImpl extends BaseServiceImpl<UserFilesInfoMapper, UserFilesInfo> implements IUserFilesInfoService {
+
+	@Override
+	public IPage<UserFilesInfoVO> selectUserFilesInfoPage(IPage<UserFilesInfoVO> page, UserFilesInfoVO userFilesInfo) {
+		return page.setRecords(baseMapper.selectUserFilesInfoPage(page, userFilesInfo));
+	}
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/UserpayInfoServiceImpl.java

@@ -17,12 +17,18 @@
 package org.springblade.control.service.impl;
 
 import org.springblade.control.entity.UserpayInfo;
+import org.springblade.control.excel.UserpayExcel;
 import org.springblade.control.vo.UserpayInfoVO;
 import org.springblade.control.mapper.UserpayInfoMapper;
 import org.springblade.control.service.IUserpayInfoService;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 薪酬管理 服务实现类
@@ -38,4 +44,19 @@ public class UserpayInfoServiceImpl extends BaseServiceImpl<UserpayInfoMapper, U
         return page.setRecords(baseMapper.selectUserpayInfoPage(page, userpayInfo));
     }
 
+    @Override
+    public boolean delUserPayInoByDate(String date) {
+        return baseMapper.delUserPayInoByDate(date);
+    }
+
+    @Override
+    public R importUserpayInfo(MultipartFile file, String dateInfo) {
+        List<UserpayExcel> list = ExcelUtil.read(file, UserpayExcel.class);
+        if(list!=null && list.size()>=1){
+            //list.stream().
+        }
+
+        return null;
+    }
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/mapper/NoticeMapper.xml

@@ -43,7 +43,7 @@
         LEFT JOIN ( SELECT * FROM blade_dict WHERE CODE = 'notice' ) d ON n.category = d.dict_key
         WHERE
         n.is_deleted = 0 and n.tenant_id = #{notice.tenantId}
-        <if test="notice.title!=null">
+         test="notice.title!=null">
             and n.title like concat(concat('%', #{notice.title}), '%')
         </if>
         <if test="notice.category!=null">