From e8d08ebdd187f99f793cd839038dd5c392cdfbd8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 09 二月 2026 17:56:36 +0800
Subject: [PATCH] fix: 修改人员薪资接口
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 25 +++
src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java | 6
src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java | 12 +
src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml | 19 ++
src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java | 7
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 30 ++--
src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java | 8
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 207 +++++++++++++--------------------
8 files changed, 156 insertions(+), 158 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index e1faffb..c90c5de 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -40,11 +40,14 @@
@Autowired
private CompensationPerformanceService compensationPerformanceService;
+ @Autowired
+ private StaffOnJobMapper staffOnJobMapper;
+
@GetMapping("/listPage")
@Log(title = "钖叕缁╂晥-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("钖叕缁╂晥-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, CompensationPerformance compensationPerformance){
- IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, compensationPerformance);
+ public AjaxResult listPage(Page page, String staffName, String payDateStr) {
+ IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, staffName, payDateStr);
return AjaxResult.success(listPage);
}
@@ -52,7 +55,7 @@
@Log(title = "钖叕缁╂晥-娣诲姞", businessType = BusinessType.INSERT)
@ApiOperation("钖叕缁╂晥-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance){
+ public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance) {
boolean save = compensationPerformanceService.save(compensationPerformance);
return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
}
@@ -61,7 +64,7 @@
@Log(title = "钖叕缁╂晥-淇敼", businessType = BusinessType.UPDATE)
@ApiOperation("钖叕缁╂晥-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance){
+ public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance) {
boolean update = compensationPerformanceService.updateById(compensationPerformance);
return update ? AjaxResult.success("淇敼鎴愬姛") : AjaxResult.error("淇敼澶辫触");
}
@@ -70,17 +73,17 @@
@Log(title = "钖叕缁╂晥-鍒犻櫎", businessType = BusinessType.DELETE)
@ApiOperation("钖叕缁╂晥-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
boolean delete = compensationPerformanceService.removeBatchByIds(ids);
return delete ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
@Log(title = "瀵煎嚭钖祫绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response ) {
+ public void export(HttpServletResponse response) {
List<CompensationPerformance> list = compensationPerformanceService.list();
- ExcelUtil<CompensationPerformance> util = new ExcelUtil<CompensationPerformance>(CompensationPerformance.class);
+ ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
util.exportExcel(response, list, "瀵煎嚭钖祫绠＄悊鍒楄〃");
}
@@ -92,18 +95,15 @@
util.exportExcel(response, list, "涓嬭浇钖祫绠＄悊鍒楄〃妯℃澘");
}
- @Autowired
- private SysUserMapper sysUserMapper;
-
@Log(title = "瀵煎叆钖祫绠＄悊鍒楄〃", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
List<CompensationPerformance> list = util.importExcel(file.getInputStream());
- list.forEach(item->{
- SysUser staffOnJob = sysUserMapper.selectUserByNickName(item.getName());
- if(staffOnJob!=null){
- item.setStaffId(staffOnJob.getUserId());
+ list.forEach(item -> {
+ StaffOnJob staffOnJob = staffOnJobMapper.selectStaffByNickName(item.getStaffName());
+ if (staffOnJob != null) {
+ item.setStaffId(staffOnJob.getId());
}
});
boolean b = compensationPerformanceService.saveBatch(list);
diff --git a/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java b/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java
index 2526df0..22d64a7 100644
--- a/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java
+++ b/src/main/java/com/ruoyi/compensationperformance/mapper/CompensationPerformanceMapper.java
@@ -15,9 +15,10 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param page
- * @param compensationPerformance
+ * @param page 鍒嗛〉
+ * @param staffName 鍛樺伐濮撳悕
+ * @param payDateStr 钖祫鏃ユ湡
* @return
*/
- IPage<CompensationPerformance> listPage(Page page,@Param("req") CompensationPerformance compensationPerformance);
+ IPage<CompensationPerformance> listPage(Page page, @Param("staffName") String staffName, @Param("payDateStr") String payDateStr);
}
diff --git a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
index 84d6138..686b975 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -8,193 +8,156 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
+ * 钖叕缁╂晥鏄庣粏
+ *
* @author :yys
- * @date : 2025/8/8 9:40
+ * @date : 2025/8/8
*/
@Data
@TableName("compensation_performance")
-@ApiModel
-public class CompensationPerformance {
-
+@ApiModel("钖叕缁╂晥鏄庣粏")
+public class CompensationPerformance implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty("涓婚敭")
private Long id;
/**
- * 鐢ㄦ埛id
+ * 鍛樺伐id
*/
- @ApiModelProperty("鐢ㄦ埛id")
+ @ApiModelProperty("鍛樺伐id")
private Long staffId;
/**
- * 濮撳悕
+ * 鍛樺伐濮撳悕
*/
- @ApiModelProperty("濮撳悕")
- @Excel(name = "濮撳悕")
- private String name;
+ @ApiModelProperty("鍛樺伐濮撳悕")
+ @Excel(name = "鍛樺伐濮撳悕")
+ @TableField(exist = false)
+ private String staffName;
/**
- * 钖祫鏈堜唤(鏌ヨ)
+ * 宀椾綅鍚嶇О
*/
- @ApiModelProperty("钖祫鏈堜唤(鏌ヨ)")
+ @ApiModelProperty("宀椾綅鍚嶇О")
+ @Excel(name = "宀椾綅鍚嶇О")
@TableField(exist = false)
- private String payDateStr;
+ private String postName;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String deptName;
/**
* 钖祫鏈堜唤
*/
@ApiModelProperty("钖祫鏈堜唤")
- @Excel(name = "钖祫鏈堜唤", dateFormat = "yyyy-MM", width = 30)
+ @Excel(name = "鏈堜唤", dateFormat = "yyyy-MM", width = 20)
@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM")
private Date payDate;
-
-
- /**
- * 搴斿嚭鍕ゅぉ鏁�
- */
- @ApiModelProperty("搴斿嚭鍕ゅぉ鏁�")
-// @Excel(name = "搴斿嚭鍕ゅぉ鏁�")
- private BigDecimal shouldAttendedNum;
-
- /**
- * 瀹為檯鍑哄嫟澶╂暟
- */
- @ApiModelProperty("瀹為檯鍑哄嫟澶╂暟")
-// @Excel(name = "瀹為檯鍑哄嫟澶╂暟")
- private BigDecimal actualAttendedNum;
-
/**
* 鍩烘湰宸ヨ祫
*/
@ApiModelProperty("鍩烘湰宸ヨ祫")
-// @Excel(name = "鍩烘湰宸ヨ祫")
+ @Excel(name = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
/**
- * 宀椾綅宸ヨ祫
+ * 璁′欢宸ヨ祫
*/
- @ApiModelProperty("宀椾綅宸ヨ祫")
-// @Excel(name = "宀椾綅宸ヨ祫")
- private BigDecimal postSalary;
+ @ApiModelProperty("璁′欢宸ヨ祫")
+ @Excel(name = "璁′欢宸ヨ祫")
+ private BigDecimal pieceworkSalary;
/**
- * 鍏ョ鑱岀己鍕ゆ墸娆�
+ * 璁℃椂宸ヨ祫
*/
- @ApiModelProperty("鍏ョ鑱岀己鍕ゆ墸娆�")
-// @Excel(name = "鍏ョ鑱岀己鍕ゆ墸娆�")
- private BigDecimal deductionAbsenteeism;
-
+ @ApiModelProperty("璁℃椂宸ヨ祫")
+ @Excel(name = "璁℃椂宸ヨ祫")
+ private BigDecimal hourlySalary;
/**
- * 鐥呭亣鎵ｆ
+ * 鍏朵粬鏀跺叆
*/
- @ApiModelProperty("鐥呭亣鎵ｆ")
-// @Excel(name = "鐥呭亣鎵ｆ")
- private BigDecimal sickLeaveDeductions;
-
- /**
- * 浜嬪亣鎵ｆ
- */
- @ApiModelProperty("浜嬪亣鎵ｆ")
-// @Excel(name = "浜嬪亣鎵ｆ")
- private BigDecimal deductionPersonalLeave;
- /**
- * 蹇樿鎵撳崱鎵ｆ
- */
- @ApiModelProperty("蹇樿鎵撳崱鎵ｆ")
-// @Excel(name = "蹇樿鎵撳崱鎵ｆ")
- private BigDecimal forgetClockDeduct;
-
- /**
- * 缁╂晥寰楀垎
- */
- @ApiModelProperty("缁╂晥寰楀垎")
-// @Excel(name = "缁╂晥寰楀垎")
- private BigDecimal performanceScore;
-
- /**
- * 缁╂晥宸ヨ祫
- */
- @ApiModelProperty("缁╂晥宸ヨ祫")
-// @Excel(name = "缁╂晥宸ヨ祫")
- private BigDecimal performancePay;
-
-
- /**
- * 搴斿彂鍚堣
- */
- @ApiModelProperty("搴斿彂鍚堣")
-// @Excel(name = "搴斿彂鍚堣")
- private BigDecimal payableWages;
+ @ApiModelProperty("鍏朵粬鏀跺叆")
+ @Excel(name = "鍏朵粬鏀跺叆")
+ private BigDecimal otherIncome;
/**
* 绀句繚涓汉
*/
@ApiModelProperty("绀句繚涓汉")
-// @Excel(name = "绀句繚涓汉")
+ @Excel(name = "绀句繚涓汉")
private BigDecimal socialSecurityIndividuals;
- /**
- * 绀句繚鍏徃
- */
- @ApiModelProperty("绀句繚鍏徃")
-// @Excel(name = "绀句繚鍏徃")
- private BigDecimal socialSecurityCompanies;
-
- /**
- * 绀句繚鍚堣
- */
- @ApiModelProperty("绀句繚鍚堣")
-// @Excel(name = "绀句繚鍚堣")
- private BigDecimal socialSecurityTotal;
-
- /**
- * 鍏Н閲戝悎璁�
- */
- @ApiModelProperty("鍏Н閲戝悎璁�")
-// @Excel(name = "鍏Н閲戝悎璁�")
- private BigDecimal providentFundTotal;
- /**
- * 鍏Н閲戝叕鍙�
- */
- @ApiModelProperty("鍏Н閲戝叕鍙�")
-// @Excel(name = "鍏Н閲戝叕鍙�")
- private BigDecimal providentFundCompany;
/**
* 鍏Н閲戜釜浜�
*/
@ApiModelProperty("鍏Н閲戜釜浜�")
-// @Excel(name = "鍏Н閲戜釜浜�")
+ @Excel(name = "鍏Н閲戜釜浜�")
private BigDecimal providentFundIndividuals;
/**
- * 搴旂◣宸ヨ祫
+ * 宸ヨ祫涓◣
*/
- @ApiModelProperty("搴旂◣宸ヨ祫")
-// @Excel(name = "搴旂◣宸ヨ祫")
- private BigDecimal taxableWaget;
- /**
- * 涓汉鎵�寰楃◣
- */
- @ApiModelProperty("涓汉鎵�寰楃◣")
-// @Excel(name = "涓汉鎵�寰楃◣")
+ @ApiModelProperty("宸ヨ祫涓◣")
+ @Excel(name = "宸ヨ祫涓◣")
private BigDecimal personalIncomeTax;
+
+ /**
+ * 鍏朵粬鏀嚭
+ */
+ @ApiModelProperty("鍏朵粬鏀嚭")
+ @Excel(name = "鍏朵粬鏀嚭")
+ private BigDecimal otherDeductions;
+
+ /**
+ * 搴斿彂宸ヨ祫
+ */
+ @ApiModelProperty("搴斿彂宸ヨ祫")
+ @Excel(name = "搴斿彂宸ヨ祫")
+ private BigDecimal payableWages;
+
+ /**
+ * 搴旀墸宸ヨ祫
+ */
+ @ApiModelProperty("搴旀墸宸ヨ祫")
+ @Excel(name = "搴旀墸宸ヨ祫")
+ private BigDecimal deductibleWages;
/**
* 瀹炲彂宸ヨ祫
*/
@ApiModelProperty("瀹炲彂宸ヨ祫")
- @Excel(name = "瀹炲彂宸ヨ祫", width = 30)
+ @Excel(name = "瀹炲彂宸ヨ祫")
private BigDecimal actualWages;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 绉熸埛ID
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
/**
* 鍒涘缓鑰�
@@ -206,6 +169,7 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
/**
@@ -218,12 +182,7 @@
* 淇敼鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
- /**
- * 绉熸埛ID
- */
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java b/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
index 547fbf8..fbd110b 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
@@ -14,9 +14,11 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param page
- * @param compensationPerformance
+ * @param page 鍒嗛〉鎻掍欢
+ * @param staffName 鍛樺伐濮撳悕
+ * @param payDateStr 钖祫鏃ユ湡
* @return
*/
- IPage<CompensationPerformance> listPage(Page page, CompensationPerformance compensationPerformance);
+ IPage<CompensationPerformance> listPage(Page page, String staffName, String payDateStr);
+
}
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
index 2e0d744..33d8c87 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
@@ -23,8 +23,8 @@
@Override
- public IPage<CompensationPerformance> listPage(Page page, CompensationPerformance compensationPerformance) {
- IPage<CompensationPerformance> compensationPerformanceIPage = compensationPerformanceMapper.listPage(page, compensationPerformance);
- return compensationPerformanceIPage;
+ public IPage<CompensationPerformance> listPage(Page page, String staffName, String payDateStr) {
+ return compensationPerformanceMapper.listPage(page, staffName, payDateStr);
}
+
}
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java
index 5bd15e4..de8a3c0 100644
--- a/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java
@@ -20,6 +20,7 @@
/**
* 缁熻鎸囧畾鏃ユ湡鐨勫湪鑱屽憳宸ユ暟
+ *
* @param date 鏃ユ湡
* @return 鍦ㄨ亴鍛樺伐鏁�
*/
@@ -27,9 +28,18 @@
/**
* 缁熻鎸囧畾鏈堜唤鐨勬柊鍏ヨ亴鍛樺伐鏁�
+ *
* @param monthStart 鏈堜唤寮�濮嬫棩鏈�
- * @param monthEnd 鏈堜唤缁撴潫鏃ユ湡
+ * @param monthEnd 鏈堜唤缁撴潫鏃ユ湡
* @return 鏂板叆鑱屽憳宸ユ暟
*/
Integer countNewHireByMonth(@Param("monthStart") LocalDate monthStart, @Param("monthEnd") LocalDate monthEnd);
+
+ /**
+ * 鏍规嵁鍛樺伐濮撳悕鏌ヨ鍛樺伐淇℃伅
+ *
+ * @param staffName 鍛樺伐濮撳悕
+ * @return 鍛樺伐鏁版嵁
+ */
+ StaffOnJob selectStaffByNickName(String staffName);
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
index f15dd8c..6071266 100644
--- a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
+++ b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
@@ -3,14 +3,23 @@
<mapper namespace="com.ruoyi.compensationperformance.mapper.CompensationPerformanceMapper">
<select id="listPage" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
- select * from compensation_performance
+ SELECT
+ cp.*,
+ soj.staff_name AS staffName,
+ sp.post_name AS postName,
+ sd.dept_name AS deptName
+ FROM compensation_performance cp
+ LEFT JOIN staff_on_job soj ON soj.id = cp.staff_id
+ LEFT JOIN sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN sys_dept sd ON sd.dept_id = soj.sys_dept_id
<where>
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
+ <if test="staffName != null and staffName != ''">
+ AND soj.staff_name LIKE CONCAT('%', #{staffName}, '%')
</if>
- <if test="req.payDateStr != null and req.payDateStr != ''">
- and pay_date like concat('%',#{req.payDateStr},'%')
+ <if test="payDateStr != null and payDateStr != ''">
+ AND DATE_FORMAT(cp.pay_date, '%Y-%m') = #{payDateStr}
</if>
</where>
+ ORDER BY cp.pay_date DESC, cp.id DESC
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 75ae5ef..fe35886 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -13,7 +13,7 @@
sys_dept sd ON sd.dept_id = staff_on_job.sys_dept_id
where 1=1
<if test="staffOnJob.staffState != null">
- AND staff_state = #{staffOnJob.staffState}
+ AND staff_state = #{staffOnJob.staffState}
</if>
<if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
@@ -22,7 +22,7 @@
AND contract_expire_time >= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
</if>
<if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
- AND contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
+ AND contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
</if>
</select>
<select id="staffOnJobList" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
@@ -48,7 +48,7 @@
SELECT COUNT(*)
FROM staff_on_job
WHERE staff_state = 1
- AND DATE_FORMAT(create_time, '%Y-%m-%d') <= #{date}
+ AND DATE_FORMAT(create_time, '%Y-%m-%d') <= #{date}
</select>
<!-- 缁熻鎸囧畾鏈堜唤鐨勬柊鍏ヨ亴鍛樺伐鏁� -->
@@ -56,6 +56,23 @@
SELECT COUNT(*)
FROM staff_on_job
WHERE staff_state = 1
- AND DATE_FORMAT(create_time, '%Y-%m-%d') BETWEEN #{monthStart} AND #{monthEnd}
+ AND DATE_FORMAT(create_time, '%Y-%m-%d') BETWEEN #{monthStart} AND #{monthEnd}
+ </select>
+
+ <select id="selectStaffByNickName" resultType="com.ruoyi.staff.pojo.StaffOnJob" parameterType="java.lang.String">
+ SELECT
+ id
+ nick_name AS staffName
+ FROM staff_on_job
+ WHERE del_flag = '0'
+ <choose>
+ <when test="staffName != null and staffName != ''">
+ AND nick_name = #{staffName}
+ </when>
+ <otherwise>
+ AND 1 = 0
+ </otherwise>
+ </choose>
+ LIMIT 1
</select>
</mapper>
--
Gitblit v1.9.3