yzc před 10 měsíci
rodič
revize
b0dc8c3b1b

+ 1 - 0
hx-oa/src/main/java/com/fjhx/oa/entity/user/po/UserSalaryManage.java

@@ -22,6 +22,7 @@ public class UserSalaryManage {
     private Long companyId;
     private Long deptId;
     private String nickName;
+    private Long phonenumber;
 
     /**
      * 10实习员工、20试用员工、30正式员工

+ 0 - 3
hx-oa/src/main/java/com/fjhx/oa/mapper/user/UserSalaryManageMapper.java

@@ -2,7 +2,6 @@ package com.fjhx.oa.mapper.user;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
 import com.fjhx.oa.entity.user.po.UserSalaryManage;
 import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -32,6 +31,4 @@ public interface UserSalaryManageMapper extends BaseMapper<UserSalaryManage> {
 
     UserSalaryManageVo getDetail(@Param("userId") Long userId);
 
-    Integer updateDataById(UserSalaryManageDto dto);
-
 }

+ 1 - 26
hx-oa/src/main/resources/mapper/user/UserSalaryManageMapper.xml

@@ -6,6 +6,7 @@
                su.nick_name,
                su.company_id,
                su.dept_id,
+               su.phonenumber,
                su.employee_type,
                su.probation_ratio,
                su.internship_ratio,
@@ -35,30 +36,4 @@
         <include refid="list"/>
         where su.user_id = #{userId}
     </select>
-    <update id="updateDataById">
-        update sys_user
-        <set>
-            <if test="employeeType != null and employeeType != ''">employee_type = #{employeeType},</if>
-            <if test="probationRatio != null and probationRatio != ''">probation_ratio = #{probationRatio},</if>
-            <if test="internshipRatio != null and internshipRatio != ''">internship_ratio = #{internshipRatio},</if>
-            <if test="amount != null and amount != ''">amount = #{amount},</if>
-            <if test="perfAmount != null and perfAmount != ''">perf_amount = #{perfAmount},</if>
-            <if test="education != null and education != ''">education = #{education},</if>
-            <if test="post != null and post != ''">post = #{post},</if>
-            <if test="probationPeriod != null and probationPeriod != ''">probation_period = #{probationPeriod},</if>
-            <if test="entryDate != null">entry_date = #{entryDate},</if>
-            <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
-            <if test="fullTimeDate != null">full_time_date = #{fullTimeDate},</if>
-            <if test="monthRest != null and monthRest != ''">month_rest = #{monthRest},</if>
-            <if test="dailyHours != null and dailyHours != ''">daily_hours = #{dailyHours},</if>
-            <if test="morningBeginTime != null">morning_begin_time = #{morningBeginTime},</if>
-            <if test="morningEndTime != null">morning_end_time = #{morningEndTime},</if>
-            <if test="afternoonBeginTime != null">afternoon_begin_time =#{afternoonBeginTime},</if>
-            <if test="afternoonEndTime != null">afternoon_end_time = #{afternoonEndTime},</if>
-            <if test="settleMethod != null and settleMethod != ''">settle_method = #{settleMethod},</if>
-            <if test="salaryRemark != null and salaryRemark != ''">salary_remark = #{salaryRemark},</if>
-            update_time = sysdate()
-        </set>
-        where user_id = #{userId}
-    </update>
 </mapper>