diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index 47df2e56..353793ec 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -148,4 +148,20 @@ public class FlowTrainController extends BaseController { map.put("result", "success"); return map; } + + @RequestMapping(value = "/oldBatchList") + @ResponseBody + public Object oldBatchList(Page page) throws Exception { + Map map = new HashMap(); + PageData pd = this.getPageData(); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = trainingbatchService.oldBatchList(page); //列出TrainingBatch列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", "success"); + return map; + } } diff --git a/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java b/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java index e25807f2..76fdf346 100644 --- a/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/xgf/TrainingBatchMapper.java @@ -76,5 +76,7 @@ public interface TrainingBatchMapper{ void graduation(PageData condition); List findByUserId(PageData condition); + + List oldlistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java b/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java index 1218f53d..5dff54a4 100644 --- a/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java +++ b/src/main/java/com/zcloud/service/xgf/TrainingBatchService.java @@ -89,5 +89,7 @@ public interface TrainingBatchService{ void saveFlow(PageData request) throws Exception; List findByUserId(PageData condition) throws Exception; + + List oldBatchList(Page page) throws Exception; } diff --git a/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java index 1e0e701e..773f317e 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java @@ -407,5 +407,10 @@ public class TrainingBatchServiceImpl implements TrainingBatchService { public List findByUserId(PageData condition) throws Exception { return trainingbatchMapper.findByUserId(condition); } + + @Override + public List oldBatchList(Page page) throws Exception { + return trainingbatchMapper.oldlistPage(page); + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a48eb064..ea7feb10 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,9 +2,9 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -#spring.profiles.active=local -#31ʱʹ -spring.profiles.active=dev +spring.profiles.active=local +#����31ʱʹ�� +#spring.profiles.active=dev #?? #spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml b/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml index 4f8b7672..c6175178 100644 --- a/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/TrainingBatchMapper.xml @@ -280,6 +280,7 @@ a.TRAIN_USERS_ID, a.STEP_STATUS, a.USER_ID, + a.USER_ID as XGF_USER_ID, a.SUPERVISION_STATE, a.MANAGER_STATE, a.TERRITORIALITY_STATE, @@ -378,4 +379,10 @@ and USER_ID = #{USER_ID} order by b.CREATTIME desc; +