活动以及活动报名

src/main/java/com/jpsoft/making_friends/entity/base/ActivityInfo.java

@@ -80,4 +80,20 @@ public class ActivityInfo {
 	@Transient
 	@ApiModelProperty(value = "是否报名")
 	private Boolean isJoin = false;
+
+    @Transient
+    @ApiModelProperty(value = "报名时间数组")
+    private String[] rangeTime;
+
+    @Transient
+    @ApiModelProperty(value = "活动时间数组")
+    private String[] rangeActivityTime;
+
+    @Transient
+    @ApiModelProperty(value = "报名时间列表显示")
+    private String rangeTimeStr;
+
+    @Transient
+    @ApiModelProperty(value = "活动时间列表显示")
+    private String rangeActivityTimeStr;
 }

src/main/java/com/jpsoft/making_friends/entity/base/ActivityMember.java

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -44,4 +45,17 @@ public class ActivityMember {
 
 	@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+
+	@Transient
+	@ApiModelProperty(value = "会员姓名")
+	private String memberRealName;
+
+	@Transient
+	@ApiModelProperty(value = "会员电话")
+	private String memberPhone;
+
+	@Transient
+	@ApiModelProperty(value = "会员身份证")
+	private String memberIdCard;
 }

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

@@ -19,7 +19,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/activityInfo")
+@RequestMapping("/base/activityInfo")
 public class ActivityInfoController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -50,6 +50,19 @@ public class ActivityInfoController {
 			activityInfo.setDelFlag(false);
             activityInfo.setCreateBy(subject);
             activityInfo.setCreateTime(new Date());
+            activityInfo.setStatus("0");
+
+            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.getRangeActivityTime()!=null&&activityInfo.getRangeActivityTime().length==2){
+                activityInfo.setActivityStartTime(sdf.parse(activityInfo.getRangeActivityTime()[0]));
+                activityInfo.setActivityEndTime(sdf.parse(activityInfo.getRangeActivityTime()[1]));
+            }
 
             int affectCount = activityInfoService.insert(activityInfo);
 
@@ -79,7 +92,34 @@ public class ActivityInfoController {
         try {
             ActivityInfo activityInfo = activityInfoService.get(id);
 
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
             if (activityInfo != null) {
+                String[] rangeTime = new String[2];
+
+                if(activityInfo.getStartTime()!=null){
+                    rangeTime[0] = sdf.format(activityInfo.getStartTime());
+                }
+
+                if(activityInfo.getEndTime()!=null){
+                    rangeTime[1] = sdf.format(activityInfo.getEndTime());
+                }
+
+                activityInfo.setRangeTime(rangeTime);
+
+                String[] rangeActivityTime = new String[2];
+
+                if(activityInfo.getActivityStartTime()!=null){
+                    rangeActivityTime[0] = sdf.format(activityInfo.getActivityStartTime());
+                }
+
+                if(activityInfo.getActivityEndTime()!=null){
+                    rangeActivityTime[1] = sdf.format(activityInfo.getActivityEndTime());
+                }
+
+                activityInfo.setRangeActivityTime(rangeActivityTime);
+
+
                 msgResult.setResult(true);
                 msgResult.setData(activityInfo);
             } else {
@@ -105,6 +145,18 @@ public class ActivityInfoController {
         try {
 		    activityInfo.setUpdateBy(subject);
             activityInfo.setUpdateTime(new Date());
+
+            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.getRangeActivityTime()!=null&&activityInfo.getRangeActivityTime().length==2){
+                activityInfo.setActivityStartTime(sdf.parse(activityInfo.getRangeActivityTime()[0]));
+                activityInfo.setActivityEndTime(sdf.parse(activityInfo.getRangeActivityTime()[1]));
+            }
 		
             int affectCount = activityInfoService.update(activityInfo);
 
@@ -196,7 +248,7 @@ public class ActivityInfoController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String title,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -207,22 +259,66 @@ public class ActivityInfoController {
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(title)) {
+            searchParams.put("title","%" + title + "%");
         }
 
 
         Page<ActivityInfo> page = activityInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (ActivityInfo activityInfo:page) {
+
+            if(activityInfo.getStartTime()!=null&&activityInfo.getEndTime()!=null){
+                activityInfo.setRangeTimeStr(sdf.format(activityInfo.getStartTime())+"至"+sdf.format(activityInfo.getEndTime()));
+                activityInfo.setRangeActivityTimeStr(sdf.format(activityInfo.getActivityStartTime())+"至"+sdf.format(activityInfo.getActivityEndTime()));
+            }
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
         return msgResult;
     }
+
+
+
+    @ApiOperation(value="审核活动")
+    @PostMapping("checkActivity")
+    public MessageResult<ActivityInfo> checkActivity(@RequestBody ActivityInfo activityInfo,@RequestAttribute String subject){
+        MessageResult<ActivityInfo> msgResult = new MessageResult<>();
+
+        try {
+            ActivityInfo item = activityInfoService.get(activityInfo.getId());
+
+            item.setUpdateTime(new Date());
+            item.setUpdateBy(subject);
+            item.setStatus(activityInfo.getStatus());
+
+            int affectCount = activityInfoService.update(item);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(item);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

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

@@ -5,7 +5,9 @@ import com.jpsoft.making_friends.dto.Sort;
 import com.jpsoft.making_friends.dto.MessageResult;
 import com.jpsoft.making_friends.dto.utils.PojoUtils;
 import com.jpsoft.making_friends.entity.base.ActivityMember;
+import com.jpsoft.making_friends.entity.base.MemberInfo;
 import com.jpsoft.making_friends.service.base.ActivityMemberService;
+import com.jpsoft.making_friends.service.base.MemberInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.mapping.ResultMap;
@@ -19,12 +21,15 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/activityMember")
+@RequestMapping("/base/activityMember")
 public class ActivityMemberController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private ActivityMemberService activityMemberService;
+
+    @Autowired
+    private MemberInfoService memberInfoService;
 	
 	
 	@ApiOperation(value="创建空记录")
@@ -196,7 +201,7 @@ public class ActivityMemberController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String id,
+            String activityId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             HttpServletRequest request){
@@ -210,15 +215,26 @@ public class ActivityMemberController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","asc"));
 
-        if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+        if (StringUtils.isNotEmpty(activityId)) {
+            searchParams.put("activityId",activityId);
         }
 
 
         Page<ActivityMember> page = activityMemberService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+        for (ActivityMember activityMember:page) {
+            MemberInfo memberInfo = memberInfoService.get(activityMember.getMemberId());
+
+            if(memberInfo!=null){
+                activityMember.setMemberRealName(memberInfo.getRealName());
+                activityMember.setMemberIdCard(memberInfo.getIdCard());
+                activityMember.setMemberPhone(memberInfo.getPhone());
+            }
+
+        }
+
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

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

@@ -121,8 +121,8 @@
 		]]>
 		<where>
 			del_flag = 0
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.title != null">
+				and title_ like #{searchParams.title}
 			</if>
 			<if test="searchParams.status != null">
 				and status_ = #{searchParams.status}

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

@@ -79,8 +79,9 @@
 			select * from base_activity_member
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			del_flag = false
+			<if test="searchParams.activityId != null">
+				and activity_id = #{searchParams.activityId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">