Commit e3340f50 authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

parents 40ff49f3 8b8ceb65
......@@ -183,6 +183,7 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
List<TSalaryAccount> getAccountListBySalaryId(@Param("searchVo") TSalaryAccountSearchVo searchVo);
List<String> getCardListBySalaryIdAndNotExists(@Param("salaryId") String salaryId, @Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth);
List<String> getCardListBySalaryId(@Param("salaryId") String salaryId);
List<String> getAccountListByKey(@Param("invoiceTitle") String invoiceTitle, @Param("settleMonth") String settleMonth
......
......@@ -98,6 +98,7 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
**/
List<TSalaryAccount> getAccountListBySalaryId(TSalaryAccountSearchVo searchVo);
List<String> getCardListBySalaryIdAndNotExists(String salaryId, String invoiceTitle, String settleMonth);
// 根据薪资ID获取报账身份证,0申报使用
List<String> getCardListBySalaryId(String salaryId);
......
......@@ -758,6 +758,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
return baseMapper.getCardListBySalaryId(salaryId);
}
@Override
public List<String> getCardListBySalaryIdAndNotExists(String salaryId, String invoiceTitle, String settleMonth) {
return baseMapper.getCardListBySalaryIdAndNotExists(salaryId, invoiceTitle, settleMonth);
}
@Override
public Map<String, Integer> getAccountMapByKey(String invoiceTitle, String settleMonth, List<String> cardList) {
Map<String, Integer> map = new HashMap<>();
......
......@@ -413,7 +413,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
sf.setDeleteFlag(SalaryConstants.DELETED);
this.updateById(sf);
// 更新0申报为可用
// 更新0申报为可用(判断是否有其他的
this.updateZero(sf, CommonConstants.ZERO_INT, CommonConstants.TWO_INT);
return R.ok("级联删除工资表成功");
......
......@@ -93,7 +93,15 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
@Override
public int updateDeleteFlagByIdList(String invoiceTitle, String settleMonth, String year, Integer deleteFlag, Integer oldDeleteFlag, String salaryId) {
List<String> cardList = salaryAccountService.getCardListBySalaryId(salaryId);
List<String> cardList;
if (deleteFlag == CommonConstants.ZERO_INT) {
cardList = salaryAccountService.getCardListBySalaryIdAndNotExists(salaryId, invoiceTitle, settleMonth);
} else {
cardList = salaryAccountService.getCardListBySalaryId(salaryId);
}
if (cardList == null || cardList.isEmpty()) {
return CommonConstants.ZERO_INT;
}
String tableName = getSalaryTableName(year);
if (Common.isEmpty(tableName)) {
return CommonConstants.ZERO_INT;
......
......@@ -1158,6 +1158,15 @@
GROUP BY a.id ORDER BY a.ROW_INDEX ASC
</select>
<!-- 获取工资下的身份证,用来处理0申报,但是要过滤掉还有报账的身份证 -->
<select id="getCardListBySalaryIdAndNotExists" resultType="java.lang.String">
SELECT distinct a.EMP_IDCARD FROM t_salary_account a where a.SALARY_FORM_ID = #{salaryId}
and not EXISTS (
SELECT distinct a.EMP_IDCARD FROM t_salary_account a where a.INVOICE_TITLE = #{invoiceTitle} and a.SETTLEMENT_MONTH = #{settleMonth} and a.DELETE_FLAG = 0
)
</select>
<!-- 获取工资下的身份证,用来处理0申报 -->
<select id="getCardListBySalaryId" resultType="java.lang.String">
SELECT distinct a.EMP_IDCARD FROM t_salary_account a where a.SALARY_FORM_ID = #{salaryId}
</select>
......
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