培训

src/main/java/com/ssj/api/controller/ApiTrainController.java

@@ -204,7 +204,7 @@ public class ApiTrainController extends BaseController {
             	Map<String, Object> dataMap1=getTrainVideoUserMap(1, list);
             	if(dataMap1!=null && Integer.parseInt(dataMap1.get("success_num").toString())>=Integer.parseInt(dataMap1.get("count_num").toString())) {
             		defaultRoleTypeModels.get(1).setUnlock(1);
-            		defaultRoleTypeModels.get(1).setUnlockAll(1);
+            		defaultRoleTypeModels.get(0).setUnlockAll(1);
             	}
             }else {
             	defaultRoleTypeModels.get(0).setUnlock(0);
@@ -262,7 +262,7 @@ public class ApiTrainController extends BaseController {
             if(tbLibManager.getType()==6) {
             	map1.put("successNum", dataMap1!=null ? Integer.parseInt(dataMap1.get("success_num").toString()):0);
             	map1.put("countNum", dataMap1!=null ? Integer.parseInt(dataMap1.get("count_num").toString()):0);
-            	map1.put("unlock", (int)map1.get("successNum")>=(int)map1.get("countNum")?1:0);
+            	map1.put("unlock", 1);
             }else {
             	map1.put("successNum", 0);
             	map1.put("countNum", 0);

src/main/java/com/ssj/sys/controller/TrainController.java

@@ -218,9 +218,9 @@ public class TrainController extends BaseController {
 					examInfo.setExamNum(Integer.valueOf(map.get("data_0")));
 					examInfo.setExamType(Integer.valueOf(map.get("data_1")));
 					examInfo.setTitle(map.get("data_2"));
-					examInfo.setOptions(map.get("data_3"));
-					examInfo.setAnswer(map.get("data_4"));
-					examInfo.setScore(Integer.valueOf(map.get("data_5")));
+					examInfo.setOptions(map.get("data_3").trim().replaceAll("\\n", ""));
+					examInfo.setAnswer(map.get("data_4").trim().replaceAll("\\n", ""));
+					examInfo.setScore(Integer.valueOf(map.get("data_5").trim()));
 					examInfo.setStatus(1);
 					if(map.containsKey("data_6") && StringUtils.isNotEmpty(map.get("data_6"))) {
 						examInfo.setId(map.get("data_6"));
@@ -244,6 +244,11 @@ public class TrainController extends BaseController {
 		return response;
     }
 	
+	public static void main(String[] args) {
+		
+		
+		
+	}
 	
 	
 	@RequestMapping("/file/list")