1.增加是否导出标示。

src/main/java/com/jpsoft/smart/modules/base/controller/EmployeeInfoController.java

@@ -192,6 +192,7 @@ public class EmployeeInfoController {
     public MessageResult<Map> pageList(
             String employeeName,
             String companyId,
+            Boolean exportStatus,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -215,6 +216,10 @@ public class EmployeeInfoController {
             searchParams.put("companyId",companyId);
         }
 
+        if (exportStatus!=null){
+            searchParams.put("exportStatus",exportStatus);
+        }
+
         Page<EmployeeInfo> page = employeeInfoService.pageSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);
@@ -269,13 +274,14 @@ public class EmployeeInfoController {
                 employeeInfo = new EmployeeInfo();
 
                 PojoUtils.map(employeeInfoDTO,employeeInfo);
-
+                employeeInfo.setExportStatus(false);
                 employeeInfo.setDelFlag(false);
                 employeeInfo.setCreateTime(new Date());
                 affectCount = employeeInfoService.insert(employeeInfo);
             }
             else{
                 PojoUtils.map(employeeInfoDTO,employeeInfo);
+                employeeInfo.setExportStatus(false);
                 employeeInfo.setDelFlag(false);
                 employeeInfo.setUpdateTime(new Date());
 
@@ -404,12 +410,16 @@ public class EmployeeInfoController {
 
             if(employeeInfos.size()>0) {
                 for (EmployeeInfo employeeInfo : employeeInfos) {
-                    csvBuilder.append(employeeInfo.getId() + ",");
-                    csvBuilder.append(employeeInfo.getName() + ",");
+                    if (StringUtils.isNotEmpty(employeeInfo.getPhoto())) {
+                        csvBuilder.append(employeeInfo.getId() + ",");
+                        csvBuilder.append(employeeInfo.getName() + ",");
 
-                    String photoExt = employeeInfo.getPhoto().substring(employeeInfo.getPhoto().lastIndexOf("."));
+                        String url = employeeInfo.getPhoto();
+                        String photoExt = url.substring(url.lastIndexOf("."));
+                        String photoFileName = employeeInfo.getCompanyName() + "-" + employeeInfo.getName() + "-" + employeeInfo.getId() + photoExt;
 
-                    csvBuilder.append(localPath + "\\照片\\" + employeeInfo.getId() + photoExt + "\r\n");
+                        csvBuilder.append(localPath + "\\照片\\" + photoFileName + "\r\n");
+                    }
                 }
 
 //                FileOutputStream fileOutput = new FileOutputStream(tmpFile);
@@ -427,14 +437,18 @@ public class EmployeeInfoController {
             //身份证
             for (EmployeeInfo employeeInfo : employeeInfos) {
                 if (StringUtils.isNotEmpty(employeeInfo.getPhoto())){
-                    String url = employeeInfo.getPhoto();
+                    employeeInfo.setExportStatus(true);
+                    employeeInfo.setUpdateTime(new Date());
+                    employeeInfoService.update(employeeInfo);
 
-                    String ext = url.substring(url.lastIndexOf("."));
+                    String url = employeeInfo.getPhoto();
+                    String photoExt = url.substring(url.lastIndexOf("."));
+                    String photoFileName = employeeInfo.getCompanyName() + "-" + employeeInfo.getName() + "-" + employeeInfo.getId() + photoExt;
 
                     Map<String,Object> fileMap = new HashMap<>();
                     fileMap.put("fileUrl",url + "?x-oss-process=image/resize,l_800,limit_1");
                     fileMap.put("filePath", "照片/");
-                    fileMap.put("fileName", employeeInfo.getId() + ext);
+                    fileMap.put("fileName", photoFileName);
 
                     fileList.add(fileMap);
                 }

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

@@ -40,6 +40,10 @@ public class EmployeeInfo {
 	private String openId;
 	@ApiModelProperty(value = "companyName")
 	private String companyName;
+	@ApiModelProperty(value = "exportStatus")
+	private Boolean exportStatus;
+	@ApiModelProperty(value = "phone")
+	private String phone;
 
 	/**
 	 *获取员工编号
@@ -204,4 +208,20 @@ public class EmployeeInfo {
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
+
+	public Boolean getExportStatus() {
+		return exportStatus;
+	}
+
+	public void setExportStatus(Boolean exportStatus) {
+		this.exportStatus = exportStatus;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
 }

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

@@ -17,6 +17,8 @@
         <result property="delFlag" column="del_flag"/>
         <result property="sortNo" column="sort_no"/>
         <result property="openId" column="open_id"/>
+        <result property="exportStatus" column="export_status"/>
+        <result property="phone" column="phone_"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.EmployeeInfo">
         <!--
@@ -27,7 +29,7 @@
         <![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)
+	    update_by,update_time,del_flag,sort_no,open_id,export_status,phone_)
 		values
 		(
 			#{name,jdbcType=VARCHAR}
@@ -41,6 +43,8 @@
 			,#{delFlag,jdbcType= NUMERIC }
 			,#{sortNo,jdbcType= NUMERIC }
 			,#{openId,jdbcType=VARCHAR}
+			,#{exportStatus,jdbcType=NUMERIC}
+			,#{phone,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -83,11 +87,19 @@
             <if test="openId!=null">
                 open_id=#{openId,jdbcType= VARCHAR },
             </if>
+            <if test="exportStatus!=null">
+                export_status=#{exportStatus,jdbcType= NUMERIC },
+            </if>
+            <if test="phone!=null">
+                phone_=#{phone,jdbcType= VARCHAR },
+            </if>
         </set>
         where id_=#{id}
     </update>
     <select id="get" parameterType="long" resultMap="EmployeeInfoMap">
-        select * from base_employee_info where id_=#{0}
+        select e.*,c.name_ as 'company_name'
+        from base_employee_info e,base_company_info c
+        where e.id_=#{0} and e.company_id = c.id_
     </select>
     <select id="exist" parameterType="string" resultType="int">
         select count(*) from base_employee_info where id_=#{0}
@@ -108,6 +120,9 @@
             <if test="searchParams.companyId != null">
                 and e.company_id = #{searchParams.companyId}
             </if>
+            <if test="searchParams.exportStatus != null">
+                and e.export_status = #{searchParams.exportStatus}
+            </if>
         </where>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}