Merge remote-tracking branch 'origin/develop' into develop

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpSalaryUtil.java

@@ -104,7 +104,7 @@ public class EkpSalaryUtil {
 	}
 
 	// 退表到ekp
-	public String backStandardToEKP(String loginName, EkpSalaryBackParam param){
+	public String backStandardToEKP(EkpSalaryBackParam param){
 		log.info("推送EKP开始--薪资退表");
 		RestTemplate yourRestTemplate = new RestTemplate();
 		try{
@@ -112,7 +112,7 @@ public class EkpSalaryUtil {
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
 			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
 			wholeForm.add("docSubject",ekpProperties.getDocSubject());
-			wholeForm.add("docCreator", "{\"LoginName\":\"" + loginName+ "\"}");
+			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
 			wholeForm.add("docStatus", ekpProperties.getDocStatus());
 			String formValues = new ObjectMapper().writeValueAsString(param);
 			wholeForm.add("formValues", formValues);

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryBackParam.java

@@ -24,5 +24,9 @@ public class EkpSalaryBackParam implements Serializable {
 	 * 薪酬申请编号
 	 **/
 	private String fd_3b3c293811c0ee;
+	/**
+	 * 薪酬推送姓名(英文的登录名)
+	 **/
+	private String fd_3b422d73d73e02;
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundCheck.java

@@ -67,6 +67,12 @@ public class InsuranceRefundCheck implements Serializable {
 	@Schema(description = "保单结束日期")
 	private String policyEnd;
 
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
 	/**
 	 * 减员状态 1待减员 2减员中3减员退回
 	 */

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -578,7 +578,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -587,7 +587,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				return R.failed(InsurancesConstants.POLICY_START_PARSE_ERROR);
@@ -717,7 +717,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -726,7 +726,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
 					.eq(TInsuranceReplace::getToInsuranceDetailId, byId.getId())
@@ -920,17 +920,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
 		}
 		List<InsuranceExportListVO> insuranceExportList;
+		//如果是待投保状态，sql中HANDLED_BY过滤条件不需要，这里强制变为null
+		if(param.getBuyHandleStatus() == CommonConstants.ONE_INT){
+			param.setCreateBy(null);
+		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			insuranceExportList =  baseMapper.getInsuranceExportListBySelect(param.getIdList());
-
-			if (CollectionUtils.isNotEmpty(insuranceExportList)){
-				for (InsuranceExportListVO exportListVO : insuranceExportList) {
-					if (exportListVO.getBuyHandleStatus() != CommonConstants.ONE_INT){
-						return R.failed(InsurancesConstants.CHANGE_ERROR);
-					}
-				}
-			}
 		}else {
 			insuranceExportList = baseMapper.getInsuranceExportList(param);
 		}
@@ -1984,7 +1980,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1995,7 +1991,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			try{
@@ -2304,7 +2300,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2315,7 +2311,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			try{
@@ -2686,7 +2682,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2697,7 +2693,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			if (param.getEmpName().equals(param.getReplaceEmpName()) && param.getEmpIdcardNo().equals(param.getReplaceEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.REPLACE_EMP_INFO_SAME);
@@ -3536,6 +3532,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
 		}
 		List<RefundExportListVo> refundExportList;
+		//如果是待减员状态，sql中UPDATE_BY过滤条件不需要，这里强制变为null
+		if(param.getReduceHandleStatus() == CommonConstants.ONE_INT){
+			param.setCreateBy(null);
+		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待减员」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			refundExportList =  baseMapper.getRefundExportListBySelect(param.getIdList());
@@ -4741,6 +4741,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			//购买标准
+			String buyStandard = param.getBuyStandard();
+			if (StringUtils.isBlank(buyStandard)){
+				param.setErrorMessage(InsurancesConstants.BUY_STANDARD_NOT_EMPTY);
+				errorList.add(param);
+				continue;
+			}
 			// 身份证号位数校验（18 位合法）
 			if (!ValidityUtil.validateIDCard(param.getEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
@@ -4768,12 +4775,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 			LambdaQueryWrapper<TInsuranceDetail> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(TInsuranceDetail :: getDeleteFlag,CommonConstants.ZERO_INT)
-					.eq(TInsuranceDetail ::getEmpName,empName )
-					.eq(TInsuranceDetail ::getEmpIdcardNo,empIdCardNo )
-					.eq(TInsuranceDetail :: getInsuranceCompanyName,insuranceCompanyName )
-					.eq(TInsuranceDetail :: getInsuranceTypeName,insuranceTypeName)
-					.eq(TInsuranceDetail :: getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
-					.eq(TInsuranceDetail :: getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd))
+					.eq(TInsuranceDetail::getEmpName,empName )
+					.eq(TInsuranceDetail::getEmpIdcardNo,empIdCardNo )
+					.eq(TInsuranceDetail::getInsuranceCompanyName,insuranceCompanyName )
+					.eq(TInsuranceDetail::getInsuranceTypeName,insuranceTypeName)
+					.eq(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
+					.eq(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd))
+					.eq(TInsuranceDetail::getBuyStandard,buyStandard)
 					.orderByDesc(TInsuranceDetail::getUpdateTime)
 					.last(CommonConstants.LAST_ONE_SQL);
 			List<TInsuranceDetail> list = list(queryWrapper);

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -407,6 +407,9 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and a.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.createBy != null and param.createBy.trim() != ''">
+			and a.HANDLED_BY = #{param.createBy}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -946,6 +949,9 @@
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
+		<if test="param.createBy != null and param.createBy.trim() != ''">
+			and  refund.UPDATE_BY = #{param.createBy}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -362,12 +362,15 @@ public class TSalaryAccount extends BaseEntity {
 	private Integer isRepeat;
 
 	/**
-	 * 是否个人承担部分税费：0否1是
+	 * 是否个人承担部分税费
+	 * 公司承担全部税费0
+	 * 个人承担部分税费1
+	 * 个人承担全部税费2
 	 */
-	@ExcelAttribute(name = "是否个人承担部分税费：0否1是", maxLength = 1)
-	@Length(max = 1, message = "是否个人承担部分税费：0否1是不能超过1个字符")
+	@ExcelAttribute(name = "是否个人承担部分税费", maxLength = 8, readConverterExp = "0=公司承担全部税费,1=个人承担部分税费,2=个人承担全部税费")
+	@Length(max = 1, message = "是否个人承担部分税费不能超过1个字符")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("是否个人承担部分税费：0否1是")
+	@ExcelProperty("是否个人承担部分税费")
 	private String isPersonTax;
 	/**
 	 * 应发薪酬（劳务费、稿酬）

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountVo.java

@@ -283,12 +283,15 @@ public class TSalaryAccountVo implements Serializable {
 	private String bankCity;
 
 	/**
-	 * 是否个人承担部分税费：0否1是
+	 * 是否个人承担部分税费
+	 * 公司承担全部税费0
+	 * 个人承担部分税费1
+	 * 个人承担全部税费2
 	 */
-	@ExcelAttribute(name = "是否个人承担部分税费：0否1是", maxLength = 1)
-	@Length(max = 1, message = "是否个人承担部分税费：0否1是不能超过1个字符")
+	@ExcelAttribute(name = "是否个人承担部分税费", maxLength = 8)
+	@Length(max = 8, message = "是否个人承担部分税费：0否1是2全不能超过1个字符")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("是否个人承担部分税费：0否1是")
+	@ExcelProperty("是否个人承担部分税费")
 	private String isPersonTax;
 	/**
 	 * 应发薪酬（劳务费、稿酬）

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -184,6 +184,7 @@ public class TSalaryStandardController {
 				return R.failed("未找到工资表");
 			} else if (s.getStatus() == SalaryConstants.STATUS[0]
 					|| s.getStatus() == SalaryConstants.STATUS[5]
+					|| s.getStatus() == SalaryConstants.STATUS[6]
 					|| s.getStatus() == SalaryConstants.STATUS[7]) {
 				YifuUser user = SecurityUtils.getUser();
 				if (user != null) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryEmployeeMapper.java

@@ -46,4 +46,6 @@ public interface TSalaryEmployeeMapper extends BaseMapper<TSalaryEmployee> {
 	List<TSalaryEmployeeExportVo> noPageDiy( @Param("tSalaryEmployee") TSalaryEmployeeSearchVo searchVo, @Param("idList")List<String> idList);
 
 	List<TSalaryEmployee> getListByIdCard(@Param("idCardList") List<String> idCardList);
+
+	TSalaryEmployee getByEmpIdCard(@Param("empIdCard") String empIdCard);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryEmployeeService.java

@@ -51,13 +51,14 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
     List<TSalaryEmployeeExportVo> noPageDiy(TSalaryEmployeeSearchVo searchVo);
 
 	/**
+	 * @param notLabour 是：非劳务费人员。 否：劳务费，不保存
 	 * @param employee
 	 * @Description: 新建薪资员工，返回值为null，保存成功。其余都是失败原因
 	 * @Author: hgw
 	 * @Date: 2022/8/17 16:03
 	 * @return: java.lang.String
 	 **/
-	String saveNewSalaryEmployee(TSalaryEmployee employee);
+	String saveNewSalaryEmployee(boolean notLabour, TSalaryEmployee employee);
 
 	/**
 	 * @param inputStream
@@ -68,4 +69,6 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
 	 **/
 	R<List<ErrorMessage>> batchUpdateSalaryEmployee(InputStream inputStream);
 
+	TSalaryEmployee getByEmpIdCard(String empIdCard);
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -1683,7 +1683,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		BigDecimal nowTaxY;
 		BigDecimal relaySalary;
 		BigDecimal salaryTax = BigDecimal.ZERO;
-		if (CommonConstants.ONE_STRING.equals(a.getIsPersonTax())) {
+		if (SalaryConstants.IS_PERSON_OTHER.equals(a.getIsPersonTax())) {
 			nowTaxT = getNowTax(actualSalarySumNow);
 			if (actualSalarySum.compareTo(actualSalarySumNow) != 0) {
 				actualSalarySumT = BigDecimalUtils.safeAdd(nowTaxT, sumSalaryTax, actualSalarySumNow).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
@@ -1700,7 +1700,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			a.setSalaryTax(salaryTax);
 			a.setSalaryTaxUnit(nowTaxT);
 			a.setActualSalary(BigDecimalUtils.safeSubtract(actualSalarySumNow, salaryTax));
-		} else {
+		} else if (SalaryConstants.IS_COMPANY.equals(a.getIsPersonTax())) {
 			getNowTax(actualSalarySumNow);
 			nowTaxY = getNowTax(actualSalarySum);
 			a.setActualSalary(actualSalarySumNow);
@@ -1709,6 +1709,13 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			}
 			a.setSalaryTaxUnit(nowTaxY);
 			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		} else {
+
+			// TODO-@胡 ：个人承担全部税费，实发要变为应发，推算出实发、个税
+
+			nowTaxY = BigDecimal.ZERO;
+			relaySalary = a.getActualSalary();
+
 		}
 		a.setRelaySalaryUnit(relaySalary);
 		a.setRelaySalary(actualSalarySumNow);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java

@@ -274,6 +274,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 	}
 
 	/**
+	 * @param notLabour 是：非劳务费人员。 否：劳务费，不保存
 	 * @param employee
 	 * @Description: 新建薪资员工，返回值为null，保存成功。其余都是失败原因
 	 * @Author: hgw
@@ -281,7 +282,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 	 * @return: java.lang.String
 	 **/
 	@Override
-	public String saveNewSalaryEmployee(TSalaryEmployee employee) {
+	public String saveNewSalaryEmployee(boolean notLabour,TSalaryEmployee employee) {
 		if (Common.isNotNull(employee.getEmpName()) && Common.isNotNull(employee.getEmpIdcard())) {
 			// 银行卡
 			if (Common.isNotNull(employee.getBankNo())) {
@@ -306,22 +307,6 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 					return pre + SalaryConstants.CHECK_NO_RESPONSE;
 				}
 			}
-//			if (Common.isNotNull(employee.getBankNo())) {
-//				// 调用校验服务
-//				TCheckBankNo checkIdCard = new TCheckBankNo();
-//				checkIdCard.setName(employee.getEmpName());
-//				checkIdCard.setBankNo(employee.getBankNo());
-//				R<TCheckBankNo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
-//						, "/tcheckbankno/inner/checkBankNo", checkIdCard, TCheckBankNo.class, SecurityConstants.FROM_IN);
-//				if (checkListR != null && checkListR.getData() != null) {
-//					TCheckBankNo check = checkListR.getData();
-//					if (!CommonConstants.ONE_STRING.equals(check.getResult())) {
-//						return check.getMessage();
-//					}
-//				} else {
-//					return "校验服务未找到银行卡，请联系管理员";
-//				}
-//			}
 			// 手机号
 			if (Common.isNotNull(employee.getEmpPhone())) {
 				// 调用校验服务-校验手机号
@@ -342,7 +327,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 				}
 			}
 		}
+		if (!notLabour) {
 			this.save(employee);
+		}
 		return null;
 	}
 
@@ -442,7 +429,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 		// 人员Map
 		Map<String, TSalaryEmployee> empMap = new HashMap<>();
 		for (TSalaryEmployee e : empList) {
-			empMap.put(e.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + e.getDeptNo(), e);
+			empMap.put(e.getEmpIdcard(), e);
 		}
 		TSalaryEmployee emp;
 		// 开户行省市的区域暂存
@@ -451,8 +438,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 		for (int i = 0; i < excelVOList.size(); i++) {
 			excel = excelVOList.get(i);
 			if (excel != null) {
-				if (Common.isNotNull(excel.getEmpIdcard()) && Common.isNotNull(excel.getDeptNo())) {
-					emp = empMap.get(excel.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + excel.getDeptNo());
+				if (Common.isNotNull(excel.getEmpIdcard())) {
+					emp = empMap.get(excel.getEmpIdcard());
 					if (Common.isNotNull(emp)) {
 						curTaxMonth = false;
 						if (Common.isNotNull(emp.getTaxMonth()) && Common.isNotNull(excel.getTaxMonth()) && emp.getTaxMonth().length()==6) {
@@ -501,11 +488,17 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 						errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.NOT_HAVE_EMP));
 					}
 				} else {
-					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.IDCARD_DEPT_NO_MUST));
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.ID_CARD_MUST));
 				}
 			} else {
-				errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT, SalaryConstants.IDCARD_DEPT_NO_MUST));
+				errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT, SalaryConstants.DATA_MUST));
 			}
 		}
 	}
