Commit 2d209c45 authored by hongguangwu's avatar hongguangwu

1.7.21-优化

parent b597f21f
...@@ -263,7 +263,7 @@ public class TSalaryStandardController { ...@@ -263,7 +263,7 @@ public class TSalaryStandardController {
// 生成收入 // 生成收入
tSalaryStandardService.doIncome(tSalaryStandard); tSalaryStandardService.doIncome(tSalaryStandard);
// 更新0申报为不可用 // 更新0申报为不可用
tSalaryStandardService.updateZero(tSalaryStandard, CommonConstants.TWO_INT); tSalaryStandardService.updateZero(tSalaryStandard, CommonConstants.TWO_INT, CommonConstants.ZERO_INT);
return R.ok("提交成功!"); return R.ok("提交成功!");
} else { } else {
......
...@@ -46,7 +46,7 @@ public interface TSalaryZeroMapper extends BaseMapper<TSalaryZero> { ...@@ -46,7 +46,7 @@ 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 int updateDeleteFlagByIdList(@Param("tableName") String tableName, @Param("deleteFlag") Integer deleteFlag, @Param("oldDeleteFlag") Integer oldDeleteFlag
, @Param("cardList") List<String> cardList, @Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth); , @Param("cardList") List<String> cardList, @Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth);
// 导出获取数据总数 // 导出获取数据总数
......
...@@ -80,7 +80,7 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> { ...@@ -80,7 +80,7 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
R<String> deleteSalaryById(String id); R<String> deleteSalaryById(String id);
// 更新0申报状态 // 更新0申报状态
void updateZero(TSalaryStandard tSalaryStandard, int deleteFlag); void updateZero(TSalaryStandard tSalaryStandard, int deleteFlag, int oldDeleteFlag);
/** /**
* @param id * @param id
......
...@@ -53,7 +53,7 @@ public interface TSalaryZeroService extends IService<TSalaryZero> { ...@@ -53,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 invoiceTitle, String settleMonth, String year, Integer deleteFlag, String salaryId); int updateDeleteFlagByIdList(String invoiceTitle, String settleMonth, String year, Integer deleteFlag, Integer oldDeleteFlag, String salaryId);
R<List<ErrorMessage>> importSalaryZero(InputStream inputStream, String settleMonth, String invoiceTitle); R<List<ErrorMessage>> importSalaryZero(InputStream inputStream, String settleMonth, String invoiceTitle);
......
...@@ -414,7 +414,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -414,7 +414,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
this.updateById(sf); this.updateById(sf);
// 更新0申报为可用 // 更新0申报为可用
this.updateZero(sf, CommonConstants.ZERO_INT); this.updateZero(sf, CommonConstants.ZERO_INT, CommonConstants.TWO_INT);
return R.ok("级联删除工资表成功"); return R.ok("级联删除工资表成功");
} }
...@@ -423,11 +423,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -423,11 +423,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
// 更新0申报状态 // 更新0申报状态
@Override @Override
public void updateZero(TSalaryStandard tSalaryStandard, int deleteFlag) { public void updateZero(TSalaryStandard tSalaryStandard, int deleteFlag, int oldDeleteFlag) {
if (Common.isNotNull(tSalaryStandard.getSettlementMonth()) && tSalaryStandard.getSettlementMonth().length() > 4) { if (Common.isNotNull(tSalaryStandard.getSettlementMonth()) && tSalaryStandard.getSettlementMonth().length() > 4) {
String year = tSalaryStandard.getSettlementMonth().substring(0, 4); String year = tSalaryStandard.getSettlementMonth().substring(0, 4);
tSalaryZeroService.updateDeleteFlagByIdList(tSalaryStandard.getInvoiceTitle() tSalaryZeroService.updateDeleteFlagByIdList(tSalaryStandard.getInvoiceTitle()
, tSalaryStandard.getSettlementMonth(), year, deleteFlag, tSalaryStandard.getId()); , tSalaryStandard.getSettlementMonth(), year, deleteFlag, oldDeleteFlag, tSalaryStandard.getId());
} }
} }
......
...@@ -92,13 +92,13 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala ...@@ -92,13 +92,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 invoiceTitle, String settleMonth, String year, Integer deleteFlag, String salaryId) { public int updateDeleteFlagByIdList(String invoiceTitle, String settleMonth, String year, Integer deleteFlag, Integer oldDeleteFlag, String salaryId) {
List<String> cardList = salaryAccountService.getCardListBySalaryId(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, cardList, invoiceTitle, settleMonth); return baseMapper.updateDeleteFlagByIdList(tableName, deleteFlag, oldDeleteFlag, cardList, invoiceTitle, settleMonth);
} }
/** /**
......
...@@ -431,6 +431,7 @@ ...@@ -431,6 +431,7 @@
<foreach item="item" collection="cardList" separator="," open="(" close=")" index=""> <foreach item="item" collection="cardList" separator="," open="(" close=")" index="">
#{item} #{item}
</foreach> </foreach>
and delete_flag = #{oldDeleteFlag}
</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