修改部分代码及 增加保存薪资明细修改接口

src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java

 package cn.timer.api.dao.xcgl;
 import java.util.List;
 
+import cn.timer.api.dto.xcgl.CheckSalaryStaffDto;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,7 +21,7 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
 	
 	int deleteByuserid(int userid,int xzzid,String xzyf);
 	
-	List<CalculationDto> CalculationResults(int xzzid,String xzyf,int orgcode);
+	List<CalculationDto> CalculationResults(CheckSalaryStaffDto checksalary);
 	
 	int deleteByAttendance(int userid,int xzzid,String xzyf);
 	
@@ -31,4 +32,6 @@ public interface XcglAssoXzbMapper extends BaseMapper<XcglAssoXzb> {
 	CalculationValueDto lateearlyDeduction(int empnum,int xzzid,String salaryitem);
 	
 	int ModifyImportedSalary(XcglAssoXzb xcglassoxzb);
+
+	void updateBatchXzxjg(List<XcglAssoXzb> list);
 }

src/main/java/cn/timer/api/dto/xcgl/CheckSalaryStaffDto.java

@@ -18,6 +18,9 @@ public class CheckSalaryStaffDto extends Page{
 	
 	@ApiModelProperty(value="薪资组id ",example="薪资组id")
 	int paygroupid;
+
+	@ApiModelProperty(value="薪资月份 ",example="薪资月份")
+	private String xzyf;
 	
 	@ApiModelProperty(value="企业编号 ",example="企业编号")
 	int orgcode;

src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml

@@ -73,9 +73,12 @@
 						 from zzgl_bmgw_m m 
 						 left join zzgl_bmgw_m um on um.id = m.up_id  
 					) as bmgw on bmgw.mid = emp.bmgw_id
-		where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{xzzid})
-		and xzbs.xzyf = #{xzyf} or xzbs.xzyf = ''
-		and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{xzzid})
+		where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
+		and (xzbs.xzyf = #{xzyf} or xzbs.xzyf = '')
+		and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
+		<if test="text != ''" >
+			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
+		</if>
 		) as aa
 		where aa.orgcode = #{orgcode}
 	</select>
@@ -193,6 +196,17 @@
 		and xzyf = #{xzyf}
 		and xzxid = #{xzxid}
 	</update>
+
+	<!-- 批量更新薪资结果 -->
+	<update id="updateBatchXzxjg" parameterType="java.util.List">
+		<foreach collection="list" item="item" index="index" open="" close="" separator=";">
+			UPDATE xcgl_asso_xzb
+			<set>
+				xzxjg=${item.xzxjg}
+			</set>
+			where id = ${item.id}
+		</foreach>
+	</update>
 	
     <!-- <delete id="delete" >
         DELETE FROM xcgl_asso_xzb