损益单分析汇总

pom.xml

@@ -62,7 +62,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
 		<dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -152,6 +152,13 @@
 		    <!-- 注意版本.这里我使用的是1.3.2 -->
 		    <version>1.3.2</version>
 		</dependency>
+		<!-- lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.22</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/chinaitop/depot/profitlossStatement/controller/DataStatisticsController.java

@@ -1,17 +1,22 @@
 package com.chinaitop.depot.profitlossStatement.controller;
 
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.chinaitop.depot.profitlossStatement.model.PayoffsInfo;
+import com.chinaitop.depot.profitlossStatement.param.PayoffsRequestParam;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -140,4 +145,16 @@ public class DataStatisticsController {
 			logger.error(e.getMessage(), e);
 		}
 	}
+
+	@RequestMapping(value="/getPayoffsInfo",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="损益单分析汇总列表", notes = "不支持分页")
+	@ApiImplicitParam(name = "param", value = "条件对象", paramType = "body")
+	public List<PayoffsInfo> getPayoffsInfo(@RequestBody PayoffsRequestParam param) {
+		try {
+			return dataStatisticsService.getPayoffsInfo(param);
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+		}
+		return new ArrayList<>();
+	}
 }

src/main/java/com/chinaitop/depot/profitlossStatement/mapper/DataStatisticsMapper.java

@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.Map;
 
 import com.chinaitop.depot.profitlossStatement.model.DataStatistics;
