fix绩效导出

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/controller/JixiaoPersonPriceController.java

@@ -52,11 +52,19 @@ public class JixiaoPersonPriceController extends JeecgController<JixiaoPersonPri
 	@ApiOperation("人员绩效——按时间导出excel")
 	@RequestMapping(value = "/exportXlsByTime")
 	public ModelAndView exportXlsByTime(HttpServletResponse response, String beginDate,String endDate) {
+
+
 		JixiaoPersonPriceExportDTO dto = new JixiaoPersonPriceExportDTO();
 		dto.setBeginDate(beginDate);
 		dto.setEndDate(endDate);
-		List<Map<String,String>> list = jixiaoPersonPriceService.exportPersonJX(dto);
-		return jixiaoPersonPriceService.exportXlsByTime(response, list, "人员绩效提成");
+		List<String> personPrices = jixiaoPersonPriceService.selectPersonByDate(dto);
+		if(personPrices!=null && !personPrices.isEmpty()){
+			List<Map<String,String>> list = jixiaoPersonPriceService.exportPersonJX(dto);
+			return jixiaoPersonPriceService.exportXlsByTime(response, list, "人员绩效提成");
+		}else{
+			List<Map<String,String>> list = new ArrayList<>();
+			return jixiaoPersonPriceService.exportXlsByTime(response, list, "人员绩效提成");
+		}
 	}
 
 	 /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/dto/JixiaoPersonPriceAddDTO.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.jixiaoPersonPrice.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Data
 public class JixiaoPersonPriceAddDTO {
@@ -19,5 +21,10 @@ public class JixiaoPersonPriceAddDTO {
     @Excel(name = "绩效人员", width = 15)
     @ApiModelProperty(value = "绩效人员")
     private java.lang.String name;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
 
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/mapper/JixiaoPersonPriceMapper.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.jixiaoPersonPrice.mapper;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceExportDTO;
 import org.jeecg.modules.jixiaoPersonPrice.entity.JixiaoPersonPrice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 人员绩效提成
@@ -16,6 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JixiaoPersonPriceMapper extends BaseMapper<JixiaoPersonPrice> {
 
+    /**查询规定时间内完结的委托对应的绩效导出的人员*/
+    @Select("SELECT DISTINCT jixiao_person FROM itdm_jixiao_person_price WHERE jixiao_person != '' AND " +
+            "create_time BETWEEN #{beginDate} AND #{endDate}")
+    public List<String> selectPersonByDate(JixiaoPersonPriceExportDTO dto);
+
     /**查询导出的人员绩效*/
     public List<List<Map>> exportPersonJX(JixiaoPersonPriceExportDTO dto);
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/mapper/xml/JixiaoPersonPriceMapper.xml

@@ -10,7 +10,11 @@
         <result column="result2" jdbcType="VARCHAR" property="result2" />
     </resultMap>
 
-    <select id="exportPersonJX" resultMap="BaseOneMap,BaseTwoMap" statementType="CALLABLE">
+    <resultMap type="java.util.Map" id="BaseThreeMap">
+        <result column="result3" jdbcType="VARCHAR" property="result3" />
+    </resultMap>
+
+    <select id="exportPersonJX" resultMap="BaseOneMap,BaseTwoMap,BaseThreeMap" statementType="CALLABLE">
         call exportPersonJX(#{beginDate,mode=IN},#{endDate,mode=IN})
     </select>
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/service/IJixiaoPersonPriceService.java

@@ -29,6 +29,9 @@ import java.util.Map;
  */
 public interface IJixiaoPersonPriceService extends IService<JixiaoPersonPrice> {
 
+    /**查询规定时间内完结的委托对应的绩效导出的人员*/
+    public List<String> selectPersonByDate(JixiaoPersonPriceExportDTO dto);
+
     /**查询导出的人员绩效*/
     public List<Map<String,String>> exportPersonJX(JixiaoPersonPriceExportDTO dto);
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/jixiaoPersonPrice/service/impl/JixiaoPersonPriceServiceImpl.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.jixiaoPersonPrice.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.jixiaoPersonPrice.dto.JixiaoPersonPriceExportDTO;
@@ -19,8 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -40,10 +37,15 @@ public class JixiaoPersonPriceServiceImpl extends ServiceImpl<JixiaoPersonPriceM
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
 
+    /**查询规定时间内完结的委托对应的绩效导出的人员*/
+    public List<String> selectPersonByDate(JixiaoPersonPriceExportDTO dto){
+        return jixiaoPersonPriceMapper.selectPersonByDate(dto);
+    }
+
     /**查询导出的人员绩效*/
     public List<Map<String,String>> exportPersonJX(JixiaoPersonPriceExportDTO dto){
         List<List<Map>> list = jixiaoPersonPriceMapper.exportPersonJX(dto);
-        List<Map> mapList = list.get(1);
+        List<Map> mapList = list.get(2);
         List<Map<String,String>> mapList1 = mapList.stream().map(i->{
                     //todo 遍历map转化成Map<String,String>优化？
                     Map<String,String> map = new HashMap<>();
@@ -76,9 +78,10 @@ public class JixiaoPersonPriceServiceImpl extends ServiceImpl<JixiaoPersonPriceM
             // 打印键集合
             for (Object key : map.keySet()) {
                 System.out.println((String) key);
-                if(key.equals("weituo_no") || key.equals("TOTAL")) continue;
+                if(key.equals("weituo_no") || key.equals("TOTAL") || key.equals("create_time")) continue;
                 filedsList.add(new ExcelExportEntity((String) key, (String)key));
             }
+            filedsList.add(new ExcelExportEntity("完结时间", "create_time"));
             filedsList.add(new ExcelExportEntity("总计", "TOTAL"));
         }