--no commit message

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/controller/activity/ActivityApplyController.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/mapper/activity/ActivityApplyMapper.java

@@ -10,7 +10,6 @@ import com.zrqx.core.form.sysuser.bg.activity.ActivityApplyForm;
 import com.zrqx.core.form.sysuser.bg.activity.QueryActivityApplyForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.sysuser.activity.ActivityApply;
-import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.sysuser.bg.activity.ActivityApplyVo;
 
 @Mapper
@@ -53,20 +52,7 @@ public interface ActivityApplyMapper extends BaseMapper<ActivityApply>{
 		    + " </if> "
 			+ "</script>")
 	List<ActivityApplyVo> list(@Param("form") QueryActivityApplyForm query);
-	/**
-	 * 查看报名信息
-	 * @param id
-	 * @return
-	 * @author chyj
-	 * @date: 2019年4月11日 下午1:56:36
-	 */
-	@Select("<script>"
-			+ "select value from sys_activity_apply where 1=1"
-			+" <if test = '" + NOTBLANK + "(id)'> "  
-		    + " and id = #{id} "
-		    + " </if> "
-			+ "</script>")
-	CallBack<String> selectById(Integer id);
+	
 	/**
 	 * 报名信息内审核
 	 * @param form

com.zrqx.bg.sysuser/src/test/java/com/zrqx/bg/sysuser/JsonTest.java

+package com.zrqx.bg.sysuser;
+
+import org.junit.Test;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+
+public class JsonTest {
+
+	@Test
+	public void demo1(){
+		JSONArray ar = new JSONArray();
+		JSONObject j = new JSONObject();
+		/**
+		 * 	{type:text,name:姓名,value:张三},
+		 *  {type:redio,name:性别,value:男},
+		 *  {type:file,name:头像,value:/2019/03/uuid.jpg}
+	     */
+		j.put("type", "text");
+		j.put("name", "姓名");
+		j.put("value", "张三");
+		JSONObject j1 = new JSONObject();
+		j1.put("type", "redio");
+		j1.put("name", "性别");
+		j1.put("value", "男");
+		JSONObject j2 = new JSONObject();
+		j2.put("type", "file");
+		j2.put("name", "头像");
+		j2.put("value", "/2019/03/uuid.jpg");
+		ar.add(j);
+		ar.add(j1);
+		ar.add(j2);
+		System.out.println(ar.toJSONString());
+	}
+}