|
|
@@ -1082,12 +1082,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public int pushPublicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks ,String uid) {
|
|
|
if (clockIn == null) clockIn = 1;
|
|
|
PublicRelease use = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
- if (use.getPublicType()==1||use.getPublicType()==3){
|
|
|
+ if (use.getPublicType()==1||use.getPublicType()==3) {
|
|
|
return -1;
|
|
|
}
|
|
|
- if (use.getTechStartProcess()==1||use.getTechStartProcess()==3){
|
|
|
- return -2;
|
|
|
- }
|
|
|
+// 取消打卡限制
|
|
|
+// if (use.getTechStartProcess()==1||use.getTechStartProcess()==3){
|
|
|
+// return -2;
|
|
|
+// }
|
|
|
List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
|
|
|
pushDateClockDetails(prdList,prdcList);
|