|
|
@@ -2742,9 +2742,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicReleaseClock> publicReleaseClocks = publicReleaseClockMapper.selectList(collect);
|
|
|
pushiClockInTime(list, publicReleaseClocks);
|
|
|
}
|
|
|
- list.forEach(e -> {
|
|
|
- e.setAssistType(pushAssistTypeName(e.getAssistType()));
|
|
|
- });
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -2760,7 +2757,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if(in.getStatus()!=null) map.put("status", in.getStatus());
|
|
|
if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
|
|
|
if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());
|
|
|
- if(in.getAssistType()!=null)map.put("assistType",in.getAssistType());
|
|
|
+ if(in.getAssistType()!=null){
|
|
|
+ String[] split = in.getAssistType().split(",");
|
|
|
+ map.put("assistType",split);
|
|
|
+ }
|
|
|
//type 0私有 1管理权限 2所有权限
|
|
|
if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
|
|
|
||TokenManager.hasRole(AFTConstants.CED_ASSISTANT )||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)
|
|
|
@@ -3461,6 +3461,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
|
|
|
for (OutPublicDtails outPublicDtails : list) {
|
|
|
+ //处理协单类型
|
|
|
+ outPublicDtails.setAssistType(pushAssistTypeName(outPublicDtails.getAssistType()));
|
|
|
+ //处理打卡
|
|
|
if (outPublicDtails.getClockIn()!=null){
|
|
|
if (outPublicDtails.getAlone()==2&&outPublicDtails.getAssist()==1){
|
|
|
outPublicDtails.setClockInStr("无需打卡");
|