修改导出和下载接口bug

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/TbStXftpNew.java

@@ -97,5 +97,9 @@ public class TbStXftpNew implements Serializable {
     @TableField("xabq")
     private String xabq;
 
+    @ApiModelProperty(value = "备注")
+    @TableField("bz")
+    private String bz;
+
 
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkTrail.java

@@ -96,6 +96,10 @@ public class SkTrail extends Model<SkTrail> implements Comparable<SkTrail>{
      * 证件号码
      */
     private String zjhm;
+    /**
+     * 描述
+     */
+    private String ms;
 
     /**
      * 获取主键值

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnRygxExport.java

@@ -30,7 +30,7 @@ public class HnRygxExport {
     @ApiModelProperty(value = "综合评分")
     private String zhpf;
 
-    @ApiModelProperty(value = "同住址")
+   /* @ApiModelProperty(value = "同住址")
     private String tzz;
 
     @ApiModelProperty(value = "同户号")
@@ -67,7 +67,7 @@ public class HnRygxExport {
     private String zttary;
 
     @ApiModelProperty(value = "在逃同撤销")
-    private String zttcx;
+    private String zttcx;*/
 
     @ApiModelProperty(value = "关系集合")
     private String value;

common/common_utils/src/main/java/com/founder/commonutils/util/ExcelUtil.java

@@ -150,11 +150,13 @@ public class ExcelUtil {
         cell_heads.add("标识");
         cell_heads.add("姓名");
         cell_heads.add("性别");
-        cell_heads.add("年龄");
+        cell_heads.add("民族");
+//        cell_heads.add("年龄");
         cell_heads.add("身份证号");
+        cell_heads.add("背景");
         cell_heads.add("综合评分");
         cell_heads.add("关系");
-        cell_heads.add("民族");
+/*
         cell_heads.add("出生日期");
         cell_heads.add("服务处所");
         cell_heads.add("出生地国家");
@@ -162,7 +164,7 @@ public class ExcelUtil {
         cell_heads.add("籍贯");
         cell_heads.add("职业");
         cell_heads.add("户籍登记地址");
-        cell_heads.add("姓名注音");
+        cell_heads.add("姓名注音");*/
         Sheet sheet = workbook.createSheet();
         // 设置列头宽度
         for (int i=0; i<cell_heads.size(); i++) {
@@ -212,6 +214,9 @@ public class ExcelUtil {
         //综合评分
         cell = row.createCell(cellNum++);
         cell.setCellValue(StringUtils.isBlank(data.getZhpf()) ? "" : data.getZhpf());
+        //Value
+        cell = row.createCell(cellNum++);
+        cell.setCellValue(StringUtils.isBlank(data.getValue()) ? "" : data.getValue());
 
         /*//服务处所
         cell = row.createCell(cellNum++);

service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java

@@ -717,6 +717,10 @@ public class HnTbStRygxController {
                        @RequestParam("username") String username,
                        @RequestParam("taskId") String taskId,
                        @RequestParam(name = "rygx", required = false) String rygx) throws IOException {
+        if (teamNum<2){
+            teamNum=2;
+        }
+        System.out.println(teamNum);
         //redis中取出数据
         List<Map<String, Object>> rythInfoList = (List<Map<String, Object>>) redisTemplate.opsForValue().get(username + ":" + taskId + ":" + TEAM_KEY + teamNum);
         //根据条件进行过滤