+import com.chinaitop.depot.profitlossStatement.model.PayoffsInfo;
+import com.chinaitop.depot.profitlossStatement.param.PayoffsRequestParam;
+import org.apache.ibatis.annotations.Param;
 
 public interface DataStatisticsMapper {
 
@@ -30,4 +33,6 @@ public interface DataStatisticsMapper {
 	 * @return
 	 */
 	List<DataStatistics> selectByKdmc(Map<String, String> paramMap);
+
+    List<PayoffsInfo> getPayoffsInfo(PayoffsRequestParam param);
 }

src/main/java/com/chinaitop/depot/profitlossStatement/mapper/DataStatisticsMapper.xml

@@ -140,4 +140,50 @@
     </if>
     group by org.org_name
   </select>
+  <select id="getPayoffsInfo" parameterType="com.chinaitop.depot.profitlossStatement.param.PayoffsRequestParam" resultType="com.chinaitop.depot.profitlossStatement.model.PayoffsInfo">
+    select distinct
+      sps.id,
+      sps.org_id orgId,
+      be.enumname areaName,
+      oi.org_name orgName,
+      bs.storehouse_name storehouseName,
+      nvl(bw.warehouse_name, '一一') warehouseName,
+      be1.enumname varietyName,
+      be2.enumname gradeName,
+      nvl(be3.enumname, '一一') harvestYear,
+      be4.enumname grainNatureName,
+      TO_CHAR(sps.rksj, 'yyyy-mm-dd') rq,
+      nvl(sps.rksl,0) rksl,
+      nvl(sps.cksl,0) cksl,
+      sps.sssl,
+      round(sps.sssl/sps.rksl*100, 2) ssl,
+      nvl(sps.sjshsl,0) sjshsl,
+      round(sps.sjshsl/sps.rksl*100, 2) shl,
+      nvl(sps.yysl,0) yysl,
+      case when sps.chsl==0 then '否' else '是' end sfch,
+      nvl(sps.chsl,0) chsl
+    from
+        storage_profitloss_statement sps
+        left join org_info oi on sps.org_id = oi.org_id
+        left join basic_enum be on oi.zc_county = be.enumid
+        left join basic_storehouse bs on sps.cforyg = bs.storehouse_id
+        left join basic_warehouse bw on sps.hwid = bw.warehouse_id
+        left join basic_enum be1 on be1.enumid = sps.pz
+        left join basic_enum be2 on be2.enumid = sps.dj
+        left join lsreport_ts:data_kcgl_fcbgz_default kfd on kfd.ch = sps.cforyg and kfd.hwh = sps.hwid and TO_CHAR(sps.rksj,'yyyy-mm-dd hh24:mi:ss') = TO_CHAR(kfd.rq,'yyyy-mm-dd hh24:mi:ss')
+        left join basic_enum be3 on be3.enumid = kfd.scnf
+        left join basic_enum be4 on be4.enumid = sps.lsxz
+    <where>
+      sps.audit_state = 6
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        and sps.cksj between #{startTime} and #{endTime}
+      </if>
+      <if test="orgName != null and orgName != ''">
+        and oi.org_name like '%'||#{orgName}||'%'
+      </if>
+      <if test="areaName != null and areaName != ''">
+        and be.enumname like '%'||#{areaName}||'%'
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/profitlossStatement/model/PayoffsInfo.java

@@ -0,0 +1,53 @@
+package com.chinaitop.depot.profitlossStatement.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author qingsong.han
+ * @description: 损益单分析汇总
+ * @create 2024-11-18 10:16
+ */
+@Getter @Setter
+public class PayoffsInfo implements Serializable {
+    private static final long serialVersionUID = -9027285257515748650L;
+    // 地区
+    private String areaName;
+    // 企业名称
+    private String orgName;
+    // 仓房名称
+    private String storehouseName;
+    // 货位名称
+    private String warehouseName;
+    // 粮食品种
+    private String varietyName;
+    // 质量等级
+    private String gradeName;
+    // 收获年度
+    private String harvestYear;
+    // 粮食性质
+    private String grainNatureName;
+    // 入库日期
+    private String rq;
+    // 入库数量(kg)
+    private BigDecimal rksl;
+    // 出库数量(kg)
+    private BigDecimal cksl;
+    // 损失量(kg)
+    private String sssl;
+    // 损失率(%)
+    private String ssl;
+    // 损耗量(kg)
+    private BigDecimal sjshsl;
+    // 损耗率(%)
+    private BigDecimal shl;
+    // 溢余数量(kg)
+    private BigDecimal yysl;
+    // 是否超耗
+    private String sfch;
+    // 超耗数量(kg)
+    private BigDecimal chsl;
+}

src/main/java/com/chinaitop/depot/profitlossStatement/param/PayoffsRequestParam.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.profitlossStatement.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-18 9:31
+ */
+@Data
+public class PayoffsRequestParam implements Serializable {
+    private static final long serialVersionUID = -7711211178033937446L;
+
+    // 出库完成时间-开始
+    private String startTime;
+    // 出库完成时间-结束
+    private String endTime;
+    // 企业名称
+    private String orgName;
+    // 地区名称
+    private String areaName;
+}

src/main/java/com/chinaitop/depot/profitlossStatement/service/DataStatisticsService.java

@@ -1,7 +1,10 @@
 package com.chinaitop.depot.profitlossStatement.service;
 
+import java.util.List;
 import java.util.Map;
 
+import com.chinaitop.depot.profitlossStatement.model.PayoffsInfo;
+import com.chinaitop.depot.profitlossStatement.param.PayoffsRequestParam;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
 public interface DataStatisticsService {
@@ -52,4 +55,6 @@ public interface DataStatisticsService {
 	 * @return
 	 */
 	HSSFWorkbook exportData(String startTime, String endTime, String orgCode) throws Exception;
+
+    List<PayoffsInfo> getPayoffsInfo(PayoffsRequestParam param);
 }

src/main/java/com/chinaitop/depot/profitlossStatement/service/impl/DataStatisticsServiceImpl.java

@@ -2,12 +2,17 @@ package com.chinaitop.depot.profitlossStatement.service.impl;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.chinaitop.depot.profitlossStatement.model.PayoffsInfo;
+import com.chinaitop.depot.profitlossStatement.param.PayoffsRequestParam;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -23,424 +28,482 @@ import com.chinaitop.depot.profitlossStatement.service.DataStatisticsService;
 import com.chinaitop.depot.utils.HSSFWorkBookUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.springframework.util.CollectionUtils;
 
+@Slf4j
 @Service
 public class DataStatisticsServiceImpl implements DataStatisticsService {
 
-	@Resource
-	private DataStatisticsMapper dataStatisticsMapper;
-
-	/**
-	 * 获取合计行数据
-	 * @return
-	 */
-	private DataStatistics getHjDate(List<DataStatistics> listall) {
-
-		DataStatistics hj_obj = new DataStatistics();
-
-		//入库数量合计
-		BigDecimal rksl_hj = listall.stream().map(DataStatistics::getRksl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setRksl(rksl_hj);
-
-		//出库数量合计
-		BigDecimal cksl_hj = listall.stream().map(DataStatistics::getCksl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setCksl(cksl_hj);
-
-		//损失数量合计
-		BigDecimal sssl_hj = listall.stream().map(DataStatistics::getSssl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setSssl(sssl_hj);
-
-		//损耗数量合计
-		BigDecimal shsl_hj = listall.stream().map(DataStatistics::getShsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setShsl(shsl_hj);
-
-		//溢余数量合计
-		BigDecimal yysl_hj = listall.stream().map(DataStatistics::getYysl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setYysl(yysl_hj);
-
-		//超耗数量合计
-		BigDecimal chsl_hj = listall.stream().map(DataStatistics::getChsl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setChsl(chsl_hj);
-		
-		//水杂减量合计
-		BigDecimal szjlhj_hj = listall.stream().map(DataStatistics::getSzjlhj).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setSzjlhj(szjlhj_hj);
-		
-		//保管自然损耗定额数量合计
-		BigDecimal bgzrshdesl_hj = listall.stream().map(DataStatistics::getBgzrshdesl).reduce(BigDecimal.ZERO, BigDecimal::add);
-		hj_obj.setBgzrshdesl(bgzrshdesl_hj);
-
-		//合计损失率(四射五入保留两位小数):损失数量 / 入库数量 * 100
-		BigDecimal ssl_hj = sssl_hj.divide(rksl_hj, 5, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
-		hj_obj.setSsl(ssl_hj);
-
-		//合计损耗率(四射五入保留两位小数):损耗数量 / 入库数量 * 100
-		BigDecimal shl_hj = shsl_hj.divide(rksl_hj, 5, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
-		hj_obj.setShl(shl_hj);
-
-		return hj_obj;
-	}
-	@Override
-	public Map<String, Object> selectByCflx(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
-		Map<String, Object> map = new HashMap<>();
-		PageInfo<DataStatistics> pageInfo = null;
-		Map<String, String> paramMap = new HashMap<String, String>();
-		if (StringUtils.isNotBlank(orgCode)) {
-			paramMap.put("orgCode", orgCode);
-		}
-		if (StringUtils.isNotBlank(startTime)) {
-			startTime = startTime+" 00:00:00";
-			paramMap.put("startTime", startTime);
-		}
-		if (StringUtils.isNotBlank(endTime)) {
-			endTime = endTime+" 23:59:59";
-			paramMap.put("endTime", endTime);
-		}
-		List<DataStatistics> listall = dataStatisticsMapper.selectByCflx(paramMap);
-
-		//获取合计行数据
-		DataStatistics hj_obj = getHjDate(listall);
-
-		map.put("ht_object", hj_obj);
-
-		if (null != pageNum && null != pageSize) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
-		List<DataStatistics> list = dataStatisticsMapper.selectByCflx(paramMap);
-		pageInfo = new PageInfo<DataStatistics>(list);
-
-		map.put("pageInfo", pageInfo);
-
-		return map;
-	}
-
-	@Override
-	public Map<String, Object> selectByLspz(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
-		Map<String, Object> map = new HashMap<>();
-
-		PageInfo<DataStatistics> pageInfo = null;
+    @Resource
+    private DataStatisticsMapper dataStatisticsMapper;
+
+    /**
+     * 获取合计行数据
+     *
+     * @return
+     */
+    private DataStatistics getHjDate(List<DataStatistics> listall) {
+
+        DataStatistics hj_obj = new DataStatistics();
+
+        //入库数量合计
+        BigDecimal rksl_hj = listall.stream().map(DataStatistics::getRksl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setRksl(rksl_hj);
+
+        //出库数量合计
+        BigDecimal cksl_hj = listall.stream().map(DataStatistics::getCksl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setCksl(cksl_hj);
+
+        //损失数量合计
+        BigDecimal sssl_hj = listall.stream().map(DataStatistics::getSssl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setSssl(sssl_hj);
+
+        //损耗数量合计
+        BigDecimal shsl_hj = listall.stream().map(DataStatistics::getShsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setShsl(shsl_hj);
+
+        //溢余数量合计
+        BigDecimal yysl_hj = listall.stream().map(DataStatistics::getYysl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setYysl(yysl_hj);
+
+        //超耗数量合计
+        BigDecimal chsl_hj = listall.stream().map(DataStatistics::getChsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setChsl(chsl_hj);
+
+        //水杂减量合计
+        BigDecimal szjlhj_hj = listall.stream().map(DataStatistics::getSzjlhj).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setSzjlhj(szjlhj_hj);
+
+        //保管自然损耗定额数量合计
+        BigDecimal bgzrshdesl_hj = listall.stream().map(DataStatistics::getBgzrshdesl).reduce(BigDecimal.ZERO, BigDecimal::add);
+        hj_obj.setBgzrshdesl(bgzrshdesl_hj);
+
+        //合计损失率(四射五入保留两位小数):损失数量 / 入库数量 * 100
+        BigDecimal ssl_hj = sssl_hj.divide(rksl_hj, 5, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
+        hj_obj.setSsl(ssl_hj);
+
+        //合计损耗率(四射五入保留两位小数):损耗数量 / 入库数量 * 100
+        BigDecimal shl_hj = shsl_hj.divide(rksl_hj, 5, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
+        hj_obj.setShl(shl_hj);
+
+        return hj_obj;
+    }
+
+    @Override
+    public Map<String, Object> selectByCflx(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        PageInfo<DataStatistics> pageInfo = null;
+        Map<String, String> paramMap = new HashMap<String, String>();
+        if (StringUtils.isNotBlank(orgCode)) {
+            paramMap.put("orgCode", orgCode);
+        }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime = startTime + " 00:00:00";
+            paramMap.put("startTime", startTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime = endTime + " 23:59:59";
+            paramMap.put("endTime", endTime);
+        }
+        List<DataStatistics> listall = dataStatisticsMapper.selectByCflx(paramMap);
+
+        //获取合计行数据
+        DataStatistics hj_obj = getHjDate(listall);
+
+        map.put("ht_object", hj_obj);
+
+        if (null != pageNum && null != pageSize) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<DataStatistics> list = dataStatisticsMapper.selectByCflx(paramMap);
+        pageInfo = new PageInfo<DataStatistics>(list);
+
+        map.put("pageInfo", pageInfo);
+
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> selectByLspz(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+
+        PageInfo<DataStatistics> pageInfo = null;
+
+        Map<String, String> paramMap = new HashMap<String, String>();
+        if (StringUtils.isNotBlank(orgCode)) {
+            paramMap.put("orgCode", orgCode);
+        }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime = startTime + " 00:00:00";
+            paramMap.put("startTime", startTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime = endTime + " 23:59:59";
+            paramMap.put("endTime", endTime);
+        }
+        List<DataStatistics> listall = dataStatisticsMapper.selectByLspz(paramMap);
+
+        //获取合计行数据
+        DataStatistics hj_obj = getHjDate(listall);
+
+        map.put("ht_object", hj_obj);
+
+        if (null != pageNum && null != pageSize) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<DataStatistics> list = dataStatisticsMapper.selectByLspz(paramMap);
+        pageInfo = new PageInfo<DataStatistics>(list);
+
+        map.put("pageInfo", pageInfo);
+
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> selectByLsxz(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+
+        PageInfo<DataStatistics> pageInfo = null;
+
+        Map<String, String> paramMap = new HashMap<String, String>();
+        if (StringUtils.isNotBlank(orgCode)) {
+            paramMap.put("orgCode", orgCode);
+        }
+        if (StringUtils.isNotBlank(startTime)) {
+            startTime = startTime + " 00:00:00";
+            paramMap.put("startTime", startTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime = endTime + " 23:59:59";
+            paramMap.put("endTime", endTime);
+        }
+
+        List<DataStatistics> listall = dataStatisticsMapper.selectByLsxz(paramMap);
+
+        //获取合计行数据
+        DataStatistics hj_obj = getHjDate(listall);
+
+        map.put("ht_object", hj_obj);
+
+        if (null != pageNum && null != pageSize) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+
+        List<DataStatistics> list = dataStatisticsMapper.selectByLsxz(paramMap);
+        pageInfo = new PageInfo<DataStatistics>(list);
+
+        map.put("pageInfo", pageInfo);
+
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> selectByKdmc(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+
+        PageInfo<DataStatistics> pageInfo = null;
 
         Map<String, String> paramMap = new HashMap<String, String>();
         if (StringUtils.isNotBlank(orgCode)) {
-			paramMap.put("orgCode", orgCode);
-		}
+            paramMap.put("orgCode", orgCode);
+        }
         if (StringUtils.isNotBlank(startTime)) {
-			startTime = startTime+" 00:00:00";
-			paramMap.put("startTime", startTime);
-		}
-		if (StringUtils.isNotBlank(endTime)) {
-			endTime = endTime+" 23:59:59";
-			paramMap.put("endTime", endTime);
-		}
-		List<DataStatistics> listall = dataStatisticsMapper.selectByLspz(paramMap);
-
-		//获取合计行数据
-		DataStatistics hj_obj = getHjDate(listall);
-
-		map.put("ht_object", hj_obj);
-		
-		if (null != pageNum && null != pageSize) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
-		List<DataStatistics> list = dataStatisticsMapper.selectByLspz(paramMap);
-		pageInfo = new PageInfo<DataStatistics>(list);
-
-		map.put("pageInfo", pageInfo);
-
-		return map;
-	}
-
-	@Override
-	public Map<String, Object> selectByLsxz(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
-		Map<String, Object> map = new HashMap<>();
-
-		PageInfo<DataStatistics> pageInfo = null;
-
-		Map<String, String> paramMap = new HashMap<String, String>();
-		if (StringUtils.isNotBlank(orgCode)) {
-			paramMap.put("orgCode", orgCode);
-		}
-		if (StringUtils.isNotBlank(startTime)) {
-			startTime = startTime+" 00:00:00";
-			paramMap.put("startTime", startTime);
-		}
-		if (StringUtils.isNotBlank(endTime)) {
-			endTime = endTime+" 23:59:59";
-			paramMap.put("endTime", endTime);
-		}
-
-		List<DataStatistics> listall = dataStatisticsMapper.selectByLsxz(paramMap);
-
-		//获取合计行数据
-		DataStatistics hj_obj = getHjDate(listall);
-
-		map.put("ht_object", hj_obj);
-
-		if (null != pageNum && null != pageSize) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
-
-		List<DataStatistics> list = dataStatisticsMapper.selectByLsxz(paramMap);
-		pageInfo = new PageInfo<DataStatistics>(list);
-
-		map.put("pageInfo", pageInfo);
-
-		return map;
-	}
-
-	@Override
-	public Map<String, Object> selectByKdmc(Integer pageNum, Integer pageSize, String startTime, String endTime, String orgCode) throws Exception {
-		Map<String, Object> map = new HashMap<>();
-
-		PageInfo<DataStatistics> pageInfo = null;
-
-		Map<String, String> paramMap = new HashMap<String, String>();
-		if (StringUtils.isNotBlank(orgCode)) {
-			paramMap.put("orgCode", orgCode);
-		}
-		if (StringUtils.isNotBlank(startTime)) {
-			startTime = startTime+" 00:00:00";
-			paramMap.put("startTime", startTime);
-		}
-		if (StringUtils.isNotBlank(endTime)) {
-			endTime = endTime+" 23:59:59";
-			paramMap.put("endTime", endTime);
-		}
-
-		List<DataStatistics> listall = dataStatisticsMapper.selectByKdmc(paramMap);
-
-		//获取合计行数据
-		DataStatistics hj_obj = getHjDate(listall);
-
-		map.put("ht_object", hj_obj);
-
-		if (null != pageNum && null != pageSize) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
-		List<DataStatistics> list = dataStatisticsMapper.selectByKdmc(paramMap);
-		pageInfo = new PageInfo<DataStatistics>(list);
-
-		map.put("pageInfo", pageInfo);
-
-		return map;
-	}
-
-	@Override
-	public HSSFWorkbook exportData(String startTime, String endTime, String orgCode) throws Exception {
-		HSSFWorkbook wb = new HSSFWorkbook();
-
-		CellRangeAddress cellRange = new CellRangeAddress(0, 0, 0, 11); // A1到J1的区域
-
-		// 创建"仓房类型统计"工作表
-		HSSFSheet sheetCflx = wb.createSheet("仓房类型统计");
-		sheetCflx.addMergedRegion(cellRange);
-		setSheetData(wb, sheetCflx, "cflx", startTime, endTime, orgCode);
-
-		HSSFSheet sheetLspz = wb.createSheet("粮食品种统计");
-		sheetLspz.addMergedRegion(cellRange);
-		setSheetData(wb, sheetLspz, "lspz", startTime, endTime, orgCode);
-
-		HSSFSheet sheetLsxz = wb.createSheet("粮食性质统计");
-		sheetLsxz.addMergedRegion(cellRange);
-		setSheetData(wb, sheetLsxz, "lsxz", startTime, endTime, orgCode);
-
-		HSSFSheet sheetKdmc = wb.createSheet("库点统计");
-		sheetKdmc.addMergedRegion(cellRange);
-		setSheetData(wb, sheetKdmc, "kdmc", startTime, endTime, orgCode);
-
-		return wb;
-	}
-
-	@SuppressWarnings("unchecked")
-	public void setSheetData(HSSFWorkbook wb, HSSFSheet sheet, String sheetNum, String startTime, String endTime, String orgCode) throws Exception {
-		HSSFCellStyle headStyle = HSSFWorkBookUtils.headStyle(wb);
-		HSSFCellStyle contentStyle = HSSFWorkBookUtils.contentStyle(wb);
-		
-		sheet.setColumnWidth(2, 20*256);
-		sheet.setColumnWidth(3, 20*256);
-		sheet.setColumnWidth(4, 20*256);
-		sheet.setColumnWidth(5, 20*256);
-		sheet.setColumnWidth(6, 20*256);
-		sheet.setColumnWidth(7, 20*256);
-		sheet.setColumnWidth(8, 20*256);
-		sheet.setColumnWidth(9, 20*256);
-		sheet.setColumnWidth(10, 20*256);
-		sheet.setColumnWidth(11, 20*256);
-
-		//第一行：标题行
-		HSSFRow sheetRow = sheet.createRow(0);
-		HSSFCell cell = sheetRow.createCell(0);
-		String tilleName = "";
-		List<DataStatistics> list = null;
-		Map<String, Object> map = null;
-		DataStatistics ds = null;
-		String cell2Name = ""; //第二行第二列的名称
-		if ("cflx".equals(sheetNum)) {
-			tilleName = "按照仓房类型统计分析汇总表";
-			cell2Name = "仓房类型";
-			sheet.setColumnWidth(1, 18*256);
-			map = selectByCflx(null, null, startTime, endTime, orgCode);
-			ds = (DataStatistics) map.get("ht_object");
-			list = ((PageInfo<DataStatistics>)map.get("pageInfo")).getList();
-		} else if ("lspz".equals(sheetNum)) {
-			tilleName = "按照粮食品种统计分析汇总表";
-			cell2Name = "粮食品种";
-			sheet.setColumnWidth(1, 20*256);
-			map = selectByLspz(null, null, startTime, endTime, orgCode);
-			ds = (DataStatistics) map.get("ht_object");
-			list = ((PageInfo<DataStatistics>)map.get("pageInfo")).getList();
-		} else if ("lsxz".equals(sheetNum)) {
-			tilleName = "按照粮食性质统计分析汇总表";
-			cell2Name = "粮食性质";
-			sheet.setColumnWidth(1, 40*256);
-			map = selectByLsxz(null, null, startTime, endTime, orgCode);
-			ds = (DataStatistics) map.get("ht_object");
-			list = ((PageInfo<DataStatistics>)map.get("pageInfo")).getList();
-		} else if ("kdmc".equals(sheetNum)) {
-			tilleName = "按照库点统计分析汇总表";
-			cell2Name = "库点名称";
-			sheet.setColumnWidth(1, 45*256);
-			map = selectByKdmc(null, null, startTime, endTime, orgCode);
-			ds = (DataStatistics) map.get("ht_object");
-			list = ((PageInfo<DataStatistics>)map.get("pageInfo")).getList();
-		}
-
-		cell.setCellValue(tilleName);
-		cell.setCellStyle(headStyle);
-
-		//第二行
-		HSSFRow sheetRow1 = sheet.createRow(1);//列名所在行
-		HSSFCell rowCell1 = sheetRow1.createCell(0);
-		rowCell1.setCellValue("序号");
-		rowCell1.setCellStyle(contentStyle);
-		HSSFCell rowCell2 = sheetRow1.createCell(1);
-		//第二行第二列的名称
-		rowCell2.setCellValue(cell2Name);
-		rowCell2.setCellStyle(contentStyle);
-		HSSFCell rowCell3 = sheetRow1.createCell(2);
-		rowCell3.setCellValue("入库数量(kg)");
-		rowCell3.setCellStyle(contentStyle);
-		HSSFCell rowCell4 = sheetRow1.createCell(3);
-		rowCell4.setCellValue("出库数量(kg)");
-		rowCell4.setCellStyle(contentStyle);
-		HSSFCell rowCell5 = sheetRow1.createCell(4);
-		rowCell5.setCellValue("损失数量(kg)");
-		rowCell5.setCellStyle(contentStyle);
-		HSSFCell rowCell6 = sheetRow1.createCell(5);
-		rowCell6.setCellValue("损失率(%)");
-		rowCell6.setCellStyle(contentStyle);
-		HSSFCell rowCell7 = sheetRow1.createCell(6);
-		rowCell7.setCellValue("损耗数量(kg)");
-		rowCell7.setCellStyle(contentStyle);
-		HSSFCell rowCell8 = sheetRow1.createCell(7);
-		rowCell8.setCellValue("损耗率(%)");
-		rowCell8.setCellStyle(contentStyle);
-		HSSFCell rowCell9 = sheetRow1.createCell(8);
-		rowCell9.setCellValue("溢余数量(kg)");
-		rowCell9.setCellStyle(contentStyle);
-		HSSFCell rowCell10 = sheetRow1.createCell(9);
-		rowCell10.setCellValue("超耗数量(kg)");
-		rowCell10.setCellStyle(contentStyle);
-		HSSFCell rowCell11 = sheetRow1.createCell(10);
-		rowCell11.setCellValue("水杂减量合计(kg)");
-		rowCell11.setCellStyle(contentStyle);
-		HSSFCell rowCell12 = sheetRow1.createCell(11);
-		rowCell12.setCellValue("保管自然损耗定额(kg)");
-		rowCell12.setCellStyle(contentStyle);
-
-		//第三行：合计行
-		HSSFRow sheetRow2 = sheet.createRow(2);//列名所在行
-		HSSFCell row2Cell1 = sheetRow2.createCell(0);
-		row2Cell1.setCellValue("——");
-		row2Cell1.setCellStyle(contentStyle);
-		HSSFCell row2Cell2 = sheetRow2.createCell(1);
-		//第二行第二列的名称
-		row2Cell2.setCellValue("合计");
-		row2Cell2.setCellStyle(headStyle);
-		HSSFCell row2Cell3 = sheetRow2.createCell(2);
-		row2Cell3.setCellValue(ds.getRksl()+"");
-		row2Cell3.setCellStyle(contentStyle);
-		HSSFCell row2Cell4 = sheetRow2.createCell(3);
-		row2Cell4.setCellValue(ds.getCksl()+"");
-		row2Cell4.setCellStyle(contentStyle);
-		HSSFCell row2Cell5 = sheetRow2.createCell(4);
-		row2Cell5.setCellValue(ds.getSssl()+"");
-		row2Cell5.setCellStyle(contentStyle);
-		HSSFCell row2Cell6 = sheetRow2.createCell(5);
-		row2Cell6.setCellValue(ds.getSsl()+"");
-		row2Cell6.setCellStyle(contentStyle);
-		HSSFCell row2Cell7 = sheetRow2.createCell(6);
-		row2Cell7.setCellValue(ds.getShsl()+"");
-		row2Cell7.setCellStyle(contentStyle);
-		HSSFCell row2Cell8 = sheetRow2.createCell(7);
-		row2Cell8.setCellValue(ds.getShl()+"");
-		row2Cell8.setCellStyle(contentStyle);
-		HSSFCell row2Cell9 = sheetRow2.createCell(8);
-		row2Cell9.setCellValue(ds.getYysl()+"");
-		row2Cell9.setCellStyle(contentStyle);
-		HSSFCell row2Cell10 = sheetRow2.createCell(9);
-		row2Cell10.setCellValue(ds.getChsl()+"");
-		row2Cell10.setCellStyle(contentStyle);
-		HSSFCell row2Cell11 = sheetRow2.createCell(10);
-		row2Cell11.setCellValue(ds.getSzjlhj()+"");
-		row2Cell11.setCellStyle(contentStyle);
-		HSSFCell row2Cell12 = sheetRow2.createCell(11);
-		row2Cell12.setCellValue(ds.getBgzrshdesl()+"");
-		row2Cell12.setCellStyle(contentStyle);
-
-		Integer xh=1;
-		int rowNum = 2;
-		HSSFRow rowData = null;
-		DataStatistics data = null;
-		for (int i = 0; i < list.size(); i++) {
-			rowNum = rowNum + 1;
-			data = list.get(i);
-			rowData = sheet.createRow(rowNum);
-			HSSFCell rowCellData1 = rowData.createCell(0);
-			rowCellData1.setCellValue(xh);
-			rowCellData1.setCellStyle(contentStyle);
-			HSSFCell rowCellData2 = rowData.createCell(1);
-			if ("cflx".equals(sheetNum)) {
-				rowCellData2.setCellValue(data.getCflx());
-			} else if ("lspz".equals(sheetNum)) {
-				rowCellData2.setCellValue(data.getLspz());
-			} else if ("lsxz".equals(sheetNum)) {
-				rowCellData2.setCellValue(data.getLsxz());
-			} else if ("kdmc".equals(sheetNum)) {
-				rowCellData2.setCellValue(data.getKdmc());
-			}
-			rowCellData2.setCellStyle(contentStyle);
-			HSSFCell rowCellData3 = rowData.createCell(2);
-			rowCellData3.setCellValue(data.getRksl() == null ? "":data.getRksl().toString());
-			rowCellData3.setCellStyle(contentStyle);
-			HSSFCell rowCellData4 = rowData.createCell(3);
-			rowCellData4.setCellValue(data.getCksl() == null ? "":data.getCksl().toString());
-			rowCellData4.setCellStyle(contentStyle);
-			HSSFCell rowCellData5 = rowData.createCell(4);
-			rowCellData5.setCellValue(data.getSssl() == null ? "":data.getSssl().toString());
-			rowCellData5.setCellStyle(contentStyle);
-			HSSFCell rowCellData6 = rowData.createCell(5);
-			rowCellData6.setCellValue(data.getSsl() == null ? "":data.getSsl().toString());
-			rowCellData6.setCellStyle(contentStyle);
-			HSSFCell rowCellData7 = rowData.createCell(6);
-			rowCellData7.setCellValue(data.getShsl() == null ? "":data.getShsl().toString());
-			rowCellData7.setCellStyle(contentStyle);
-			HSSFCell rowCellData8 = rowData.createCell(7);
-			rowCellData8.setCellValue(data.getShl() == null ? "":data.getShl().toString());
-			rowCellData8.setCellStyle(contentStyle);
-			HSSFCell rowCellData9 = rowData.createCell(8);
-			rowCellData9.setCellValue(data.getYysl() == null ? "":data.getYysl().toString());
-			rowCellData9.setCellStyle(contentStyle);
-			HSSFCell rowCellData10 = rowData.createCell(9);
-			rowCellData10.setCellValue(data.getChsl() == null ? "":data.getChsl().toString());
-			rowCellData10.setCellStyle(contentStyle);
-			HSSFCell rowCellData11 = rowData.createCell(10);
-			rowCellData11.setCellValue(data.getSzjlhj() == null ? "":data.getSzjlhj().toString());
-			rowCellData11.setCellStyle(contentStyle);
-			HSSFCell rowCellData12 = rowData.createCell(11);
-			rowCellData12.setCellValue(data.getBgzrshdesl() == null ? "":data.getChsl().toString());
-			rowCellData12.setCellStyle(contentStyle);
-			++xh;
-		}
-	}
+            startTime = startTime + " 00:00:00";
+            paramMap.put("startTime", startTime);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            endTime = endTime + " 23:59:59";
+            paramMap.put("endTime", endTime);
+        }
+
+        List<DataStatistics> listall = dataStatisticsMapper.selectByKdmc(paramMap);
+
+        //获取合计行数据
+        DataStatistics hj_obj = getHjDate(listall);
+
+        map.put("ht_object", hj_obj);
+
+        if (null != pageNum && null != pageSize) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<DataStatistics> list = dataStatisticsMapper.selectByKdmc(paramMap);
+        pageInfo = new PageInfo<DataStatistics>(list);
+
+        map.put("pageInfo", pageInfo);
+
+        return map;
+    }
+
+    @Override
+    public HSSFWorkbook exportData(String startTime, String endTime, String orgCode) throws Exception {
+        HSSFWorkbook wb = new HSSFWorkbook();
+
+        CellRangeAddress cellRange = new CellRangeAddress(0, 0, 0, 11); // A1到J1的区域
+
+        // 创建"仓房类型统计"工作表
+        HSSFSheet sheetCflx = wb.createSheet("仓房类型统计");
+        sheetCflx.addMergedRegion(cellRange);
+        setSheetData(wb, sheetCflx, "cflx", startTime, endTime, orgCode);
+
+        HSSFSheet sheetLspz = wb.createSheet("粮食品种统计");
+        sheetLspz.addMergedRegion(cellRange);
+        setSheetData(wb, sheetLspz, "lspz", startTime, endTime, orgCode);
+
+        HSSFSheet sheetLsxz = wb.createSheet("粮食性质统计");
+        sheetLsxz.addMergedRegion(cellRange);
+        setSheetData(wb, sheetLsxz, "lsxz", startTime, endTime, orgCode);
+
+        HSSFSheet sheetKdmc = wb.createSheet("库点统计");
+        sheetKdmc.addMergedRegion(cellRange);
+        setSheetData(wb, sheetKdmc, "kdmc", startTime, endTime, orgCode);
+
+        return wb;
+    }
+
+    @SuppressWarnings("unchecked")
+    public void setSheetData(HSSFWorkbook wb, HSSFSheet sheet, String sheetNum, String startTime, String endTime, String orgCode) throws Exception {
+        HSSFCellStyle headStyle = HSSFWorkBookUtils.headStyle(wb);
+        HSSFCellStyle contentStyle = HSSFWorkBookUtils.contentStyle(wb);
+
+        sheet.setColumnWidth(2, 20 * 256);
+        sheet.setColumnWidth(3, 20 * 256);
+        sheet.setColumnWidth(4, 20 * 256);
+        sheet.setColumnWidth(5, 20 * 256);
+        sheet.setColumnWidth(6, 20 * 256);
+        sheet.setColumnWidth(7, 20 * 256);
+        sheet.setColumnWidth(8, 20 * 256);
+        sheet.setColumnWidth(9, 20 * 256);
+        sheet.setColumnWidth(10, 20 * 256);
+        sheet.setColumnWidth(11, 20 * 256);
+
+        //第一行：标题行
+        HSSFRow sheetRow = sheet.createRow(0);
+        HSSFCell cell = sheetRow.createCell(0);
+        String tilleName = "";
+        List<DataStatistics> list = null;
+        Map<String, Object> map = null;
+        DataStatistics ds = null;
+        String cell2Name = ""; //第二行第二列的名称
+        if ("cflx".equals(sheetNum)) {
+            tilleName = "按照仓房类型统计分析汇总表";
+            cell2Name = "仓房类型";
+            sheet.setColumnWidth(1, 18 * 256);
+            map = selectByCflx(null, null, startTime, endTime, orgCode);
+            ds = (DataStatistics) map.get("ht_object");
+            list = ((PageInfo<DataStatistics>) map.get("pageInfo")).getList();
+        } else if ("lspz".equals(sheetNum)) {
+            tilleName = "按照粮食品种统计分析汇总表";
+            cell2Name = "粮食品种";
+            sheet.setColumnWidth(1, 20 * 256);
+            map = selectByLspz(null, null, startTime, endTime, orgCode);
+            ds = (DataStatistics) map.get("ht_object");
+            list = ((PageInfo<DataStatistics>) map.get("pageInfo")).getList();
+        } else if ("lsxz".equals(sheetNum)) {
+            tilleName = "按照粮食性质统计分析汇总表";
+            cell2Name = "粮食性质";
+            sheet.setColumnWidth(1, 40 * 256);
+            map = selectByLsxz(null, null, startTime, endTime, orgCode);
+            ds = (DataStatistics) map.get("ht_object");
+            list = ((PageInfo<DataStatistics>) map.get("pageInfo")).getList();
+        } else if ("kdmc".equals(sheetNum)) {
+            tilleName = "按照库点统计分析汇总表";
+            cell2Name = "库点名称";
+            sheet.setColumnWidth(1, 45 * 256);
+            map = selectByKdmc(null, null, startTime, endTime, orgCode);
+            ds = (DataStatistics) map.get("ht_object");
+            list = ((PageInfo<DataStatistics>) map.get("pageInfo")).getList();
+        }
+
+        cell.setCellValue(tilleName);
+        cell.setCellStyle(headStyle);
+
+        //第二行
+        HSSFRow sheetRow1 = sheet.createRow(1);//列名所在行
+        HSSFCell rowCell1 = sheetRow1.createCell(0);
+        rowCell1.setCellValue("序号");
+        rowCell1.setCellStyle(contentStyle);
+        HSSFCell rowCell2 = sheetRow1.createCell(1);
+        //第二行第二列的名称
+        rowCell2.setCellValue(cell2Name);
+        rowCell2.setCellStyle(contentStyle);
+        HSSFCell rowCell3 = sheetRow1.createCell(2);
+        rowCell3.setCellValue("入库数量(kg)");
+        rowCell3.setCellStyle(contentStyle);
+        HSSFCell rowCell4 = sheetRow1.createCell(3);
+        rowCell4.setCellValue("出库数量(kg)");
+        rowCell4.setCellStyle(contentStyle);
+        HSSFCell rowCell5 = sheetRow1.createCell(4);
+        rowCell5.setCellValue("损失数量(kg)");
+        rowCell5.setCellStyle(contentStyle);
+        HSSFCell rowCell6 = sheetRow1.createCell(5);
+        rowCell6.setCellValue("损失率(%)");
+        rowCell6.setCellStyle(contentStyle);
+        HSSFCell rowCell7 = sheetRow1.createCell(6);
+        rowCell7.setCellValue("损耗数量(kg)");
+        rowCell7.setCellStyle(contentStyle);
+        HSSFCell rowCell8 = sheetRow1.createCell(7);
+        rowCell8.setCellValue("损耗率(%)");
+        rowCell8.setCellStyle(contentStyle);
+        HSSFCell rowCell9 = sheetRow1.createCell(8);
+        rowCell9.setCellValue("溢余数量(kg)");
+        rowCell9.setCellStyle(contentStyle);
+        HSSFCell rowCell10 = sheetRow1.createCell(9);
+        rowCell10.setCellValue("超耗数量(kg)");
+        rowCell10.setCellStyle(contentStyle);
+        HSSFCell rowCell11 = sheetRow1.createCell(10);
+        rowCell11.setCellValue("水杂减量合计(kg)");
+        rowCell11.setCellStyle(contentStyle);
+        HSSFCell rowCell12 = sheetRow1.createCell(11);
+        rowCell12.setCellValue("保管自然损耗定额(kg)");
+        rowCell12.setCellStyle(contentStyle);
+
+        //第三行：合计行
+        HSSFRow sheetRow2 = sheet.createRow(2);//列名所在行
+        HSSFCell row2Cell1 = sheetRow2.createCell(0);
+        row2Cell1.setCellValue("——");
+        row2Cell1.setCellStyle(contentStyle);
+        HSSFCell row2Cell2 = sheetRow2.createCell(1);
+        //第二行第二列的名称
+        row2Cell2.setCellValue("合计");
+        row2Cell2.setCellStyle(headStyle);
+        HSSFCell row2Cell3 = sheetRow2.createCell(2);
+        row2Cell3.setCellValue(ds.getRksl() + "");
+        row2Cell3.setCellStyle(contentStyle);
+        HSSFCell row2Cell4 = sheetRow2.createCell(3);
+        row2Cell4.setCellValue(ds.getCksl() + "");
+        row2Cell4.setCellStyle(contentStyle);
+        HSSFCell row2Cell5 = sheetRow2.createCell(4);
+        row2Cell5.setCellValue(ds.getSssl() + "");
+        row2Cell5.setCellStyle(contentStyle);
+        HSSFCell row2Cell6 = sheetRow2.createCell(5);
+        row2Cell6.setCellValue(ds.getSsl() + "");
+        row2Cell6.setCellStyle(contentStyle);
+        HSSFCell row2Cell7 = sheetRow2.createCell(6);
+        row2Cell7.setCellValue(ds.getShsl() + "");
+        row2Cell7.setCellStyle(contentStyle);
+        HSSFCell row2Cell8 = sheetRow2.createCell(7);
+        row2Cell8.setCellValue(ds.getShl() + "");
+        row2Cell8.setCellStyle(contentStyle);
+        HSSFCell row2Cell9 = sheetRow2.createCell(8);
+        row2Cell9.setCellValue(ds.getYysl() + "");
+        row2Cell9.setCellStyle(contentStyle);
+        HSSFCell row2Cell10 = sheetRow2.createCell(9);
+        row2Cell10.setCellValue(ds.getChsl() + "");
+        row2Cell10.setCellStyle(contentStyle);
+        HSSFCell row2Cell11 = sheetRow2.createCell(10);
+        row2Cell11.setCellValue(ds.getSzjlhj() + "");
+        row2Cell11.setCellStyle(contentStyle);
+        HSSFCell row2Cell12 = sheetRow2.createCell(11);
+        row2Cell12.setCellValue(ds.getBgzrshdesl() + "");
+        row2Cell12.setCellStyle(contentStyle);
+
+        Integer xh = 1;
+        int rowNum = 2;
+        HSSFRow rowData = null;
+        DataStatistics data = null;
+        for (int i = 0; i < list.size(); i++) {
+            rowNum = rowNum + 1;
+            data = list.get(i);
+            rowData = sheet.createRow(rowNum);
+            HSSFCell rowCellData1 = rowData.createCell(0);
+            rowCellData1.setCellValue(xh);
+            rowCellData1.setCellStyle(contentStyle);
+            HSSFCell rowCellData2 = rowData.createCell(1);
+            if ("cflx".equals(sheetNum)) {
+                rowCellData2.setCellValue(data.getCflx());
+            } else if ("lspz".equals(sheetNum)) {
+                rowCellData2.setCellValue(data.getLspz());
+            } else if ("lsxz".equals(sheetNum)) {
+                rowCellData2.setCellValue(data.getLsxz());
+            } else if ("kdmc".equals(sheetNum)) {
+                rowCellData2.setCellValue(data.getKdmc());
+            }
+            rowCellData2.setCellStyle(contentStyle);
+            HSSFCell rowCellData3 = rowData.createCell(2);
+            rowCellData3.setCellValue(data.getRksl() == null ? "" : data.getRksl().toString());
+            rowCellData3.setCellStyle(contentStyle);
+            HSSFCell rowCellData4 = rowData.createCell(3);
+            rowCellData4.setCellValue(data.getCksl() == null ? "" : data.getCksl().toString());
+            rowCellData4.setCellStyle(contentStyle);
+            HSSFCell rowCellData5 = rowData.createCell(4);
+            rowCellData5.setCellValue(data.getSssl() == null ? "" : data.getSssl().toString());
+            rowCellData5.setCellStyle(contentStyle);
+            HSSFCell rowCellData6 = rowData.createCell(5);
+            rowCellData6.setCellValue(data.getSsl() == null ? "" : data.getSsl().toString());
+            rowCellData6.setCellStyle(contentStyle);
+            HSSFCell rowCellData7 = rowData.createCell(6);
+            rowCellData7.setCellValue(data.getShsl() == null ? "" : data.getShsl().toString());
+            rowCellData7.setCellStyle(contentStyle);
+            HSSFCell rowCellData8 = rowData.createCell(7);
+            rowCellData8.setCellValue(data.getShl() == null ? "" : data.getShl().toString());
+            rowCellData8.setCellStyle(contentStyle);
+            HSSFCell rowCellData9 = rowData.createCell(8);
+            rowCellData9.setCellValue(data.getYysl() == null ? "" : data.getYysl().toString());
+            rowCellData9.setCellStyle(contentStyle);
+            HSSFCell rowCellData10 = rowData.createCell(9);
+            rowCellData10.setCellValue(data.getChsl() == null ? "" : data.getChsl().toString());
+            rowCellData10.setCellStyle(contentStyle);
+            HSSFCell rowCellData11 = rowData.createCell(10);
+            rowCellData11.setCellValue(data.getSzjlhj() == null ? "" : data.getSzjlhj().toString());
+            rowCellData11.setCellStyle(contentStyle);
+            HSSFCell rowCellData12 = rowData.createCell(11);
+            rowCellData12.setCellValue(data.getBgzrshdesl() == null ? "" : data.getChsl().toString());
+            rowCellData12.setCellStyle(contentStyle);
+            ++xh;
+        }
+    }
+
+    @SuppressWarnings("all")
+    @Override
+    public List<PayoffsInfo> getPayoffsInfo(PayoffsRequestParam param) {
+        // 先查询合计
+        List<PayoffsInfo> initList = dataStatisticsMapper.getPayoffsInfo(param);
+        log.info("initList: {}", initList);
+        List<PayoffsInfo> resultList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(initList)) {
+            // 天津市合计
+            PayoffsInfo tjs = new PayoffsInfo();
+            tjs.setAreaName("天津市");
+            BigDecimal rksl = initList.stream().map(PayoffsInfo::getRksl).reduce(BigDecimal.ZERO, BigDecimal::add);
+            tjs.setRksl(rksl);
+            BigDecimal cksl = initList.stream().map(PayoffsInfo::getChsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+            tjs.setCksl(cksl);
+            BigDecimal sjshsl = initList.stream().map(PayoffsInfo::getSjshsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+            tjs.setSjshsl(sjshsl);
+            float shlF = sjshsl.floatValue() / rksl.floatValue() * 100;
+            BigDecimal shlB = new BigDecimal(shlF);
+            BigDecimal shl = shlB.setScale(2, BigDecimal.ROUND_HALF_UP);
+            tjs.setShl(shl);
+            BigDecimal yysl = initList.stream().map(PayoffsInfo::getYysl).reduce(BigDecimal.ZERO, BigDecimal::add);
+            tjs.setYysl(yysl);
+            BigDecimal chsl = initList.stream().map(PayoffsInfo::getChsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+            tjs.setChsl(chsl);
+            resultList.add(tjs);
+
+            // 区合计
+            Map<String, List<PayoffsInfo>> areaGroup = initList.stream().collect(Collectors.groupingBy(p -> p.getAreaName()));// 分组
+            areaGroup.forEach((areaName, payoffsInfoList) -> {
+                PayoffsInfo areaData = new PayoffsInfo();
+                areaData.setAreaName(String.format("%s%s", areaName, "合计"));
+                BigDecimal rksl_area = payoffsInfoList.stream().map(PayoffsInfo::getRksl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                areaData.setRksl(rksl_area);
+                BigDecimal cksl_area = payoffsInfoList.stream().map(PayoffsInfo::getChsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                areaData.setCksl(cksl_area);
+                BigDecimal sjshsl_area = payoffsInfoList.stream().map(PayoffsInfo::getSjshsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                areaData.setSjshsl(sjshsl_area);
+                float shlF_area = sjshsl_area.floatValue() / rksl_area.floatValue() * 100;
+                BigDecimal shlB_area = new BigDecimal(shlF_area);
+                BigDecimal shl_area = shlB_area.setScale(2, BigDecimal.ROUND_HALF_UP);
+                areaData.setShl(shl_area);
+                BigDecimal yysl_area = payoffsInfoList.stream().map(PayoffsInfo::getYysl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                areaData.setYysl(yysl_area);
+                BigDecimal chsl_area = payoffsInfoList.stream().map(PayoffsInfo::getChsl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                areaData.setChsl(chsl_area);
+                resultList.add(areaData);
+                // 添加单位数据
+                payoffsInfoList.forEach(p -> resultList.add(p));
+            });
+        }
+        return resultList;
+    }
 }