1、导入调整，增加籍贯类型字段

2、增加根据数据源id查询数据模板的id

src/main/java/com/xjrsoft/module/dataexpert/controller/DataExpertTemplateController.java

@@ -8,6 +8,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.google.gson.JsonArray;
@@ -20,6 +21,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.dataexpert.dto.AddDataExpertTemplateDto;
 import com.xjrsoft.module.dataexpert.dto.DataExpertDto;
+import com.xjrsoft.module.dataexpert.dto.DataExpertTemplateListDto;
 import com.xjrsoft.module.dataexpert.dto.DataExpertTemplatePageDto;
 import com.xjrsoft.module.dataexpert.dto.UpdateDataExpertTemplateDto;
 import com.xjrsoft.module.dataexpert.entity.DataExpertSource;
@@ -95,6 +97,17 @@ public class DataExpertTemplateController {
         return RT.ok(BeanUtil.toBean(dataExpertTemplate, DataExpertTemplateVo.class));
     }
 
+    @GetMapping(value = "/list")
+    @ApiOperation(value="根据数据源id查询数据导出-数据模板信息")
+    @SaCheckPermission("dataexperttemplate:detail")
+    public RT<List<DataExpertTemplateVo>> list(@Valid DataExpertTemplateListDto dto){
+        List<DataExpertTemplate> list = dataExpertTemplateService.list(
+            new QueryWrapper<DataExpertTemplate>().lambda()
+            .eq(DataExpertTemplate::getDataExpertSourceId, dto.getDataExpertSourceId())
+        );
+        return RT.ok(BeanUtil.copyToList(list, DataExpertTemplateVo.class));
+    }
+
 
     @PostMapping
     @ApiOperation(value = "新增数据导出-数据模板")
@@ -109,7 +122,6 @@ public class DataExpertTemplateController {
     @ApiOperation(value = "修改数据导出-数据模板")
     @SaCheckPermission("dataexperttemplate:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateDataExpertTemplateDto dto){
-
         DataExpertTemplate dataExpertTemplate = BeanUtil.toBean(dto, DataExpertTemplate.class);
         return RT.ok(dataExpertTemplateService.updateById(dataExpertTemplate));
 

src/main/java/com/xjrsoft/module/dataexpert/dto/DataExpertTemplateListDto.java

@@ -0,0 +1,20 @@
+package com.xjrsoft.module.dataexpert.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 数据导出-数据模板分页查询入参
+* @Author dzx
+* @Date: 2024-04-19
+* @Version 1.0
+*/
+@Data
+public class DataExpertTemplateListDto {
+
+    @ApiModelProperty("数据源id")
+    private Long dataExpertSourceId;
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudent.java

@@ -259,5 +259,6 @@ public class BaseStudent implements Serializable {
     @ApiModelProperty("特长")
     private String specialty;
 
-
+    @ApiModelProperty("籍贯类型")
+    private String nativePlaceType;
 }

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -624,9 +624,9 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
             if(dataMaps.get(21) != null && !"".equals(dataMaps.get(21).toString())){
                 baseStudent.setHouseHoldType(dictionary.get(dataMaps.get(21).toString()));//户口类别
             }
-//            if(dataMaps.get(22) != null && !"".equals(dataMaps.get(22).toString())){
-//                baseStudent.setHouseHoldType(dictionary.get(dataMaps.get(22).toString()));//籍贯类型
-//            }
+            if(dataMaps.get(22) != null && !"".equals(dataMaps.get(22).toString())){
+                baseStudent.setNativePlaceType(dataMaps.get(22).toString());//籍贯类型
+            }
             if(dataMaps.get(23) != null && !"".equals(dataMaps.get(23).toString())){
                 baseStudent.setProvinces(areaMap.get(dataMaps.get(23).toString()));//省
             }