From 25098b059d812bec89c8f55e049d409e044b54b4 Mon Sep 17 00:00:00 2001 From: tzy Date: Fri, 30 May 2025 10:51:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(personnelMatters):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=9D=A2=E8=AF=95=E7=99=BB=E8=AE=B0=E8=A1=A8=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 RzInterviewerDetail 类用于存储面试登记表详细信息 - 在 RzInterviewer 中添加表单数据字段 - 实现面试登记表信息的导入和导出功能 - 优化面试信息的添加和更新逻辑 --- .../evo/attendance/domain/vo/RzSalaryVo.java | 22 +++ .../common/core/domain/entity/SysDept.java | 111 +------------ .../controller/RzSalaryDetailController.java | 18 +++ .../evo/finance/domain/RzSalaryDetail.java | 111 +++++++------ .../finance/mapper/RzSalaryDetailMapper.java | 5 +- .../service/IRzSalaryDetailService.java | 3 + .../impl/RzSalaryDetailServiceImpl.java | 43 ++++- .../evo/framework/config/SecurityConfig.java | 1 + .../controller/RzInterviewerController.java | 23 ++- .../domain/RzInterviewer.java | 119 ++------------ .../domain/vo/EducationExperience.java | 12 ++ .../domain/vo/FamilyMember.java | 13 ++ .../domain/vo/RzInterviewerDetail.java | 150 ++++++++++++++++++ .../domain/vo/WorkExperience.java | 13 ++ .../impl/RzInterviewerServiceImpl.java | 41 ++++- .../RzRestaurantImagesController.java | 1 + .../impl/RzRestaurantImagesServiceImpl.java | 6 +- .../system/controller/SysStaffController.java | 14 +- .../com/evo/system/domain/SysStaffDetail.java | 3 + .../com/evo/system/mapper/SysDeptMapper.java | 4 +- .../evo/system/service/ISysStaffService.java | 8 +- .../impl/SysStaffDetailServiceImpl.java | 6 +- .../service/impl/SysStaffServiceImpl.java | 48 +++++- .../mapper/finance/RzSalaryDetailMapper.xml | 6 +- .../personnelMatters/RzInterviewerMapper.xml | 12 +- .../resources/mapper/system/SysDeptMapper.xml | 11 +- .../mapper/system/SysStaffDetailMapper.xml | 2 + 27 files changed, 513 insertions(+), 293 deletions(-) create mode 100644 evo-admin/src/main/java/com/evo/attendance/domain/vo/RzSalaryVo.java create mode 100644 evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/EducationExperience.java create mode 100644 evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/FamilyMember.java create mode 100644 evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/RzInterviewerDetail.java create mode 100644 evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/WorkExperience.java diff --git a/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzSalaryVo.java b/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzSalaryVo.java new file mode 100644 index 0000000..7d66562 --- /dev/null +++ b/evo-admin/src/main/java/com/evo/attendance/domain/vo/RzSalaryVo.java @@ -0,0 +1,22 @@ +package com.evo.attendance.domain.vo; + +import com.evo.common.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/* + * @Author ：tzy + * @Description ：用于导入销售提成 + */ +@Data +public class RzSalaryVo { + + @Excel(name = "姓名") + private String name; + @Excel(name = "提成金额") + private BigDecimal sale; + @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM") + private Date date; +} diff --git a/evo-admin/src/main/java/com/evo/common/core/domain/entity/SysDept.java b/evo-admin/src/main/java/com/evo/common/core/domain/entity/SysDept.java index 6215bca..917f8f8 100644 --- a/evo-admin/src/main/java/com/evo/common/core/domain/entity/SysDept.java +++ b/evo-admin/src/main/java/com/evo/common/core/domain/entity/SysDept.java @@ -6,6 +6,8 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.evo.common.core.domain.BaseEntity; @@ -15,6 +17,7 @@ import com.evo.common.core.domain.BaseEntity; * * @author evo */ +@Data public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; @@ -46,39 +49,12 @@ public class SysDept extends BaseEntity /** 父部门名称 */ private String parentName; + /** 是否加班 */ + private String isOverTime; + /** 子部门 */ private List children = new ArrayList(); - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } - - public String getAncestors() - { - return ancestors; - } - - public void setAncestors(String ancestors) - { - this.ancestors = ancestors; - } - @NotBlank(message = "部门名称不能为空") @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") public String getDeptName() @@ -86,86 +62,11 @@ public class SysDept extends BaseEntity return deptName; } - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - public String getLeader() - { - return leader; - } - - public void setLeader(String leader) - { - this.leader = leader; - } - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") public String getPhone() { return phone; } - public void setPhone(String phone) - { - this.phone = phone; - } - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getDelFlag() - { - return delFlag; - } - - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deptId", getDeptId()) - .append("parentId", getParentId()) - .append("ancestors", getAncestors()) - .append("deptName", getDeptName()) - .append("leader", getLeader()) - .append("phone", getPhone()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/evo-admin/src/main/java/com/evo/finance/controller/RzSalaryDetailController.java b/evo-admin/src/main/java/com/evo/finance/controller/RzSalaryDetailController.java index 4260a1b..4721db6 100644 --- a/evo-admin/src/main/java/com/evo/finance/controller/RzSalaryDetailController.java +++ b/evo-admin/src/main/java/com/evo/finance/controller/RzSalaryDetailController.java @@ -4,10 +4,14 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; + +import com.evo.attendance.domain.vo.RzAttendanceDetailVO; +import com.evo.attendance.domain.vo.RzSalaryVo; import com.evo.common.constant.Constants; import com.evo.common.core.domain.entity.SysDept; import com.evo.common.core.domain.entity.SysDictData; import com.evo.common.utils.StringUtils; +import com.evo.common.utils.poi.ExcelUtil; import com.evo.common.utils.poi.ExcelUtilSs; import com.evo.finance.domain.vo.SalaryVo; import com.evo.system.mapper.SysDictDataMapper; @@ -30,6 +34,8 @@ import com.evo.common.enums.BusinessType; import com.evo.finance.domain.RzSalaryDetail; import com.evo.finance.service.IRzSalaryDetailService; import com.evo.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; + import javax.annotation.Resource; /** @@ -491,5 +497,17 @@ public class RzSalaryDetailController extends BaseController String footer = "制表: "+"审核: "+"经理签字: "+"总经理签字: "; return util.exportExcel(list,lists,"总表",sheetNameList,title,footer); } + /** + * 导入销售提成 + */ + @PreAuthorize("@ss.hasPermi('finance:financeDetail:importSalesCommissions')") + @Log(title = "导入销售提成", businessType = BusinessType.IMPORT) + @PostMapping("/importSalesCommissions") + public AjaxResult importSalesCommissions(MultipartFile file) throws Exception + { + ExcelUtil util = new ExcelUtil<>(RzSalaryVo.class); + List attendanceList = util.importExcel(file.getInputStream()); + return success(rzSalaryDetailService.importSalesCommissions(attendanceList)); + } } diff --git a/evo-admin/src/main/java/com/evo/finance/domain/RzSalaryDetail.java b/evo-admin/src/main/java/com/evo/finance/domain/RzSalaryDetail.java index fcf146d..dcdf614 100644 --- a/evo-admin/src/main/java/com/evo/finance/domain/RzSalaryDetail.java +++ b/evo-admin/src/main/java/com/evo/finance/domain/RzSalaryDetail.java @@ -184,17 +184,28 @@ public class RzSalaryDetail extends BaseEntity @Excel(name = "本月应缴个税") private BigDecimal taxPayable; + /** 实发工资 */ @Excel(name = "实发工资") private BigDecimal netPayroll; - + @Excel(name = "销售提成") + private BigDecimal salesCommission; /** 备注 */ @Excel(name = "备注") private String remarks; + /** 删除标识 */ private String delFlag; + public BigDecimal getSalesCommission() { + return salesCommission; + } + + public void setSalesCommission(BigDecimal salesCommission) { + this.salesCommission = salesCommission; + } + public BigDecimal getMonthSalary() { return monthSalary; } @@ -609,54 +620,54 @@ public class RzSalaryDetail extends BaseEntity @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("staffId", getStaffId()) - .append("name", getName()) - .append("month", getMonth()) - .append("wbFlag", getWbFlag()) - .append("deptId", getDeptId()) - .append("basicSalary", getBasicSalary()) - .append("jobSalary", getJobSalary()) - .append("dailyWage", getDailyWage()) - .append("hoursSalary", getHoursSalary()) - .append("overtimeSalary", getOvertimeSalary()) - .append("levelSubsidies", getLevelSubsidies()) - .append("contractSubsidies", getContractSubsidies()) - .append("senioritySalary", getSenioritySalary()) - .append("socialSubsidies", getSocialSubsidies()) - .append("fullSubsidies", getFullSubsidies()) - .append("nightSubsidies", getNightSubsidies()) - .append("dinnerSubsidies", getDinnerSubsidies()) - .append("subsidyOrBonus", getSubsidyOrBonus()) - .append("absenteeismSalary", getAbsenteeismSalary()) - .append("absenteeismSubsidies", getAbsenteeismSubsidies()) - .append("mealFee", getMealFee()) - .append("deductions", getDeductions()) - .append("salary", getSalary()) - .append("payInsurance", getPayInsurance()) - .append("endowmentInsurance", getEndowmentInsurance()) - .append("medicalInsurance", getMedicalInsurance()) - .append("employmentInjuryInsurance", getEmploymentInjuryInsurance()) - .append("maternityInsurance", getMaternityInsurance()) - .append("unemploymentInsurance", getUnemploymentInsurance()) - .append("accumulationFund", getAccumulationFund()) - .append("salaryBeforeTax", getSalaryBeforeTax()) - .append("totalWages", getTotalWages()) - .append("annualExemptionAmount", getAnnualExemptionAmount()) - .append("specialDeduction", getSpecialDeduction()) - .append("taxableIncome", getTaxableIncome()) - .append("taxRate", getTaxRate()) - .append("slowDownTheDeduction", getSlowDownTheDeduction()) - .append("aggregatePersonalIncomeTax", getAggregatePersonalIncomeTax()) - .append("taxPayable", getTaxPayable()) - .append("netPayroll", getNetPayroll()) - .append("remarks", getRemarks()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "RzSalaryDetail{" + + "id=" + id + + ", staffId=" + staffId + + ", name='" + name + '\'' + + ", month=" + month + + ", wbFlag='" + wbFlag + '\'' + + ", deptId=" + deptId + + ", deptName='" + deptName + '\'' + + ", monthSalary=" + monthSalary + + ", basicSalary=" + basicSalary + + ", jobSalary=" + jobSalary + + ", dailyWage=" + dailyWage + + ", hoursSalary=" + hoursSalary + + ", overtimeSalary=" + overtimeSalary + + ", levelSubsidies=" + levelSubsidies + + ", contractSubsidies=" + contractSubsidies + + ", senioritySalary=" + senioritySalary + + ", socialSubsidies=" + socialSubsidies + + ", fullSubsidies=" + fullSubsidies + + ", middleSubsidies=" + middleSubsidies + + ", nightSubsidies=" + nightSubsidies + + ", dinnerSubsidies=" + dinnerSubsidies + + ", subsidyOrBonus=" + subsidyOrBonus + + ", absenteeismSalary=" + absenteeismSalary + + ", absenteeismSubsidies=" + absenteeismSubsidies + + ", mealFee=" + mealFee + + ", deductions=" + deductions + + ", salary=" + salary + + ", payInsurance=" + payInsurance + + ", endowmentInsurance=" + endowmentInsurance + + ", medicalInsurance=" + medicalInsurance + + ", employmentInjuryInsurance=" + employmentInjuryInsurance + + ", maternityInsurance=" + maternityInsurance + + ", unemploymentInsurance=" + unemploymentInsurance + + ", accumulationFund=" + accumulationFund + + ", salaryBeforeTax=" + salaryBeforeTax + + ", totalWages=" + totalWages + + ", annualExemptionAmount=" + annualExemptionAmount + + ", specialDeduction=" + specialDeduction + + ", taxableIncome=" + taxableIncome + + ", taxRate=" + taxRate + + ", slowDownTheDeduction=" + slowDownTheDeduction + + ", aggregatePersonalIncomeTax=" + aggregatePersonalIncomeTax + + ", taxPayable=" + taxPayable + + ", netPayroll=" + netPayroll + + ", salesCommission=" + salesCommission + + ", remarks='" + remarks + '\'' + + ", delFlag='" + delFlag + '\'' + + '}'; } } diff --git a/evo-admin/src/main/java/com/evo/finance/mapper/RzSalaryDetailMapper.java b/evo-admin/src/main/java/com/evo/finance/mapper/RzSalaryDetailMapper.java index bface97..0e21284 100644 --- a/evo-admin/src/main/java/com/evo/finance/mapper/RzSalaryDetailMapper.java +++ b/evo-admin/src/main/java/com/evo/finance/mapper/RzSalaryDetailMapper.java @@ -2,7 +2,10 @@ package com.evo.finance.mapper; import java.util.Date; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.evo.finance.domain.RzSalaryDetail; +import com.evo.system.domain.SysStaff; import org.apache.ibatis.annotations.Param; /** @@ -11,7 +14,7 @@ import org.apache.ibatis.annotations.Param; * @author evo * @date 2024-11-26 */ -public interface RzSalaryDetailMapper +public interface RzSalaryDetailMapper extends BaseMapper { /** * 查询工资详情 diff --git a/evo-admin/src/main/java/com/evo/finance/service/IRzSalaryDetailService.java b/evo-admin/src/main/java/com/evo/finance/service/IRzSalaryDetailService.java index 71b0604..97ac51b 100644 --- a/evo-admin/src/main/java/com/evo/finance/service/IRzSalaryDetailService.java +++ b/evo-admin/src/main/java/com/evo/finance/service/IRzSalaryDetailService.java @@ -2,6 +2,8 @@ package com.evo.finance.service; import java.util.Date; import java.util.List; + +import com.evo.attendance.domain.vo.RzSalaryVo; import com.evo.common.core.domain.AjaxResult; import com.evo.finance.domain.RzSalaryDetail; import org.apache.ibatis.annotations.Param; @@ -66,4 +68,5 @@ public interface IRzSalaryDetailService */ public List selectSalaryDetailByWbFlag(String wbFlag,Date date); + AjaxResult importSalesCommissions(List attendanceList); } diff --git a/evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java b/evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java index 4b8d2f5..981a44e 100644 --- a/evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java @@ -1,13 +1,14 @@ package com.evo.finance.service.impl; -import com.evo.attendance.domain.RzAttendance; -import com.evo.attendance.domain.RzAttendanceStatistical; -import com.evo.attendance.domain.RzSpecialOverTime; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.evo.attendance.domain.vo.RzSalaryVo; import com.evo.attendance.mapper.RzAttendanceMapper; import com.evo.attendance.mapper.RzAttendanceStatisticalMapper; import com.evo.attendance.mapper.RzSpecialOverTimeMapper; import com.evo.common.constant.Constants; import com.evo.common.core.domain.AjaxResult; +import com.evo.common.core.domain.entity.SysDept; import com.evo.common.utils.DateUtils; import com.evo.common.utils.SecurityUtils; import com.evo.common.utils.StringUtils; @@ -16,7 +17,6 @@ import com.evo.finance.domain.RzSalaryStatistics; import com.evo.finance.mapper.RzSalaryDetailMapper; import com.evo.finance.mapper.RzSalaryStatisticsMapper; import com.evo.finance.service.IRzSalaryDetailService; -import com.evo.personnelMatters.domain.RzHoliday; import com.evo.personnelMatters.mapper.RzHolidayMapper; import com.evo.restaurant.domain.RzRestaurantStatistics; import com.evo.restaurant.mapper.RzRestaurantStatisticsMapper; @@ -26,13 +26,11 @@ import com.evo.system.mapper.SysDeptMapper; import com.evo.system.mapper.SysStaffDetailMapper; import com.evo.system.mapper.SysStaffMapper; import com.evo.system.service.ISysDictDataService; -import com.evo.utils.DateUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -45,7 +43,7 @@ import java.util.List; * @date 2024-11-26 */ @Service -public class RzSalaryDetailServiceImpl implements IRzSalaryDetailService +public class RzSalaryDetailServiceImpl extends ServiceImpl implements IRzSalaryDetailService { @Resource private RzSalaryDetailMapper rzSalaryDetailMapper; @@ -69,6 +67,7 @@ public class RzSalaryDetailServiceImpl implements IRzSalaryDetailService private RzSpecialOverTimeMapper rzSpecialOverTimeMapper; @Resource private ISysDictDataService sysDictDataService; + /** * 查询工资详情 * @@ -554,4 +553,34 @@ public class RzSalaryDetailServiceImpl implements IRzSalaryDetailService public List selectSalaryDetailByWbFlag(String wbFlag,Date date){ return rzSalaryDetailMapper.selectSalaryDetailByWbFlag(wbFlag,date); } + + @Override + public AjaxResult importSalesCommissions(List attendanceList) { + + LambdaQueryWrapper wa = new LambdaQueryWrapper<>(); + wa.eq(SysDept::getDelFlag,Constants.DELETE_FLAG_0) + .eq(SysDept::getDeptName,"销售部"); + SysDept sysDept = deptMapper.selectOne(wa); + + + //更新工资单详情,写入销售提成 + for (RzSalaryVo rzSalaryVo : attendanceList) { + if (rzSalaryVo.getSale() != null ){ + //根据本门查询 月份工资单 + List rzSalaryDetails = rzSalaryDetailMapper.selectSalaryDetailByDeptId(sysDept.getDeptId(),rzSalaryVo.getDate()); + if (!rzSalaryDetails.isEmpty()){ + for (RzSalaryDetail rzSalaryDetail : rzSalaryDetails) { + if (rzSalaryDetail.getName().equals(rzSalaryVo.getName())){ + //更新销售提成 + rzSalaryDetail.setSalesCommission(rzSalaryVo.getSale()); + rzSalaryDetail.setUpdateTime(DateUtils.getNowDate()); + rzSalaryDetail.setUpdateBy(SecurityUtils.getUsername()); + rzSalaryDetailMapper.updateById(rzSalaryDetail); + } + } + } + } + } + return AjaxResult.success(); + } } diff --git a/evo-admin/src/main/java/com/evo/framework/config/SecurityConfig.java b/evo-admin/src/main/java/com/evo/framework/config/SecurityConfig.java index 072a00c..da4369e 100644 --- a/evo-admin/src/main/java/com/evo/framework/config/SecurityConfig.java +++ b/evo-admin/src/main/java/com/evo/framework/config/SecurityConfig.java @@ -120,6 +120,7 @@ public class SecurityConfig .antMatchers("/api/v1/verify_user").permitAll() .antMatchers("/api/v1/record/face").permitAll() .antMatchers("/api/v2/verify_user_yt").permitAll() + .antMatchers("/dev-api/personnelMatters/interviewer").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/controller/RzInterviewerController.java b/evo-admin/src/main/java/com/evo/personnelMatters/controller/RzInterviewerController.java index 9ed6cb6..7958333 100644 --- a/evo-admin/src/main/java/com/evo/personnelMatters/controller/RzInterviewerController.java +++ b/evo-admin/src/main/java/com/evo/personnelMatters/controller/RzInterviewerController.java @@ -1,5 +1,8 @@ package com.evo.personnelMatters.controller; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.evo.common.annotation.Anonymous; import com.evo.common.annotation.Log; import com.evo.common.core.controller.BaseController; import com.evo.common.core.domain.AjaxResult; @@ -58,17 +61,33 @@ public class RzInterviewerController extends BaseController */ @PreAuthorize("@ss.hasPermi('personnelMatters:interviewer:query')") @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(rzInterviewerService.selectRzInterviewerById(id)); + try { + RzInterviewer interviewer = rzInterviewerService.selectRzInterviewerById(id); + if (interviewer == null) { + return AjaxResult.error("未找到相关数据"); + } + // 解析JSON数据 + if (interviewer.getFromData() != null && !interviewer.getFromData().isEmpty()) { + JSONObject formData = JSON.parseObject(interviewer.getFromData()); + interviewer.setFromData(formData.toJSONString()); + } + + return AjaxResult.success(interviewer); + } catch (Exception e) { + logger.error("获取面试登记表信息失败", e); + return AjaxResult.error("获取数据失败：" + e.getMessage()); + } } /** * 新增面试信息 */ - @PreAuthorize("@ss.hasPermi('personnelMatters:interviewer:add')") @Log(title = "面试信息", businessType = BusinessType.INSERT) @PostMapping + @Anonymous public AjaxResult add(@RequestBody RzInterviewer rzInterviewer) { return toAjax(rzInterviewerService.insertRzInterviewer(rzInterviewer)); diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzInterviewer.java b/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzInterviewer.java index fef116b..3a84ec1 100644 --- a/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzInterviewer.java +++ b/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzInterviewer.java @@ -3,6 +3,7 @@ package com.evo.personnelMatters.domain; import com.evo.common.annotation.Excel; import com.evo.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +15,7 @@ import java.util.Date; * @author chenyj * @date 2024-09-07 */ +@Data public class RzInterviewer extends BaseEntity { private static final long serialVersionUID = 1L; @@ -53,118 +55,15 @@ public class RzInterviewer extends BaseEntity /** 备注 */ @Excel(name = "备注") private String remarks; + /** 提交时间 */ + @Excel(name = "提交时间") + private String submitTime; + + /** 表单数据 */ + @Excel(name = "表单数据") + private String fromData; /** 删除标记 */ private String delFlag; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - public void setPost(String post) - { - this.post = post; - } - - public String getPost() - { - return post; - } - public void setContent(String content) - { - this.content = content; - } - - public String getContent() - { - return content; - } - public void setAddress(String address) - { - this.address = address; - } - - public String getAddress() - { - return address; - } - public void setInterviewDate(Date interviewDate) - { - this.interviewDate = interviewDate; - } - - public Date getInterviewDate() - { - return interviewDate; - } - public void setYtFlag(String ytFlag) - { - this.ytFlag = ytFlag; - } - - public String getYtFlag() - { - return ytFlag; - } - public void setRemarks(String remarks) - { - this.remarks = remarks; - } - - public String getRemarks() - { - return remarks; - } - public void setDelFlag(String delFlag) - { - this.delFlag = delFlag; - } - - public String getDelFlag() - { - return delFlag; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("phone", getPhone()) - .append("post", getPost()) - .append("content", getContent()) - .append("address", getAddress()) - .append("interviewDate", getInterviewDate()) - .append("ytFlag", getYtFlag()) - .append("remarks", getRemarks()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/EducationExperience.java b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/EducationExperience.java new file mode 100644 index 0000000..6598e99 --- /dev/null +++ b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/EducationExperience.java @@ -0,0 +1,12 @@ +package com.evo.personnelMatters.domain.vo; + +import lombok.Data; + +@Data +public class EducationExperience { + private String start; + private String school; + private String major; + private String certificate; + private String remark; +} diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/FamilyMember.java b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/FamilyMember.java new file mode 100644 index 0000000..4bda781 --- /dev/null +++ b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/FamilyMember.java @@ -0,0 +1,13 @@ +package com.evo.personnelMatters.domain.vo; + +import lombok.Data; + +@Data +public class FamilyMember { + private String relation; + private String name; + private String age; + private String address; + private String company; + private String job; +} diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/RzInterviewerDetail.java b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/RzInterviewerDetail.java new file mode 100644 index 0000000..53a9f2f --- /dev/null +++ b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/RzInterviewerDetail.java @@ -0,0 +1,150 @@ +package com.evo.personnelMatters.domain.vo; + +import com.evo.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.List; + +@Data +public class RzInterviewerDetail { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 应聘部门 */ + @Excel(name = "应聘部门") + private String department; + + /** 应聘岗位 */ + @Excel(name = "应聘岗位") + private String post; + + /** 期望薪资 */ + @Excel(name = "期望薪资") + private String salary; + + /** 填写日期 */ + @Excel(name = "填写日期") + private String fillDate; + + /** 姓名 */ + @Excel(name = "姓名") + private String name; + + /** 性别 */ + @Excel(name = "性别") + private String gender; + + /** 出生年月 */ + @JsonFormat(pattern = "yyyy-MM") + @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM") + private String birth; + + /** 民族 */ + @Excel(name = "民族") + private String nation; + + /** 婚姻状况 */ + @Excel(name = "婚姻状况") + private String maritalStatus; + + /** 政治面貌 */ + @Excel(name = "政治面貌") + private String politicalStatus; + + /** 身份证号 */ + @Excel(name = "身份证号") + private String idCard; + + /** 目前工作状况 */ + @Excel(name = "目前工作状况") + private String jobStatus; + + /** 最高学历 */ + @Excel(name = "最高学历") + private String education; + + /** 专业 */ + @Excel(name = "专业") + private String major; + + /** 毕业学校 */ + @Excel(name = "毕业学校") + private String school; + + /** 学位 */ + @Excel(name = "学位") + private String degree; + + /** 职称 */ + @Excel(name = "职称") + private String title; + + /** 到岗时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "到岗时间", width = 30, dateFormat = "yyyy-MM-dd") + private String arrivalDate; + + /** 户口所在地 */ + @Excel(name = "户口所在地") + private String registeredAddress; + + /** 现居住地址 */ + @Excel(name = "现居住地址") + private String currentAddress; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String phone; + + /** 教育经历列表 */ + private List educationList; + + /** 工作经历列表 */ + private List workList; + + /** 家庭成员列表 */ + private List familyList; + + /** 人才招聘会 */ + @Excel(name = "人才招聘会") + private Boolean channelJobFair; + + /** 招聘网站 */ + @Excel(name = "招聘网站") + private Boolean channelWebsite; + + /** 朋友推荐 */ + @Excel(name = "朋友推荐") + private Boolean channelFriend; + + /** 其他渠道 */ + @Excel(name = "其他渠道") + private Boolean channelOther; + + /** 介绍人 */ + @Excel(name = "介绍人") + private String referrer; + + /** 介绍人关系 */ + @Excel(name = "介绍人关系") + private String referrerRelation; + + /** 介绍人职务 */ + @Excel(name = "介绍人职务") + private String referrerJob; + + /** 是否同意承诺 */ + @Excel(name = "是否同意承诺") + private Boolean promiseAgreed; + + /** 删除标记 */ + private String delFlag; + + /** 表单数据 */ + @Excel(name = "表单数据") + private String fromData; + +} diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/WorkExperience.java b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/WorkExperience.java new file mode 100644 index 0000000..ad50a3c --- /dev/null +++ b/evo-admin/src/main/java/com/evo/personnelMatters/domain/vo/WorkExperience.java @@ -0,0 +1,13 @@ +package com.evo.personnelMatters.domain.vo; + +import lombok.Data; + +@Data +public class WorkExperience { + private String start; + private String company; + private String position; + private String content; + private String salary; + private String reason; +} diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzInterviewerServiceImpl.java b/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzInterviewerServiceImpl.java index f7cfb3f..feeae41 100644 --- a/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzInterviewerServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzInterviewerServiceImpl.java @@ -1,13 +1,19 @@ package com.evo.personnelMatters.service.impl; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.evo.common.constant.Constants; import com.evo.common.utils.DateUtils; import com.evo.common.utils.SecurityUtils; import com.evo.personnelMatters.domain.RzInterviewer; +import com.evo.personnelMatters.domain.vo.RzInterviewerDetail; import com.evo.personnelMatters.mapper.RzInterviewerMapper; import com.evo.personnelMatters.service.IRzInterviewerService; +import com.evo.system.domain.SysStaff; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -55,8 +61,15 @@ public class RzInterviewerServiceImpl implements IRzInterviewerService @Override public int insertRzInterviewer(RzInterviewer rzInterviewer) { + // 解析JSON数据 + if (rzInterviewer.getFromData() != null && !rzInterviewer.getFromData().isEmpty()) { + JSONObject formData = JSON.parseObject(rzInterviewer.getFromData()); + //将JSON 转换为RzInterviewerDetail + RzInterviewerDetail rzInterviewerDetail = formData.toJavaObject(RzInterviewerDetail.class); + rzInterviewer.setInterviewDate(DateUtils.getNowDate()); + rzInterviewer.setAddress(rzInterviewerDetail.getCurrentAddress()); + } rzInterviewer.setYtFlag("否"); - rzInterviewer.setCreateBy(SecurityUtils.getUsername()); rzInterviewer.setCreateTime(DateUtils.getNowDate()); rzInterviewer.setDelFlag(Constants.DELETE_FLAG_0); return rzInterviewerMapper.insertRzInterviewer(rzInterviewer); @@ -69,8 +82,30 @@ public class RzInterviewerServiceImpl implements IRzInterviewerService * @return 结果 */ @Override - public int updateRzInterviewer(RzInterviewer rzInterviewer) - { + public int updateRzInterviewer(RzInterviewer rzInterviewer) { + if (rzInterviewer.getYtFlag().equals("是")){ + //同步员工信息中 + SysStaff sysStaff = new SysStaff(); + sysStaff.setName(rzInterviewer.getName()); + String fromData = rzInterviewer.getFromData(); + RzInterviewerDetail detail = JSON.parseObject(fromData).toJavaObject(RzInterviewerDetail.class); + sysStaff.setPhone(detail.getPhone()); + sysStaff.setIdCard(detail.getIdCard()); + sysStaff.setSex(detail.getGender()); + //根据出生年月计算年龄 + String birth = detail.getBirth(); + if (birth != null && !birth.isEmpty()) { + int year = Integer.parseInt(birth.substring(0,4)); + int age = Integer.parseInt(new SimpleDateFormat("yyyy").format(new Date())) - year; + sysStaff.setAge(Long.parseLong(age+"")); + } + sysStaff.setAddress(detail.getCurrentAddress()); + sysStaff.setLevel(detail.getEducation()); + sysStaff.setMajor(detail.getMajor()); + sysStaff.setSchool(detail.getSchool()); + + + } rzInterviewer.setUpdateBy(SecurityUtils.getUsername()); rzInterviewer.setUpdateTime(DateUtils.getNowDate()); return rzInterviewerMapper.updateRzInterviewer(rzInterviewer); diff --git a/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java b/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java index 0d0b1c8..6fc33ec 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java +++ b/evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantImagesController.java @@ -58,4 +58,5 @@ public class RzRestaurantImagesController extends BaseController public AjaxResult uploadPDF(@RequestParam("name") String name,@RequestParam("file") MultipartFile filePath){ return rzRestaurantImagesService.insertRzRestaurantImages(name,filePath); } + } diff --git a/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java b/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java index 4073cc1..b843a1b 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantImagesServiceImpl.java @@ -8,6 +8,7 @@ import com.evo.common.utils.Collections; import com.evo.common.utils.DateUtils; import com.evo.common.utils.SecurityUtils; import com.evo.common.utils.StringUtils; +import com.evo.common.utils.file.FileUploadUtils; import com.evo.equipment.domain.vo.StaffData; import com.evo.equipment.domain.vo.StaffDto; import com.evo.equipment.service.IEqSnDetailService; @@ -20,10 +21,7 @@ import com.evo.restaurant.service.IRzRestaurantImagesService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; +import java.io.*; import java.util.Date; import java.util.List; diff --git a/evo-admin/src/main/java/com/evo/system/controller/SysStaffController.java b/evo-admin/src/main/java/com/evo/system/controller/SysStaffController.java index d4ec12f..aa70fa0 100644 --- a/evo-admin/src/main/java/com/evo/system/controller/SysStaffController.java +++ b/evo-admin/src/main/java/com/evo/system/controller/SysStaffController.java @@ -5,6 +5,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson2.JSON; +import com.evo.attendance.domain.vo.RzSalaryVo; import com.evo.system.domain.SysStaff; import com.evo.system.domain.vo.SysStaffVo; import com.evo.system.service.ISysStaffService; @@ -162,5 +163,16 @@ public class SysStaffController extends BaseController List list = sysStaffService.queryysStaffByDeptId(dept); return list; } - + /** + * 导入销售提成 + */ + @PreAuthorize("@ss.hasPermi('system:staff:importSalesCommissions')") + @Log(title = "导入销售提成", businessType = BusinessType.IMPORT) + @PostMapping("/importSalesCommissions") + public AjaxResult importSalesCommissions(MultipartFile file) throws Exception + { + ExcelUtil util = new ExcelUtil<>(RzSalaryVo.class); + List attendanceList = util.importExcel(file.getInputStream()); + return success(sysStaffService.importSalesCommissions(attendanceList)); + } } diff --git a/evo-admin/src/main/java/com/evo/system/domain/SysStaffDetail.java b/evo-admin/src/main/java/com/evo/system/domain/SysStaffDetail.java index be6d635..317552e 100644 --- a/evo-admin/src/main/java/com/evo/system/domain/SysStaffDetail.java +++ b/evo-admin/src/main/java/com/evo/system/domain/SysStaffDetail.java @@ -163,6 +163,9 @@ public class SysStaffDetail extends BaseEntity /** 本年累计已缴个税 */ @Excel(name = "本年累计已缴个税") private BigDecimal aggregatePersonalIncomeTax; + /** 本年累计已缴个税 */ + @Excel(name = "销售提成") + private BigDecimal salesCommission; /** 备注 */ @Excel(name = "备注") diff --git a/evo-admin/src/main/java/com/evo/system/mapper/SysDeptMapper.java b/evo-admin/src/main/java/com/evo/system/mapper/SysDeptMapper.java index cc8194b..9826fc8 100644 --- a/evo-admin/src/main/java/com/evo/system/mapper/SysDeptMapper.java +++ b/evo-admin/src/main/java/com/evo/system/mapper/SysDeptMapper.java @@ -1,6 +1,8 @@ package com.evo.system.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import com.evo.common.core.domain.entity.SysDept; @@ -9,7 +11,7 @@ import com.evo.common.core.domain.entity.SysDept; * * @author evo */ -public interface SysDeptMapper +public interface SysDeptMapper extends BaseMapper { /** * 查询部门管理数据 diff --git a/evo-admin/src/main/java/com/evo/system/service/ISysStaffService.java b/evo-admin/src/main/java/com/evo/system/service/ISysStaffService.java index 6a560d3..4d6b0b4 100644 --- a/evo-admin/src/main/java/com/evo/system/service/ISysStaffService.java +++ b/evo-admin/src/main/java/com/evo/system/service/ISysStaffService.java @@ -1,14 +1,12 @@ package com.evo.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.evo.attendance.domain.RzAttendanceStatistical; +import com.evo.attendance.domain.vo.RzSalaryVo; import com.evo.common.core.domain.AjaxResult; -import com.evo.common.core.domain.entity.SysUser; import com.evo.system.domain.SysStaff; import com.evo.system.domain.vo.SysStaffVo; import org.springframework.web.multipart.MultipartFile; -import java.util.Date; import java.util.List; /** @@ -98,4 +96,8 @@ public interface ISysStaffService extends IService public void calculationOfSeniority(); public SysStaff selectSysStaffByName(String employeeName); + + SysStaff selectByDepId(Long deptId); + + AjaxResult importSalesCommissions(List attendanceList); } diff --git a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffDetailServiceImpl.java b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffDetailServiceImpl.java index 503ba10..0771cd5 100644 --- a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffDetailServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffDetailServiceImpl.java @@ -59,7 +59,11 @@ public class SysStaffDetailServiceImpl extends ServiceImpl().eq(SysStaffDetail::getDelFlag, Constants.DELETE_FLAG_0).eq(SysStaffDetail::getStaffId, id).orderByDesc(SysStaffDetail::getCreateTime), false), rzSubsidyInfoService.list()); + return SubsidyCalculationUtils.subsidyCalculation(sysStaffService.selectSysStaffByUserId(id), + getOne(new LambdaQueryWrapper() + .eq(SysStaffDetail::getDelFlag, Constants.DELETE_FLAG_0) + .eq(SysStaffDetail::getStaffId, id) + .orderByDesc(SysStaffDetail::getCreateTime), false), rzSubsidyInfoService.list()); } /** diff --git a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java index 26d4ed6..83760b0 100644 --- a/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java @@ -3,6 +3,7 @@ package com.evo.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.evo.attendance.service.IRzAttendanceStatisticalService; +import com.evo.attendance.domain.vo.RzSalaryVo; import com.evo.common.annotation.DataScope; import com.evo.common.constant.Constants; import com.evo.common.core.domain.AjaxResult; @@ -861,7 +862,52 @@ public class SysStaffServiceImpl extends ServiceImpl i public SysStaff selectSysStaffByName(String employeeName) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysStaff::getName,employeeName); - return getBaseMapper().selectOne(wrapper); } + + @Override + public SysStaff selectByDepId(Long deptId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysStaff::getDeptId,deptId); + return getBaseMapper().selectOne(wrapper); + } + + @Override + public AjaxResult importSalesCommissions(List attendanceList) { + // 获取销售部门信息 + SysDept sysDept = deptMapper.selectOne(new LambdaQueryWrapper() + .eq(SysDept::getDelFlag, Constants.DELETE_FLAG_0) + .eq(SysDept::getDeptName, "销售部")); + + if (sysDept == null) { + return AjaxResult.error("销售部门未找到，请确认部门是否存在且未被删除！"); + } + + // 更新工资单详情，写入销售提成 + for (RzSalaryVo rzSalaryVo : attendanceList) { + if (rzSalaryVo.getSale() != null && rzSalaryVo.getName() != null) { + // 直接根据姓名和部门ID查询员工信息 + SysStaff sysStaff = getBaseMapper().selectOne(new LambdaQueryWrapper() + .eq(SysStaff::getName, rzSalaryVo.getName()) + .eq(SysStaff::getDeptId, sysDept.getDeptId()) + .eq(SysStaff::getDelFlag, Constants.DELETE_FLAG_0)); + + if (sysStaff != null) { + // 获取员工详情 + SysStaffDetail sysStaffDetail = sysStaffDetailMapper.selectSysStaffDetailByStaffId(sysStaff.getUserId()); + if (sysStaffDetail != null) { + // 更新销售提成 + sysStaffDetail.setSalesCommission(rzSalaryVo.getSale()); + sysStaffDetail.setUpdateTime(new Date()); + sysStaffDetail.setUpdateBy(SecurityUtils.getUsername()); + sysStaffDetailMapper.updateById(sysStaffDetail); + } + } + } + } + + return AjaxResult.success(); + } + + } diff --git a/evo-admin/src/main/resources/mapper/finance/RzSalaryDetailMapper.xml b/evo-admin/src/main/resources/mapper/finance/RzSalaryDetailMapper.xml index 0174ae7..b9855a3 100644 --- a/evo-admin/src/main/resources/mapper/finance/RzSalaryDetailMapper.xml +++ b/evo-admin/src/main/resources/mapper/finance/RzSalaryDetailMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, staff_id, name, month, wb_flag, dept_id,month_salary, basic_salary, job_salary, daily_wage, hours_salary, overtime_salary, level_subsidies, contract_subsidies, seniority_salary, social_subsidies, full_subsidies, night_subsidies, dinner_subsidies, subsidy_or_bonus, absenteeism_salary, absenteeism_subsidies, meal_fee, deductions, salary, pay_insurance, endowment_insurance, medical_insurance, employment_injury_insurance, maternity_insurance, unemployment_insurance, accumulation_fund, salary_before_tax, total_wages, annual_exemption_amount, special_deduction, taxable_income, tax_rate, slow_down_the_deduction, aggregate_personal_income_tax, aggregate_tax, tax_payable, net_payroll, remarks, del_flag, create_by, create_time, update_by, update_time from rz_salary_detail + select id, staff_id, name, month, wb_flag, dept_id,month_salary, basic_salary, job_salary, daily_wage, hours_salary, overtime_salary, level_subsidies, contract_subsidies, seniority_salary, social_subsidies, full_subsidies, night_subsidies, dinner_subsidies, subsidy_or_bonus, absenteeism_salary, absenteeism_subsidies, meal_fee, deductions, salary, pay_insurance, endowment_insurance, medical_insurance, employment_injury_insurance, maternity_insurance, unemployment_insurance, accumulation_fund, salary_before_tax, total_wages, annual_exemption_amount, special_deduction, taxable_income, tax_rate, slow_down_the_deduction, aggregate_personal_income_tax, aggregate_tax, tax_payable, net_payroll,sales_commissions, remarks, del_flag, create_by, create_time, update_by, update_time from rz_salary_detail @@ -33,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and post like concat('%', #{post}, '%') and content like concat('%', #{content}, '%') and yt_flag = #{ytFlag} + and submit_time = #{submitTime} + and from_data = #{fromData} @@ -57,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + submit_time, + from_data, #{name}, @@ -72,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{submitTime}, + #{fromData}, @@ -91,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + submit_time = #{submitTime}, + from_data = #{fromData}, where id = #{id} diff --git a/evo-admin/src/main/resources/mapper/system/SysDeptMapper.xml b/evo-admin/src/main/resources/mapper/system/SysDeptMapper.xml index d2c5c6a..bbbdf06 100644 --- a/evo-admin/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/evo-admin/src/main/resources/mapper/system/SysDeptMapper.xml @@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.leader, d.phone,d.status, d.del_flag, d.create_by, d.create_time + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.leader, d.phone,d.status, d.del_flag,d.is_over_time, d.create_by, d.create_time from sys_dept d @@ -40,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND status = #{status} + + AND is_over_time = #{isOverTime} + ${params.dataScope} order by d.parent_id @@ -57,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"