1.新增企业及员工信息管理。

pom.xml

@@ -213,6 +213,14 @@
             <type>jar</type>
             <classifier>jdk15</classifier>
         </dependency>
+
+        <!-- aliyun oss start -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- aliyun oss end -->
     </dependencies>
     <build>
         <plugins>

src/main/java/com/jpsoft/smart/config/OSSConfig.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "oss")
+@Data
+public class OSSConfig {
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String endpoint;
+    private String bucketName;
+    private String urlPrefix;
+    private String objectPre;
+}

src/main/java/com/jpsoft/smart/config/SwaggerConfig.java

@@ -1,5 +1,6 @@
 package com.jpsoft.smart.config;
 
+import io.swagger.annotations.Api;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,7 +24,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+                .apis(RequestHandlerSelectors.basePackage("com.jpsoft.smart"))
                 .paths(PathSelectors.any())
                 .build()
                 //添加登录认证

src/main/java/com/jpsoft/smart/config/WebMvcConfig.java

@@ -56,6 +56,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/wxPay/payNotify")
 				.excludePathPatterns("/base/alarmInfo/alarmNotify")
 				.excludePathPatterns("/base/informationInfo/addMobile")
+				.excludePathPatterns("/base/employeeInfo/mobile/**")
+				.excludePathPatterns("/base/companyInfo/list")
 				.excludePathPatterns("/wechat/**");
 	}
 }

