Commit 12ee9a5d authored by hongguangwu's avatar hongguangwu

MVP1.7.11- HCM工资相关

parent a295b6d9
package com.yifu.cloud.plus.v1.yifu.salary.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* Hcm查询工资表的入参
*
* @author hgw
* @date 2019-07-30 15:00:05
*/
@Data
public class HcmSalarySearchVo implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "身份证集合")
List<String> idCardList;
@Schema(description = "工资月份")
String salaryMonth;
}
...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R; ...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService; import com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.HcmSalarySearchVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
...@@ -61,7 +62,12 @@ public class SalaryUploadController { ...@@ -61,7 +62,12 @@ public class SalaryUploadController {
**/ **/
@Operation(description = "HCM查询工资") @Operation(description = "HCM查询工资")
@PostMapping("/getHcmSalaryByIdCardListAndMonth") @PostMapping("/getHcmSalaryByIdCardListAndMonth")
public R<List<TSalaryAccount>> getSalaryByIdCardList(@RequestBody List<String> idCardList, @RequestParam String salaryMonth) { public R<List<TSalaryAccount>> getSalaryByIdCardList(@RequestBody HcmSalarySearchVo vo) {
List<String> idCardList = vo.getIdCardList();
String salaryMonth = vo.getSalaryMonth();
if (Common.isEmpty(salaryMonth)) {
return R.failed("工资月不可为空");
}
if (Common.isEmpty(idCardList) || idCardList.isEmpty()) { if (Common.isEmpty(idCardList) || idCardList.isEmpty()) {
return R.failed("身份证不可为空"); return R.failed("身份证不可为空");
} else if (idCardList.size() > 3000) { } else if (idCardList.size() > 3000) {
......
...@@ -480,8 +480,8 @@ ...@@ -480,8 +480,8 @@
<select id="getSalaryItemVoListByHcm" resultMap="tSalaryAccountItemMap"> <select id="getSalaryItemVoListByHcm" resultMap="tSalaryAccountItemMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_salary_account_item i FROM t_salary_account_item a
where i.SALARY_ACCOUNT_ID in where a.SALARY_ACCOUNT_ID in
<foreach item="item" index="index" collection="accIdList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="accIdList" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment