Browse Source

取消技术打卡限制

anderx 1 year ago
parent
commit
261c4ed09d

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

@@ -112,10 +112,11 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("公出他人企业!需通过审核,才可以打卡!"));
 			return res;
 		}
-		if (x==-2){
-			res.getError().add(buildError("已超过合同规定时限,需审核通过,才可打卡!"));
-			return res;
-		}
+//		取消打卡限制
+//		if (x==-2){
+//			res.getError().add(buildError("已超过合同规定时限,需审核通过,才可打卡!"));
+//			return res;
+//		}
 		res.setData(x);
 		return res;
 	}

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

@@ -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);