111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java

@@ -14,7 +14,7 @@ public interface AuditApiService {
 	
 	Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,String enterpriseId,Integer auditStatus,Integer auditFlag,BasePageInfo pageInfo);
 	
-	void audit(String auditId,String aduitName);
+	String audit(String auditId,String aduitName);
 	
 	void refuse(String auditId,String auditReason,String aduitName);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -116,10 +116,10 @@ public class AuditApiServiceImpl implements AuditApiService{
 	}
 	@Transactional
 	@Override
-	public void audit(String auditId,String auditName) {
+	public String audit(String auditId,String auditName) {
 		TabHaobanAudit tab = auditMapper.selectByPrimaryKey(auditId);
 		if(tab==null){
-			return;
+			return "1";
 		}
 		tab.setAuditId(auditId);
 		tab.setAuditStatus(1);
@@ -140,6 +140,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 		TabHaobanAudit tab2 = auditMapper.selectByPrimaryKey(auditId);
 		String staffId = tab2.getCommitStaffId();
 		this.sendMessageByStaffId(staffId, storeId, title, content);
+		return "";
 	}
 	@Override
 	public void refuse(String auditId, String auditReason,String auditName) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -14,6 +14,7 @@ import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.GlobalVar;
+import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.StoreFieldEnum;
 import com.gic.haoban.manage.api.service.ApplicationSettingApiService;
@@ -174,14 +175,32 @@ public class AuditController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		StaffDTO staffDTO = staffApiService.selectById(staffId);
-//		StaffVO staffVO = new StaffVO();
-//		staffVO.setPhoneNumber(phoneNumber);
-//		staffVO.setNationCode(nationCode);
-//		staffVO.setPostion(postion);
 		return resultResponse(HaoBanErrCode.ERR_1,staffDTO);
 	}
 	
-	
+	//批量同意
+	@HttpLimit
+	@RequestMapping("batch-approve")
+	public HaobanResponse batchApprove(String auditIds,String auditName ) {
+		if(StringUtils.isAnyBlank(auditIds)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		String[] s = auditIds.split(",");
+		int successCount = 0;
+		int failCount = 0;
+		String batchId = UuidUtil.randomUUID();
+		for(String auditId : s){
+			String result = auditApiService.audit(auditId,auditName);
+			if(StringUtils.isEmpty(result)){
+				successCount = successCount+1;
+				//TODO 插入批量日志
+			}else{
+				failCount = failCount+1;
+				//TODO 插入批量日志
+			}
+		}
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
 	
 	//审核拒绝
 	@HttpLimit