From 3f68339a0371b30add05b5c69005f3a21f8cb33a Mon Sep 17 00:00:00 2001
From: mobh <mobh@youlingrc.com>
Date: Tue, 3 Nov 2020 19:14:53 +0800
Subject: [PATCH] 修改问题
---
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java | 12 ++++++++++++
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java | 12 ++++++++++++
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml | 43 ++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
index b731011..7e14a3f 100644
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
@@ -834,6 +834,18 @@ public class SalaryManagementController {
page.setTotal(total);
return ResultUtil.data(page, dxrylist, "获取自定义薪资组表头信息");
}
+
+
+ /**
+ * 查询定薪人员+模糊查询*******
+ */
+ @PostMapping(value = "/fixedstaffAll")
+ @ApiOperation(value = "查询定薪人员 不分页", httpMethod = "POST", notes = "接口发布说明")
+ public Result<Object> FixedSalarStaffAll(@CurrentUser UserBean userBean,@RequestBody SearchSalariedPeopleDto search) {
+ search.setOrgcode(userBean.getOrgCode());
+ List<FixedSalaryStaffDto> dxrylist = xcglassoxzdazdymapper.selectFixedSalaryStaffAll(search);
+ return ResultUtil.data(dxrylist, "获取自定义薪资组表头信息");
+ }
/**
* 核对算薪人员及薪资档案*******
diff --git a/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java b/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java
index b755eca..0d6ac20 100644
--- a/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java
+++ b/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java
@@ -25,9 +25,21 @@ public interface XcglAssoXzdazdyMapper extends BaseMapper<XcglAssoXzdazdy> {
int dazdyupdate(XcglAssoXzdazdy xcglassoxzdazdy);
+ /**
+ * 查询定薪人员 分页
+ * @param search
+ * @return
+ */
long selectFixedSalaryStaffCount(@Param("param")SearchSalariedPeopleDto search);
List<FixedSalaryStaffDto> selectFixedSalaryStaff(@Param("param")SearchSalariedPeopleDto search);
+ /**
+ * 查询定薪人员 不分页
+ * @param search
+ * @return
+ */
+ List<FixedSalaryStaffDto> selectFixedSalaryStaffAll(@Param("param")SearchSalariedPeopleDto search);
+
List<ChangeSalaryDto> AchieveSalaryAdjustment(Integer orgcode,Integer empnum);
List<FixedSalaryStaffDto> SalaryAdjustmentRecord(Integer orgcode,Integer empnum);
diff --git a/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml b/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
index 770e4d4..9b640f2 100644
--- a/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
+++ b/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
@@ -226,7 +226,48 @@
LEFT JOIN xcgl_asso_xzdadx as dadx on dadx.userid = emp.emp_num and dadx.txzt = 0
LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
</select>
-
+
+
+ <select id="selectFixedSalaryStaffAll" resultMap="FixedSalaryStaffMap">
+ select emp.emp_num empnum,
+ emp.`name` empname,
+ case emp.job_type
+ when 0 then '全职'
+ when 1 then '实习生'
+ when 2 then '兼职'
+ when 3 then '劳务派遣'
+ when 4 then '劳务'
+ when 5 then '派遣'
+ when 6 then '外包'
+ else '退休返聘' end as empjobtype,
+ case emp.job_status
+ when 0 then '试用'
+ when 1 then '正式'
+ when 2 then '离职中'
+ else '已离职' end as empjobstatus,
+ SUBSTR(emp.rz_time,1,10) emprztime ,
+ SUBSTR(emp.zz_time,1,10) empzztime,
+ IF(dadx.userid IS NOT NULL,1,0) as sfdx,
+ dadx.sxrq as tratime,
+ xzdaz.id as dazid,
+ xzdaz.xzdazdyid as xzdazdyid,
+ xzdaz.rsz as dazrsz,
+ xzdaz.xzdadxid as xzdadxid
+ from (select * from yggl_main_emp emp
+ where emp.org_code = #{param.orgcode}
+ <if test="param.status != null and param.status.size() >0" >
+ and emp.job_status in
+ <foreach collection="param.status" open="(" close=")" separator="," index="i" item="item">
+ #{item, jdbcType=INTEGER}
+ </foreach>
+ </if>
+ <if test="param.text != ''" >
+ and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
+ </if>
+ ) emp
+ LEFT JOIN xcgl_asso_xzdadx as dadx on dadx.userid = emp.emp_num and dadx.txzt = 0
+ LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
+ </select>
<select id="selectPaygroupStaff" resultMap="FixedSalaryStaffMap">
select emp.emp_num empnum,
--
libgit2 0.26.0