Преглед изворни кода

打卡新增限制,不在时间范围内的不允许打卡

anderx пре 2 дана
родитељ
комит
dfa6b53ad9

+ 4 - 0
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -192,6 +192,10 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("技术协单,必须先写协单意见,才可打卡!"));
 			return res;
 		}
+		if (x==-4){
+			res.getError().add(buildError("当前打卡不在公出/非公出时间范围内!"));
+			return res;
+		}
 		res.setData(x);
 		return res;
 	}

+ 18 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -2308,6 +2308,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks ,String uid) {
 		if (clockIn == null) clockIn = 1;
+		String str = "";
+		Date date = new Date();
+		boolean flag=false;
+		Integer clockCount=0;
 		PublicRelease use = publicReleaseMapper.selectById(id);
 		if (use.getPublicType()==1||use.getPublicType()==3) {
 			return -1;
@@ -2321,13 +2325,23 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				return -3;
 			}
 		}
+		//非公出协单只要大于
+		Date start = use.getReleaseStart();
+		Date end = use.getReleaseEnd();
+		if (use.getType()==5||use.getType()==6){
+			//结束时间需要+1天
+			end = DateUtils.addDays(end, 1);
+		}
+		if (start.getTime()>date.getTime()){
+			return -4;
+		}
+		if (end.getTime()<date.getTime()){
+			return -4;
+		}
 		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
 		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
 		pushDateClockDetails(prdList,prdcList);
-		String str = "";
-		Date date = new Date();
-		boolean flag=false;
-		Integer clockCount=0;
+
 		PublicReleaseClock pc=new PublicReleaseClock();
 		pc.setPrid(id);
 		pc.setPhotoUrl(photoUrl);