src/main/java/com/jpsoft/smart/modules/base/dao/CompanyInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface CompanyInfoDAO {
+	int insert(CompanyInfo entity);
+	int update(CompanyInfo entity);
+	int exist(String id);
+	CompanyInfo get(String id);
+	int delete(String id);
+	List<CompanyInfo> list();
+	List<CompanyInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/dao/EmployeeInfoDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.EmployeeInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface EmployeeInfoDAO {
+	int insert(EmployeeInfo entity);
+	int update(EmployeeInfo entity);
+	int exist(Long id);
+	EmployeeInfo get(Long id);
+	int delete(Long id);
+	List<EmployeeInfo> list();
+	List<EmployeeInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<EmployeeInfo> findByArray(String[] array);
+	EmployeeInfo findByOpenId(String openId);
+}

src/main/java/com/jpsoft/smart/modules/base/dto/EmployeeInfoDTO.java

@@ -0,0 +1,16 @@
+package com.jpsoft.smart.modules.base.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EmployeeInfoDTO {
+    @ApiModelProperty(value = "openId")
+    private String openId;
+    @ApiModelProperty(value = "员工姓名")
+    private String name;
+    @ApiModelProperty(value = "所属公司")
+    private String companyId;
+    @ApiModelProperty(value = "照片网址")
+    private String photo;
+}

src/main/java/com/jpsoft/smart/modules/base/entity/CompanyInfo.java

@@ -0,0 +1,157 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+
+/**
+  描述:base_company_info的实体类
+ */
+@ApiModel(value = "base_company_info的实体类")
+public class CompanyInfo {
+    @ApiModelProperty(value = "公司编号")
+	private String id;
+    @ApiModelProperty(value = "序号")
+	private Integer sortNo;
+    @ApiModelProperty(value = "公司名称")
+	private String name;
+    @ApiModelProperty(value = "备注")
+	private String remark;
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+    @ApiModelProperty(value = "更新人")
+	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+
+	/**
+	 *获取公司编号
+	 */
+    	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置公司编号
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+	/**
+	 *获取序号
+	 */
+    	public Integer getSortNo(){
+		return sortNo;
+	}
+	
+	/**
+	 *设置序号
+	 */
+	public void setSortNo(Integer sortNo){
+		this.sortNo = sortNo;
+	}
+	/**
+	 *获取公司名称
+	 */
+    	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置公司名称
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+	/**
+	 *获取备注
+	 */
+    	public String getRemark(){
+		return remark;
+	}
+	
+	/**
+	 *设置备注
+	 */
+	public void setRemark(String remark){
+		this.remark = remark;
+	}
+	/**
+	 *获取创建人
+	 */
+    	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+	/**
+	 *获取创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+	/**
+	 *获取更新人
+	 */
+    	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+	/**
+	 *获取更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+	/**
+	 *获取是否删除
+	 */
+    	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+}

src/main/java/com/jpsoft/smart/modules/base/entity/EmployeeInfo.java

@@ -0,0 +1,197 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+
+/**
+  描述:base_employee_info的实体类
+ */
+@ApiModel(value = "base_employee_info的实体类")
+public class EmployeeInfo {
+    @ApiModelProperty(value = "员工编号")
+	private Long id;
+    @ApiModelProperty(value = "员工姓名")
+	private String name;
+    @ApiModelProperty(value = "所属公司")
+	private String companyId;
+    @ApiModelProperty(value = "照片网址")
+	private String photo;
+    @ApiModelProperty(value = "工牌号")
+	private String no;
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+    @ApiModelProperty(value = "更新人")
+	private String updateBy;
+    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+    @ApiModelProperty(value = "序号")
+	private Integer sortNo;
+	@ApiModelProperty(value = "openId")
+	private String openId;
+
+	/**
+	 *获取员工编号
+	 */
+    	public Long getId(){
+		return id;
+	}
+	
+	/**
+	 *设置员工编号
+	 */
+	public void setId(Long id){
+		this.id = id;
+	}
+	/**
+	 *获取员工姓名
+	 */
+    	public String getName(){
+		return name;
+	}
+	
+	/**
+	 *设置员工姓名
+	 */
+	public void setName(String name){
+		this.name = name;
+	}
+	/**
+	 *获取所属公司
+	 */
+    	public String getCompanyId(){
+		return companyId;
+	}
+	
+	/**
+	 *设置所属公司
+	 */
+	public void setCompanyId(String companyId){
+		this.companyId = companyId;
+	}
+	/**
+	 *获取照片网址
+	 */
+    	public String getPhoto(){
+		return photo;
+	}
+	
+	/**
+	 *设置照片网址
+	 */
+	public void setPhoto(String photo){
+		this.photo = photo;
+	}
+	/**
+	 *获取工牌号
+	 */
+    	public String getNo(){
+		return no;
+	}
+	
+	/**
+	 *设置工牌号
+	 */
+	public void setNo(String no){
+		this.no = no;
+	}
+	/**
+	 *获取创建人
+	 */
+    	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+	/**
+	 *获取创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+	/**
+	 *获取更新人
+	 */
+    	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+	/**
+	 *获取更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+		public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+	/**
+	 *获取是否删除
+	 */
+    	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置是否删除
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+	/**
+	 *获取序号
+	 */
+    	public Integer getSortNo(){
+		return sortNo;
+	}
+	
+	/**
+	 *设置序号
+	 */
+	public void setSortNo(Integer sortNo){
+		this.sortNo = sortNo;
+	}
+
+	public String getOpenId() {
+		return openId;
+	}
+
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+}

src/main/java/com/jpsoft/smart/modules/base/service/CompanyInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface CompanyInfoService {
+	CompanyInfo get(String id);
+	boolean exist(String id);
+	int insert(CompanyInfo model);
+	int update(CompanyInfo model);
+	int delete(String id);
+	List<CompanyInfo> list();
+	Page<CompanyInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/service/EmployeeInfoService.java

@@ -0,0 +1,21 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.EmployeeInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface EmployeeInfoService {
+	EmployeeInfo get(Long id);
+	boolean exist(Long id);
+	int insert(EmployeeInfo model);
+	int update(EmployeeInfo model);
+	int delete(Long id);
+	List<EmployeeInfo> list();
+	Page<EmployeeInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+
+    List<EmployeeInfo> findByArray(String[] split);
+
+    EmployeeInfo findByOpenId(String openId);
+}

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8086
   servlet:
     context-path: /smart-community-server
 

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9192
+  port: 8086
   servlet:
     context-path: /smart-community-server
 
@@ -131,3 +131,11 @@ doorApi:
   apiId: bl63d49fae22bf5cca
   apiKey: e52e545cb4d6c98a8a7e68b0718d3f63
 
+oss:
+  accessKeyId: LTAILGOo7bwpkvnq
+  accessKeySecret: ZGsaTO5klbSHxULr2Q3s2PiqKDzN15
+  endpoint: http://oss-cn-hangzhou.aliyuncs.com
+  bucketName: wzzgh2out
+  urlPrefix: http://vod.wzgh.org
+  objectPre: picc
+

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

@@ -0,0 +1,96 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.CompanyInfoDAO">
+	<resultMap id="CompanyInfoMap" type="com.jpsoft.smart.modules.base.entity.CompanyInfo">
+		<id property="id" column="id_" />
+			<result property="sortNo" column="sort_no" />
+			<result property="name" column="name_" />
+			<result property="remark" column="remark_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_company_info
+	    (id_,sort_no,name_,remark_,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{sortNo,jdbcType= NUMERIC }
+,#{name,jdbcType=VARCHAR}
+,#{remark,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_company_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
+		update base_company_info
+		<set>
+				<if test="sortNo!=null">
+		sort_no=#{sortNo,jdbcType= NUMERIC },
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="remark!=null">
+		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="CompanyInfoMap">
+		select 
+id_,sort_no,name_,remark_,create_by,create_time,update_by,update_time,del_flag		from base_company_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_company_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="CompanyInfoMap">
+		select * from base_company_info where del_flag=0 order by sort_no asc
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="CompanyInfoMap">
+		<![CDATA[
+			select * from base_company_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

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

@@ -0,0 +1,123 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.EmployeeInfoDAO">
+    <resultMap id="EmployeeInfoMap" type="com.jpsoft.smart.modules.base.entity.EmployeeInfo">
+        <id property="id" column="id_"/>
+        <result property="name" column="name_"/>
+        <result property="companyId" column="company_id"/>
+        <result property="photo" column="photo_"/>
+        <result property="no" column="no_"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="sortNo" column="sort_no"/>
+        <result property="openId" column="open_id"/>
+    </resultMap>
+    <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.EmployeeInfo">
+        <!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+        <![CDATA[
+		insert into base_employee_info
+	    (name_,company_id,photo_,no_,create_by,create_time,
+	    update_by,update_time,del_flag,sort_no,open_id)
+		values
+		(
+			#{name,jdbcType=VARCHAR}
+			,#{companyId,jdbcType=VARCHAR}
+			,#{photo,jdbcType=VARCHAR}
+			,#{no,jdbcType=VARCHAR}
+			,#{createBy,jdbcType=VARCHAR}
+			,#{createTime,jdbcType= TIMESTAMP }
+			,#{updateBy,jdbcType=VARCHAR}
+			,#{updateTime,jdbcType= TIMESTAMP }
+			,#{delFlag,jdbcType= NUMERIC }
+			,#{sortNo,jdbcType= NUMERIC }
+			,#{openId,jdbcType=VARCHAR}
+		)
+	]]>
+    </insert>
+    <delete id="delete" parameterType="string">
+        delete from base_employee_info where id_=#{id,jdbcType=NUMERIC}
+    </delete>
+    <update id="update" parameterType="com.jpsoft.smart.modules.base.entity.EmployeeInfo">
+        update base_employee_info
+        <set>
+            <if test="name!=null">
+                name_=#{name,jdbcType=VARCHAR},
+            </if>
+            <if test="companyId!=null">
+                company_id=#{companyId,jdbcType=VARCHAR},
+            </if>
+            <if test="photo!=null">
+                photo_=#{photo,jdbcType=VARCHAR},
+            </if>
+            <if test="no!=null">
+                no_=#{no,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy!=null">
+                create_by=#{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime!=null">
+                create_time=#{createTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="updateBy!=null">
+                update_by=#{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="delFlag!=null">
+                del_flag=#{delFlag,jdbcType= NUMERIC },
+            </if>
+            <if test="sortNo!=null">
+                sort_no=#{sortNo,jdbcType= NUMERIC },
+            </if>
+            <if test="openId!=null">
+                open_id=#{openId,jdbcType= VARCHAR },
+            </if>
+        </set>
+        where id_=#{id}
+    </update>
+    <select id="get" parameterType="long" resultMap="EmployeeInfoMap">
+        select * from base_employee_info where id_=#{0}
+    </select>
+    <select id="exist" parameterType="string" resultType="int">
+        select count(*) from base_employee_info where id_=#{0}
+    </select>
+    <select id="list" resultMap="EmployeeInfoMap">
+        select * from base_employee_info
+    </select>
+    <select id="search" parameterType="hashmap" resultMap="EmployeeInfoMap">
+        <![CDATA[
+			select * from base_employee_info e,base_company_info c
+		]]>
+        <where>
+            e.company_id = c.id_ and c.del_flag=0
+            <if test="searchParams.employeeName != null">
+                and e.name_ like #{searchParams.employeeName}
+            </if>
+            <if test="searchParams.companyId != null">
+                and e.company_id = #{searchParams.companyId}
+            </if>
+        </where>
+        <foreach item="sort" collection="sortList" open="order by" separator=",">
+            ${sort.name} ${sort.order}
+        </foreach>
+    </select>
+    <select id="findByArray" resultMap="EmployeeInfoMap">
+        select * from base_employee_info where id_ in
+        <foreach item="item" collection="array" open="(" separator="," close=")">
+            ${item}
+        </foreach>
+    </select>
+    <select id="findByOpenId" resultMap="EmployeeInfoMap" parameterType="string">
+        select * from base_employee_info where open_id=#{openId}
+    </select>
+</mapper>

src/main/resources/mapper/sys/Menu.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.smart.modules.sys.dao.MenuDAO">
-    <resultMap id="MenuMap" type="Menu">
+    <resultMap id="MenuMap" type="com.jpsoft.smart.modules.sys.entity.Menu">
         <id property="id" column="id_"/>
         <result property="menuName" column="menu_name"/>
         <result property="parentId" column="parent_id"/>
@@ -47,7 +47,7 @@
     <delete id="delete" parameterType="string">
         delete from sys_menu where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="Menu">
+    <update id="update" parameterType="com.jpsoft.smart.modules.sys.entity.Menu">
         update sys_menu
         <set>
             <if test="menuName!=null">

src/main/resources/static/模板.csv

@@ -0,0 +1,7 @@
+"必填项，唯一性的标识号，如工号、学号等
+最大15个字符(大小写英文字母、数字、下划线、中划线)",必填项，最大20个字符,"可填写全路径或相对路径；
+多张图用分号分隔；
+支持无图；",证件类型：身份证、IC卡,证件号码：最大20个字符(大小写英文字母、数字),证件类型：身份证、IC卡,证件号码：最大20个字符(大小写英文字母、数字),"时间模板生效的时间段，24小时制，支持跨天、缺省；0 -  0 长期有效；
+0 - XXX：  当前时间到XXX有效；
+XXX-0：从XXX时间开始长期有效；              注意：生效时间、失效时间填充时，时间模板名称必填",,模板名，缺省为第一个时间模板。最大63个字符。,最大20个字符
+*编号,*姓名,人脸图片,证卡类型1,证卡号码1,证卡类型2,证卡号码2,生效时间,失效时间,时间模板名,备注