1、导入模块调整

2、导出模块调整

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -25,4 +26,10 @@ public class DataExpertDto {
     @ApiModelProperty("数据源(data_expert_source)")
     private Long dataExpertSourceId;
 
+    @ApiModelProperty("数据行id")
+    private List<Long> ids;
+
+    @ApiModelProperty("条件")
+    private Map<String, String> conditions;
+
 }

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

@@ -44,6 +44,7 @@ import com.xjrsoft.module.system.entity.Area;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.DictionaryItem;
 import com.xjrsoft.module.system.mapper.DictionarydetailMapper;
+import com.xjrsoft.module.system.mapper.DictionaryitemMapper;
 import com.xjrsoft.module.system.service.IAreaService;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -81,7 +82,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     private final IAreaService areaService;
     private final BaseGradeMapper baseGradeMapper;
     private final BaseMajorSetMapper baseMajorSetMapper;
-
+    private final DictionaryitemMapper dictionaryitemMapper;
     private final IBaseStudentSchoolRollService schoolRollService;
     private final IBaseStudentSubsidizeService subsidizeService;
     private final IBaseStudentFamilyService familyService;
@@ -593,7 +594,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 baseStudent.setFormerName(dataMaps.get(10).toString());//曾用名
             }
             if(dataMaps.get(11) != null && !"".equals(dataMaps.get(11).toString())){
-                user.setCredentialType(dictionary.get(dataMaps.get(11).toString()));//证件类型
+                user.setCredentialType(dictionary.get("credential_type" + dataMaps.get(11).toString()));//证件类型
             }
             if(dataMaps.get(12) != null && !"".equals(dataMaps.get(12).toString())){
                 LocalDateTime birthday = parseLocalDateTime(dataMaps.get(12).toString());
@@ -601,31 +602,31 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 baseStudent.setDayOfBirth(birthday);//出生日期
             }
             if(dataMaps.get(13) != null && !"".equals(dataMaps.get(13).toString())){
-                baseStudent.setBirthType(dictionary.get(dataMaps.get(13).toString()));//生日类型
+                baseStudent.setBirthType(dictionary.get("birth_type" + dataMaps.get(13).toString()));//生日类型
             }
             if(dataMaps.get(14) != null && !"".equals(dataMaps.get(14).toString())){
-                baseStudent.setNation(dictionary.get(dataMaps.get(14).toString()));//民族
+                baseStudent.setNation(dictionary.get("nation" + dataMaps.get(14).toString()));//民族
             }
             if(dataMaps.get(15) != null && !"".equals(dataMaps.get(15).toString())){
-                baseStudent.setBloodType(dictionary.get(dataMaps.get(15).toString()));//血型
+                baseStudent.setBloodType(dictionary.get("blood_type" + dataMaps.get(15).toString()));//血型
             }
             if(dataMaps.get(16) != null && !"".equals(dataMaps.get(16).toString())){
-                baseStudent.setHealth(dictionary.get(dataMaps.get(16).toString()));//健康状况
+                baseStudent.setHealth(dictionary.get("health" + dataMaps.get(16).toString()));//健康状况
             }
             if(dataMaps.get(17) != null && !"".equals(dataMaps.get(17).toString())){
-                baseStudent.setMaritalState(dictionary.get(dataMaps.get(17).toString()));//婚姻状况
+                baseStudent.setMaritalState(dictionary.get("marital_state" + dataMaps.get(17).toString()));//婚姻状况
             }
             if(dataMaps.get(18) != null && !"".equals(dataMaps.get(18).toString())){
-                baseStudent.setPoliticalState(dictionary.get(dataMaps.get(18).toString()));//政治面貌
+                baseStudent.setPoliticalState(dictionary.get("political_state" + dataMaps.get(18).toString()));//政治面貌
             }
             if(dataMaps.get(19) != null && !"".equals(dataMaps.get(19).toString())){
-                baseStudent.setPoliticalState(dictionary.get(dataMaps.get(19).toString()));//国籍地区
+                baseStudent.setNationality(dictionary.get("nationality" + dataMaps.get(19).toString()));//国籍地区
             }
             if(dataMaps.get(20) != null && !"".equals(dataMaps.get(20).toString())){
-                baseStudent.setChineseType(dictionary.get(dataMaps.get(20).toString()));//港澳台侨外
+                baseStudent.setChineseType(dictionary.get("chinese_type" + dataMaps.get(20).toString()));//港澳台侨外
             }
             if(dataMaps.get(21) != null && !"".equals(dataMaps.get(21).toString())){
-                baseStudent.setHouseHoldType(dictionary.get(dataMaps.get(21).toString()));//户口类别
+                baseStudent.setHouseHoldType(dictionary.get("house_hold_type" + dataMaps.get(21).toString()));//户口类别
             }
             if(dataMaps.get(22) != null && !"".equals(dataMaps.get(22).toString())){
                 baseStudent.setNativePlaceType(dataMaps.get(22).toString());//籍贯类型
@@ -664,7 +665,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 baseStudent.setHouseHoldAddress(dataMaps.get(33).toString());//户籍地址
             }
             if(dataMaps.get(34) != null && !"".equals(dataMaps.get(34).toString())){
-                baseStudent.setResidenceType(dictionary.get(dataMaps.get(34).toString()));//学生居住地类型
+                baseStudent.setResidenceType(dictionary.get("residence_type" + dataMaps.get(34).toString()));//学生居住地类型
             }
             if(dataMaps.get(35) != null && !"".equals(dataMaps.get(35).toString())){
                 baseStudent.setTrainInterval(dataMaps.get(35).toString());//乘火车区间
@@ -708,13 +709,13 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 schoolRoll.setEnrollmentDate(sdf.parse(dataMaps.get(47).toString()));//入学年月
             }
             if(dataMaps.get(48) != null && !"".equals(dataMaps.get(48).toString())){
-                schoolRoll.setEnrollmentType(dictionary.get(dataMaps.get(48).toString()));//入学方式
+                schoolRoll.setEnrollmentType(dictionary.get("enrollment_type" + dataMaps.get(48).toString()));//入学方式
             }
             if(dataMaps.get(49) != null && !"".equals(dataMaps.get(49).toString())){
                 schoolRoll.setGradeId(gradeMap.get(dataMaps.get(49).toString()));//入学年级
             }
             if(dataMaps.get(50) != null && !"".equals(dataMaps.get(50).toString())){
-                schoolRoll.setEnrollType(dictionary.get(dataMaps.get(50).toString()));//入学招生类型
+                schoolRoll.setEnrollType(dictionary.get("enroll_type" + dataMaps.get(50).toString()));//入学招生类型
             }
             if(dataMaps.get(51) != null && !"".equals(dataMaps.get(51).toString())){
                 schoolRoll.setMajorSetId(majorSetMap.get(dataMaps.get(51).toString()));//在读专业方向
@@ -726,34 +727,34 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
                 schoolRoll.setClassId(classMap.get(dataMaps.get(53).toString()));//班级
             }
             if(dataMaps.get(54) != null && !"".equals(dataMaps.get(54).toString())){
-                schoolRoll.setStudentSource(dictionary.get(dataMaps.get(54).toString()));//学生来源
+                schoolRoll.setStudentSource(dictionary.get("student_type" + dataMaps.get(54).toString()));//学生来源
             }
             if(dataMaps.get(55) != null && !"".equals(dataMaps.get(55).toString())){
-                schoolRoll.setStudentType(dictionary.get(dataMaps.get(55).toString()));//学生类别
+                schoolRoll.setStudentType(dictionary.get("student_type" + dataMaps.get(55).toString()));//学生类别
             }
             if(dataMaps.get(56) != null && !"".equals(dataMaps.get(56).toString())){
-                schoolRoll.setArchivesStatus(dictionary.get(dataMaps.get(56).toString()));//学籍状态
+                schoolRoll.setArchivesStatus(dictionary.get("archives_status" + dataMaps.get(56).toString()));//学籍状态
             }
             if(dataMaps.get(57) != null && !"".equals(dataMaps.get(57).toString())){
-                schoolRoll.setLearnStatus(dictionary.get(dataMaps.get(57).toString()));//学习形式
+                schoolRoll.setLearnStatus(dictionary.get("learn_status" + dataMaps.get(57).toString()));//学习形式
             }
             if(dataMaps.get(58) != null && !"".equals(dataMaps.get(58).toString())){
-                schoolRoll.setStduyStatus(dictionary.get(dataMaps.get(58).toString()));//就读方式
+                schoolRoll.setStduyStatus(dictionary.get("stduy_status" + dataMaps.get(58).toString()));//就读方式
             }
             if(dataMaps.get(59) != null && !"".equals(dataMaps.get(59).toString())){
-                schoolRoll.setChooseStatus(dictionary.get(dataMaps.get(59).toString()));//分流状态
+                schoolRoll.setChooseStatus(dictionary.get("choose_status" + dataMaps.get(59).toString()));//分流状态
             }
             if(dataMaps.get(60) != null && !"".equals(dataMaps.get(60).toString())){
-                schoolRoll.setFosterType(dictionary.get(dataMaps.get(60).toString()));//分段培养方式
+                schoolRoll.setFosterType(dictionary.get("foster_type" + dataMaps.get(60).toString()));//分段培养方式
             }
             if(dataMaps.get(61) != null && !"".equals(dataMaps.get(61).toString())){
-                schoolRoll.setRecruitType(dictionary.get(dataMaps.get(61).toString()));//招生类型
+                schoolRoll.setRecruitType(dictionary.get("recruit_type" + dataMaps.get(61).toString()));//招生类型
             }
             if(dataMaps.get(62) != null && !"".equals(dataMaps.get(62).toString())){
-                schoolRoll.setRecruitTarget(dictionary.get(dataMaps.get(62).toString()));//招生对象
+                schoolRoll.setRecruitTarget(dictionary.get("recruit_target" + dataMaps.get(62).toString()));//招生对象
             }
             if(dataMaps.get(63) != null && !"".equals(dataMaps.get(63).toString())){
-                schoolRoll.setHighestEducation(dictionary.get(dataMaps.get(63).toString()));//入学前最高学历
+                schoolRoll.setHighestEducation(dictionary.get("highest_education" + dataMaps.get(63).toString()));//入学前最高学历
             }
             if(dataMaps.get(64) != null && !"".equals(dataMaps.get(64).toString())){
                 schoolRoll.setGraduatedUniversity(dataMaps.get(64).toString());//入学前毕业院校
@@ -896,13 +897,25 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
         codeList.add("choose_status");codeList.add("foster_type");
         codeList.add("recruit_type");codeList.add("recruit_target");
         codeList.add("education");codeList.add("recruit_target");
+        codeList.add("highest_education");
         List<DictionaryDetail> detailList = dictionarydetailMapper.selectJoinList(DictionaryDetail.class,
             new MPJLambdaWrapper<DictionaryDetail>()
             .leftJoin(DictionaryItem.class, DictionaryItem::getId, DictionaryDetail::getItemId)
+            .in(DictionaryItem::getCode, codeList)
+        );
+
+        List<DictionaryItem> dictionaryItemList = dictionaryitemMapper.selectList(
+                new QueryWrapper<DictionaryItem>().lambda()
+                        .eq(DictionaryItem::getDeleteMark, DeleteMark.NODELETE.getCode())
         );
+        Map<Long, String> itemMap = new HashMap<>();
+        for (DictionaryItem dictionaryItem : dictionaryItemList) {
+            itemMap.put(dictionaryItem.getId(), dictionaryItem.getCode());
+        }
+
         Map<String, String> resultMap = new HashMap<>();
         for (DictionaryDetail dictionaryDetail : detailList) {
-            resultMap.put(dictionaryDetail.getName(), dictionaryDetail.getCode());
+            resultMap.put(itemMap.get(dictionaryDetail.getItemId()) + dictionaryDetail.getName(), dictionaryDetail.getCode());
         }
         return resultMap;
     }