Merge remote-tracking branch 'origin/master'

common/src/main/java/com/winsun/mapper/NetworkInfoMapper.java

@@ -3,10 +3,18 @@ package com.winsun.mapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.NetworkInfo;
 import com.winsun.bean.NetworkInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
+import java.util.Map;
+
 @Mapper
 @Mapper
 @Component
 @Component
 public interface NetworkInfoMapper extends BaseMapper<NetworkInfo> {
 public interface NetworkInfoMapper extends BaseMapper<NetworkInfo> {
 
 
+    Map<String, Object> queryMap(@Param("networkCode") String networkCode);
+
+    int insertMap(Map<String,Object> map);
+
+    int updateMap(Map<String,Object> map);
 }
 }

common/src/main/resources/com/winsun/mapper/mapping/NetworkPlaceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.winsun.mapper.NetworkInfoMapper">
+
+
+    <select id="queryMap" parameterType="String" resultType="HashMap">
+        select * from hhr_network_info where network_code = #{networkCode}
+    </select>
+
+    <insert id="insertMap">
+        INSERT INTO hhr_network_info
+        (network_code,network_name,school_name,area_name,spring_start_time,spring_end_time,greater_fifty,greater_hundred)
+        VALUES (#{a},#{b},#{c},#{d},#{e},#{f},#{g},#{h})
+    </insert>
+
+    <update id="updateMap">
+        update hhr_network_info set
+        <if test="e != null and e != ''">
+            spring_start_time = #{e},
+        </if>
+        <if test="f != null and f != ''">
+            spring_end_time = #{f},
+        </if>
+        <if test="g != null and g != ''">
+            greater_fifty = #{g},
+        </if>
+        <if test="h != null and h != ''">
+            greater_hundred = #{h},
+        </if>
+        network_code = #{a},
+        network_name = #{b},
+        school_name = #{c},
+        area_name = #{d}
+        where
+        area_name = #{d}
+        and
+        school_name = #{c}
+    </update>
+
+
+</mapper>
\ No newline at end of file

service-manager/src/main/java/com/winsun/controller/ActivityRecordController.java

@@ -231,7 +231,6 @@ public class ActivityRecordController extends BaseController {
 			}
 			}
 			
 			
 			if(num == 2) {
 			if(num == 2) {
-
 				newList.add(map);
 				newList.add(map);
 			}
 			}
 		}
 		}
@@ -317,7 +316,7 @@ public class ActivityRecordController extends BaseController {
 					num++;
 					num++;
 				}
 				}
 			}
 			}
-			
+
 			for(SysUser sysUser : userList) {
 			for(SysUser sysUser : userList) {
 				if(sysUser.getId().equals(activityRecord.getCreateId())) {
 				if(sysUser.getId().equals(activityRecord.getCreateId())) {
 					map.put("account", sysUser.getAccount());
 					map.put("account", sysUser.getAccount());

service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java

@@ -164,7 +164,9 @@ public class ExcelDealUtils {
 	public static Map<String, Object> activityExcel(String sheetName){
 	public static Map<String, Object> activityExcel(String sheetName){
 		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
 		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
 		headMap.put("姓名", "name");
 		headMap.put("姓名", "name");
-		headMap.put("账号", "account");
+		headMap.put("账号", "title");
+		headMap.put("活动标题", "account");
+		headMap.put("活动详情", "desc");
 		headMap.put("所得积分", "recordIntegral");
 		headMap.put("所得积分", "recordIntegral");
 		headMap.put("积分类型", "activityType");
 		headMap.put("积分类型", "activityType");
 		headMap.put("积分小类", "subclass");
 		headMap.put("积分小类", "subclass");
@@ -543,4 +545,20 @@ public class ExcelDealUtils {
 		resultMap.put("sheetName", sheetName);
 		resultMap.put("sheetName", sheetName);
 		return resultMap;
 		return resultMap;
 	}
 	}
+
+	// 网点管理导出excel表头
+	public static Map<String, Object> networkExcel(String sheetName){
+		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
+		headMap.put("网点编码（必填）", "networkCode");
+		headMap.put("网点名（必填）", "networkName");
+		headMap.put("学校（必填）", "schoolName");
+		headMap.put("县分（必填）", "areaName");
+		headMap.put("前置开始时间", "springStartTime");
+		headMap.put("开学时间", "springEndTime");
+		headMap.put("充值大于50奖励", "greaterFifty");
+		headMap.put("充值大于100奖励", "greaterHundred");
+		Map<String, Object> resultMap = dealHeadMap(headMap);
+		resultMap.put("sheetName", sheetName);
+		return resultMap;
+	}
 }
 }