+
+	@Override
+	public TSalaryEmployee getByEmpIdCard(String empIdCard) {
+		return baseMapper.getByEmpIdCard(empIdCard);
+	}
+
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -416,6 +416,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			if (sf != null && Common.isNotNull(sf.getId())) {
 				if (sf.getStatus() != null && !SalaryConstants.AUDIT_STATUS[0].equals(sf.getStatus())
 						&& !SalaryConstants.AUDIT_STATUS[5].equals(sf.getStatus())
+						&& !SalaryConstants.AUDIT_STATUS[6].equals(sf.getStatus())
 						&& !SalaryConstants.AUDIT_STATUS[7].equals(sf.getStatus())) {
 					return R.failed("状态为：【" + SalaryConstants.AUDIT_STATUS_STRING[sf.getStatus()] + "】，不可删除");
 				}
@@ -908,15 +909,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				param.setFd_3b3c2935c13056(ss.getDeptNo());
 				param.setFd_3b3c293811c0ee(ss.getApplyNo());
 				YifuUser user = SecurityUtils.getUser();
-				String loginName;
 				if (user != null) {
-					loginName = user.getUsername();
+					param.setFd_3b422d73d73e02(user.getUsername());
 				} else {
-					loginName = ss.getCreateName();
+					param.setFd_3b422d73d73e02("");
 				}
-				String sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
+				String sendBack = ekpSalaryUtil.backStandardToEKP(param);
 				if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
-					sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
+					sendBack = ekpSalaryUtil.backStandardToEKP(param);
 				}
 				if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
 					// 更新薪资为确认不通过
