|
|
@@ -958,7 +958,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setStatus(status);
|
|
|
np.setAid(null);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
|
- updatePublicReleaseDtails(use,np.getId());
|
|
|
+ updatePublicReleaseDtails(use,np);
|
|
|
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
|
@@ -993,10 +993,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void updatePublicReleaseDtails(PublicRelease use, Integer id) {
|
|
|
+ private void updatePublicReleaseDtails(PublicRelease use, PublicRelease in) {
|
|
|
|
|
|
List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPrid(use.getId());
|
|
|
- List<OutPublicReleaseDetails> list2 = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
+ List<OutPublicReleaseDetails> list2 = publicReleaseDetailsMapper.selectByPrid(in.getId());
|
|
|
//打卡信息重新梳理
|
|
|
|
|
|
//查找新增的
|
|
|
@@ -1010,7 +1010,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (flag){
|
|
|
OutPublicReleaseDetails prd=new OutPublicReleaseDetails();
|
|
|
BeanUtils.copyProperties(out,prd);
|
|
|
- prd.setPrid(id);
|
|
|
+ prd.setPrid(in.getId());
|
|
|
prd.setClockIn(0);
|
|
|
prd.setClockInTime(null);
|
|
|
prd.setClockInRemarks(null);
|
|
|
@@ -1031,7 +1031,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
//最后再来处理打卡信息
|
|
|
- addPublicReleaseDateClock(use);
|
|
|
+ addPublicReleaseDateClock(in);
|
|
|
}
|
|
|
|
|
|
private void addpublicReleaseDtails(PublicRelease use, PublicRelease in) {
|
|
|
@@ -1528,7 +1528,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newP.setAssistantAid(p.getAssistantAid());
|
|
|
newP.setAssistantName(p.getAssistantName());
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(newP);
|
|
|
- updatePublicReleaseDtails(p,newP.getId());
|
|
|
+ updatePublicReleaseDtails(p,newP);
|
|
|
}
|
|
|
}
|
|
|
}
|