修改活动时间问题

src/main/java/com/jpsoft/making_friends/modules/mgr/controller/ActivityInfoController.java

@@ -149,13 +149,31 @@ public class ActivityInfoController {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
             if(activityInfo.getRangeTime()!=null&&activityInfo.getRangeTime().length==2){
-                activityInfo.setStartTime(sdf.parse(activityInfo.getRangeTime()[0]));
-                activityInfo.setEndTime(sdf.parse(activityInfo.getRangeTime()[1]));
+
+                if(activityInfo.getRangeTime()[0]!=null){
+                    activityInfo.setStartTime(sdf.parse(activityInfo.getRangeTime()[0]));
+                }
+                if(activityInfo.getRangeTime()[1]!=null){
+                    activityInfo.setEndTime(sdf.parse(activityInfo.getRangeTime()[1]));
+                }
+            }
+            else{
+                activityInfo.setStartTime(null);
+                activityInfo.setEndTime(null);
             }
 
             if(activityInfo.getRangeActivityTime()!=null&&activityInfo.getRangeActivityTime().length==2){
-                activityInfo.setActivityStartTime(sdf.parse(activityInfo.getRangeActivityTime()[0]));
-                activityInfo.setActivityEndTime(sdf.parse(activityInfo.getRangeActivityTime()[1]));
+
+                if(activityInfo.getRangeActivityTime()[0]!=null){
+                    activityInfo.setActivityStartTime(sdf.parse(activityInfo.getRangeActivityTime()[0]));
+                }
+                if(activityInfo.getRangeActivityTime()[1]!=null){
+                    activityInfo.setActivityEndTime(sdf.parse(activityInfo.getRangeActivityTime()[1]));
+                }
+            }
+            else{
+                activityInfo.setActivityStartTime(null);
+                activityInfo.setActivityEndTime(null);
             }
 		
             int affectCount = activityInfoService.update(activityInfo);

src/main/java/com/jpsoft/making_friends/modules/mgr/controller/ActivityMemberController.java

@@ -308,7 +308,7 @@ public class ActivityMemberController {
         //表头
         Row rowTitle = sheet.createRow(0);
 
-        String[] titles = new String[]{"序号", "用户姓名", "电话", "身份证",  "创建时间"};
+        String[] titles = new String[]{"序号", "用户姓名", "电话", "身份证",  "报名时间"};
 
         for (int i = 0; i < titles.length; i++) {
             Cell cell = rowTitle.createCell(i);

src/main/java/com/jpsoft/making_friends/modules/mgr/controller/LikeInfoController.java

@@ -151,7 +151,7 @@ public class LikeInfoController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String name,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -165,10 +165,10 @@ public class LikeInfoController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
         }
 
 

src/main/resources/mapper/base/ActivityInfo.xml

@@ -66,18 +66,31 @@
 				<if test="address!=null">
 		address_=#{address,jdbcType=VARCHAR},
 		</if>
+			<if test="startTime==null">
+				start_time=null,
+			</if>
+			<if test="endTime==null">
+				end_time=null,
+			</if>
 				<if test="startTime!=null">
 		start_time=#{startTime,jdbcType= TIMESTAMP },
 		</if>
 				<if test="endTime!=null">
 		end_time=#{endTime,jdbcType= TIMESTAMP },
 		</if>
+			<if test="activityStartTime==null">
+				activity_start_time=null,
+			</if>
+			<if test="activityEndTime==null">
+				activity_end_time=null,
+			</if>
 				<if test="activityStartTime!=null">
 		activity_start_time=#{activityStartTime,jdbcType= TIMESTAMP },
 		</if>
 				<if test="activityEndTime!=null">
 		activity_end_time=#{activityEndTime,jdbcType= TIMESTAMP },
 		</if>
+
 				<if test="introduction!=null">
 		introduction_=#{introduction,jdbcType=VARCHAR},
 		</if>

src/main/resources/mapper/business/LikeInfo.xml

@@ -89,8 +89,8 @@
 		]]>
 		<where>
 			a.del_flag = 0
-			<if test="searchParams.id != null">
-				and a.ID_ like #{searchParams.id}
+			<if test="searchParams.name != null">
+				and b.real_name like #{searchParams.name}
 			</if>
 			<if test="searchParams.eachOtherIMemberId != null">
 				and a.like_member_id in (