@@ -936,6 +936,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 							, Object.class, SecurityConstants.FROM_IN);
 					// 添加流程进展明细
 					if (user != null) {
+						ss.setRemark(" ");
 						this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表");
 					}
 					return R.ok();

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryCommonUtil.java

@@ -463,6 +463,12 @@ public class SalaryCommonUtil implements Serializable {
 			field.set(entity, "0");
 		} else if ("单独".equals(cellValueStr)) {
 			field.set(entity, "1");
+		} else if (SalaryConstants.IS_COMPANY.equals(cellValueStr)) {
+			field.set(entity, SalaryConstants.IS_PERSON_TAX_ARR[0]);
+		} else if (SalaryConstants.IS_PERSON_OTHER.equals(cellValueStr)) {
+			field.set(entity, SalaryConstants.IS_PERSON_TAX_ARR[1]);
+		} else if (SalaryConstants.IS_PERSON.equals(cellValueStr)) {
+			field.set(entity, SalaryConstants.IS_PERSON_TAX_ARR[2]);
 		} else {
 			field.set(entity, cellValueStr);
 		}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java

@@ -21,7 +21,7 @@ public class SalaryConstants {
       * @Date: 2019/10/10 14:55
       * @return:
       **/
-     public static final Integer[] AUDIT_STATUS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+     public static final Integer[] AUDIT_STATUS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
      public static final int[] STATUS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
      public static final String[] AUDIT_STATUS_STRING = {"待提交", "待审核", "-", "待发放", "已发放", "审核不通过", "确认不通过", "财务退回", "结算单调整待审核", "结算单调整待打印"};
 
@@ -142,7 +142,16 @@ public class SalaryConstants {
      public static final String ACTUAL_SALARY_SUM = "个人实发合计";
      //个人实发合计
      public static final String ACTUAL_SALARY_SUM_JAVA = "actualSalarySum";
-
+	 // 是否个人承担部分税费
+     public static final String IS_PERSON_TAX = "isPersonTax";
+	 // 是否个人承担部分税费数组
+	 public static final String IS_PERSON_TAX_ARR[] = {"0","1","2"};
+	 // 公司承担全部税费0
+     public static final String IS_COMPANY = "公司承担全部税费";
+	 // 个人承担部分税费1
+     public static final String IS_PERSON_OTHER = "个人承担部分税费";
+	 // 个人承担全部税费2
+	 public static final String IS_PERSON = "个人承担全部税费";
 	 //个人代扣
      public static final String PDEDUCTION_JAVA = "pdeduction";
      //单位代扣
@@ -168,9 +177,9 @@ public class SalaryConstants {
 
 	public static final String CHECK_NO_RESPONSE = "校验服务器未返回，请联系管理员！";
 	public static final String LINE_EMP = "行：员工：";
-	public static final String IDCARD_DEPT_NO_MUST = "身份证、项目编码不可为空！";
+	public static final String DATA_MUST = "未获取到表格数据！";
+	public static final String ID_CARD_MUST = "身份证不可为空！";
 	public static final String NOT_HAVE_EMP = "根据身份证、项目编码未找到人员！";
-	public static final String TAX_MONTH_CUR = "计税月份已存在，不可更新，请清空计税月份单元格内容！";
 	public static final String PROVINCE_ERROR = "开户行省错误！";
 	public static final String CITY_ERROR = "开户行市错误！";
 	public static final String CUR_TAX_INFO = "当前项目薪酬人员已维护计税月份，计税月份沿用系统原值，其他字段已更新！";

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryEmployeeMapper.xml

@@ -221,4 +221,13 @@
 			</foreach>
 		</if>
 	</select>
+
+	<!-- 按身份证查询人员 -->
+	<select id="getByEmpIdCard" resultMap="tSalaryEmployeeMap" >
+		SELECT
+			<include refid="Base_Column_List"/>
+		FROM t_salary_employee a
+		where a.EMP_IDCARD = #{empIdCard}
+		ORDER BY a.BANK_CITY DESC LIMIT 1
+	</select>
 </mapper>

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -16,9 +16,11 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -630,4 +632,42 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("工资公积金结算状态")
 	private String salaryFundFlag;
 
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String ylSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String dbSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String sySameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String brSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String gsSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String ybSameFlg;
+
+
 }