Forráskód Böngészése

新版培训兼容不同分支

wy 7 hónapja
szülő
commit
27de7e0a7c

+ 9 - 3
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/controller/AuditController.java

@@ -1,13 +1,14 @@
 package com.lc.ibps.business.controller;
 package com.lc.ibps.business.controller;
 
 
 import com.lc.ibps.api.base.constants.StateEnum;
 import com.lc.ibps.api.base.constants.StateEnum;
+import com.lc.ibps.base.core.util.BeanUtils;
 import com.lc.ibps.base.core.util.I18nUtil;
 import com.lc.ibps.base.core.util.I18nUtil;
 import com.lc.ibps.business.service.AuditService;
 import com.lc.ibps.business.service.AuditService;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.cloud.provider.GenericProvider;
 import com.lc.ibps.cloud.provider.GenericProvider;
+import com.lc.ibps.untils.settingUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
@@ -30,8 +31,13 @@ public class AuditController extends GenericProvider {
 
 
         APIResult result = new APIResult<>();
         APIResult result = new APIResult<>();
         try {
         try {
-           //auditService.personnelTrain(ids);
-            auditService.newPersonnelTrain(ids);
+            String version = settingUtil.getPx();
+            if(BeanUtils.isNotEmpty(version) && "1".equals(version)){
+                //新版培训
+                auditService.newPersonnelTrain(ids);
+                return result;
+            }
+            auditService.personnelTrain(ids);
         } catch (Exception e) {
         } catch (Exception e) {
             setExceptionResult(result, StateEnum.ILLEGAL_REQUEST.getCode(), I18nUtil.getMessage(StateEnum.ILLEGAL_REQUEST.getCode() + ""), e);
             setExceptionResult(result, StateEnum.ILLEGAL_REQUEST.getCode(), I18nUtil.getMessage(StateEnum.ILLEGAL_REQUEST.getCode() + ""), e);
         }
         }