Commit 7bf4a2e6 authored by hongguangwu's avatar hongguangwu

1.7.21-薪资0申报

parent 5597a052
...@@ -2020,6 +2020,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2020,6 +2020,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
Integer oldDeptSocialStatus = project.getSocialStatus(); Integer oldDeptSocialStatus = project.getSocialStatus();
Integer oldDeptFundStatus = project.getFundStatus(); Integer oldDeptFundStatus = project.getFundStatus();
Integer oldDeptInsuranceStatus = project.getInsuranceStatus(); Integer oldDeptInsuranceStatus = project.getInsuranceStatus();
Integer oldDeptSocialProvince = project.getSocialProvince();
Integer oldDeptSocialCity = project.getSocialCity();
Integer oldDeptSocialTown = project.getSocialTown();
if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) { if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) {
tPreEmployeeProject.setWorkingHours(""); tPreEmployeeProject.setWorkingHours("");
...@@ -2054,6 +2057,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2054,6 +2057,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(oldDeptInsuranceStatus) && oldDeptInsuranceStatus != 0) { if (Common.isNotNull(oldDeptInsuranceStatus) && oldDeptInsuranceStatus != 0) {
project.setInsuranceStatus(oldDeptInsuranceStatus); project.setInsuranceStatus(oldDeptInsuranceStatus);
} }
// 2026-03-24 段说要不更新社保省市县
if (Common.isNotNull(oldDeptSocialProvince)) {
project.setSocialProvince(oldDeptSocialProvince);
project.setSocialCity(oldDeptSocialCity);
project.setSocialTown(oldDeptSocialTown);
}
tEmployeeProjectService.updateById(project); tEmployeeProjectService.updateById(project);
} else { } else {
......
...@@ -262,6 +262,8 @@ public class TSalaryStandardController { ...@@ -262,6 +262,8 @@ public class TSalaryStandardController {
tSalaryStandard = tSalaryStandardService.getById(tSalaryStandard.getId()); tSalaryStandard = tSalaryStandardService.getById(tSalaryStandard.getId());
// 生成收入 // 生成收入
tSalaryStandardService.doIncome(tSalaryStandard); tSalaryStandardService.doIncome(tSalaryStandard);
// 更新0申报为不可用
tSalaryStandardService.updateZero(tSalaryStandard, CommonConstants.TWO_INT);
return R.ok("提交成功!"); return R.ok("提交成功!");
} else { } else {
......
...@@ -183,6 +183,8 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> { ...@@ -183,6 +183,8 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
List<TSalaryAccount> getAccountListBySalaryId(@Param("searchVo") TSalaryAccountSearchVo searchVo); List<TSalaryAccount> getAccountListBySalaryId(@Param("searchVo") TSalaryAccountSearchVo searchVo);
List<String> getCardListBySalaryId(@Param("salaryId") String salaryId);
List<String> getAccountListByKey(@Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth List<String> getAccountListByKey(@Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth
, @Param("cardList") List<String> cardList); , @Param("cardList") List<String> cardList);
......
...@@ -46,7 +46,8 @@ public interface TSalaryZeroMapper extends BaseMapper<TSalaryZero> { ...@@ -46,7 +46,8 @@ public interface TSalaryZeroMapper extends BaseMapper<TSalaryZero> {
IPage<TSalaryZero> getTSalaryZeroPage(Page<TSalaryZero> page, @Param("tableName") String tableName, @Param("tSalaryZero") TSalaryZeroSearchVo searchVo); IPage<TSalaryZero> getTSalaryZeroPage(Page<TSalaryZero> page, @Param("tableName") String tableName, @Param("tSalaryZero") TSalaryZeroSearchVo searchVo);
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除) // 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
int updateDeleteFlagByIdList(@Param("tableName") String tableName, @Param("deleteFlag") Integer deleteFlag, @Param("idList") List<String> idList); int updateDeleteFlagByIdList(@Param("tableName") String tableName, @Param("deleteFlag") Integer deleteFlag
, @Param("cardList") List<String> cardList, @Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth);
// 导出获取数据总数 // 导出获取数据总数
long getTSalaryZeroCount(@Param("tableName") String tableName, @Param("tSalaryZero") TSalaryZeroSearchVo searchVo); long getTSalaryZeroCount(@Param("tableName") String tableName, @Param("tSalaryZero") TSalaryZeroSearchVo searchVo);
......
...@@ -98,6 +98,9 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> { ...@@ -98,6 +98,9 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
**/ **/
List<TSalaryAccount> getAccountListBySalaryId(TSalaryAccountSearchVo searchVo); List<TSalaryAccount> getAccountListBySalaryId(TSalaryAccountSearchVo searchVo);
// 根据薪资ID获取报账身份证,0申报使用
List<String> getCardListBySalaryId(String salaryId);
// 根据抬头、结算月、身份证list获取是否存在 // 根据抬头、结算月、身份证list获取是否存在
Map<String, Integer> getAccountMapByKey(String invoiceTitle, String settleMonth,List<String> keyList); Map<String, Integer> getAccountMapByKey(String invoiceTitle, String settleMonth,List<String> keyList);
......
...@@ -79,6 +79,9 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> { ...@@ -79,6 +79,9 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
**/ **/
R<String> deleteSalaryById(String id); R<String> deleteSalaryById(String id);
// 更新0申报状态
void updateZero(TSalaryStandard tSalaryStandard, int deleteFlag);
/** /**
* @param id * @param id
* @Description: 推送至ekp * @Description: 推送至ekp
......
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
package com.yifu.cloud.plus.v1.yifu.salary.service; package com.yifu.cloud.plus.v1.yifu.salary.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryZero;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryZero;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryZeroSearchVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryZeroSearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
...@@ -52,7 +53,7 @@ public interface TSalaryZeroService extends IService<TSalaryZero> { ...@@ -52,7 +53,7 @@ public interface TSalaryZeroService extends IService<TSalaryZero> {
boolean deleteTSalaryZeroByIdList(List<String> idList); boolean deleteTSalaryZeroByIdList(List<String> idList);
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除) // 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
int updateDeleteFlagByIdList(String year, Integer deleteFlag, List<String> idList); int updateDeleteFlagByIdList(String invoiceTitle, String settleMonth, String year, Integer deleteFlag, String salaryId);
R<List<ErrorMessage>> importSalaryZero(InputStream inputStream, String settleMonth, String invoiceTitle); R<List<ErrorMessage>> importSalaryZero(InputStream inputStream, String settleMonth, String invoiceTitle);
......
...@@ -753,6 +753,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -753,6 +753,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
return baseMapper.getAccountListBySalaryId(searchVo); return baseMapper.getAccountListBySalaryId(searchVo);
} }
@Override
public List<String> getCardListBySalaryId(String salaryId) {
return baseMapper.getCardListBySalaryId(salaryId);
}
@Override @Override
public Map<String, Integer> getAccountMapByKey(String invoiceTitle, String settleMonth, List<String> cardList) { public Map<String, Integer> getAccountMapByKey(String invoiceTitle, String settleMonth, List<String> cardList) {
Map<String, Integer> map = new HashMap<>(); Map<String, Integer> map = new HashMap<>();
......
...@@ -101,6 +101,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -101,6 +101,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
private final TInsuranceUnpurchasePersonService tInsuranceUnpurchasePersonService; private final TInsuranceUnpurchasePersonService tInsuranceUnpurchasePersonService;
private final TInsuranceUnpurchasePersonSalaryService tInsuranceUnpurchasePersonSalaryService; private final TInsuranceUnpurchasePersonSalaryService tInsuranceUnpurchasePersonSalaryService;
private final TSalaryZeroService tSalaryZeroService;
/** /**
...@@ -411,11 +412,25 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -411,11 +412,25 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
sf.setDeleteDate(new Date()); sf.setDeleteDate(new Date());
sf.setDeleteFlag(SalaryConstants.DELETED); sf.setDeleteFlag(SalaryConstants.DELETED);
this.updateById(sf); this.updateById(sf);
// 更新0申报为可用
this.updateZero(sf, CommonConstants.ZERO_INT);
return R.ok("级联删除工资表成功"); return R.ok("级联删除工资表成功");
} }
return R.failed("id 不可为空"); return R.failed("id 不可为空");
} }
// 更新0申报状态
@Override
public void updateZero(TSalaryStandard tSalaryStandard, int deleteFlag) {
if (Common.isNotNull(tSalaryStandard.getSettlementMonth()) && tSalaryStandard.getSettlementMonth().length() > 4) {
String year = tSalaryStandard.getSettlementMonth().substring(0, 4);
tSalaryZeroService.updateDeleteFlagByIdList(tSalaryStandard.getInvoiceTitle()
, tSalaryStandard.getSettlementMonth(), year, deleteFlag, tSalaryStandard.getId());
}
}
/** /**
* @Description: 推送 * @Description: 推送
* @Author: hgw * @Author: hgw
......
...@@ -89,12 +89,13 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala ...@@ -89,12 +89,13 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除) // 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
@Override @Override
public int updateDeleteFlagByIdList(String year, Integer deleteFlag, List<String> idList) { public int updateDeleteFlagByIdList(String invoiceTitle, String settleMonth, String year, Integer deleteFlag, String salaryId) {
List<String> cardList = salaryAccountService.getCardListBySalaryId(salaryId);
String tableName = getSalaryTableName(year); String tableName = getSalaryTableName(year);
if (Common.isEmpty(tableName)) { if (Common.isEmpty(tableName)) {
return CommonConstants.ZERO_INT; return CommonConstants.ZERO_INT;
} }
return baseMapper.updateDeleteFlagByIdList(tableName, deleteFlag, idList); return baseMapper.updateDeleteFlagByIdList(tableName, deleteFlag, cardList, invoiceTitle, settleMonth);
} }
/** /**
...@@ -171,7 +172,6 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala ...@@ -171,7 +172,6 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala
*/ */
@Override @Override
public IPage<TSalaryZero> getTSalaryZeroPage(Page<TSalaryZero> page, TSalaryZeroSearchVo searchVo) { public IPage<TSalaryZero> getTSalaryZeroPage(Page<TSalaryZero> page, TSalaryZeroSearchVo searchVo) {
// baseMapper.createSalaryZeroYear(tableName);
if (Common.isNotNull(searchVo.getYear())) { if (Common.isNotNull(searchVo.getYear())) {
String tableName = getSalaryTableName(searchVo.getYear()); String tableName = getSalaryTableName(searchVo.getYear());
if (Common.isEmpty(tableName)) { if (Common.isEmpty(tableName)) {
......
...@@ -1158,6 +1158,10 @@ ...@@ -1158,6 +1158,10 @@
GROUP BY a.id ORDER BY a.ROW_INDEX ASC GROUP BY a.id ORDER BY a.ROW_INDEX ASC
</select> </select>
<select id="getCardListBySalaryId" resultType="java.lang.String">
SELECT distinct a.EMP_IDCARD FROM t_salary_account a where a.SALARY_FORM_ID = #{salaryId}
</select>
<select id="getAccountListByKey" resultType="java.lang.String"> <select id="getAccountListByKey" resultType="java.lang.String">
SELECT SELECT
a.EMP_IDCARD a.EMP_IDCARD
......
...@@ -383,8 +383,9 @@ ...@@ -383,8 +383,9 @@
<!-- 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除) --> <!-- 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除) -->
<update id="updateDeleteFlagByIdList" > <update id="updateDeleteFlagByIdList" >
update ${tableName} set delete_flag = #{deleteFlag} where id in update ${tableName} set delete_flag = #{deleteFlag}
<foreach item="item" collection="idList" separator="," open="(" close=")" index=""> where INVOICE_TITLE = #{invoiceTitle} and SETTLE_MONTH = #{settleMonth} and EMP_IDCARD in
<foreach item="item" collection="cardList" separator="," open="(" close=")" index="">
#{item} #{item}
</foreach> </foreach>
</update> </update>
......
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