Merge remote-tracking branch 'origin/main'

This commit is contained in:
sxu 2025-07-24 21:51:26 +08:00
commit ff57b48f51
2 changed files with 3 additions and 3 deletions

View File

@ -26,6 +26,6 @@ public class WorkerEfficiencyVo {
private int actualDay; private int actualDay;
/**工序*/ /**工序*/
private String gxName; private String gxName;
/**工作标准*/ /**工作内容*/
private String workStandard; private String workStandard;
} }

View File

@ -17,10 +17,10 @@
FROM tb_worker_efficiency FROM tb_worker_efficiency
<where> <where>
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
AND user_name = #{userName} AND INSTR(user_name,#{userName}) > 0
</if> </if>
<if test="teamName != null and teamName != ''"> <if test="teamName != null and teamName != ''">
AND team_name = #{teamName} AND INSTR(team_name,#{teamName}) > 0
</if> </if>
AND bid_code = #{bidCode} AND bid_code = #{bidCode}
ORDER BY id ORDER BY id