Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -15,6 +15,7 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import cn.timer.api.dto.xcgl.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
@@ -95,52 +96,6 @@ import cn.timer.api.dao.xcgl.XcglSalaryItemMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dto.kqmk.CalculatingCompensationDto;
 import cn.timer.api.dto.sbgjj.InspersonnelDto;
-import cn.timer.api.dto.xcgl.APPPayslipPeriodDto;
-import cn.timer.api.dto.xcgl.AdditionalDeductionDto;
-import cn.timer.api.dto.xcgl.AppPaysSalaryOneDto;
-import cn.timer.api.dto.xcgl.AppPaysSalaryTwoDto;
-import cn.timer.api.dto.xcgl.AppPayslipDetailsDto;
-import cn.timer.api.dto.xcgl.BuildPayGroupDto;
-import cn.timer.api.dto.xcgl.CalculatedFieldDto;
-import cn.timer.api.dto.xcgl.CalculationDto;
-import cn.timer.api.dto.xcgl.CalculationOptionsDto;
-import cn.timer.api.dto.xcgl.ChangeSalaryDto;
-import cn.timer.api.dto.xcgl.CheckSalaryStaffDto;
-import cn.timer.api.dto.xcgl.CjPayrollGroupDto;
-import cn.timer.api.dto.xcgl.CustomDto;
-import cn.timer.api.dto.xcgl.FixedSalaryStaffDto;
-import cn.timer.api.dto.xcgl.FixedsalaryDto;
-import cn.timer.api.dto.xcgl.FloatingDataDto;
-import cn.timer.api.dto.xcgl.HolidayInquiryDto;
-import cn.timer.api.dto.xcgl.ImportDescriptionDto;
-import cn.timer.api.dto.xcgl.ImportSalaryDto;
-import cn.timer.api.dto.xcgl.ImportSalarySetDto;
-import cn.timer.api.dto.xcgl.IndividualTaxDetailsDto;
-import cn.timer.api.dto.xcgl.ModifyPayslipDto;
-import cn.timer.api.dto.xcgl.ModifysalaryruleDto;
-import cn.timer.api.dto.xcgl.PayCustomDto;
-import cn.timer.api.dto.xcgl.PayCustomZDYDto;
-import cn.timer.api.dto.xcgl.PayGroupedDataDto;
-import cn.timer.api.dto.xcgl.PayTermDto;
-import cn.timer.api.dto.xcgl.PayrollExceptionDto;
-import cn.timer.api.dto.xcgl.PayrollGroupDto;
-import cn.timer.api.dto.xcgl.PayslipDetailsDto;
-import cn.timer.api.dto.xcgl.PayslipListDto;
-import cn.timer.api.dto.xcgl.PayslipSearchDto;
-import cn.timer.api.dto.xcgl.PushPayslipDto;
-import cn.timer.api.dto.xcgl.SalaryCustomizationDto;
-import cn.timer.api.dto.xcgl.SalaryFieldDto;
-import cn.timer.api.dto.xcgl.SalaryGroupGroupingDto;
-import cn.timer.api.dto.xcgl.SalaryItemRulesDto;
-import cn.timer.api.dto.xcgl.SalaryRulesDto;
-import cn.timer.api.dto.xcgl.SalaryoptionsDto;
-import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto;
-import cn.timer.api.dto.xcgl.SpecialDeductionDto;
-import cn.timer.api.dto.xcgl.TjSalaryItemDot;
-import cn.timer.api.dto.xcgl.UserPersonnelDto;
-import cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto;
-import cn.timer.api.dto.xcgl.XcglAssoOptionDto;
-import cn.timer.api.dto.xcgl.YdMobilePacketDto;
 import cn.timer.api.utils.DateUtil;
 import cn.timer.api.utils.ResponseResult;
 import cn.timer.api.utils.Result;
@@ -3359,6 +3314,13 @@ public class SalaryManagementController {
 		return new ResponseResult().success("成功");
 	}
 
+	@PostMapping(value = "/sendpayslipBatch")
+	@ApiOperation(value = "发送工资条--一键发送", httpMethod = "POST", notes = "接口发布说明")
+	public ResponseResult sendpayslipBatch(@CurrentUser UserBean userBean, @RequestBody SendpayslipBatchDto dto) {
+		xcglassogztztmapper.payslipSendBatch(dto);
+		return new ResponseResult().success("成功");
+	}
+	
 	
 	/***************************APP*************************************************/
 	

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

@@ -2,6 +2,7 @@ package cn.timer.api.dao.xcgl;
 import java.util.List;
 
 import cn.timer.api.dto.xcgl.PayslipSearchDto;
+import cn.timer.api.dto.xcgl.SendpayslipBatchDto;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -30,4 +31,10 @@ public interface XcglAssoGztztMapper extends BaseMapper<XcglAssoGztzt> {
 	 * @param fsType
 	 */
 	void payslipSend(Integer id, Integer fsType);
+
+	/**
+	 * 批量发送
+	 * @param dto
+	 */
+	void payslipSendBatch(SendpayslipBatchDto dto);
 }

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

+package cn.timer.api.dto.xcgl;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendpayslipBatchDto {
+    private List<Integer> ids;
+}

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

@@ -85,6 +85,7 @@
 		<if test="gztszid != null"> and gztzt.gztszid = #{gztszid} </if>
 		<if test="fsType != null"> and gztzt.fs_type = #{fsType} </if>
 		<if test="qrType != null"> and gztzt.qr_type = #{qrType} </if>
+		<if test="xzzid != null"> and xzury.xzzid = #{xzzid} </if>
 		<if test="text != null and text != ''" >
 			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
 		</if>
@@ -145,4 +146,14 @@
 		UPDATE xcgl_asso_gztzt SET fs_type = #{fsType}
 		WHERE id = #{id}
 	</update>
+
+	<!-- 发送工资条 批量发送 -->
+	<update id="payslipSendBatch">
+		UPDATE xcgl_asso_gztzt SET fs_type = 1
+		WHERE fs_type in (0, 2)
+			AND id in
+				<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+					#{item}
+				</foreach>
+	</update>
 </mapper>
\ No newline at end of file