Commit d044cc47 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5

parents 1b2f07d8 fa4f5213
...@@ -49,7 +49,7 @@ public interface TInsuranceUnpurchasePersonMapper extends BaseMapper<TInsuranceU ...@@ -49,7 +49,7 @@ public interface TInsuranceUnpurchasePersonMapper extends BaseMapper<TInsuranceU
*/ */
List<TInsuranceUnpurchasePersonAddVo> getTInsuranceUnpurchasePersonList(@Param("id") String id); List<TInsuranceUnpurchasePersonAddVo> getTInsuranceUnpurchasePersonList(@Param("id") String id);
List<TInsuranceUnpurchasePerson> getBuyList(@Param("deptId") String deptId, @Param("idCardList") List<String> idCardList); List<TInsuranceUnpurchasePerson> getBuyList(@Param("deptNo") String deptNo, @Param("idCardList") List<String> idCardList);
List<String> getSocialBuyList(); List<String> getSocialBuyList();
......
...@@ -29,7 +29,7 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn ...@@ -29,7 +29,7 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn
List<TInsuranceUnpurchasePersonAddVo> getTInsuranceUnpurchasePersonList(String id); List<TInsuranceUnpurchasePersonAddVo> getTInsuranceUnpurchasePersonList(String id);
List<TInsuranceUnpurchasePerson> getBuyList(String deptId, List<String> idCardList); List<TInsuranceUnpurchasePerson> getBuyList(String deptNo, List<String> idCardList);
/** /**
* @param id 明细id * @param id 明细id
......
...@@ -39,8 +39,8 @@ public class TInsuranceUnpurchasePersonSalaryServiceImpl extends ServiceImpl<TIn ...@@ -39,8 +39,8 @@ public class TInsuranceUnpurchasePersonSalaryServiceImpl extends ServiceImpl<TIn
**/ **/
@Override @Override
public void deletePersonSalaryBySalaryId(String salaryId) { public void deletePersonSalaryBySalaryId(String salaryId) {
baseMapper.deletePersonSalaryBySalaryId(salaryId);
baseMapper.updatePersonSalaryNumBySalaryId(salaryId); baseMapper.updatePersonSalaryNumBySalaryId(salaryId);
baseMapper.deletePersonSalaryBySalaryId(salaryId);
} }
} }
...@@ -117,8 +117,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc ...@@ -117,8 +117,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
} }
@Override @Override
public List<TInsuranceUnpurchasePerson> getBuyList(String deptId, List<String> idCardList) { public List<TInsuranceUnpurchasePerson> getBuyList(String deptNo, List<String> idCardList) {
return baseMapper.getBuyList(deptId, idCardList); return baseMapper.getBuyList(deptNo, idCardList);
} }
/** /**
......
...@@ -1130,7 +1130,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1130,7 +1130,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
idCardList.add(a.getEmpIdCard()); idCardList.add(a.getEmpIdCard());
} }
// 3 判断不购买申请明细 // 3 判断不购买申请明细
List<TInsuranceUnpurchasePerson> buyList = tInsuranceUnpurchasePersonService.getBuyList(s.getDeptId(), idCardList); List<TInsuranceUnpurchasePerson> buyList = tInsuranceUnpurchasePersonService.getBuyList(s.getDeptNo(), idCardList);
Map<String, TInsuranceUnpurchasePerson> buyMap = new HashMap<>(); Map<String, TInsuranceUnpurchasePerson> buyMap = new HashMap<>();
TInsuranceUnpurchasePerson buyPerson; TInsuranceUnpurchasePerson buyPerson;
for (TInsuranceUnpurchasePerson buys : buyList) { for (TInsuranceUnpurchasePerson buys : buyList) {
...@@ -1231,7 +1231,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1231,7 +1231,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
updatePerSonList.add(updatePerSon); updatePerSonList.add(updatePerSon);
TInsuranceUnpurchasePersonSalary updatePerSonSalary = new TInsuranceUnpurchasePersonSalary(); TInsuranceUnpurchasePersonSalary updatePerSonSalary = new TInsuranceUnpurchasePersonSalary();
updatePerSonSalary.setId(buyPerson.getId());
updatePerSonSalary.setSalaryId(s.getId()); updatePerSonSalary.setSalaryId(s.getId());
updatePerSonSalary.setApplyNo(s.getApplyNo()); updatePerSonSalary.setApplyNo(s.getApplyNo());
updatePerSonSalary.setParentId(buyPerson.getId()); updatePerSonSalary.setParentId(buyPerson.getId());
......
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
SOCIAL_STATUS, SOCIAL_STATUS,
SALARY_NUM SALARY_NUM
FROM t_insurance_unpurchase_person a FROM t_insurance_unpurchase_person a
where STATUS = '3' AND (REASON_TYPE = '1' or (REASON_TYPE = '2' AND SALARY_NUM = 0) ) AND DEPT_ID = #{deptId} AND EMP_IDCARD_NO in where STATUS = '3' AND (REASON_TYPE = '1' or (REASON_TYPE = '2' AND SALARY_NUM = 0) ) AND DEPT_NO = #{deptNo} AND EMP_IDCARD_NO in
<foreach item="idStr" index="index" collection="idCardList" open="(" separator="," close=")"> <foreach item="idStr" index="index" collection="idCardList" open="(" separator="," close=")">
#{idStr} #{idStr}
</foreach> </foreach>
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
update t_insurance_unpurchase_person a update t_insurance_unpurchase_person a
left join t_insurance_unpurchase_person_salary b on a.id=b.PARENT_ID left join t_insurance_unpurchase_person_salary b on a.id=b.PARENT_ID
set a.SALARY_NUM = (if(a.SALARY_NUM is null or a.SALARY_NUM = 0,1,a.SALARY_NUM) - 1) set a.SALARY_NUM = (if(a.SALARY_NUM is null or a.SALARY_NUM = 0,1,a.SALARY_NUM) - 1)
where b.SALARY_ID = #{salaryId} where b.DELETE_FLAG = 0 and b.SALARY_ID = #{salaryId}
</update> </update>
</mapper> </mapper>
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