Procházet zdrojové kódy

修改公出审核调整
修改切换打卡
新增多人审核

anderx před 1 rokem
rodič
revize
2309e28bad

+ 3 - 2
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -120,7 +120,8 @@ public class AdminSuperviserApiController extends CertifyApiController {
 	 * 修改管理员信息
 	 */
 	@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
-	public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data) {
+	public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds, String data,
+							  String reviewerIds) {
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.parse(data);
 		List<String> roles = new ArrayList<String>();
@@ -173,7 +174,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 			if (!useAdmin.getStatus().equals(ad.getStatus())&&!ad.getStatus().equals("0")){
 				redisUtil.deleteAid(aa.getId());
 			}
-			res.setData(newAdminService.updateByPrimaryKeySelective(ad,useAdmin, roles));
+			res.setData(newAdminService.updateByPrimaryKeySelective(ad,useAdmin, roles,reviewerIds));
 		}
 		return res;
 	}

+ 4 - 4
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -1,13 +1,13 @@
 package com.goafanti.admin.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.mybatis.page.Pagination;
 
+import java.util.List;
+import java.util.Map;
+
 public interface NewAdminService {
 	Pagination<AdminListBo> listAdmin(AdminListBo alb,String rid,String roleName, Integer pageNo, Integer pageSize);
 
@@ -19,7 +19,7 @@ public interface NewAdminService {
 
 	int insert(Admin ad);
 
-	int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds );
+	int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds ,String reviewerIds);
 
 	int updateByPrimaryKey(Admin a);
 

+ 6 - 1
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -93,7 +93,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 
 	@SuppressWarnings("unused")
 	@Override
-	public int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds) {
+	public int updateByPrimaryKeySelective(Admin ad,Admin useAdmin, List<String> roleIds,String reviewerIds) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("uid", ad.getId());
 		params.put("roles", roleIds);
@@ -110,6 +110,8 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		int count=adminMapper.updateByPrimaryKey(ad);
 		//
 		asyncUtils.pushRoleUpdateExamine(ad,useAdmin,roleIds,useRole);
+		//修改公出审核人
+		updatePublicReviewer(ad.getId(),reviewerIds);
 		pushAmbRole(ad);
 		if (count>0&&ad.getAmbId()!=null){
 			//进行巴人数计算
@@ -122,7 +124,10 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		return count;
 	}
 
+	private void updatePublicReviewer(String aid ,String reviewerIds) {
+		String[] split = reviewerIds.split(",");
 
+	}
 
 
 	private int sumType(List<String > roleIds) {

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

@@ -113,10 +113,10 @@ public class AdminReleaseApiController extends CertifyApiController{
 			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;
 	}

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

@@ -1140,10 +1140,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if (use.getPublicType()==1||use.getPublicType()==3) {
 			return -1;
 		}
-//		取消打卡限制
-//		if (use.getTechStartProcess()==1||use.getTechStartProcess()==3){
-//			return -2;
-//		}
+		if (use.getStatus()!=2){
+			return -2;
+		}
 		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
 		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
 		pushDateClockDetails(prdList,prdcList);