Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

 Conflicts:

	src/main/resources/generatorConfig.xml

parth5/parth5/src/app/views/tapp/tabs/tabs.page.html

@@ -4,13 +4,13 @@
       <img src="assets/icon/tab_main.svg"/>
       <ion-label >首页</ion-label>
     </ion-tab-button>
-    <ion-tab-button class="tab-zuzhi" tab="tabWork">
+    <!--<ion-tab-button class="tab-zuzhi" tab="tabWork">
       <img src="assets/icon/tab_work.svg"/>
       <ion-label>工作提醒</ion-label>
-    </ion-tab-button>
+    </ion-tab-button>-->
     <ion-tab-button class="tab-xuexi" tab="tabStudy">
       <img src="assets/icon/tab_xuexi.svg"/>
-      <ion-label>制度查询</ion-label>
+      <ion-label>制度学习</ion-label>
     </ion-tab-button>
     <ion-tab-button class="tab-me" tab="tabUser">
       <img src="assets/icon/tab_me.svg" />

src/main/java/com/ghsc/partybuild/controller/LeaderworkController.java

@@ -1,11 +1,11 @@
 package com.ghsc.partybuild.controller;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.ghsc.partybuild.model.CfDictionary;
+import com.ghsc.partybuild.service.DictionaryService;
 import com.github.pagehelper.PageInfo;
 import com.ghsc.partybuild.controller.jsonmodel.RequsetData;
-import com.ghsc.partybuild.model.AstAssetinfoWithBLOBs;
 import com.ghsc.partybuild.model.LwLeaderassessment;
-import com.ghsc.partybuild.model.LwLeaderteam;
 import com.ghsc.partybuild.service.LeaderworkService;
 import com.ghsc.partybuild.service.UserService;
 import com.ghsc.partybuild.util.DateUtils;
@@ -30,6 +30,8 @@ public class LeaderworkController {
     @Autowired
     private UserService userService;
     @Autowired
+    private DictionaryService dictionaryService;
+    @Autowired
     private StringUtils stringUtils;
     @Autowired
     private DateUtils dateUtils;
@@ -37,12 +39,15 @@ public class LeaderworkController {
 
     @ResponseBody
     @GetMapping("/getLeaderTeamList")
-    public RequsetData<PageInfo<LeaderTeamVo>> getLeaderTeamList(int pageindex, int pagesize, int leaderTeamType, @RequestParam(required = false) String departmentName, @RequestParam(required = false) String userName,
-                                                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinStartDate, @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinEndDate,
-                                                                 @RequestParam(required = false) String position, @RequestParam(required = false) Integer sex,
-                                                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthStartDate, @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthEndDate) {
+    public RequsetData<PageInfo<LeaderTeamVo>> getLeaderTeamList(int pageindex, int pagesize, int leaderTeamType, @RequestParam(required = false) String departmentName,
+                                                                 @RequestParam(required = false) String name, @RequestParam(required = false) String position,
+                                                                 @RequestParam(required = false) String sex, @RequestParam(required = false) String party,
+                                                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinStartDate,
+                                                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinEndDate,
+                                                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthStartDate,
+                                                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthEndDate) {
         RequsetData<PageInfo<LeaderTeamVo>> result = new RequsetData<>();
-        result.setItem(leaderworkService.getLeaderTeamList(pageindex, pagesize, leaderTeamType, departmentName, userName, joinStartDate, joinEndDate, position, sex, birthStartDate, birthEndDate));
+        result.setItem(leaderworkService.getLeaderTeamList(pageindex, pagesize, leaderTeamType, null, departmentName, name, position, sex, party, joinStartDate, joinEndDate, birthStartDate, birthEndDate));
         return result;
     }
 
@@ -52,10 +57,11 @@ public class LeaderworkController {
         RequsetData<LeaderTeamVo> res = new RequsetData<>();
 
         LeaderTeamVo model = leaderworkService.getLeaderTeamById(id);
-        if (model == null || (model != null && stringUtils.IsNullOrEmpty(model.getLeaderTeamId()))) {
+        if (model == null || (model != null && stringUtils.IsNullOrEmpty(model.getLeaderteamid()))) {
             UUID uuid = UUID.randomUUID();
             model = new LeaderTeamVo();
-            model.setLeaderTeamId(uuid.toString());
+            model.setLeaderteamid(uuid.toString());
+            model.setExperienceList(new ArrayList<>());
         }
 
         res.setItem(model);
@@ -64,7 +70,7 @@ public class LeaderworkController {
 
     @ResponseBody
     @PostMapping("/saveLeaderTeam")
-    public RequsetData<String> saveLeaderTeam(@RequestBody LwLeaderteam data) {
+    public RequsetData<String> saveLeaderTeam(@RequestBody LeaderTeamVo data) {
         RequsetData<String> result = new RequsetData<String>();
         int count = 0;
         String message = "";
@@ -114,93 +120,67 @@ public class LeaderworkController {
     }
 
     @RequestMapping(value = "/exportLeaderTeam", method = RequestMethod.GET)
-    public void exportLeaderTeam(HttpServletResponse response, int leaderTeamType,
-                                 @RequestParam(required = false) String departmentName, @RequestParam(required = false) String userName, @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinStartDate, @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinEndDate,
-                                 @RequestParam(required = false) String position, @RequestParam(required = false) Integer sex, @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthStartDate, @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthEndDate) throws Exception {
+    public void exportLeaderTeam(HttpServletResponse response, int leaderTeamType, @RequestParam(required = false) String departmentName,
+                                 @RequestParam(required = false) String name, @RequestParam(required = false) String position,
+                                 @RequestParam(required = false) String sex, @RequestParam(required = false) String party,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinStartDate,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date joinEndDate,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthStartDate,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date birthEndDate) throws Exception {
         /**查询数据**/
-        List<LeaderTeamVo> dataList = leaderworkService.getLeaderTeamList(1, 10000, leaderTeamType, departmentName, userName, joinStartDate, joinEndDate, position, sex, birthStartDate, birthEndDate).getList();
+        List<LeaderTeamVo> dataList = leaderworkService.getLeaderTeamList(1, 10000, leaderTeamType, null, departmentName, name, position, sex, party, joinStartDate, joinEndDate, birthStartDate, birthEndDate).getList();
 
         ExcelHelper excelHelper = new ExcelHelper();
         ExcelHelper.ExcelData data = excelHelper.new ExcelData();
 
-        String title = "";
-        switch (leaderTeamType) {
-            case 1:
-                title = "副处以上中层干部信息";
-                break;
-            case 2:
-                title = "科级干部信息";
-                break;
-        }
+        List<CfDictionary> leaderTeamTypeList =  dictionaryService.getDictionaryListByDicTypeKey("leaderTeamType");
+        String title = dictionaryService.getDicByKey(leaderTeamType, leaderTeamTypeList).getDicvalue();
 
         //列名
         data.setName(title);
         List<String> titles = new ArrayList();
-        titles.add("机构");
-        titles.add("职位");
-        titles.add("工号");
         titles.add("姓名");
-        titles.add("职务");
-        titles.add("职务级别");
-        titles.add("现职时间");
-        titles.add("同职时间");
+        titles.add("机构");
+        titles.add("部门职务");
         titles.add("性别");
-        titles.add("出生年月");
+        titles.add("民族");
         titles.add("籍贯");
-        titles.add("出生地");
-        titles.add("政治面貌");
-        titles.add("专业技术职务");
-        titles.add("入党时间");
+        titles.add("出生年月");
         titles.add("参加工作时间");
-        titles.add("全日制教育学历");
-        titles.add("全日制教育学位");
-        titles.add("全日制教育毕业院校及专业");
-        titles.add("在职教育学历");
-        titles.add("在职教育学位");
-        titles.add("在职教育毕业院校及专业");
-
-        if (leaderTeamType == 2) {
-            titles.add("本科专业");
-            titles.add("硕士专业");
-        }
-
-        titles.add("任职经历");
-
+        titles.add("学历");
+        titles.add("党派");
+        titles.add("加入时间");
+        titles.add("学位");
+        titles.add("专业");
+        titles.add("专业技术职务");
+        titles.add("专业技术职务聘任时间");
+        titles.add("任行政现职时间");
+        titles.add("任行政同职级时间");
+        titles.add("相关管理工作经历");
         data.setTitles(titles);
 
         //数据
         List<List<Object>> rows = new ArrayList();
         for (LeaderTeamVo item : dataList) {
             List<Object> row = new ArrayList();
-            row.add(item.getDepartmentName());
-            row.add(item.getJobTitle());
-            row.add(item.getNo());
             row.add(item.getName());
+            row.add(item.getDepartmentname());
             row.add(item.getPosition());
-            row.add(item.getPositionLevelName());
-            row.add(dateUtils.dateToStrFormat(item.getNowPositionDate(), "yyyyMM"));
-            row.add(dateUtils.dateToStrFormat(item.getSamePositionDate(), "yyyyMM"));
-            row.add(item.getSexName());
-            row.add(dateUtils.dateToStrFormat(item.getBirthDate(), "yyyyMM"));
-            row.add(item.getNativePlace());
-            row.add(item.getBirthplace());
-            row.add(item.getPoliticsStatusName());
-            row.add(item.getProfessionalName());
-            row.add(dateUtils.dateToStrFormat(item.getJoinDate(), leaderTeamType == 1 ? "yyyyMM" : "yyyyMMdd"));
-            row.add(dateUtils.dateToStrFormat(item.getWorkDate(), "yyyyMM"));
-            row.add(item.getEducationName());
-            row.add(item.getQualificationName());
-            row.add(item.getGraduationSchoolMajor());
-            row.add(item.getInJobEducationName());
-            row.add(item.getInJobQualificationName());
-            row.add(item.getInJobGraduationSchoolMajor());
-
-            if (leaderTeamType == 2) {
-                row.add(item.getUndergraduateProfessional());
-                row.add(item.getMasterProfessional());
-            }
-
-            row.add(item.getWorkExperience());
+            row.add(item.getSexname());
+            row.add(item.getBirthplacename());
+            row.add(item.getNativeplace());
+            row.add(dateUtils.dateToStrFormat(item.getBirthdate(), "yyyyMM"));
+            row.add(dateUtils.dateToStrFormat(item.getWorkdate(), "yyyyMM"));
+            row.add(item.getEducationname());
+            row.add(item.getParty());
+            row.add(dateUtils.dateToStrFormat(item.getJoindate(), "yyyyMM"));
+            row.add(item.getQualificationname());
+            row.add(item.getGraduationschoolmajor());
+            row.add(item.getProfessionalname());
+            row.add(dateUtils.dateToStrFormat(item.getEngagedate(), "yyyyMM"));
+            row.add(dateUtils.dateToStrFormat(item.getNowpositiondate(), "yyyyMM"));
+            row.add(dateUtils.dateToStrFormat(item.getSamepositiondate(), "yyyyMM"));
+            row.add(item.getWorkexperience());
 
             rows.add(row);
         }
@@ -211,12 +191,12 @@ public class LeaderworkController {
 
     @ResponseBody
     @RequestMapping("/importLeaderTeam")
-    public RequsetData<List<LeaderTeamImportVo>> importLeaderTeam(@RequestBody Map<String, Object> reqMap) {
-        RequsetData<List<LeaderTeamImportVo>> res = new RequsetData<>();
-        List<LeaderTeamImportVo> errorInfo = new ArrayList<>();
+    public RequsetData<List<LeaderTeamVo>> importLeaderTeam(@RequestBody Map<String, Object> reqMap) {
+        RequsetData<List<LeaderTeamVo>> res = new RequsetData<>();
+        List<LeaderTeamVo> errorInfo = new ArrayList<>();
         String message = "";
         try {
-            List<LeaderTeamImportVo> dataList = JsonMapper.jsonToObject(reqMap.get("dataList").toString(), new TypeReference<List<LeaderTeamImportVo>>() {});
+            List<LeaderTeamVo> dataList = JsonMapper.jsonToObject(reqMap.get("dataList").toString(), new TypeReference<List<LeaderTeamVo>>() {});
 
             int leaderTeamType = Integer.parseInt(reqMap.get("leaderTeamType").toString());
 

src/main/java/com/ghsc/partybuild/mapper/LeaderworkCQuery.java

@@ -8,8 +8,11 @@ import java.util.Date;
 import java.util.List;
 
 public interface LeaderworkCQuery {
-    List<LeaderTeamVo> selectLeaderTeamList(@Param("leaderTeamType") Integer leaderTeamType,@Param("id") String id, @Param("departmentName") String departmentName, @Param("userName") String userName, @Param("joinStartDate") Date joinStartDate, @Param("joinEndDate") Date joinEndDate,
-                                            @Param("position") String position, @Param("sex") Integer sex, @Param("birthStartDate") Date birthStartDate, @Param("birthEndDate") Date birthEndDate);
+    List<LeaderTeamVo> selectLeaderTeamList(@Param("leaderTeamType") Integer leaderTeamType, @Param("id") String id,
+                                            @Param("departmentName") String departmentName, @Param("name") String userName,
+                                            @Param("position") String position, @Param("sex") String sex, @Param("party") String party,
+                                            @Param("joinStartDate") Date joinStartDate, @Param("joinEndDate") Date joinEndDate,
+                                            @Param("birthStartDate") Date birthStartDate, @Param("birthEndDate") Date birthEndDate);
 
 
     List<LeaderAssessmentVo> selectLeaderAssessmentList(@Param("id") String id, @Param("departmentName") String departmentName, @Param("userName") String userName, @Param("position") String position, @Param("assessmentResult") String assessmentResult,

src/main/java/com/ghsc/partybuild/mapper/LwLeaderteamExperienceMapper.java

@@ -0,0 +1,30 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.model.LwLeaderteamExperience;
+import com.ghsc.partybuild.model.LwLeaderteamExperienceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface LwLeaderteamExperienceMapper {
+    long countByExample(LwLeaderteamExperienceExample example);
+
+    int deleteByExample(LwLeaderteamExperienceExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(LwLeaderteamExperience record);
+
+    int insertSelective(LwLeaderteamExperience record);
+
+    List<LwLeaderteamExperience> selectByExample(LwLeaderteamExperienceExample example);
+
+    LwLeaderteamExperience selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") LwLeaderteamExperience record, @Param("example") LwLeaderteamExperienceExample example);
+
+    int updateByExample(@Param("record") LwLeaderteamExperience record, @Param("example") LwLeaderteamExperienceExample example);
+
+    int updateByPrimaryKeySelective(LwLeaderteamExperience record);
+
+    int updateByPrimaryKey(LwLeaderteamExperience record);
+}

src/main/java/com/ghsc/partybuild/mapper/LwLeaderteamMapper.java

@@ -10,7 +10,7 @@ public interface LwLeaderteamMapper {
 
     int deleteByExample(LwLeaderteamExample example);
 
-    int deleteByPrimaryKey(String leaderTeamId);
+    int deleteByPrimaryKey(String leaderteamid);
 
     int insert(LwLeaderteam record);
 
@@ -20,7 +20,7 @@ public interface LwLeaderteamMapper {
 
     List<LwLeaderteam> selectByExample(LwLeaderteamExample example);
 
-    LwLeaderteam selectByPrimaryKey(String leaderTeamId);
+    LwLeaderteam selectByPrimaryKey(String leaderteamid);
 
     int updateByExampleSelective(@Param("record") LwLeaderteam record, @Param("example") LwLeaderteamExample example);
 

src/main/java/com/ghsc/partybuild/model/LwLeaderteam.java

@@ -3,76 +3,80 @@ package com.ghsc.partybuild.model;
 import java.util.Date;
 
 public class LwLeaderteam {
-    private String leaderTeamId;
+    private String leaderteamid;
 
     private String name;
 
     private String no;
 
-    private Integer leaderTeamType;
+    private Integer leaderteamtype;
 
     private Integer sex;
 
-    private Date birthDate;
+    private Date birthdate;
 
-    private String nativePlace;
+    private String nativeplace;
 
-    private Integer politicsStatus;
+    private Integer politicsstatus;
 
-    private String departmentName;
+    private String departmentname;
 
     private String position;
 
-    private Integer positionLevel;
+    private Integer positionlevel;
 
-    private Date nowPositionDate;
+    private Date nowpositiondate;
 
-    private Date samePositionDate;
+    private Date samepositiondate;
 
-    private Date joinDate;
+    private Date joindate;
 
-    private Date workDate;
+    private Date workdate;
 
-    private Integer educationType;
+    private Integer educationtype;
 
-    private Integer qualificationType;
+    private Integer qualificationtype;
 
-    private Integer professionalType;
+    private Integer professionaltype;
 
-    private String undergraduateProfessional;
+    private String undergraduateprofessional;
 
-    private String masterProfessional;
+    private String masterprofessional;
 
     private String remark;
 
-    private Date createTime;
+    private Date createtime;
 
-    private String createUserId;
+    private String createuserid;
 
-    private Date updateTime;
+    private Date updatetime;
 
-    private String updateUserId;
+    private String updateuserid;
 
-    private String jobTitle;
+    private String jobtitle;
 
     private String birthplace;
 
-    private String graduationSchoolMajor;
+    private String graduationschoolmajor;
 
-    private Integer inJobEducationType;
+    private Integer injobeducationtype;
 
-    private Integer inJobQualificationType;
+    private Integer injobqualificationtype;
 
-    private String inJobGraduationSchoolMajor;
+    private String injobgraduationschoolmajor;
 
-    private String workExperience;
+    private String party;
 
-    public String getLeaderTeamId() {
-        return leaderTeamId;
+    private Date engagedate;
+
+    private String workexperience;
+
+    public String getLeaderteamid() {
+        return leaderteamid;
     }
 
-    public void setLeaderTeamId(String leaderTeamId) {
-        this.leaderTeamId = leaderTeamId == null ? null : leaderTeamId.trim();
+    public void setLeaderteamid(String leaderteamid) {
+        this.leaderteamid = leaderteamid == null ? null : leaderteamid.trim();
     }
 
     public String getName() {
@@ -91,12 +95,12 @@ public class LwLeaderteam {
         this.no = no == null ? null : no.trim();
     }
 
-    public Integer getLeaderTeamType() {
-        return leaderTeamType;
+    public Integer getLeaderteamtype() {
+        return leaderteamtype;
     }
 
-    public void setLeaderTeamType(Integer leaderTeamType) {
-        this.leaderTeamType = leaderTeamType;
+    public void setLeaderteamtype(Integer leaderteamtype) {
+        this.leaderteamtype = leaderteamtype;
     }
 
     public Integer getSex() {
@@ -107,36 +111,36 @@ public class LwLeaderteam {
         this.sex = sex;
     }
 
-    public Date getBirthDate() {
-        return birthDate;
+    public Date getBirthdate() {
+        return birthdate;
     }
 
-    public void setBirthDate(Date birthDate) {
-        this.birthDate = birthDate;
+    public void setBirthdate(Date birthdate) {
+        this.birthdate = birthdate;
     }
 
-    public String getNativePlace() {
-        return nativePlace;
+    public String getNativeplace() {
+        return nativeplace;
     }
 
-    public void setNativePlace(String nativePlace) {
-        this.nativePlace = nativePlace == null ? null : nativePlace.trim();
+    public void setNativeplace(String nativeplace) {
+        this.nativeplace = nativeplace == null ? null : nativeplace.trim();
     }
 
-    public Integer getPoliticsStatus() {
-        return politicsStatus;
+    public Integer getPoliticsstatus() {
+        return politicsstatus;
     }
 
-    public void setPoliticsStatus(Integer politicsStatus) {
-        this.politicsStatus = politicsStatus;
+    public void setPoliticsstatus(Integer politicsstatus) {
+        this.politicsstatus = politicsstatus;
     }
 
-    public String getDepartmentName() {
-        return departmentName;
+    public String getDepartmentname() {
+        return departmentname;
     }
 
-    public void setDepartmentName(String departmentName) {
-        this.departmentName = departmentName == null ? null : departmentName.trim();
+    public void setDepartmentname(String departmentname) {
+        this.departmentname = departmentname == null ? null : departmentname.trim();
     }
 
     public String getPosition() {
@@ -147,84 +151,84 @@ public class LwLeaderteam {
         this.position = position == null ? null : position.trim();
     }
 
-    public Integer getPositionLevel() {
-        return positionLevel;
+    public Integer getPositionlevel() {
+        return positionlevel;
     }
 
-    public void setPositionLevel(Integer positionLevel) {
-        this.positionLevel = positionLevel;
+    public void setPositionlevel(Integer positionlevel) {
+        this.positionlevel = positionlevel;
     }
 
-    public Date getNowPositionDate() {
-        return nowPositionDate;
+    public Date getNowpositiondate() {
+        return nowpositiondate;
     }
 
-    public void setNowPositionDate(Date nowPositionDate) {
-        this.nowPositionDate = nowPositionDate;
+    public void setNowpositiondate(Date nowpositiondate) {
+        this.nowpositiondate = nowpositiondate;
     }
 
-    public Date getSamePositionDate() {
-        return samePositionDate;
+    public Date getSamepositiondate() {
+        return samepositiondate;
     }
 
-    public void setSamePositionDate(Date samePositionDate) {
-        this.samePositionDate = samePositionDate;
+    public void setSamepositiondate(Date samepositiondate) {
+        this.samepositiondate = samepositiondate;
     }
 
-    public Date getJoinDate() {
-        return joinDate;
+    public Date getJoindate() {
+        return joindate;
     }
 
-    public void setJoinDate(Date joinDate) {
-        this.joinDate = joinDate;
+    public void setJoindate(Date joindate) {
+        this.joindate = joindate;
     }
 
-    public Date getWorkDate() {
-        return workDate;
+    public Date getWorkdate() {
+        return workdate;
     }
 
-    public void setWorkDate(Date workDate) {
-        this.workDate = workDate;
+    public void setWorkdate(Date workdate) {
+        this.workdate = workdate;
     }
 
-    public Integer getEducationType() {
-        return educationType;
+    public Integer getEducationtype() {
+        return educationtype;
     }
 
-    public void setEducationType(Integer educationType) {
-        this.educationType = educationType;
+    public void setEducationtype(Integer educationtype) {
+        this.educationtype = educationtype;
     }
 
-    public Integer getQualificationType() {
-        return qualificationType;
+    public Integer getQualificationtype() {
+        return qualificationtype;
     }
 
-    public void setQualificationType(Integer qualificationType) {
-        this.qualificationType = qualificationType;
+    public void setQualificationtype(Integer qualificationtype) {
+        this.qualificationtype = qualificationtype;
     }
 
-    public Integer getProfessionalType() {
-        return professionalType;
+    public Integer getProfessionaltype() {
+        return professionaltype;
     }
 
-    public void setProfessionalType(Integer professionalType) {
-        this.professionalType = professionalType;
+    public void setProfessionaltype(Integer professionaltype) {
+        this.professionaltype = professionaltype;
     }
 
-    public String getUndergraduateProfessional() {
-        return undergraduateProfessional;
+    public String getUndergraduateprofessional() {
+        return undergraduateprofessional;
     }
 
-    public void setUndergraduateProfessional(String undergraduateProfessional) {
-        this.undergraduateProfessional = undergraduateProfessional == null ? null : undergraduateProfessional.trim();
+    public void setUndergraduateprofessional(String undergraduateprofessional) {
+        this.undergraduateprofessional = undergraduateprofessional == null ? null : undergraduateprofessional.trim();
     }
 
-    public String getMasterProfessional() {
-        return masterProfessional;
+    public String getMasterprofessional() {
+        return masterprofessional;
     }
 
-    public void setMasterProfessional(String masterProfessional) {
-        this.masterProfessional = masterProfessional == null ? null : masterProfessional.trim();
+    public void setMasterprofessional(String masterprofessional) {
+        this.masterprofessional = masterprofessional == null ? null : masterprofessional.trim();
     }
 
     public String getRemark() {
@@ -235,44 +239,44 @@ public class LwLeaderteam {
         this.remark = remark == null ? null : remark.trim();
     }
 
-    public Date getCreateTime() {
-        return createTime;
+    public Date getCreatetime() {
+        return createtime;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
     }
 
-    public String getCreateUserId() {
-        return createUserId;
+    public String getCreateuserid() {
+        return createuserid;
     }
 
-    public void setCreateUserId(String createUserId) {
-        this.createUserId = createUserId == null ? null : createUserId.trim();
+    public void setCreateuserid(String createuserid) {
+        this.createuserid = createuserid == null ? null : createuserid.trim();
     }
 
-    public Date getUpdateTime() {
-        return updateTime;
+    public Date getUpdatetime() {
+        return updatetime;
     }
 
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
     }
 
-    public String getUpdateUserId() {
-        return updateUserId;
+    public String getUpdateuserid() {
+        return updateuserid;
     }
 
-    public void setUpdateUserId(String updateUserId) {
-        this.updateUserId = updateUserId == null ? null : updateUserId.trim();
+    public void setUpdateuserid(String updateuserid) {
+        this.updateuserid = updateuserid == null ? null : updateuserid.trim();
     }
 
-    public String getJobTitle() {
-        return jobTitle;
+    public String getJobtitle() {
+        return jobtitle;
     }
 
-    public void setJobTitle(String jobTitle) {
-        this.jobTitle = jobTitle == null ? null : jobTitle.trim();
+    public void setJobtitle(String jobtitle) {
+        this.jobtitle = jobtitle == null ? null : jobtitle.trim();
     }
 
     public String getBirthplace() {
@@ -283,43 +287,59 @@ public class LwLeaderteam {
         this.birthplace = birthplace == null ? null : birthplace.trim();
     }
 
-    public String getGraduationSchoolMajor() {
-        return graduationSchoolMajor;
+    public String getGraduationschoolmajor() {
+        return graduationschoolmajor;
+    }
+
+    public void setGraduationschoolmajor(String graduationschoolmajor) {
+        this.graduationschoolmajor = graduationschoolmajor == null ? null : graduationschoolmajor.trim();
+    }
+
+    public Integer getInjobeducationtype() {
+        return injobeducationtype;
+    }
+
+    public void setInjobeducationtype(Integer injobeducationtype) {
+        this.injobeducationtype = injobeducationtype;
+    }
+
+    public Integer getInjobqualificationtype() {
+        return injobqualificationtype;
     }
 
-    public void setGraduationSchoolMajor(String graduationSchoolMajor) {
-        this.graduationSchoolMajor = graduationSchoolMajor == null ? null : graduationSchoolMajor.trim();
+    public void setInjobqualificationtype(Integer injobqualificationtype) {
+        this.injobqualificationtype = injobqualificationtype;
     }
 
-    public Integer getInJobEducationType() {
-        return inJobEducationType;
+    public String getInjobgraduationschoolmajor() {
+        return injobgraduationschoolmajor;
     }
 
-    public void setInJobEducationType(Integer inJobEducationType) {
-        this.inJobEducationType = inJobEducationType;
+    public void setInjobgraduationschoolmajor(String injobgraduationschoolmajor) {
+        this.injobgraduationschoolmajor = injobgraduationschoolmajor == null ? null : injobgraduationschoolmajor.trim();
     }
 
-    public Integer getInJobQualificationType() {
-        return inJobQualificationType;
+    public String getParty() {
+        return party;
     }
 
-    public void setInJobQualificationType(Integer inJobQualificationType) {
-        this.inJobQualificationType = inJobQualificationType;
+    public void setParty(String party) {
+        this.party = party == null ? null : party.trim();
     }
 
-    public String getInJobGraduationSchoolMajor() {
-        return inJobGraduationSchoolMajor;
+    public Date getEngagedate() {
+        return engagedate;
     }
 
-    public void setInJobGraduationSchoolMajor(String inJobGraduationSchoolMajor) {
-        this.inJobGraduationSchoolMajor = inJobGraduationSchoolMajor == null ? null : inJobGraduationSchoolMajor.trim();
+    public void setEngagedate(Date engagedate) {
+        this.engagedate = engagedate;
     }
 
-    public String getWorkExperience() {
-        return workExperience;
+    public String getWorkexperience() {
+        return workexperience;
     }
 
-    public void setWorkExperience(String workExperience) {
-        this.workExperience = workExperience == null ? null : workExperience.trim();
+    public void setWorkexperience(String workexperience) {
+        this.workexperience = workexperience == null ? null : workexperience.trim();
     }
 }

src/main/java/com/ghsc/partybuild/model/LwLeaderteamExperience.java

@@ -0,0 +1,43 @@
+package com.ghsc.partybuild.model;
+
+public class LwLeaderteamExperience {
+    private String id;
+
+    private String leaderteamid;
+
+    private Integer schoolyear;
+
+    private String coursename;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getLeaderteamid() {
+        return leaderteamid;
+    }
+
+    public void setLeaderteamid(String leaderteamid) {
+        this.leaderteamid = leaderteamid == null ? null : leaderteamid.trim();
+    }
+
+    public Integer getSchoolyear() {
+        return schoolyear;
+    }
+
+    public void setSchoolyear(Integer schoolyear) {
+        this.schoolyear = schoolyear;
+    }
+
+    public String getCoursename() {
+        return coursename;
+    }
+
+    public void setCoursename(String coursename) {
+        this.coursename = coursename == null ? null : coursename.trim();
+    }
+}

src/main/java/com/ghsc/partybuild/model/LwLeaderteamExperienceExample.java

@@ -0,0 +1,470 @@
+package com.ghsc.partybuild.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LwLeaderteamExperienceExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public LwLeaderteamExperienceExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidIsNull() {
+            addCriterion("leaderTeamId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidIsNotNull() {
+            addCriterion("leaderTeamId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidEqualTo(String value) {
+            addCriterion("leaderTeamId =", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidNotEqualTo(String value) {
+            addCriterion("leaderTeamId <>", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidGreaterThan(String value) {
+            addCriterion("leaderTeamId >", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidGreaterThanOrEqualTo(String value) {
+            addCriterion("leaderTeamId >=", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidLessThan(String value) {
+            addCriterion("leaderTeamId <", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidLessThanOrEqualTo(String value) {
+            addCriterion("leaderTeamId <=", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidLike(String value) {
+            addCriterion("leaderTeamId like", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidNotLike(String value) {
+            addCriterion("leaderTeamId not like", value, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidIn(List<String> values) {
+            addCriterion("leaderTeamId in", values, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidNotIn(List<String> values) {
+            addCriterion("leaderTeamId not in", values, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidBetween(String value1, String value2) {
+            addCriterion("leaderTeamId between", value1, value2, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLeaderteamidNotBetween(String value1, String value2) {
+            addCriterion("leaderTeamId not between", value1, value2, "leaderteamid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearIsNull() {
+            addCriterion("schoolYear is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearIsNotNull() {
+            addCriterion("schoolYear is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearEqualTo(Integer value) {
+            addCriterion("schoolYear =", value, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearNotEqualTo(Integer value) {
+            addCriterion("schoolYear <>", value, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearGreaterThan(Integer value) {
+            addCriterion("schoolYear >", value, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearGreaterThanOrEqualTo(Integer value) {
+            addCriterion("schoolYear >=", value, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearLessThan(Integer value) {
+            addCriterion("schoolYear <", value, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearLessThanOrEqualTo(Integer value) {
+            addCriterion("schoolYear <=", value, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearIn(List<Integer> values) {
+            addCriterion("schoolYear in", values, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearNotIn(List<Integer> values) {
+            addCriterion("schoolYear not in", values, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearBetween(Integer value1, Integer value2) {
+            addCriterion("schoolYear between", value1, value2, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andSchoolyearNotBetween(Integer value1, Integer value2) {
+            addCriterion("schoolYear not between", value1, value2, "schoolyear");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameIsNull() {
+            addCriterion("courseName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameIsNotNull() {
+            addCriterion("courseName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameEqualTo(String value) {
+            addCriterion("courseName =", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameNotEqualTo(String value) {
+            addCriterion("courseName <>", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameGreaterThan(String value) {
+            addCriterion("courseName >", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameGreaterThanOrEqualTo(String value) {
+            addCriterion("courseName >=", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameLessThan(String value) {
+            addCriterion("courseName <", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameLessThanOrEqualTo(String value) {
+            addCriterion("courseName <=", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameLike(String value) {
+            addCriterion("courseName like", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameNotLike(String value) {
+            addCriterion("courseName not like", value, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameIn(List<String> values) {
+            addCriterion("courseName in", values, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameNotIn(List<String> values) {
+            addCriterion("courseName not in", values, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameBetween(String value1, String value2) {
+            addCriterion("courseName between", value1, value2, "coursename");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoursenameNotBetween(String value1, String value2) {
+            addCriterion("courseName not between", value1, value2, "coursename");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ghsc/partybuild/service/DictionaryService.java

@@ -68,4 +68,12 @@ public interface DictionaryService {
      */
     CfDictionary getDicByKey(Integer dicKey, List<CfDictionary> dicList);
 
+    /**
+     * 字典对象
+     * @param name name
+     * @param dataList list
+     * @return m
+     */
+    Integer getDickeyByName(String name, List<CfDictionary> dataList);
+
 }

src/main/java/com/ghsc/partybuild/service/LeaderworkService.java

@@ -2,25 +2,23 @@ package com.ghsc.partybuild.service;
 
 import com.github.pagehelper.PageInfo;
 import com.ghsc.partybuild.model.LwLeaderassessment;
-import com.ghsc.partybuild.model.LwLeaderteam;
 import com.ghsc.partybuild.vo.LeaderAssessmentImportVo;
 import com.ghsc.partybuild.vo.LeaderAssessmentVo;
-import com.ghsc.partybuild.vo.LeaderTeamImportVo;
 import com.ghsc.partybuild.vo.LeaderTeamVo;
 
 import java.util.Date;
 import java.util.List;
 
 public interface LeaderworkService {
-    PageInfo<LeaderTeamVo> getLeaderTeamList(int pageIndex, int pageSize, int leaderTeamType, String departmentName, String userName, Date joinStartDate, Date joinEndDate, String position, Integer sex, Date birthStartDate, Date birthEndDate);
+    PageInfo<LeaderTeamVo> getLeaderTeamList(int pageIndex, int pageSize, Integer leaderTeamType, String id, String departmentName, String name, String position, String sex, String party, Date joinStartDate, Date joinEndDate, Date birthStartDate, Date birthEndDate);
 
     LeaderTeamVo getLeaderTeamById(String id);
 
-    int saveLeaderTeam(LwLeaderteam data, String userId, String userName);
+    int saveLeaderTeam(LeaderTeamVo data, String userId, String userName);
 
     int deleteLeaderTeam(List<String> leaderTeamIdList);
 
-    List<LeaderTeamImportVo> importLeaderTeam(int leaderTeamType, List<LeaderTeamImportVo> dataList, String userID) throws Exception;
+    List<LeaderTeamVo> importLeaderTeam(int leaderTeamType, List<LeaderTeamVo> dataList, String userID) throws Exception;
 
 
     PageInfo<LeaderAssessmentVo> getLeaderAssessmentList(int pageIndex, int pageSize, String departmentName, String userName,  String position, String assessmentResult,Integer year);

src/main/java/com/ghsc/partybuild/service/impl/DictionaryServiceImpl.java

@@ -157,4 +157,13 @@ public class DictionaryServiceImpl implements DictionaryService {
         return dic;
     }
 
+    @Override
+    public Integer getDickeyByName(String name, List<CfDictionary> dataList) {
+        if (stringUtils.IsNullOrEmpty(name))
+            return null;
+        CfDictionary cfDictionary = dataList.stream().filter(it -> it.getDicvalue().equals(name)).findFirst().orElse(null);
+
+        return cfDictionary != null ? cfDictionary.getDickey() : null;
+    }
+
 }

src/main/java/com/ghsc/partybuild/service/impl/LeaderworkServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ghsc.partybuild.service.impl;
 
+import com.ghsc.partybuild.mapper.LwLeaderteamExperienceMapper;
+import com.ghsc.partybuild.service.PartyDicService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ghsc.partybuild.mapper.LeaderworkCQuery;
@@ -12,7 +14,6 @@ import com.ghsc.partybuild.util.DateUtils;
 import com.ghsc.partybuild.util.StringUtils;
 import com.ghsc.partybuild.vo.LeaderAssessmentImportVo;
 import com.ghsc.partybuild.vo.LeaderAssessmentVo;
-import com.ghsc.partybuild.vo.LeaderTeamImportVo;
 import com.ghsc.partybuild.vo.LeaderTeamVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,16 +31,38 @@ public class LeaderworkServiceImpl implements LeaderworkService {
     @Autowired
     private DictionaryService dictionaryService;
     @Autowired
+    private PartyDicService partyDicService;
+    @Autowired
     private StringUtils stringUtils;
     @Autowired
     private DateUtils dateUtils;
     @Autowired
     private LwLeaderassessmentMapper lwLeaderassessmentMapper;
+    @Autowired
+    private LwLeaderteamExperienceMapper lwLeaderteamExperienceMapper;
 
     @Override
-    public PageInfo<LeaderTeamVo> getLeaderTeamList(int pageIndex, int pageSize, int leaderTeamType, String departmentName, String userName, Date joinStartDate, Date joinEndDate, String position, Integer sex, Date birthStartDate, Date birthEndDate) {
+    public PageInfo<LeaderTeamVo> getLeaderTeamList(int pageIndex, int pageSize, Integer leaderTeamType, String id, String selectdzzdm, String name, String position, String sex, String party, Date joinStartDate, Date joinEndDate, Date birthStartDate, Date birthEndDate) {
         PageHelper.startPage(pageIndex, pageSize);
-        List<LeaderTeamVo> list = leaderworkCQuery.selectLeaderTeamList(leaderTeamType, null, departmentName, userName, joinStartDate, joinEndDate, position, sex, birthStartDate, birthEndDate);
+        List<LeaderTeamVo> list = leaderworkCQuery.selectLeaderTeamList(leaderTeamType, id, selectdzzdm, name, position, sex, party, joinStartDate, joinEndDate, birthStartDate, birthEndDate);
+
+        List<CfDictionary> qualificationTypeList =  dictionaryService.getDictionaryListByDicTypeKey("QualificationType");
+        List<CfDictionary> professionalTypeList =  dictionaryService.getDictionaryListByDicTypeKey("ProfessionalType");
+        List<CfDictionary> educationTypeList =  dictionaryService.getDictionaryListByDicTypeKey("EducationType");
+        List<CfDictionary> dicSexList =  dictionaryService.getDictionaryListByDicTypeKey("dic_sex");
+        List<HashMap<String, Object>> nationList = partyDicService.getNationList();
+
+        list.forEach(item -> {
+            item.setQualificationname(item.getQualificationtype() == null ? "" : dictionaryService.getDicByKey(item.getQualificationtype(), qualificationTypeList).getDicvalue());
+            item.setProfessionalname(item.getProfessionaltype() == null ? "" : dictionaryService.getDicByKey(item.getProfessionaltype(), professionalTypeList).getDicvalue());
+            item.setEducationname(item.getEducationtype() == null ? "" : dictionaryService.getDicByKey(item.getEducationtype(), educationTypeList).getDicvalue());
+            item.setSexname(item.getSex() == null ? "" : dictionaryService.getDicByKey(item.getSex(), dicSexList).getDicvalue());
+            if(!stringUtils.IsNullOrEmpty(item.getBirthplace())){
+                HashMap<String, Object> nationMap = nationList.stream().filter(x->stringUtils.valueOf(x.get("BM")).equals(item.getBirthplace())).findFirst().orElse(null);
+                item.setBirthplacename(nationMap != null ? stringUtils.valueOf(nationMap.get("HZMC")) : "");
+            }
+        });
+
         PageInfo<LeaderTeamVo> result = new PageInfo(list);
         return result;
     }
@@ -49,53 +72,119 @@ public class LeaderworkServiceImpl implements LeaderworkService {
         if (stringUtils.IsNullOrEmpty(id))
             return null;
 
-        List<LeaderTeamVo> list = leaderworkCQuery.selectLeaderTeamList(null, id, null, null, null, null, null, null, null, null);
+        List<LeaderTeamVo> list = getLeaderTeamList(1,999999,null, id, null, null, null, null, null, null, null, null, null).getList();
 
-        return list.size() > 0 ? list.get(0) : null;
+        LeaderTeamVo data = list.size() > 0 ? list.get(0) : null;
+        if(data != null){
+            LwLeaderteamExperienceExample emp = new LwLeaderteamExperienceExample();
+            emp.or().andLeaderteamidEqualTo(data.getLeaderteamid());
+            emp.setOrderByClause("schoolYear asc");
+            data.setExperienceList(lwLeaderteamExperienceMapper.selectByExample(emp));
+        }
+
+        return data;
     }
 
     @Override
-    public int saveLeaderTeam(LwLeaderteam data, String userId, String userName) {
+    public int saveLeaderTeam(LeaderTeamVo data, String userId, String userName) {
         int result = 0;
-        LeaderTeamVo dbModel = getLeaderTeamById(data.getLeaderTeamId());
-        if (dbModel == null || (dbModel != null && stringUtils.IsNullOrEmpty(dbModel.getLeaderTeamId()))) {
-            data.setCreateTime(new Date());
-            data.setCreateUserId(userId);
-
-            result = leaderteamMapper.insert(data);
+        LwLeaderteam model = leaderteamMapper.selectByPrimaryKey(data.getLeaderteamid());
+        if (model == null) {
+            model = new LwLeaderteam();
+            model.setLeaderteamid(data.getLeaderteamid());
+            model.setLeaderteamtype(data.getLeaderteamtype());
+            model.setName(data.getName());
+            model.setDepartmentname(data.getDepartmentname());
+            model.setPosition(data.getPosition());
+            model.setSex(data.getSex());
+            model.setBirthplace(data.getBirthplace());
+            model.setNativeplace(data.getNativeplace());
+            model.setBirthdate(data.getBirthdate());
+            model.setWorkdate(data.getWorkdate());
+            model.setEducationtype(data.getEducationtype());
+            model.setParty(data.getParty());
+            model.setJoindate(data.getJoindate());
+            model.setQualificationtype(data.getQualificationtype());
+            model.setGraduationschoolmajor(data.getGraduationschoolmajor());
+            model.setProfessionaltype(data.getProfessionaltype());
+            model.setEngagedate(data.getEngagedate());
+            model.setNowpositiondate(data.getNowpositiondate());
+            model.setSamepositiondate(data.getSamepositiondate());
+            model.setWorkexperience(data.getWorkexperience());
+            model.setCreatetime(new Date());
+            model.setCreateuserid(userId);
+
+            result = leaderteamMapper.insert(model);
         } else {
-            data.setUpdateTime(new Date());
-            data.setUpdateUserId(userId);
+            model.setLeaderteamtype(data.getLeaderteamtype());
+            model.setName(data.getName());
+            model.setDepartmentname(data.getDepartmentname());
+            model.setPosition(data.getPosition());
+            model.setSex(data.getSex());
+            model.setBirthplace(data.getBirthplace());
+            model.setNativeplace(data.getNativeplace());
+            model.setBirthdate(data.getBirthdate());
+            model.setWorkdate(data.getWorkdate());
+            model.setEducationtype(data.getEducationtype());
+            model.setParty(data.getParty());
+            model.setJoindate(data.getJoindate());
+            model.setQualificationtype(data.getQualificationtype());
+            model.setGraduationschoolmajor(data.getGraduationschoolmajor());
+            model.setProfessionaltype(data.getProfessionaltype());
+            model.setEngagedate(data.getEngagedate());
+            model.setNowpositiondate(data.getNowpositiondate());
+            model.setSamepositiondate(data.getSamepositiondate());
+            model.setWorkexperience(data.getWorkexperience());
+            model.setUpdatetime(new Date());
+            model.setUpdateuserid(userId);
+
+            result = leaderteamMapper.updateByPrimaryKeyWithBLOBs(model);
+        }
 
-            result = leaderteamMapper.updateByPrimaryKeyWithBLOBs(data);
+        if(data.getExperienceList().size() > 0){
+            LwLeaderteamExperienceExample eexp = new LwLeaderteamExperienceExample();
+            eexp.or().andLeaderteamidEqualTo(data.getLeaderteamid());
+            lwLeaderteamExperienceMapper.deleteByExample(eexp);
+
+            data.getExperienceList().forEach(item -> {
+                LwLeaderteamExperience emodel = new LwLeaderteamExperience();
+                emodel.setId(UUID.randomUUID().toString());
+                emodel.setLeaderteamid(data.getLeaderteamid());
+                emodel.setSchoolyear(item.getSchoolyear());
+                emodel.setCoursename(item.getCoursename());
+                lwLeaderteamExperienceMapper.insert(emodel);
+            });
         }
 
         return result;
     }
 
     @Override
-    public int deleteLeaderTeam(List<String> leaderTeamIdList) {
+    public int deleteLeaderTeam(List<String> LeaderteamidList) {
         LwLeaderteamExample exp = new LwLeaderteamExample();
-        LwLeaderteamExample.Criteria cri = exp.or().andLeaderTeamIdIn(leaderTeamIdList);
+        exp.or().andLeaderteamidIn(LeaderteamidList);
+
+        LwLeaderteamExperienceExample eexp = new LwLeaderteamExperienceExample();
+        eexp.or().andLeaderteamidIn(LeaderteamidList);
+        lwLeaderteamExperienceMapper.deleteByExample(eexp);
 
         return leaderteamMapper.deleteByExample(exp);
     }
 
-    public List<LeaderTeamImportVo> importLeaderTeam(int leaderTeamType, List<LeaderTeamImportVo> dataList, String userID) throws Exception {
+    public List<LeaderTeamVo> importLeaderTeam(int leaderTeamType, List<LeaderTeamVo> dataList, String userID) throws Exception {
         if (dataList.size() <= 0) {
             throw new Exception("请添加导入数据");
         }
-        List<LeaderTeamImportVo> errorList = new ArrayList<>();
+        List<LeaderTeamVo> errorList = new ArrayList<>();
         List<LwLeaderteam> resultList = new ArrayList<>();
 
         List<String> nameList = dataList.stream().filter(it -> !stringUtils.IsNullOrEmpty(it.getName())).map(it -> it.getName().trim()).collect(Collectors.toList());
 
-        List<CfDictionary> sexList = dictionaryService.getDictionaryListByDicTypeKey("dic_sex");
-        List<CfDictionary> politicsStatusList = dictionaryService.getDictionaryListByDicTypeKey("PoliticsStatus");
-        List<CfDictionary> leaderTeamPositionLevelList = dictionaryService.getDictionaryListByDicTypeKey("LeaderTeamPositionLevel");
-        List<CfDictionary> educationTypeList = dictionaryService.getDictionaryListByDicTypeKey("EducationType");
-        List<CfDictionary> qualificationTypeList = dictionaryService.getDictionaryListByDicTypeKey("QualificationType");
-        List<CfDictionary> professionalTypeList = dictionaryService.getDictionaryListByDicTypeKey("ProfessionalType");
+        List<CfDictionary> qualificationTypeList =  dictionaryService.getDictionaryListByDicTypeKey("QualificationType");
+        List<CfDictionary> professionalTypeList =  dictionaryService.getDictionaryListByDicTypeKey("ProfessionalType");
+        List<CfDictionary> educationTypeList =  dictionaryService.getDictionaryListByDicTypeKey("EducationType");
+        List<CfDictionary> dicSexList =  dictionaryService.getDictionaryListByDicTypeKey("dic_sex");
+        List<HashMap<String, Object>> nationList = partyDicService.getNationList();
 
         List<LwLeaderteam> dbLwLeaderteamList = getLeaderteamList(nameList, leaderTeamType);
 
@@ -104,61 +193,75 @@ public class LeaderworkServiceImpl implements LeaderworkService {
         }
 
         for (int i = 0; i < dataList.size(); i++) {
-            LeaderTeamImportVo item = dataList.get(i);
+            LeaderTeamVo item = dataList.get(i);
 
             LwLeaderteam lwLeaderteam = dbLwLeaderteamList.stream().filter(it -> it.getName().equals(item.getName())).findFirst().orElse(new LwLeaderteam());
 
             String errorInfo = "";
-            Date birthDate = dateUtils.strToDateExt(item.getBirthDate());
-            Date nowPositionDate = dateUtils.strToDateExt(item.getNowPositionDate());
-            Date samePositionDate = dateUtils.strToDateExt(item.getSamePositionDate());
-            Date joinDate = dateUtils.strToDateExt(item.getJoinDate());
-            Date workDate = dateUtils.strToDateExt(item.getWorkDate());
+            Date birthDate = dateUtils.strToDateExt(item.getBirthdatestr());
+            Date joinDate = dateUtils.strToDateExt(item.getJoindatestr());
+            Date workDate = dateUtils.strToDateExt(item.getWorkdatestr());
+            Date engageDate = dateUtils.strToDateExt(item.getEngagedatestr());
+            Date nowPositionDate = dateUtils.strToDateExt(item.getNowpositiondatestr());
+            Date samePositionDate = dateUtils.strToDateExt(item.getSamepositiondatestr());
+
+            item.setSex(dictionaryService.getDickeyByName(item.getSexname(), dicSexList));
+            item.setEducationtype(dictionaryService.getDickeyByName(item.getEducationname(), educationTypeList));
+            item.setQualificationtype(dictionaryService.getDickeyByName(item.getQualificationname(), qualificationTypeList));
+            item.setProfessionaltype(dictionaryService.getDickeyByName(item.getProfessionalname(), professionalTypeList));
+            if(!stringUtils.IsNullOrEmpty(item.getBirthplacename())){
+                HashMap<String, Object> nationMap = nationList.stream().filter(x->stringUtils.valueOf(x.get("HZMC")).equals(item.getBirthplacename())).findFirst().orElse(null);
+                item.setBirthplace(nationMap != null ? stringUtils.valueOf(nationMap.get("BM")) : "");
+            }
 
             if (stringUtils.IsNullOrEmpty(item.getName()))
                 errorInfo += "请填写姓名!";
-            if (stringUtils.IsNullOrEmpty(item.getDepartmentName()))
+            if (stringUtils.IsNullOrEmpty(item.getDepartmentname()))
                 errorInfo += "请填写机构!";
-            if (!stringUtils.IsNullOrEmpty(item.getBirthDate()) && birthDate == null)
+            if (stringUtils.IsNullOrEmpty(item.getPosition()))
+                errorInfo += "请填写部门职务!";
+            if(item.getSex() == null)
+                errorInfo += "请根据单元格下拉选项选择性别!";
+            if(item.getBirthplace() == null)
+                errorInfo += "请根据单元格下拉选项选择民族!";
+            if (stringUtils.IsNullOrEmpty(item.getNativeplace()))
+                errorInfo += "请填写籍贯!";
+            if (!stringUtils.IsNullOrEmpty(item.getBirthdatestr()) && birthDate == null)
                 errorInfo += "出生年月格式错误!";
-            if (!stringUtils.IsNullOrEmpty(item.getNowPositionDate()) && nowPositionDate == null)
-                errorInfo += "现职时间格式错误!";
-            if (!stringUtils.IsNullOrEmpty(item.getSamePositionDate()) && samePositionDate == null)
-                errorInfo += "同职时间格式错误!";
-            if (!stringUtils.IsNullOrEmpty(item.getJoinDate()) && joinDate == null)
-                errorInfo += "入党时间格式错误!";
-            if (!stringUtils.IsNullOrEmpty(item.getWorkDate()) && workDate == null)
-                errorInfo += "工作时间格式错误!";
+            if (!stringUtils.IsNullOrEmpty(item.getWorkdatestr()) && workDate == null)
+                errorInfo += "参加工作时间格式错误!";
+            if(item.getEducationtype() == null)
+                errorInfo += "请根据单元格下拉选项选择学历!";
+            if (stringUtils.IsNullOrEmpty(item.getParty()))
+                errorInfo += "请填写党派!";
+            if (!stringUtils.IsNullOrEmpty(item.getJoindatestr()) && joinDate == null)
+                errorInfo += "加入时间格式错误!";
+            if(item.getQualificationtype() == null)
+                errorInfo += "请根据单元格下拉选项选择学位!";
+            if (stringUtils.IsNullOrEmpty(item.getGraduationschoolmajor()))
+                errorInfo += "请填写专业!";
+            if (!stringUtils.IsNullOrEmpty(item.getNowpositiondatestr()) && nowPositionDate == null)
+                errorInfo += "任行政现职时间格式错误!";
 
             if (stringUtils.IsNullOrEmpty(errorInfo)) {
                 lwLeaderteam.setName(item.getName());
-                lwLeaderteam.setNo(item.getNo());
-                lwLeaderteam.setJobTitle(item.getJobTitle());
-                lwLeaderteam.setDepartmentName(item.getDepartmentName());
+                lwLeaderteam.setDepartmentname(item.getDepartmentname());
                 lwLeaderteam.setPosition(item.getPosition());
-                lwLeaderteam.setNativePlace(item.getNativePlace());
+                lwLeaderteam.setSex(item.getSex());
                 lwLeaderteam.setBirthplace(item.getBirthplace());
-                lwLeaderteam.setRemark(item.getRemark());
-                lwLeaderteam.setUndergraduateProfessional(item.getUndergraduateProfessional());
-                lwLeaderteam.setMasterProfessional(item.getMasterProfessional());
-                lwLeaderteam.setSex(getDickeyByName(sexList, item.getSex()));
-                lwLeaderteam.setPoliticsStatus(getDickeyByName(politicsStatusList, item.getPoliticsStatus()));
-                lwLeaderteam.setPositionLevel(getDickeyByName(leaderTeamPositionLevelList, item.getPositionLevel()));
-                lwLeaderteam.setEducationType(getDickeyByName(educationTypeList, item.getEducationType()));
-                lwLeaderteam.setQualificationType(getDickeyByName(qualificationTypeList, item.getQualificationType()));
-                lwLeaderteam.setGraduationSchoolMajor(item.getGraduationSchoolMajor());
-                lwLeaderteam.setProfessionalType(getDickeyByName(professionalTypeList, item.getProfessionalType()));
-                lwLeaderteam.setBirthDate(birthDate);
-                lwLeaderteam.setNowPositionDate(nowPositionDate);
-                lwLeaderteam.setSamePositionDate(samePositionDate);
-                lwLeaderteam.setWorkDate(workDate);
-                lwLeaderteam.setJoinDate(joinDate);
-
-                lwLeaderteam.setInJobEducationType(getDickeyByName(educationTypeList, item.getInJobEducationType()));
-                lwLeaderteam.setInJobQualificationType(getDickeyByName(qualificationTypeList, item.getInJobQualificationType()));
-                lwLeaderteam.setInJobGraduationSchoolMajor(item.getInJobGraduationSchoolMajor());
-                lwLeaderteam.setWorkExperience(item.getWorkExperience());
-
+                lwLeaderteam.setNativeplace(item.getNativeplace());
+                lwLeaderteam.setBirthdate(birthDate);
+                lwLeaderteam.setWorkdate(workDate);
+                lwLeaderteam.setEducationtype(item.getEducationtype());
+                lwLeaderteam.setParty(item.getParty());
+                lwLeaderteam.setJoindate(joinDate);
+                lwLeaderteam.setQualificationtype(item.getQualificationtype());
+                lwLeaderteam.setGraduationschoolmajor(item.getGraduationschoolmajor());
+                lwLeaderteam.setProfessionaltype(item.getProfessionaltype());
+                lwLeaderteam.setEngagedate(engageDate);
+                lwLeaderteam.setNowpositiondate(nowPositionDate);
+                lwLeaderteam.setSamepositiondate(samePositionDate);
+                lwLeaderteam.setWorkexperience(item.getWorkexperience());
                 resultList.add(lwLeaderteam);
             } else {
                 item.setErrorInfo("第" + (i + 1) + "行，" + errorInfo);
@@ -169,14 +272,14 @@ public class LeaderworkServiceImpl implements LeaderworkService {
         if (errorList.size() <= 0) {
             resultList.forEach(item -> {
                 if (dbLwLeaderteamList.stream().filter(it -> it.getName().equals(item.getName())).count() == 0) {
-                    item.setLeaderTeamId(UUID.randomUUID().toString());
-                    item.setLeaderTeamType(leaderTeamType);
-                    item.setCreateUserId(userID);
-                    item.setCreateTime(new Date());
+                    item.setLeaderteamid(UUID.randomUUID().toString());
+                    item.setLeaderteamtype(leaderTeamType);
+                    item.setCreateuserid(userID);
+                    item.setCreatetime(new Date());
                     leaderteamMapper.insert(item);
                 } else {
-                    item.setUpdateUserId(userID);
-                    item.setUpdateTime(new Date());
+                    item.setUpdateuserid(userID);
+                    item.setUpdatetime(new Date());
                     leaderteamMapper.updateByPrimaryKeyWithBLOBs(item);
                 }
             });
@@ -189,7 +292,7 @@ public class LeaderworkServiceImpl implements LeaderworkService {
         if (names.size() == 0)
             return new ArrayList<>();
         LwLeaderteamExample exp = new LwLeaderteamExample();
-        LwLeaderteamExample.Criteria cri = exp.or().andNameIn(names).andLeaderTeamTypeEqualTo(leaderTeamType);
+        LwLeaderteamExample.Criteria cri = exp.or().andNameIn(names).andLeaderteamtypeEqualTo(leaderTeamType);
         return leaderteamMapper.selectByExample(exp);
     }
 
@@ -240,9 +343,9 @@ public class LeaderworkServiceImpl implements LeaderworkService {
     }
 
     @Override
-    public int deleteLeaderAssessment(List<String> leaderTeamIdList) {
+    public int deleteLeaderAssessment(List<String> LeaderteamidList) {
         LwLeaderassessmentExample exp = new LwLeaderassessmentExample();
-        LwLeaderassessmentExample.Criteria cri = exp.or().andLeaderAssessmentIDIn(leaderTeamIdList);
+        LwLeaderassessmentExample.Criteria cri = exp.or().andLeaderAssessmentIDIn(LeaderteamidList);
 
         return lwLeaderassessmentMapper.deleteByExample(exp);
     }

src/main/java/com/ghsc/partybuild/vo/LeaderTeamVo.java

@@ -1,16 +1,28 @@
 package com.ghsc.partybuild.vo;
 
 import com.ghsc.partybuild.model.LwLeaderteam;
+import com.ghsc.partybuild.model.LwLeaderteamExperience;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class LeaderTeamVo extends LwLeaderteam {
-    private String politicsStatusName;
-    private String positionLevelName;
-    private String qualificationName;
-    private String professionalName;
-    private String educationName;
-    private String sexName;
-    private String inJobQualificationName;
-    private String inJobEducationName;
+    private String politicsstatusname;
+    private String positionlevelname;
+    private String qualificationname;
+    private String professionalname;
+    private String educationname;
+    private String sexname;
+    private String injobqualificationname;
+    private String injobeducationname;
+    private String birthplacename;
+    private String birthdatestr;
+    private String workdatestr;
+    private String joindatestr;
+    private String engagedatestr;
+    private String nowpositiondatestr;
+    private String samepositiondatestr;
+    private List<LwLeaderteamExperience> experienceList ;
+    private String errorInfo;
 }

src/main/resources/generatorConfig.xml

@@ -263,9 +263,12 @@
           <table schema="" tableName="us_party_month"></table>
         <table schema="" tableName="pf_partylifemeeting"></table>
         <table schema="" tableName="pf_partylifemeeting_personnel"></table>
-        <table schema="" tableName="SHYK_Meeting_Type"></table>
-        <table schema="" tableName="SHYK_Meeting_DemocracyReview"></table>
-        -->
+        <table schema="" tableName="pf_partylifemeeting_scyd"></table>
+        <table schema="" tableName="pf_reportsystem"></table>
+        <table schema="" tableName="lw_leaderteam"></table>
+        <table schema="" tableName="lw_leaderteam_experience"></table>
+        <table schema="" tableName="TEST_ONLINETEST"></table>
 
+        -->
     </context>
 </generatorConfiguration>

src/main/resources/mapping/LeaderworkCQuery.xml

@@ -4,33 +4,11 @@
     <select id="selectLeaderTeamList" resultType="com.ghsc.partybuild.vo.LeaderTeamVo">
         select ldt.leaderTeamId, ldt.name, ldt.no, ldt.leaderTeamType, ldt.sex, ldt.birthDate, ldt.nativePlace,
         ldt.politicsStatus, ldt.departmentName, ldt.position, ldt.positionLevel, ldt.nowPositionDate,
-        ldt.samePositionDate,
-        ldt.joinDate, ldt.workDate, ldt.educationType, ldt.qualificationType, ldt.professionalType,
+        ldt.samePositionDate,ldt.joinDate, ldt.workDate, ldt.educationType, ldt.qualificationType, ldt.professionalType,
         ldt.undergraduateProfessional, ldt.masterProfessional, ldt.remark, ldt.createTime, ldt.createUserId,
-        ldt.updateTime, ldt.updateUserId,
-        ldt.jobTitle,ldt.birthplace,ldt.graduationSchoolMajor,ldt.inJobEducationType,ldt.inJobQualificationType,ldt.inJobGraduationSchoolMajor,ldt.workExperience,
-        dic_PoliticsStatus.DICVALUE as politicsStatusName, dic_PositionLevel.DICVALUE as positionLevelName,
-        dic_QualificationType.DICVALUE as qualificationName,
-        dic_ProfessionalType.DICVALUE as professionalName,dic_EducationType.DICVALUE as educationName,dic_Sex.DICVALUE
-        as sexName,
-        dic_InJobEducationType.DICVALUE as inJobEducationName, dic_InJobQualificationType.DICVALUE as
-        inJobQualificationName
+        ldt.updateTime, ldt.updateUserId, ldt.party ,ldt.jobTitle,ldt.birthplace,ldt.engageDate,
+        ldt.graduationSchoolMajor,ldt.inJobEducationType,ldt.inJobQualificationType, ldt.inJobGraduationSchoolMajor,ldt.workExperience
         from lw_leaderteam ldt
-        left join cf_dictionary dic_PoliticsStatus on dic_PoliticsStatus.DICTYPEKEY='PoliticsStatus' and
-        ldt.politicsStatus=dic_PoliticsStatus.DICKEY -- 政治面貌
-        left join cf_dictionary dic_PositionLevel on dic_PositionLevel.DICTYPEKEY='LeaderTeamPositionLevel' and
-        ldt.positionLevel=dic_PositionLevel.DICKEY -- 职务级别
-        left join cf_dictionary dic_QualificationType on dic_QualificationType.DICTYPEKEY='QualificationType' and
-        ldt.qualificationType=dic_QualificationType.DICKEY -- 学位
-        left join cf_dictionary dic_ProfessionalType on dic_ProfessionalType.DICTYPEKEY='ProfessionalType' and
-        ldt.professionalType=dic_ProfessionalType.DICKEY -- 专业技术职务
-        left join cf_dictionary dic_EducationType on dic_EducationType.DICTYPEKEY='EducationType' and
-        ldt.educationType=dic_EducationType.DICKEY -- 学历
-        left join cf_dictionary dic_Sex on dic_Sex.DICTYPEKEY='dic_sex' and ldt.sex=dic_Sex.DICKEY -- 性别
-        left join cf_dictionary dic_InJobEducationType on dic_InJobEducationType.DICTYPEKEY='EducationType' and
-        ldt.inJobeducationType=dic_InJobEducationType.DICKEY -- 学历
-        left join cf_dictionary dic_InJobQualificationType on dic_InJobQualificationType.DICTYPEKEY='QualificationType'
-        and ldt.inJobqualificationType=dic_InJobQualificationType.DICKEY -- 学位
         where 1=1
         <if test="leaderTeamType != null">
             and ldt.leaderTeamType = #{leaderTeamType}
@@ -41,8 +19,8 @@
         <if test="departmentName != null and departmentName != ''">
             and ldt.departmentName like concat('%',#{departmentName},'%')
         </if>
-        <if test="userName != null and userName != ''">
-            and ldt.name like concat('%',#{userName},'%')
+        <if test="name != null and name != ''">
+            and ldt.name like concat('%',#{name},'%')
         </if>
         <if test="position != null and position != ''">
             and ldt.position like concat('%',#{position},'%')
@@ -50,6 +28,9 @@
         <if test="sex != null">
             and ldt.sex = #{sex}
         </if>
+        <if test="party != null and party != ''">
+            and ldt.party = #{party}
+        </if>
         <if test="joinStartDate != null">
             and ldt.joinDate <![CDATA[ >= ]]> #{joinStartDate}
         </if>
@@ -62,7 +43,7 @@
         <if test="birthEndDate != null">
             and ldt.birthDate <![CDATA[ < ]]> date_add(#{birthEndDate}, interval 1 day)
         </if>
-        order by ldt.departmentName,ldt.name
+        order by ldt.createTime desc
     </select>
 
 

src/main/resources/mapping/LwLeaderteamExperienceMapper.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ghsc.partybuild.mapper.LwLeaderteamExperienceMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.LwLeaderteamExperience">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="leaderTeamId" jdbcType="VARCHAR" property="leaderteamid" />
+    <result column="schoolYear" jdbcType="INTEGER" property="schoolyear" />
+    <result column="courseName" jdbcType="VARCHAR" property="coursename" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, leaderTeamId, schoolYear, courseName
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperienceExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from lw_leaderteam_experience
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from lw_leaderteam_experience
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from lw_leaderteam_experience
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperienceExample">
+    delete from lw_leaderteam_experience
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperience">
+    insert into lw_leaderteam_experience (id, leaderTeamId, schoolYear, 
+      courseName)
+    values (#{id,jdbcType=VARCHAR}, #{leaderteamid,jdbcType=VARCHAR}, #{schoolyear,jdbcType=INTEGER}, 
+      #{coursename,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperience">
+    insert into lw_leaderteam_experience
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="leaderteamid != null">
+        leaderTeamId,
+      </if>
+      <if test="schoolyear != null">
+        schoolYear,
+      </if>
+      <if test="coursename != null">
+        courseName,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="leaderteamid != null">
+        #{leaderteamid,jdbcType=VARCHAR},
+      </if>
+      <if test="schoolyear != null">
+        #{schoolyear,jdbcType=INTEGER},
+      </if>
+      <if test="coursename != null">
+        #{coursename,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperienceExample" resultType="java.lang.Long">
+    select count(*) from lw_leaderteam_experience
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update lw_leaderteam_experience
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.leaderteamid != null">
+        leaderTeamId = #{record.leaderteamid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.schoolyear != null">
+        schoolYear = #{record.schoolyear,jdbcType=INTEGER},
+      </if>
+      <if test="record.coursename != null">
+        courseName = #{record.coursename,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update lw_leaderteam_experience
+    set id = #{record.id,jdbcType=VARCHAR},
+      leaderTeamId = #{record.leaderteamid,jdbcType=VARCHAR},
+      schoolYear = #{record.schoolyear,jdbcType=INTEGER},
+      courseName = #{record.coursename,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperience">
+    update lw_leaderteam_experience
+    <set>
+      <if test="leaderteamid != null">
+        leaderTeamId = #{leaderteamid,jdbcType=VARCHAR},
+      </if>
+      <if test="schoolyear != null">
+        schoolYear = #{schoolyear,jdbcType=INTEGER},
+      </if>
+      <if test="coursename != null">
+        courseName = #{coursename,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.LwLeaderteamExperience">
+    update lw_leaderteam_experience
+    set leaderTeamId = #{leaderteamid,jdbcType=VARCHAR},
+      schoolYear = #{schoolyear,jdbcType=INTEGER},
+      courseName = #{coursename,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mapping/LwLeaderteamMapper.xml

@@ -2,40 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ghsc.partybuild.mapper.LwLeaderteamMapper">
   <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.LwLeaderteam">
-    <id column="leaderTeamId" jdbcType="VARCHAR" property="leaderTeamId" />
+    <id column="leaderTeamId" jdbcType="VARCHAR" property="leaderteamid" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="no" jdbcType="VARCHAR" property="no" />
-    <result column="leaderTeamType" jdbcType="INTEGER" property="leaderTeamType" />
+    <result column="leaderTeamType" jdbcType="INTEGER" property="leaderteamtype" />
     <result column="sex" jdbcType="INTEGER" property="sex" />
-    <result column="birthDate" jdbcType="DATE" property="birthDate" />
-    <result column="nativePlace" jdbcType="VARCHAR" property="nativePlace" />
-    <result column="politicsStatus" jdbcType="INTEGER" property="politicsStatus" />
-    <result column="departmentName" jdbcType="VARCHAR" property="departmentName" />
+    <result column="birthDate" jdbcType="DATE" property="birthdate" />
+    <result column="nativePlace" jdbcType="VARCHAR" property="nativeplace" />
+    <result column="politicsStatus" jdbcType="INTEGER" property="politicsstatus" />
+    <result column="departmentName" jdbcType="VARCHAR" property="departmentname" />
     <result column="position" jdbcType="VARCHAR" property="position" />
-    <result column="positionLevel" jdbcType="INTEGER" property="positionLevel" />
-    <result column="nowPositionDate" jdbcType="DATE" property="nowPositionDate" />
-    <result column="samePositionDate" jdbcType="DATE" property="samePositionDate" />
-    <result column="joinDate" jdbcType="DATE" property="joinDate" />
-    <result column="workDate" jdbcType="DATE" property="workDate" />
-    <result column="educationType" jdbcType="INTEGER" property="educationType" />
-    <result column="qualificationType" jdbcType="INTEGER" property="qualificationType" />
-    <result column="professionalType" jdbcType="INTEGER" property="professionalType" />
-    <result column="undergraduateProfessional" jdbcType="VARCHAR" property="undergraduateProfessional" />
-    <result column="masterProfessional" jdbcType="VARCHAR" property="masterProfessional" />
+    <result column="positionLevel" jdbcType="INTEGER" property="positionlevel" />
+    <result column="nowPositionDate" jdbcType="DATE" property="nowpositiondate" />
+    <result column="samePositionDate" jdbcType="DATE" property="samepositiondate" />
+    <result column="joinDate" jdbcType="DATE" property="joindate" />
+    <result column="workDate" jdbcType="DATE" property="workdate" />
+    <result column="educationType" jdbcType="INTEGER" property="educationtype" />
+    <result column="qualificationType" jdbcType="INTEGER" property="qualificationtype" />
+    <result column="professionalType" jdbcType="INTEGER" property="professionaltype" />
+    <result column="undergraduateProfessional" jdbcType="VARCHAR" property="undergraduateprofessional" />
+    <result column="masterProfessional" jdbcType="VARCHAR" property="masterprofessional" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="createUserId" jdbcType="VARCHAR" property="createUserId" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="updateUserId" jdbcType="VARCHAR" property="updateUserId" />
-    <result column="jobTitle" jdbcType="VARCHAR" property="jobTitle" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="createUserId" jdbcType="VARCHAR" property="createuserid" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="updateUserId" jdbcType="VARCHAR" property="updateuserid" />
+    <result column="jobTitle" jdbcType="VARCHAR" property="jobtitle" />
     <result column="birthplace" jdbcType="VARCHAR" property="birthplace" />
-    <result column="graduationSchoolMajor" jdbcType="VARCHAR" property="graduationSchoolMajor" />
-    <result column="inJobEducationType" jdbcType="INTEGER" property="inJobEducationType" />
-    <result column="inJobQualificationType" jdbcType="INTEGER" property="inJobQualificationType" />
-    <result column="inJobGraduationSchoolMajor" jdbcType="VARCHAR" property="inJobGraduationSchoolMajor" />
+    <result column="graduationSchoolMajor" jdbcType="VARCHAR" property="graduationschoolmajor" />
+    <result column="inJobEducationType" jdbcType="INTEGER" property="injobeducationtype" />
+    <result column="inJobQualificationType" jdbcType="INTEGER" property="injobqualificationtype" />
+    <result column="inJobGraduationSchoolMajor" jdbcType="VARCHAR" property="injobgraduationschoolmajor" />
+    <result column="party" jdbcType="VARCHAR" property="party" />
+    <result column="engageDate" jdbcType="DATE" property="engagedate" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.ghsc.partybuild.model.LwLeaderteam">
-    <result column="workExperience" jdbcType="LONGVARCHAR" property="workExperience" />
+    <result column="workExperience" jdbcType="LONGVARCHAR" property="workexperience" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -100,7 +102,8 @@
     departmentName, position, positionLevel, nowPositionDate, samePositionDate, joinDate, 
     workDate, educationType, qualificationType, professionalType, undergraduateProfessional, 
     masterProfessional, remark, createTime, createUserId, updateTime, updateUserId, jobTitle, 
-    birthplace, graduationSchoolMajor, inJobEducationType, inJobQualificationType, inJobGraduationSchoolMajor
+    birthplace, graduationSchoolMajor, inJobEducationType, inJobQualificationType, inJobGraduationSchoolMajor, 
+    party, engageDate
   </sql>
   <sql id="Blob_Column_List">
     workExperience
@@ -141,11 +144,11 @@
     ,
     <include refid="Blob_Column_List" />
     from lw_leaderteam
-    where leaderTeamId = #{leaderTeamId,jdbcType=VARCHAR}
+    where leaderTeamId = #{leaderteamid,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from lw_leaderteam
-    where leaderTeamId = #{leaderTeamId,jdbcType=VARCHAR}
+    where leaderTeamId = #{leaderteamid,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.LwLeaderteamExample">
     delete from lw_leaderteam
@@ -165,24 +168,26 @@
       updateTime, updateUserId, jobTitle, 
       birthplace, graduationSchoolMajor, inJobEducationType, 
       inJobQualificationType, inJobGraduationSchoolMajor, 
-      workExperience)
-    values (#{leaderTeamId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, 
-      #{leaderTeamType,jdbcType=INTEGER}, #{sex,jdbcType=INTEGER}, #{birthDate,jdbcType=DATE}, 
-      #{nativePlace,jdbcType=VARCHAR}, #{politicsStatus,jdbcType=INTEGER}, #{departmentName,jdbcType=VARCHAR}, 
-      #{position,jdbcType=VARCHAR}, #{positionLevel,jdbcType=INTEGER}, #{nowPositionDate,jdbcType=DATE}, 
-      #{samePositionDate,jdbcType=DATE}, #{joinDate,jdbcType=DATE}, #{workDate,jdbcType=DATE}, 
-      #{educationType,jdbcType=INTEGER}, #{qualificationType,jdbcType=INTEGER}, #{professionalType,jdbcType=INTEGER}, 
-      #{undergraduateProfessional,jdbcType=VARCHAR}, #{masterProfessional,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserId,jdbcType=VARCHAR}, #{jobTitle,jdbcType=VARCHAR}, 
-      #{birthplace,jdbcType=VARCHAR}, #{graduationSchoolMajor,jdbcType=VARCHAR}, #{inJobEducationType,jdbcType=INTEGER}, 
-      #{inJobQualificationType,jdbcType=INTEGER}, #{inJobGraduationSchoolMajor,jdbcType=VARCHAR}, 
-      #{workExperience,jdbcType=LONGVARCHAR})
+      party, engageDate, workExperience
+      )
+    values (#{leaderteamid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, 
+      #{leaderteamtype,jdbcType=INTEGER}, #{sex,jdbcType=INTEGER}, #{birthdate,jdbcType=DATE}, 
+      #{nativeplace,jdbcType=VARCHAR}, #{politicsstatus,jdbcType=INTEGER}, #{departmentname,jdbcType=VARCHAR}, 
+      #{position,jdbcType=VARCHAR}, #{positionlevel,jdbcType=INTEGER}, #{nowpositiondate,jdbcType=DATE}, 
+      #{samepositiondate,jdbcType=DATE}, #{joindate,jdbcType=DATE}, #{workdate,jdbcType=DATE}, 
+      #{educationtype,jdbcType=INTEGER}, #{qualificationtype,jdbcType=INTEGER}, #{professionaltype,jdbcType=INTEGER}, 
+      #{undergraduateprofessional,jdbcType=VARCHAR}, #{masterprofessional,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{createuserid,jdbcType=VARCHAR}, 
+      #{updatetime,jdbcType=TIMESTAMP}, #{updateuserid,jdbcType=VARCHAR}, #{jobtitle,jdbcType=VARCHAR}, 
+      #{birthplace,jdbcType=VARCHAR}, #{graduationschoolmajor,jdbcType=VARCHAR}, #{injobeducationtype,jdbcType=INTEGER}, 
+      #{injobqualificationtype,jdbcType=INTEGER}, #{injobgraduationschoolmajor,jdbcType=VARCHAR}, 
+      #{party,jdbcType=VARCHAR}, #{engagedate,jdbcType=DATE}, #{workexperience,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.LwLeaderteam">
     insert into lw_leaderteam
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="leaderTeamId != null">
+      <if test="leaderteamid != null">
         leaderTeamId,
       </if>
       <if test="name != null">
@@ -191,97 +196,103 @@
       <if test="no != null">
         no,
       </if>
-      <if test="leaderTeamType != null">
+      <if test="leaderteamtype != null">
         leaderTeamType,
       </if>
       <if test="sex != null">
         sex,
       </if>
-      <if test="birthDate != null">
+      <if test="birthdate != null">
         birthDate,
       </if>
-      <if test="nativePlace != null">
+      <if test="nativeplace != null">
         nativePlace,
       </if>
-      <if test="politicsStatus != null">
+      <if test="politicsstatus != null">
         politicsStatus,
       </if>
-      <if test="departmentName != null">
+      <if test="departmentname != null">
         departmentName,
       </if>
       <if test="position != null">
         position,
       </if>
-      <if test="positionLevel != null">
+      <if test="positionlevel != null">
         positionLevel,
       </if>
-      <if test="nowPositionDate != null">
+      <if test="nowpositiondate != null">
         nowPositionDate,
       </if>
-      <if test="samePositionDate != null">
+      <if test="samepositiondate != null">
         samePositionDate,
       </if>
-      <if test="joinDate != null">
+      <if test="joindate != null">
         joinDate,
       </if>
-      <if test="workDate != null">
+      <if test="workdate != null">
         workDate,
       </if>
-      <if test="educationType != null">
+      <if test="educationtype != null">
         educationType,
       </if>
-      <if test="qualificationType != null">
+      <if test="qualificationtype != null">
         qualificationType,
       </if>
-      <if test="professionalType != null">
+      <if test="professionaltype != null">
         professionalType,
       </if>
-      <if test="undergraduateProfessional != null">
+      <if test="undergraduateprofessional != null">
         undergraduateProfessional,
       </if>
-      <if test="masterProfessional != null">
+      <if test="masterprofessional != null">
         masterProfessional,
       </if>
       <if test="remark != null">
         remark,
       </if>
-      <if test="createTime != null">
+      <if test="createtime != null">
         createTime,
       </if>
-      <if test="createUserId != null">
+      <if test="createuserid != null">
         createUserId,
       </if>
-      <if test="updateTime != null">
+      <if test="updatetime != null">
         updateTime,
       </if>
-      <if test="updateUserId != null">
+      <if test="updateuserid != null">
         updateUserId,
       </if>
-      <if test="jobTitle != null">
+      <if test="jobtitle != null">
         jobTitle,
       </if>
       <if test="birthplace != null">
         birthplace,
       </if>
-      <if test="graduationSchoolMajor != null">
+      <if test="graduationschoolmajor != null">
         graduationSchoolMajor,
       </if>
-      <if test="inJobEducationType != null">
+      <if test="injobeducationtype != null">
         inJobEducationType,
       </if>
-      <if test="inJobQualificationType != null">
+      <if test="injobqualificationtype != null">
         inJobQualificationType,
       </if>
-      <if test="inJobGraduationSchoolMajor != null">
+      <if test="injobgraduationschoolmajor != null">
         inJobGraduationSchoolMajor,
       </if>
-      <if test="workExperience != null">
+      <if test="party != null">
+        party,
+      </if>
+      <if test="engagedate != null">
+        engageDate,
+      </if>
+      <if test="workexperience != null">
         workExperience,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="leaderTeamId != null">
-        #{leaderTeamId,jdbcType=VARCHAR},
+      <if test="leaderteamid != null">
+        #{leaderteamid,jdbcType=VARCHAR},
       </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
@@ -289,92 +300,98 @@
       <if test="no != null">
         #{no,jdbcType=VARCHAR},
       </if>
-      <if test="leaderTeamType != null">
-        #{leaderTeamType,jdbcType=INTEGER},
+      <if test="leaderteamtype != null">
+        #{leaderteamtype,jdbcType=INTEGER},
       </if>
       <if test="sex != null">
         #{sex,jdbcType=INTEGER},
       </if>
-      <if test="birthDate != null">
-        #{birthDate,jdbcType=DATE},
+      <if test="birthdate != null">
+        #{birthdate,jdbcType=DATE},
       </if>
-      <if test="nativePlace != null">
-        #{nativePlace,jdbcType=VARCHAR},
+      <if test="nativeplace != null">
+        #{nativeplace,jdbcType=VARCHAR},
       </if>
-      <if test="politicsStatus != null">
-        #{politicsStatus,jdbcType=INTEGER},
+      <if test="politicsstatus != null">
+        #{politicsstatus,jdbcType=INTEGER},
       </if>
-      <if test="departmentName != null">
-        #{departmentName,jdbcType=VARCHAR},
+      <if test="departmentname != null">
+        #{departmentname,jdbcType=VARCHAR},
       </if>
       <if test="position != null">
         #{position,jdbcType=VARCHAR},
       </if>
-      <if test="positionLevel != null">
-        #{positionLevel,jdbcType=INTEGER},
+      <if test="positionlevel != null">
+        #{positionlevel,jdbcType=INTEGER},
       </if>
-      <if test="nowPositionDate != null">
-        #{nowPositionDate,jdbcType=DATE},
+      <if test="nowpositiondate != null">
+        #{nowpositiondate,jdbcType=DATE},
       </if>
-      <if test="samePositionDate != null">
-        #{samePositionDate,jdbcType=DATE},
+      <if test="samepositiondate != null">
+        #{samepositiondate,jdbcType=DATE},
       </if>
-      <if test="joinDate != null">
-        #{joinDate,jdbcType=DATE},
+      <if test="joindate != null">
+        #{joindate,jdbcType=DATE},
       </if>
-      <if test="workDate != null">
-        #{workDate,jdbcType=DATE},
+      <if test="workdate != null">
+        #{workdate,jdbcType=DATE},
       </if>
-      <if test="educationType != null">
-        #{educationType,jdbcType=INTEGER},
+      <if test="educationtype != null">
+        #{educationtype,jdbcType=INTEGER},
       </if>
-      <if test="qualificationType != null">
-        #{qualificationType,jdbcType=INTEGER},
+      <if test="qualificationtype != null">
+        #{qualificationtype,jdbcType=INTEGER},
       </if>
-      <if test="professionalType != null">
-        #{professionalType,jdbcType=INTEGER},
+      <if test="professionaltype != null">
+        #{professionaltype,jdbcType=INTEGER},
       </if>
-      <if test="undergraduateProfessional != null">
-        #{undergraduateProfessional,jdbcType=VARCHAR},
+      <if test="undergraduateprofessional != null">
+        #{undergraduateprofessional,jdbcType=VARCHAR},
       </if>
-      <if test="masterProfessional != null">
-        #{masterProfessional,jdbcType=VARCHAR},
+      <if test="masterprofessional != null">
+        #{masterprofessional,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
       </if>
-      <if test="createUserId != null">
-        #{createUserId,jdbcType=VARCHAR},
+      <if test="createuserid != null">
+        #{createuserid,jdbcType=VARCHAR},
       </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updateUserId != null">
-        #{updateUserId,jdbcType=VARCHAR},
+      <if test="updateuserid != null">
+        #{updateuserid,jdbcType=VARCHAR},
       </if>
-      <if test="jobTitle != null">
-        #{jobTitle,jdbcType=VARCHAR},
+      <if test="jobtitle != null">
+        #{jobtitle,jdbcType=VARCHAR},
       </if>
       <if test="birthplace != null">
         #{birthplace,jdbcType=VARCHAR},
       </if>
-      <if test="graduationSchoolMajor != null">
-        #{graduationSchoolMajor,jdbcType=VARCHAR},
+      <if test="graduationschoolmajor != null">
+        #{graduationschoolmajor,jdbcType=VARCHAR},
+      </if>
+      <if test="injobeducationtype != null">
+        #{injobeducationtype,jdbcType=INTEGER},
+      </if>
+      <if test="injobqualificationtype != null">
+        #{injobqualificationtype,jdbcType=INTEGER},
       </if>
-      <if test="inJobEducationType != null">
-        #{inJobEducationType,jdbcType=INTEGER},
+      <if test="injobgraduationschoolmajor != null">
+        #{injobgraduationschoolmajor,jdbcType=VARCHAR},
       </if>
-      <if test="inJobQualificationType != null">
-        #{inJobQualificationType,jdbcType=INTEGER},
+      <if test="party != null">
+        #{party,jdbcType=VARCHAR},
       </if>
-      <if test="inJobGraduationSchoolMajor != null">
-        #{inJobGraduationSchoolMajor,jdbcType=VARCHAR},
+      <if test="engagedate != null">
+        #{engagedate,jdbcType=DATE},
       </if>
-      <if test="workExperience != null">
-        #{workExperience,jdbcType=LONGVARCHAR},
+      <if test="workexperience != null">
+        #{workexperience,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
@@ -387,8 +404,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update lw_leaderteam
     <set>
-      <if test="record.leaderTeamId != null">
-        leaderTeamId = #{record.leaderTeamId,jdbcType=VARCHAR},
+      <if test="record.leaderteamid != null">
+        leaderTeamId = #{record.leaderteamid,jdbcType=VARCHAR},
       </if>
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
@@ -396,92 +413,98 @@
       <if test="record.no != null">
         no = #{record.no,jdbcType=VARCHAR},
       </if>
-      <if test="record.leaderTeamType != null">
-        leaderTeamType = #{record.leaderTeamType,jdbcType=INTEGER},
+      <if test="record.leaderteamtype != null">
+        leaderTeamType = #{record.leaderteamtype,jdbcType=INTEGER},
       </if>
       <if test="record.sex != null">
         sex = #{record.sex,jdbcType=INTEGER},
       </if>
-      <if test="record.birthDate != null">
-        birthDate = #{record.birthDate,jdbcType=DATE},
+      <if test="record.birthdate != null">
+        birthDate = #{record.birthdate,jdbcType=DATE},
       </if>
-      <if test="record.nativePlace != null">
-        nativePlace = #{record.nativePlace,jdbcType=VARCHAR},
+      <if test="record.nativeplace != null">
+        nativePlace = #{record.nativeplace,jdbcType=VARCHAR},
       </if>
-      <if test="record.politicsStatus != null">
-        politicsStatus = #{record.politicsStatus,jdbcType=INTEGER},
+      <if test="record.politicsstatus != null">
+        politicsStatus = #{record.politicsstatus,jdbcType=INTEGER},
       </if>
-      <if test="record.departmentName != null">
-        departmentName = #{record.departmentName,jdbcType=VARCHAR},
+      <if test="record.departmentname != null">
+        departmentName = #{record.departmentname,jdbcType=VARCHAR},
       </if>
       <if test="record.position != null">
         position = #{record.position,jdbcType=VARCHAR},
       </if>
-      <if test="record.positionLevel != null">
-        positionLevel = #{record.positionLevel,jdbcType=INTEGER},
+      <if test="record.positionlevel != null">
+        positionLevel = #{record.positionlevel,jdbcType=INTEGER},
       </if>
-      <if test="record.nowPositionDate != null">
-        nowPositionDate = #{record.nowPositionDate,jdbcType=DATE},
+      <if test="record.nowpositiondate != null">
+        nowPositionDate = #{record.nowpositiondate,jdbcType=DATE},
       </if>
-      <if test="record.samePositionDate != null">
-        samePositionDate = #{record.samePositionDate,jdbcType=DATE},
+      <if test="record.samepositiondate != null">
+        samePositionDate = #{record.samepositiondate,jdbcType=DATE},
       </if>
-      <if test="record.joinDate != null">
-        joinDate = #{record.joinDate,jdbcType=DATE},
+      <if test="record.joindate != null">
+        joinDate = #{record.joindate,jdbcType=DATE},
       </if>
-      <if test="record.workDate != null">
-        workDate = #{record.workDate,jdbcType=DATE},
+      <if test="record.workdate != null">
+        workDate = #{record.workdate,jdbcType=DATE},
       </if>
-      <if test="record.educationType != null">
-        educationType = #{record.educationType,jdbcType=INTEGER},
+      <if test="record.educationtype != null">
+        educationType = #{record.educationtype,jdbcType=INTEGER},
       </if>
-      <if test="record.qualificationType != null">
-        qualificationType = #{record.qualificationType,jdbcType=INTEGER},
+      <if test="record.qualificationtype != null">
+        qualificationType = #{record.qualificationtype,jdbcType=INTEGER},
       </if>
-      <if test="record.professionalType != null">
-        professionalType = #{record.professionalType,jdbcType=INTEGER},
+      <if test="record.professionaltype != null">
+        professionalType = #{record.professionaltype,jdbcType=INTEGER},
       </if>
-      <if test="record.undergraduateProfessional != null">
-        undergraduateProfessional = #{record.undergraduateProfessional,jdbcType=VARCHAR},
+      <if test="record.undergraduateprofessional != null">
+        undergraduateProfessional = #{record.undergraduateprofessional,jdbcType=VARCHAR},
       </if>
-      <if test="record.masterProfessional != null">
-        masterProfessional = #{record.masterProfessional,jdbcType=VARCHAR},
+      <if test="record.masterprofessional != null">
+        masterProfessional = #{record.masterprofessional,jdbcType=VARCHAR},
       </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.createTime != null">
-        createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      <if test="record.createtime != null">
+        createTime = #{record.createtime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.createUserId != null">
-        createUserId = #{record.createUserId,jdbcType=VARCHAR},
+      <if test="record.createuserid != null">
+        createUserId = #{record.createuserid,jdbcType=VARCHAR},
       </if>
-      <if test="record.updateTime != null">
-        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      <if test="record.updatetime != null">
+        updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updateUserId != null">
-        updateUserId = #{record.updateUserId,jdbcType=VARCHAR},
+      <if test="record.updateuserid != null">
+        updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
       </if>
-      <if test="record.jobTitle != null">
-        jobTitle = #{record.jobTitle,jdbcType=VARCHAR},
+      <if test="record.jobtitle != null">
+        jobTitle = #{record.jobtitle,jdbcType=VARCHAR},
       </if>
       <if test="record.birthplace != null">
         birthplace = #{record.birthplace,jdbcType=VARCHAR},
       </if>
-      <if test="record.graduationSchoolMajor != null">
-        graduationSchoolMajor = #{record.graduationSchoolMajor,jdbcType=VARCHAR},
+      <if test="record.graduationschoolmajor != null">
+        graduationSchoolMajor = #{record.graduationschoolmajor,jdbcType=VARCHAR},
       </if>
-      <if test="record.inJobEducationType != null">
-        inJobEducationType = #{record.inJobEducationType,jdbcType=INTEGER},
+      <if test="record.injobeducationtype != null">
+        inJobEducationType = #{record.injobeducationtype,jdbcType=INTEGER},
       </if>
-      <if test="record.inJobQualificationType != null">
-        inJobQualificationType = #{record.inJobQualificationType,jdbcType=INTEGER},
+      <if test="record.injobqualificationtype != null">
+        inJobQualificationType = #{record.injobqualificationtype,jdbcType=INTEGER},
       </if>
-      <if test="record.inJobGraduationSchoolMajor != null">
-        inJobGraduationSchoolMajor = #{record.inJobGraduationSchoolMajor,jdbcType=VARCHAR},
+      <if test="record.injobgraduationschoolmajor != null">
+        inJobGraduationSchoolMajor = #{record.injobgraduationschoolmajor,jdbcType=VARCHAR},
       </if>
-      <if test="record.workExperience != null">
-        workExperience = #{record.workExperience,jdbcType=LONGVARCHAR},
+      <if test="record.party != null">
+        party = #{record.party,jdbcType=VARCHAR},
+      </if>
+      <if test="record.engagedate != null">
+        engageDate = #{record.engagedate,jdbcType=DATE},
+      </if>
+      <if test="record.workexperience != null">
+        workExperience = #{record.workexperience,jdbcType=LONGVARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -490,75 +513,79 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update lw_leaderteam
-    set leaderTeamId = #{record.leaderTeamId,jdbcType=VARCHAR},
+    set leaderTeamId = #{record.leaderteamid,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       no = #{record.no,jdbcType=VARCHAR},
-      leaderTeamType = #{record.leaderTeamType,jdbcType=INTEGER},
+      leaderTeamType = #{record.leaderteamtype,jdbcType=INTEGER},
       sex = #{record.sex,jdbcType=INTEGER},
-      birthDate = #{record.birthDate,jdbcType=DATE},
-      nativePlace = #{record.nativePlace,jdbcType=VARCHAR},
-      politicsStatus = #{record.politicsStatus,jdbcType=INTEGER},
-      departmentName = #{record.departmentName,jdbcType=VARCHAR},
+      birthDate = #{record.birthdate,jdbcType=DATE},
+      nativePlace = #{record.nativeplace,jdbcType=VARCHAR},
+      politicsStatus = #{record.politicsstatus,jdbcType=INTEGER},
+      departmentName = #{record.departmentname,jdbcType=VARCHAR},
       position = #{record.position,jdbcType=VARCHAR},
-      positionLevel = #{record.positionLevel,jdbcType=INTEGER},
-      nowPositionDate = #{record.nowPositionDate,jdbcType=DATE},
-      samePositionDate = #{record.samePositionDate,jdbcType=DATE},
-      joinDate = #{record.joinDate,jdbcType=DATE},
-      workDate = #{record.workDate,jdbcType=DATE},
-      educationType = #{record.educationType,jdbcType=INTEGER},
-      qualificationType = #{record.qualificationType,jdbcType=INTEGER},
-      professionalType = #{record.professionalType,jdbcType=INTEGER},
-      undergraduateProfessional = #{record.undergraduateProfessional,jdbcType=VARCHAR},
-      masterProfessional = #{record.masterProfessional,jdbcType=VARCHAR},
+      positionLevel = #{record.positionlevel,jdbcType=INTEGER},
+      nowPositionDate = #{record.nowpositiondate,jdbcType=DATE},
+      samePositionDate = #{record.samepositiondate,jdbcType=DATE},
+      joinDate = #{record.joindate,jdbcType=DATE},
+      workDate = #{record.workdate,jdbcType=DATE},
+      educationType = #{record.educationtype,jdbcType=INTEGER},
+      qualificationType = #{record.qualificationtype,jdbcType=INTEGER},
+      professionalType = #{record.professionaltype,jdbcType=INTEGER},
+      undergraduateProfessional = #{record.undergraduateprofessional,jdbcType=VARCHAR},
+      masterProfessional = #{record.masterprofessional,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
-      createTime = #{record.createTime,jdbcType=TIMESTAMP},
-      createUserId = #{record.createUserId,jdbcType=VARCHAR},
-      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
-      updateUserId = #{record.updateUserId,jdbcType=VARCHAR},
-      jobTitle = #{record.jobTitle,jdbcType=VARCHAR},
+      createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      jobTitle = #{record.jobtitle,jdbcType=VARCHAR},
       birthplace = #{record.birthplace,jdbcType=VARCHAR},
-      graduationSchoolMajor = #{record.graduationSchoolMajor,jdbcType=VARCHAR},
-      inJobEducationType = #{record.inJobEducationType,jdbcType=INTEGER},
-      inJobQualificationType = #{record.inJobQualificationType,jdbcType=INTEGER},
-      inJobGraduationSchoolMajor = #{record.inJobGraduationSchoolMajor,jdbcType=VARCHAR},
-      workExperience = #{record.workExperience,jdbcType=LONGVARCHAR}
+      graduationSchoolMajor = #{record.graduationschoolmajor,jdbcType=VARCHAR},
+      inJobEducationType = #{record.injobeducationtype,jdbcType=INTEGER},
+      inJobQualificationType = #{record.injobqualificationtype,jdbcType=INTEGER},
+      inJobGraduationSchoolMajor = #{record.injobgraduationschoolmajor,jdbcType=VARCHAR},
+      party = #{record.party,jdbcType=VARCHAR},
+      engageDate = #{record.engagedate,jdbcType=DATE},
+      workExperience = #{record.workexperience,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
     update lw_leaderteam
-    set leaderTeamId = #{record.leaderTeamId,jdbcType=VARCHAR},
+    set leaderTeamId = #{record.leaderteamid,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
       no = #{record.no,jdbcType=VARCHAR},
-      leaderTeamType = #{record.leaderTeamType,jdbcType=INTEGER},
+      leaderTeamType = #{record.leaderteamtype,jdbcType=INTEGER},
       sex = #{record.sex,jdbcType=INTEGER},
-      birthDate = #{record.birthDate,jdbcType=DATE},
-      nativePlace = #{record.nativePlace,jdbcType=VARCHAR},
-      politicsStatus = #{record.politicsStatus,jdbcType=INTEGER},
-      departmentName = #{record.departmentName,jdbcType=VARCHAR},
+      birthDate = #{record.birthdate,jdbcType=DATE},
+      nativePlace = #{record.nativeplace,jdbcType=VARCHAR},
+      politicsStatus = #{record.politicsstatus,jdbcType=INTEGER},
+      departmentName = #{record.departmentname,jdbcType=VARCHAR},
       position = #{record.position,jdbcType=VARCHAR},
-      positionLevel = #{record.positionLevel,jdbcType=INTEGER},
-      nowPositionDate = #{record.nowPositionDate,jdbcType=DATE},
-      samePositionDate = #{record.samePositionDate,jdbcType=DATE},
-      joinDate = #{record.joinDate,jdbcType=DATE},
-      workDate = #{record.workDate,jdbcType=DATE},
-      educationType = #{record.educationType,jdbcType=INTEGER},
-      qualificationType = #{record.qualificationType,jdbcType=INTEGER},
-      professionalType = #{record.professionalType,jdbcType=INTEGER},
-      undergraduateProfessional = #{record.undergraduateProfessional,jdbcType=VARCHAR},
-      masterProfessional = #{record.masterProfessional,jdbcType=VARCHAR},
+      positionLevel = #{record.positionlevel,jdbcType=INTEGER},
+      nowPositionDate = #{record.nowpositiondate,jdbcType=DATE},
+      samePositionDate = #{record.samepositiondate,jdbcType=DATE},
+      joinDate = #{record.joindate,jdbcType=DATE},
+      workDate = #{record.workdate,jdbcType=DATE},
+      educationType = #{record.educationtype,jdbcType=INTEGER},
+      qualificationType = #{record.qualificationtype,jdbcType=INTEGER},
+      professionalType = #{record.professionaltype,jdbcType=INTEGER},
+      undergraduateProfessional = #{record.undergraduateprofessional,jdbcType=VARCHAR},
+      masterProfessional = #{record.masterprofessional,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
-      createTime = #{record.createTime,jdbcType=TIMESTAMP},
-      createUserId = #{record.createUserId,jdbcType=VARCHAR},
-      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
-      updateUserId = #{record.updateUserId,jdbcType=VARCHAR},
-      jobTitle = #{record.jobTitle,jdbcType=VARCHAR},
+      createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      jobTitle = #{record.jobtitle,jdbcType=VARCHAR},
       birthplace = #{record.birthplace,jdbcType=VARCHAR},
-      graduationSchoolMajor = #{record.graduationSchoolMajor,jdbcType=VARCHAR},
-      inJobEducationType = #{record.inJobEducationType,jdbcType=INTEGER},
-      inJobQualificationType = #{record.inJobQualificationType,jdbcType=INTEGER},
-      inJobGraduationSchoolMajor = #{record.inJobGraduationSchoolMajor,jdbcType=VARCHAR}
+      graduationSchoolMajor = #{record.graduationschoolmajor,jdbcType=VARCHAR},
+      inJobEducationType = #{record.injobeducationtype,jdbcType=INTEGER},
+      inJobQualificationType = #{record.injobqualificationtype,jdbcType=INTEGER},
+      inJobGraduationSchoolMajor = #{record.injobgraduationschoolmajor,jdbcType=VARCHAR},
+      party = #{record.party,jdbcType=VARCHAR},
+      engageDate = #{record.engagedate,jdbcType=DATE}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -572,163 +599,173 @@
       <if test="no != null">
         no = #{no,jdbcType=VARCHAR},
       </if>
-      <if test="leaderTeamType != null">
-        leaderTeamType = #{leaderTeamType,jdbcType=INTEGER},
+      <if test="leaderteamtype != null">
+        leaderTeamType = #{leaderteamtype,jdbcType=INTEGER},
       </if>
       <if test="sex != null">
         sex = #{sex,jdbcType=INTEGER},
       </if>
-      <if test="birthDate != null">
-        birthDate = #{birthDate,jdbcType=DATE},
+      <if test="birthdate != null">
+        birthDate = #{birthdate,jdbcType=DATE},
       </if>
-      <if test="nativePlace != null">
-        nativePlace = #{nativePlace,jdbcType=VARCHAR},
+      <if test="nativeplace != null">
+        nativePlace = #{nativeplace,jdbcType=VARCHAR},
       </if>
-      <if test="politicsStatus != null">
-        politicsStatus = #{politicsStatus,jdbcType=INTEGER},
+      <if test="politicsstatus != null">
+        politicsStatus = #{politicsstatus,jdbcType=INTEGER},
       </if>
-      <if test="departmentName != null">
-        departmentName = #{departmentName,jdbcType=VARCHAR},
+      <if test="departmentname != null">
+        departmentName = #{departmentname,jdbcType=VARCHAR},
       </if>
       <if test="position != null">
         position = #{position,jdbcType=VARCHAR},
       </if>
-      <if test="positionLevel != null">
-        positionLevel = #{positionLevel,jdbcType=INTEGER},
+      <if test="positionlevel != null">
+        positionLevel = #{positionlevel,jdbcType=INTEGER},
       </if>
-      <if test="nowPositionDate != null">
-        nowPositionDate = #{nowPositionDate,jdbcType=DATE},
+      <if test="nowpositiondate != null">
+        nowPositionDate = #{nowpositiondate,jdbcType=DATE},
       </if>
-      <if test="samePositionDate != null">
-        samePositionDate = #{samePositionDate,jdbcType=DATE},
+      <if test="samepositiondate != null">
+        samePositionDate = #{samepositiondate,jdbcType=DATE},
       </if>
-      <if test="joinDate != null">
-        joinDate = #{joinDate,jdbcType=DATE},
+      <if test="joindate != null">
+        joinDate = #{joindate,jdbcType=DATE},
       </if>
-      <if test="workDate != null">
-        workDate = #{workDate,jdbcType=DATE},
+      <if test="workdate != null">
+        workDate = #{workdate,jdbcType=DATE},
       </if>
-      <if test="educationType != null">
-        educationType = #{educationType,jdbcType=INTEGER},
+      <if test="educationtype != null">
+        educationType = #{educationtype,jdbcType=INTEGER},
       </if>
-      <if test="qualificationType != null">
-        qualificationType = #{qualificationType,jdbcType=INTEGER},
+      <if test="qualificationtype != null">
+        qualificationType = #{qualificationtype,jdbcType=INTEGER},
       </if>
-      <if test="professionalType != null">
-        professionalType = #{professionalType,jdbcType=INTEGER},
+      <if test="professionaltype != null">
+        professionalType = #{professionaltype,jdbcType=INTEGER},
       </if>
-      <if test="undergraduateProfessional != null">
-        undergraduateProfessional = #{undergraduateProfessional,jdbcType=VARCHAR},
+      <if test="undergraduateprofessional != null">
+        undergraduateProfessional = #{undergraduateprofessional,jdbcType=VARCHAR},
       </if>
-      <if test="masterProfessional != null">
-        masterProfessional = #{masterProfessional,jdbcType=VARCHAR},
+      <if test="masterprofessional != null">
+        masterProfessional = #{masterprofessional,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null">
-        createTime = #{createTime,jdbcType=TIMESTAMP},
+      <if test="createtime != null">
+        createTime = #{createtime,jdbcType=TIMESTAMP},
       </if>
-      <if test="createUserId != null">
-        createUserId = #{createUserId,jdbcType=VARCHAR},
+      <if test="createuserid != null">
+        createUserId = #{createuserid,jdbcType=VARCHAR},
       </if>
-      <if test="updateTime != null">
-        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      <if test="updatetime != null">
+        updateTime = #{updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updateUserId != null">
-        updateUserId = #{updateUserId,jdbcType=VARCHAR},
+      <if test="updateuserid != null">
+        updateUserId = #{updateuserid,jdbcType=VARCHAR},
       </if>
-      <if test="jobTitle != null">
-        jobTitle = #{jobTitle,jdbcType=VARCHAR},
+      <if test="jobtitle != null">
+        jobTitle = #{jobtitle,jdbcType=VARCHAR},
       </if>
       <if test="birthplace != null">
         birthplace = #{birthplace,jdbcType=VARCHAR},
       </if>
-      <if test="graduationSchoolMajor != null">
-        graduationSchoolMajor = #{graduationSchoolMajor,jdbcType=VARCHAR},
+      <if test="graduationschoolmajor != null">
+        graduationSchoolMajor = #{graduationschoolmajor,jdbcType=VARCHAR},
+      </if>
+      <if test="injobeducationtype != null">
+        inJobEducationType = #{injobeducationtype,jdbcType=INTEGER},
+      </if>
+      <if test="injobqualificationtype != null">
+        inJobQualificationType = #{injobqualificationtype,jdbcType=INTEGER},
       </if>
-      <if test="inJobEducationType != null">
-        inJobEducationType = #{inJobEducationType,jdbcType=INTEGER},
+      <if test="injobgraduationschoolmajor != null">
+        inJobGraduationSchoolMajor = #{injobgraduationschoolmajor,jdbcType=VARCHAR},
       </if>
-      <if test="inJobQualificationType != null">
-        inJobQualificationType = #{inJobQualificationType,jdbcType=INTEGER},
+      <if test="party != null">
+        party = #{party,jdbcType=VARCHAR},
       </if>
-      <if test="inJobGraduationSchoolMajor != null">
-        inJobGraduationSchoolMajor = #{inJobGraduationSchoolMajor,jdbcType=VARCHAR},
+      <if test="engagedate != null">
+        engageDate = #{engagedate,jdbcType=DATE},
       </if>
-      <if test="workExperience != null">
-        workExperience = #{workExperience,jdbcType=LONGVARCHAR},
+      <if test="workexperience != null">
+        workExperience = #{workexperience,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where leaderTeamId = #{leaderTeamId,jdbcType=VARCHAR}
+    where leaderTeamId = #{leaderteamid,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.ghsc.partybuild.model.LwLeaderteam">
     update lw_leaderteam
     set name = #{name,jdbcType=VARCHAR},
       no = #{no,jdbcType=VARCHAR},
-      leaderTeamType = #{leaderTeamType,jdbcType=INTEGER},
+      leaderTeamType = #{leaderteamtype,jdbcType=INTEGER},
       sex = #{sex,jdbcType=INTEGER},
-      birthDate = #{birthDate,jdbcType=DATE},
-      nativePlace = #{nativePlace,jdbcType=VARCHAR},
-      politicsStatus = #{politicsStatus,jdbcType=INTEGER},
-      departmentName = #{departmentName,jdbcType=VARCHAR},
+      birthDate = #{birthdate,jdbcType=DATE},
+      nativePlace = #{nativeplace,jdbcType=VARCHAR},
+      politicsStatus = #{politicsstatus,jdbcType=INTEGER},
+      departmentName = #{departmentname,jdbcType=VARCHAR},
       position = #{position,jdbcType=VARCHAR},
-      positionLevel = #{positionLevel,jdbcType=INTEGER},
-      nowPositionDate = #{nowPositionDate,jdbcType=DATE},
-      samePositionDate = #{samePositionDate,jdbcType=DATE},
-      joinDate = #{joinDate,jdbcType=DATE},
-      workDate = #{workDate,jdbcType=DATE},
-      educationType = #{educationType,jdbcType=INTEGER},
-      qualificationType = #{qualificationType,jdbcType=INTEGER},
-      professionalType = #{professionalType,jdbcType=INTEGER},
-      undergraduateProfessional = #{undergraduateProfessional,jdbcType=VARCHAR},
-      masterProfessional = #{masterProfessional,jdbcType=VARCHAR},
+      positionLevel = #{positionlevel,jdbcType=INTEGER},
+      nowPositionDate = #{nowpositiondate,jdbcType=DATE},
+      samePositionDate = #{samepositiondate,jdbcType=DATE},
+      joinDate = #{joindate,jdbcType=DATE},
+      workDate = #{workdate,jdbcType=DATE},
+      educationType = #{educationtype,jdbcType=INTEGER},
+      qualificationType = #{qualificationtype,jdbcType=INTEGER},
+      professionalType = #{professionaltype,jdbcType=INTEGER},
+      undergraduateProfessional = #{undergraduateprofessional,jdbcType=VARCHAR},
+      masterProfessional = #{masterprofessional,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
-      createTime = #{createTime,jdbcType=TIMESTAMP},
-      createUserId = #{createUserId,jdbcType=VARCHAR},
-      updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      updateUserId = #{updateUserId,jdbcType=VARCHAR},
-      jobTitle = #{jobTitle,jdbcType=VARCHAR},
+      createTime = #{createtime,jdbcType=TIMESTAMP},
+      createUserId = #{createuserid,jdbcType=VARCHAR},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      jobTitle = #{jobtitle,jdbcType=VARCHAR},
       birthplace = #{birthplace,jdbcType=VARCHAR},
-      graduationSchoolMajor = #{graduationSchoolMajor,jdbcType=VARCHAR},
-      inJobEducationType = #{inJobEducationType,jdbcType=INTEGER},
-      inJobQualificationType = #{inJobQualificationType,jdbcType=INTEGER},
-      inJobGraduationSchoolMajor = #{inJobGraduationSchoolMajor,jdbcType=VARCHAR},
-      workExperience = #{workExperience,jdbcType=LONGVARCHAR}
-    where leaderTeamId = #{leaderTeamId,jdbcType=VARCHAR}
+      graduationSchoolMajor = #{graduationschoolmajor,jdbcType=VARCHAR},
+      inJobEducationType = #{injobeducationtype,jdbcType=INTEGER},
+      inJobQualificationType = #{injobqualificationtype,jdbcType=INTEGER},
+      inJobGraduationSchoolMajor = #{injobgraduationschoolmajor,jdbcType=VARCHAR},
+      party = #{party,jdbcType=VARCHAR},
+      engageDate = #{engagedate,jdbcType=DATE},
+      workExperience = #{workexperience,jdbcType=LONGVARCHAR}
+    where leaderTeamId = #{leaderteamid,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.LwLeaderteam">
     update lw_leaderteam
     set name = #{name,jdbcType=VARCHAR},
       no = #{no,jdbcType=VARCHAR},
-      leaderTeamType = #{leaderTeamType,jdbcType=INTEGER},
+      leaderTeamType = #{leaderteamtype,jdbcType=INTEGER},
       sex = #{sex,jdbcType=INTEGER},
-      birthDate = #{birthDate,jdbcType=DATE},
-      nativePlace = #{nativePlace,jdbcType=VARCHAR},
-      politicsStatus = #{politicsStatus,jdbcType=INTEGER},
-      departmentName = #{departmentName,jdbcType=VARCHAR},
+      birthDate = #{birthdate,jdbcType=DATE},
+      nativePlace = #{nativeplace,jdbcType=VARCHAR},
+      politicsStatus = #{politicsstatus,jdbcType=INTEGER},
+      departmentName = #{departmentname,jdbcType=VARCHAR},
       position = #{position,jdbcType=VARCHAR},
-      positionLevel = #{positionLevel,jdbcType=INTEGER},
-      nowPositionDate = #{nowPositionDate,jdbcType=DATE},
-      samePositionDate = #{samePositionDate,jdbcType=DATE},
-      joinDate = #{joinDate,jdbcType=DATE},
-      workDate = #{workDate,jdbcType=DATE},
-      educationType = #{educationType,jdbcType=INTEGER},
-      qualificationType = #{qualificationType,jdbcType=INTEGER},
-      professionalType = #{professionalType,jdbcType=INTEGER},
-      undergraduateProfessional = #{undergraduateProfessional,jdbcType=VARCHAR},
-      masterProfessional = #{masterProfessional,jdbcType=VARCHAR},
+      positionLevel = #{positionlevel,jdbcType=INTEGER},
+      nowPositionDate = #{nowpositiondate,jdbcType=DATE},
+      samePositionDate = #{samepositiondate,jdbcType=DATE},
+      joinDate = #{joindate,jdbcType=DATE},
+      workDate = #{workdate,jdbcType=DATE},
+      educationType = #{educationtype,jdbcType=INTEGER},
+      qualificationType = #{qualificationtype,jdbcType=INTEGER},
+      professionalType = #{professionaltype,jdbcType=INTEGER},
+      undergraduateProfessional = #{undergraduateprofessional,jdbcType=VARCHAR},
+      masterProfessional = #{masterprofessional,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
-      createTime = #{createTime,jdbcType=TIMESTAMP},
-      createUserId = #{createUserId,jdbcType=VARCHAR},
-      updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      updateUserId = #{updateUserId,jdbcType=VARCHAR},
-      jobTitle = #{jobTitle,jdbcType=VARCHAR},
+      createTime = #{createtime,jdbcType=TIMESTAMP},
+      createUserId = #{createuserid,jdbcType=VARCHAR},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      jobTitle = #{jobtitle,jdbcType=VARCHAR},
       birthplace = #{birthplace,jdbcType=VARCHAR},
-      graduationSchoolMajor = #{graduationSchoolMajor,jdbcType=VARCHAR},
-      inJobEducationType = #{inJobEducationType,jdbcType=INTEGER},
-      inJobQualificationType = #{inJobQualificationType,jdbcType=INTEGER},
-      inJobGraduationSchoolMajor = #{inJobGraduationSchoolMajor,jdbcType=VARCHAR}
-    where leaderTeamId = #{leaderTeamId,jdbcType=VARCHAR}
+      graduationSchoolMajor = #{graduationschoolmajor,jdbcType=VARCHAR},
+      inJobEducationType = #{injobeducationtype,jdbcType=INTEGER},
+      inJobQualificationType = #{injobqualificationtype,jdbcType=INTEGER},
+      inJobGraduationSchoolMajor = #{injobgraduationschoolmajor,jdbcType=VARCHAR},
+      party = #{party,jdbcType=VARCHAR},
+      engageDate = #{engagedate,jdbcType=DATE}
+    where leaderTeamId = #{leaderteamid,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/static/app/main/app.js

@@ -2936,10 +2936,39 @@
             controller: "leaderTeamListCtrl",
             resolve: {
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
-                    $ocLazyLoad.load('../main/leaderwork/leaderteam/edit.js?' + window.sysVersion);
                     return $ocLazyLoad.load('../main/leaderwork/leaderteam/list.js?' + window.sysVersion);
                 }]
             }
+        }).state("home.leaderTeamEdit1", {
+            url: "leaderTeamEdit1",
+            params: { "leaderTeamType": 1 },
+            templateUrl: "../main/leaderwork/leaderteam/edit.html?" + window.sysVersion,
+            controller: "leaderTeamEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/leaderwork/leaderteam/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.leaderTeamAdd1", {
+            url: "leaderTeamAdd1",
+            params: { "leaderTeamType": 1 },
+            templateUrl: "../main/leaderwork/leaderteam/edit.html?" + window.sysVersion,
+            controller: "leaderTeamEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/leaderwork/leaderteam/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.leaderTeamDetail1", {
+            url: "leaderTeamDetail1",
+            params: { "leaderTeamType": 1 },
+            templateUrl: "../main/leaderwork/leaderteam/detail.html?" + window.sysVersion,
+            controller: "leaderTeamDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/leaderwork/leaderteam/detail.js?' + window.sysVersion);
+                }]
+            }
         }).state("home.lw_leaderTeamList2", {
             url: "lw_leaderTeamList2",
             params: { "leaderTeamType": 2 },
@@ -2947,10 +2976,39 @@
             controller: "leaderTeamListCtrl",
             resolve: {
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
-                    $ocLazyLoad.load('../main/leaderwork/leaderteam/edit.js?' + window.sysVersion);
                     return $ocLazyLoad.load('../main/leaderwork/leaderteam/list.js?' + window.sysVersion);
                 }]
             }
+        }).state("home.leaderTeamEdit2", {
+            url: "leaderTeamEdit2",
+            params: { "leaderTeamType": 2 },
+            templateUrl: "../main/leaderwork/leaderteam/edit.html?" + window.sysVersion,
+            controller: "leaderTeamEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/leaderwork/leaderteam/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.leaderTeamAdd2", {
+            url: "leaderTeamAdd2",
+            params: { "leaderTeamType": 2 },
+            templateUrl: "../main/leaderwork/leaderteam/edit.html?" + window.sysVersion,
+            controller: "leaderTeamEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/leaderwork/leaderteam/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.leaderTeamDetail2", {
+            url: "leaderTeamDetail2",
+            params: { "leaderTeamType": 2 },
+            templateUrl: "../main/leaderwork/leaderteam/detail.html?" + window.sysVersion,
+            controller: "leaderTeamDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/leaderwork/leaderteam/detail.js?' + window.sysVersion);
+                }]
+            }
         }).state("home.pf_meetingList1", {
             url: "pf_meetingList1",
             params: { "partyLifeMeetingType": 1 },

src/main/resources/static/app/main/leaderwork/leaderteam/detail.html

@@ -0,0 +1,94 @@
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
+        <div class="card">
+                <div class="dj-formtable">
+                    <table class="dj-table dj-table3">
+                        <tr>
+                            <th>姓名</th>
+                            <td>{{dataModel.name}}</td>
+                            <th>所属机构（学校院系）</th>
+                            <td>{{dataModel.departmentname}}</td>
+                            <th>部门职务</th>
+                            <td>{{dataModel.position}}</td>
+                        </tr>
+                        <tr>
+                            <th>性别</th>
+                            <td>{{dataModel.sexname}}</td>
+                            <th>民族</th>
+                            <td>{{dataModel.birthplacename}}</td>
+                            <th>籍贯</th>
+                            <td>{{dataModel.nativeplace}}</td>
+                        </tr>
+                        <tr>
+                            <th>出生年月</th>
+                            <td>{{dataModel.birthdate|date:'yyyyMM'}}</td>
+                            <th>参加工作时间</th>
+                            <td>{{dataModel.workdate|date:'yyyyMM'}}</td>
+                            <th>学历</th>
+                            <td>{{dataModel.educationname}}</td>
+                        </tr>
+                        <tr>
+                            <th>党派</th>
+                            <td>{{dataModel.party}}</td>
+                            <th>加入时间</th>
+                            <td>{{dataModel.joindate|date:'yyyyMM'}}</td>
+                            <th>学位</th>
+                            <td>{{dataModel.qualificationname}}</td>
+                        </tr>
+                        <tr>
+                            <th>专业</th>
+                            <td>{{dataModel.graduationschoolmajor}}</td>
+                            <th>专业技术职务</th>
+                            <td>{{dataModel.professionalname}}</td>
+                            <th>专业技术职务聘任时间</th>
+                            <td>{{dataModel.engagedate|date:'yyyyMM'}}</td>
+                        </tr>
+                        <tr>
+                            <th>任行政现职时间</th>
+                            <td>{{dataModel.nowpositiondate|date:'yyyyMM'}}</td>
+                            <th>任行政同职级时间</th>
+                            <td>{{dataModel.samepositiondate|date:'yyyyMM'}}</td>
+                        </tr>
+                        <tr>
+                            <th>相关管理工作经历</th>
+                            <td colspan="5">{{dataModel.workexperience}}</td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="dj-formtable">
+                    <div class="table-responsive list-table-panel">
+                        <div class="list-table-title">
+                            <div class="table-title">
+                                一线授课情况({{dataModel.experienceList.length}}人)
+                            </div>
+                        </div>
+                        <div class="outoflow" style="max-height: 300px;">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>序号</th>
+                                    <th>学年</th>
+                                    <th>课程名称</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataModel.experienceList">
+                                    <td>{{$index+1}}</td>
+                                    <td>{{it.schoolyear}}</td>
+                                    <td>{{it.coursename}}</td>
+                                </tr>
+                                <tr ng-if="dataModel.experienceList.length<=0">
+                                    <td colspan="7" style="text-align:center">暂无数据</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+                <div class="form_foot">
+                    <button type="button" class="btn btn-default" ng-click="pagechange()">关闭</button>
+                </div>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/main/leaderwork/leaderteam/detail.js

@@ -0,0 +1,26 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('leaderTeamDetailCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.editParams = $bsRouterState.$params($scope);
+        $scope.dataModel = {};
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/leaderWork/getLeaderTeamById",
+                params: {
+                    'id': $scope.editParams.id
+                }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.getData();
+
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
+    });
+})(angular);

src/main/resources/static/app/main/leaderwork/leaderteam/edit.html

@@ -1,248 +1,253 @@
-<div class="modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" style="width: 850px;">
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
         <div class="card">
-            <div class="header" dragable-header>
-                <button type="button" class="close" ng-click="$hide()">&times;</button>
-                <h4 class="modal-title">{{editParams.title}}</h4>
-            </div>
-            <div activate-input activate-select class="body">
-                <form class="form-horizontal" role="form" id="editForm"
+            <form class="form-horizontal" role="form" id="editForm"
                       name="editForm" ng-submit="save(editForm.$valid)" novalidate>
                     <div class="dj-formtable">
-                        <table class="dj-table">
+                        <table class="dj-table dj-table3">
                             <tr>
-                                <th>机构<span style="color: red">*</span></th>
-                                <td ng-class="{ 'has-error' : this.editForm.departmentName.$invalid &&  this.editForm.$submitted}">
-                                    <input type="text" class="form-control" name="departmentName"
-                                           ng-model="dataModel.departmentName" ng-required="true"/>
-                                </td>
-                                <th>职位</th>
-                                <td>
-                                    <input type="text" class="form-control" name="jobTitle"
-                                           ng-model="dataModel.jobTitle"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>工号</th>
-                                <td ng-class="{ 'has-error' : this.editForm.no.$invalid &&  this.editForm.$submitted}">
-                                    <input type="text" class="form-control" name="no"
-                                           ng-model="dataModel.no"/>
-                                </td>
                                 <th>姓名<span style="color: red">*</span></th>
                                 <td ng-class="{ 'has-error' : this.editForm.name.$invalid &&  this.editForm.$submitted}">
                                     <input type="text" class="form-control" name="name"
+                                           autocomplete="off" autoclose="true"
                                            ng-model="dataModel.name" ng-required="true"/>
+                                    <span ng-show="this.editForm.name.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>所属机构（学校院系）<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.departmentname.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="departmentname"
+                                           autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.departmentname" ng-required="true"/>
+                                    <span ng-show="this.editForm.departmentname.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>部门职务<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.position.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="position"
+                                           autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.position" ng-required="true"/>
+                                    <span ng-show="this.editForm.position.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
-                                <th>职务</th>
-                                <td>
-                                    <input type="text" class="form-control" name="position"
-                                           ng-model="dataModel.position"/>
-                                </td>
-                                <th>职务级别</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.positionLevel"
-                                            ng-options="type.dickey as type.dicvalue for type in positionLevelList"
-                                            class="form-control"
-                                            name="positionLevel">
+                                <th>性别<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.sex.position.$invalid &&  this.editForm.$submitted}">
+                                    <select class="form-control show-tick" ng-model="dataModel.sex"
+                                            ng-options="type.dickey as type.dicvalue for type in sexList"
+                                            class="form-control" ng-required="true" name="sex">
+                                        <option value="" selected>--请选择--</option>
+                                    </select>
+                                    <span ng-show="this.editForm.sex.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>民族<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.birthplace.$invalid &&  this.editForm.$submitted}">
+                                    <select class="form-control show-tick" ng-model="dataModel.birthplace"
+                                        ng-options="type.BM as type.HZMC for type in birthplaceList"
+                                        class="form-control" ng-required="true" name="birthplace">
                                         <option value="" selected>--请选择--</option>
                                     </select>
+                                    <span ng-show="this.editForm.birthplace.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>籍贯<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.nativeplace.position.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="nativeplace"
+                                           autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.nativeplace" ng-required="true"/>
+                                    <span ng-show="this.editForm.nativeplace.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
-                                <th>现职时间</th>
-                                <td ng-class="{ 'has-error' : this.editForm.nowPositionDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="nowPositionDate" class="form-control"
+                                <th>出生年月<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.birthdate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="birthdate" class="form-control"
                                            autocomplete="off"
-                                           autoclose="true"
+                                           autoclose="true" ng-required="true"
                                            data-date-format="yyyyMM" data-date-type="date"
                                            data-start-view="1" data-min-view="1"
-                                           ng-model="dataModel.nowPositionDate"
+                                           ng-model="dataModel.birthdate"
                                            placeholder="" bs-datepicker/>
+                                    <span ng-show="this.editForm.birthdate.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
-                                <th>同职时间</th>
-                                <td ng-class="{ 'has-error' : this.editForm.samePositionDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="samePositionDate" class="form-control"
+                                <th>参加工作时间<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.workdate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="workdate" class="form-control"
                                            autocomplete="off"
-                                           autoclose="true"
+                                           autoclose="true" ng-required="true"
                                            data-date-format="yyyyMM" data-date-type="date"
                                            data-start-view="1" data-min-view="1"
-                                           ng-model="dataModel.samePositionDate"
+                                           ng-model="dataModel.workdate"
                                            placeholder="" bs-datepicker/>
+                                    <span ng-show="this.editForm.workdate.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
-                            </tr>
-                            <tr>
-                                <th>性别</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.sex"
-                                            ng-options="type.dickey as type.dicvalue for type in sexList"
-                                            class="form-control"
-                                            name="sex">
+                                <th>学历<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.educationtype.$invalid &&  this.editForm.$submitted}">
+                                    <select class="form-control show-tick" ng-model="dataModel.educationtype"
+                                            ng-options="type.dickey as type.dicvalue for type in educationTypeList"
+                                            class="form-control" name="educationtype" ng-required="true">
                                         <option value="" selected>--请选择--</option>
                                     </select>
+                                    <span ng-show="this.editForm.educationtype.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
-                                <th>出生年月</th>
-                                <td ng-class="{ 'has-error' : this.editForm.birthDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="birthDate" class="form-control"
+                            </tr>
+                            <tr>
+                                <th>党派<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.party.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="party"
+                                           autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.party" ng-required="true"/>
+                                    <span ng-show="this.editForm.party.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>加入时间<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.joindate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="joindate" class="form-control"
                                            autocomplete="off"
-                                           autoclose="true"
+                                           autoclose="true" ng-required="true"
                                            data-date-format="yyyyMM" data-date-type="date"
                                            data-start-view="1" data-min-view="1"
-                                           ng-model="dataModel.birthDate"
+                                           ng-model="dataModel.joindate"
                                            placeholder="" bs-datepicker/>
+                                    <span ng-show="this.editForm.joindate.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
-                            </tr>
-                            <tr>
-                                <th>籍贯</th>
-                                <td>
-                                    <input type="text" class="form-control" name="nativePlace"
-                                           ng-model="dataModel.nativePlace"/>
-                                </td>
-                                <th>出生地</th>
-                                <td>
-                                    <input type="text" class="form-control" name="birthplace"
-                                           ng-model="dataModel.birthplace"/>
+                                <th>学位<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.qualificationtype.$invalid &&  this.editForm.$submitted}">
+                                    <select class="form-control show-tick" ng-model="dataModel.qualificationtype"
+                                            ng-options="type.dickey as type.dicvalue for type in qualificationTypeList"
+                                            class="form-control" name="qualificationtype" ng-required="true">
+                                        <option value="" selected>--请选择--</option>
+                                    </select>
+                                    <span ng-show="this.editForm.qualificationtype.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
-                                <th>政治面貌</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.politicsStatus"
-                                            ng-options="type.dickey as type.dicvalue for type in politicsStatusList"
-                                            class="form-control"
-                                            name="politicsStatus">
-                                        <option value="" selected>--请选择--</option>
-                                    </select>
+                                <th>专业<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.graduationschoolmajor.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="graduationschoolmajor"
+                                           ng-model="dataModel.graduationschoolmajor" ng-required="true"/>
+                                    <span ng-show="this.editForm.graduationschoolmajor.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
                                 <th>专业技术职务</th>
                                 <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.professionalType"
+                                    <select class="form-control show-tick" ng-model="dataModel.professionaltype"
                                             ng-options="type.dickey as type.dicvalue for type in professionalTypeList"
                                             class="form-control"
-                                            name="professionalType">
+                                            name="professionaltype">
                                         <option value="" selected>--请选择--</option>
                                     </select>
                                 </td>
-                            </tr>
-                            <tr>
-                                <th>入党时间</th>
-                                <td ng-if="dataModel.leaderTeamType==1"
-                                    ng-class="{ 'has-error' : this.editForm.joinDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="joinDate" class="form-control"
+                                <th>专业技术职务聘任时间</th>
+                                <td ng-class="{ 'has-error' : this.editForm.engagedate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="engagedate" class="form-control"
                                            autocomplete="off"
                                            autoclose="true"
                                            data-date-format="yyyyMM" data-date-type="date"
                                            data-start-view="1" data-min-view="1"
-                                           ng-model="dataModel.joinDate"
+                                           ng-model="dataModel.engagedate"
                                            placeholder="" bs-datepicker/>
                                 </td>
-                                <td ng-if="dataModel.leaderTeamType==2"
-                                    ng-class="{ 'has-error' : this.editForm.joinDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="joinDate" class="form-control"
+                            </tr>
+                            <tr>
+                                <th>任行政现职时间<span style="color: red">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.nowpositiondate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="nowpositiondate" class="form-control"
                                            autocomplete="off"
-                                           autoclose="true"
-                                           data-date-format="yyyyMMdd" data-date-type="date"
-                                           ng-model="dataModel.joinDate"
+                                           autoclose="true" ng-required="true"
+                                           data-date-format="yyyyMM" data-date-type="date"
+                                           data-start-view="1" data-min-view="1"
+                                           ng-model="dataModel.nowpositiondate"
                                            placeholder="" bs-datepicker/>
+                                    <span ng-show="this.editForm.nowpositiondate.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
-                                <th>参加工作时间</th>
-                                <td ng-class="{ 'has-error' : this.editForm.workDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="workDate" class="form-control"
+                                <th>任行政同职级时间</th>
+                                <td ng-class="{ 'has-error' : this.editForm.samepositiondate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="samepositiondate" class="form-control"
                                            autocomplete="off"
                                            autoclose="true"
                                            data-date-format="yyyyMM" data-date-type="date"
                                            data-start-view="1" data-min-view="1"
-                                           ng-model="dataModel.workDate"
+                                           ng-model="dataModel.samepositiondate"
                                            placeholder="" bs-datepicker/>
                                 </td>
                             </tr>
                             <tr>
-                                <th>全日制教育学历</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.educationType"
-                                            ng-options="type.dickey as type.dicvalue for type in educationTypeList"
-                                            class="form-control"
-                                            name="educationType">
-                                        <option value="" selected>--请选择--</option>
-                                    </select>
-                                </td>
-                                <th>全日制教育学位</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.qualificationType"
-                                            ng-options="type.dickey as type.dicvalue for type in qualificationTypeList"
-                                            class="form-control"
-                                            name="qualificationType">
-                                        <option value="" selected>--请选择--</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>全日制教育毕业院校及专业</th>
-                                <td colspan="3">
-                                    <input type="text" class="form-control" name="graduationSchoolMajor"
-                                           ng-model="dataModel.graduationSchoolMajor"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>在职教育学历</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.inJobEducationType"
-                                            ng-options="type.dickey as type.dicvalue for type in educationTypeList"
-                                            class="form-control"
-                                            name="inJobEducationType">
-                                        <option value="" selected>--请选择--</option>
-                                    </select>
-                                </td>
-                                <th>在职教育学位</th>
-                                <td>
-                                    <select class="form-control show-tick" ng-model="dataModel.inJobQualificationType"
-                                            ng-options="type.dickey as type.dicvalue for type in qualificationTypeList"
-                                            class="form-control"
-                                            name="inJobQualificationType">
-                                        <option value="" selected>--请选择--</option>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th>在职教育毕业院校及专业</th>
-                                <td colspan="3">
-                                    <input type="text" class="form-control" name="inJobGraduationSchoolMajor"
-                                           ng-model="dataModel.inJobGraduationSchoolMajor"/>
-                                </td>
-                            </tr>
-                            <tr ng-if="dataModel.leaderTeamType==2">
-                                <th>本科专业</th>
-                                <td>
-                                    <input type="text" class="form-control" name="undergraduateProfessional"
-                                           ng-model="dataModel.undergraduateProfessional"/>
-                                </td>
-                                <th>硕士专业</th>
-                                <td>
-                                    <input type="text" class="form-control" name="masterProfessional"
-                                           ng-model="dataModel.masterProfessional"/>
-                                </td>
-                            </tr>
-                            <!--<tr>
-                                <th>备注</th>
-                                <td colspan="3">
-                                    <textarea class="form-control"  ng-model="dataModel.remark" rows="3"></textarea>
-                                </td>
-                            </tr>-->
-                            <tr>
-                                <th>任职经历</th>
-                                <td colspan="3">
-                                    <textarea class="form-control"  ng-model="dataModel.workExperience" rows="3"></textarea>
+                                <th>相关管理工作经历</th>
+                                <td colspan="5">
+                                    <textarea class="form-control"  ng-model="dataModel.workexperience" rows="3"></textarea>
                                 </td>
                             </tr>
                         </table>
                     </div>
+                    <div class="dj-formtable">
+                    <div class="table-responsive list-table-panel">
+                        <div class="list-table-title">
+                            <div class="table-title">
+                                一线授课情况({{dataModel.experienceList.length}}人)
+                            </div>
+                            <div class="table-tool">
+                                <button type="button" class="btn btn-primary dropdown-toggle"
+                                        title="新增" ng-click="addExperience()">
+                                    新增
+                                </button>
+                            </div>
+                        </div>
+                        <div class="outoflow" style="max-height: 300px;">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>序号</th>
+                                    <th>学年</th>
+                                    <th>课程名称</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataModel.experienceList">
+                                    <td scope="row">{{$index+1}}</td>
+                                    <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'schoolyear') &&  this.editForm.$submitted}">
+                                        <input name="schoolyear_{{$index}}" class="form-control"
+                                                autocomplete="off"
+                                                autoclose="true" data-min-view="2" data-start-view="2"
+                                                data-date-format="yyyy" data-date-type="string"
+                                                ng-model="it.schoolyear" placeholder="" ng-required="true"
+                                                bs-datepicker/>
+                                    </td>
+                                    <td ng-class="{ 'has-error' : invalidFee($index, editForm, 'coursename') &&  this.editForm.$submitted}">
+                                        <input type="text" class="form-control" name="coursename_{{$index}}" ng-required="true"
+                                               ng-model="it.coursename"/>
+                                    </td>
+                                    <td class="text-center">
+                                        <button type="button" class="btn td-btn bg-pink waves-effect"
+                                                ng-click="delExperience($index)" title="删除">
+                                            删除
+                                        </button>
+                                    </td>
+                                </tr>
+                                <tr ng-if="dataModel.experienceList.length<=0">
+                                    <td colspan="7" style="text-align:center">暂无数据</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
                     <div class="form_foot">
-                        <button type="button" class="btn btn-default" ng-click="$hide()">取消</button>
+                        <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
                         <button type="submit" class="btn btn-primary" form="editForm">保存</button>
                     </div>
                 </form>
-            </div>
         </div>
     </div>
 </div>

src/main/resources/static/app/main/leaderwork/leaderteam/edit.js

@@ -1,123 +1,144 @@
-var leaderTeam_editCtrl = function ($scope, $http, $alert, $loading) {
-    $scope.parentLoad = leaderTeam_editModal.parentLoad;
-    $scope.editParams = leaderTeam_editModal.params;
-    $scope.leaderTeamType = $scope.editParams.leaderTeamType;
-    $scope.dataModel = {};
-    $scope.politicsStatusList = [];
-    $scope.positionLevelList = [];
-    $scope.qualificationTypeList = [];
-    $scope.professionalTypeList = [];
-    $scope.educationTypeList = [];
+(function ($app) {
+    $app.module('gtPartyApp').controller('leaderTeamEditCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.editParams = $bsRouterState.$params($scope);
+        $scope.leaderTeamType = $scope.editParams.leaderTeamType;
+        $scope.dataModel = {};
+        $scope.sexList = [];
+        $scope.politicsStatusList = [];
+        $scope.qualificationTypeList = [];
+        $scope.professionalTypeList = [];
+        $scope.educationTypeList = [];
+        $scope.birthplaceList = [];
 
-    $scope.getData = function () {
-        $http
-        ({
-            method: 'get', url: "../../api/leaderWork/getLeaderTeamById",
-            params: {
-                'id': $scope.editParams.id
-            }
-        }).then(function (result) {
-            $scope.dataModel = result.data.item;
-            $scope.dataModel.leaderTeamType = $scope.leaderTeamType;
-            $scope.getSexList();
-            $scope.getPoliticsStatusList();
-            $scope.getPositionLevelList();
-            $scope.getQualificationTypeList();
-            $scope.getProfessionalTypeList();
-            $scope.getEducationTypeList();
-        }, function (resp) {
-            $scope.showMsg('错误', '服务器错误：' + resp.data);
-        });
-    };
+        $scope.addExperience = function (){
+            $scope.dataModel.experienceList.push({leaderteamid: $scope.dataModel.leaderteamid});
+        };
+        $scope.delExperience = function (index){
+            $scope.dataModel.experienceList.splice(index, 1);
+        };
 
-    $scope.save = function (isflag) {
-        if (isflag) {
-            $loading.show();
-            $http({
-                method: "post",
-                url: "../../api/leaderWork/saveLeaderTeam",
-                data: $scope.dataModel
-            }).then(function (result) {
-                $loading.hide();
-                if (result.data.success) {
-                    $scope.showMsg('成功', "操作成功");
-                    //重新刷新列表
-                    $scope.parentLoad();
-                    $scope.$hide();
-                } else {
-                    $scope.showMsg('失败', result.data.msg);
+        $scope.invalidFee = function (index, form1, name) {
+            name = name + "_" + index;
+            eval('var i=form1.' + name + '.$invalid');
+            return i;
+        };
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/leaderWork/getLeaderTeamById",
+                params: {
+                    'id': $scope.editParams.id
                 }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.dataModel.leaderteamtype = $scope.leaderTeamType;
+                $scope.getSexList();
+                $scope.getPoliticsStatusList();
+                $scope.getQualificationTypeList();
+                $scope.getProfessionalTypeList();
+                $scope.getEducationTypeList();
+                $scope.getBirthplaceList();
             }, function (resp) {
-                $loading.hide();
                 $scope.showMsg('错误', '服务器错误：' + resp.data);
             });
-        }
-    };
+        };
 
-    $scope.getPoliticsStatusList = function () {
-        $http({
-            method: 'get',
-            url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-            params: {
-                dicTypeKey: 'PoliticsStatus'
-            }
-        }).then(function (result) {
-            $scope.politicsStatusList = result.data;
-        });
-    };
-    $scope.getPositionLevelList = function () {
-        $http({
-            method: 'get',
-            url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-            params: {
-                dicTypeKey: 'LeaderTeamPositionLevel'
-            }
-        }).then(function (result) {
-            if ($scope.leaderTeamType == 1) {
-                $scope.positionLevelList = result.data.filter(it => (it.dickey == 1 || it.dickey == 2));
-            }
-            else{
-                $scope.positionLevelList = result.data.filter(it => (it.dickey == 3 || it.dickey == 4));
-            }
-        });
-    };
-    $scope.getQualificationTypeList = function () {
-        $http({
-            method: 'get',
-            url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-            params: {
-                dicTypeKey: 'QualificationType'
-            }
-        }).then(function (result) {
-            $scope.qualificationTypeList = result.data;
-        });
-    };
-    $scope.getProfessionalTypeList = function () {
-        $http({
-            method: 'get',
-            url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-            params: {
-                dicTypeKey: 'ProfessionalType'
+        $scope.save = function (isflag) {
+            if (isflag) {
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/leaderWork/saveLeaderTeam",
+                    data: $scope.dataModel
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', "操作成功");
+                        //重新刷新列表
+                        $scope.pagechange();
+                        $scope.$emit("tabReloadData", {name: 'leaderTeamListCtrl', data: 1});
+                    } else {
+                        $scope.showMsg('失败', result.data.msg);
+                    }
+                }, function (resp) {
+                    $loading.hide();
+                    $scope.showMsg('错误', '服务器错误：' + resp.data);
+                });
             }
-        }).then(function (result) {
-            $scope.professionalTypeList = result.data;
-        });
-    };
-    $scope.getEducationTypeList = function () {
-        $http({
-            method: 'get',
-            url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-            params: {
-                dicTypeKey: 'EducationType'
-            }
-        }).then(function (result) {
-            $scope.educationTypeList = result.data;
-        });
-    };
+        };
+
+        $scope.getSexList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {
+                    dicTypeKey: 'dic_sex'
+                }
+            }).then(function (result) {
+                $scope.sexList = result.data;
+            });
+        };
+        $scope.getPoliticsStatusList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {
+                    dicTypeKey: 'PoliticsStatus'
+                }
+            }).then(function (result) {
+                $scope.politicsStatusList = result.data;
+            });
+        };
+        $scope.getQualificationTypeList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {
+                    dicTypeKey: 'QualificationType'
+                }
+            }).then(function (result) {
+                $scope.qualificationTypeList = result.data;
+            });
+        };
+        $scope.getProfessionalTypeList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {
+                    dicTypeKey: 'ProfessionalType'
+                }
+            }).then(function (result) {
+                $scope.professionalTypeList = result.data;
+            });
+        };
+        $scope.getEducationTypeList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {
+                    dicTypeKey: 'EducationType'
+                }
+            }).then(function (result) {
+                $scope.educationTypeList = result.data;
+            });
+        };
+        $scope.getBirthplaceList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/partyDic/getNationList'
+            }).then(function (result) {
+                $scope.birthplaceList = result.data;
+            }, function (resp) {
+
+            });
+        };
 
-    $scope.getData();
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
 
-};
+        $scope.getData();
 
-//定义模态框
-var leaderTeam_editModal;
+    });
+})(angular);

src/main/resources/static/app/main/leaderwork/leaderteam/list.html

@@ -9,83 +9,82 @@
                             <form class="form-horizontal">
                                 <div class="row clearfix form-inline">
                                     <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>机构</label>
+                                        <label>姓名</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="departmentName" class="form-control" type="text"
+                                                <input name="name" class="form-control" type="text"
                                                        ng-keypress="($event.which === 13)?search():0"
-                                                       ng-model="selectparams.departmentName"
+                                                       ng-model="selectparams.name"
                                                        placeholder=""/>
+
                                             </div>
                                         </div>
                                     </div>
                                     <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>姓名</label>
+                                        <label>职务</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="userName" class="form-control" type="text"
+                                                <input name="position" class="form-control" type="text"
                                                        ng-keypress="($event.which === 13)?search():0"
-                                                       ng-model="selectparams.userName"
+                                                       ng-model="selectparams.position"
                                                        placeholder=""/>
-
                                             </div>
                                         </div>
                                     </div>
                                     <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>入党时间</label>
+                                        <label>性别</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="joinStartDate" class="form-control fm-ct-first"
-                                                       autocomplete="off"
-                                                       autoclose="true"
-                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
-                                                       ng-model="selectparams.joinStartDate"
-                                                       ng-change="search()"
-                                                       placeholder="" bs-datepicker/>
-                                                <input name="joinEndDate" class="form-control fm-ct-last"
-                                                       autocomplete="off"
-                                                       autoclose="true"
-                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
-                                                       ng-model="selectparams.joinEndDate"
-                                                       ng-change="search()"
-                                                       placeholder="" bs-datepicker/>
+                                                <select class="form-control show-tick" ng-model="dataModel.sex"
+                                                        ng-options="type.dickey as type.dicvalue for type in sexList"
+                                                        class="form-control"
+                                                        name="sex" ng-change="search()">
+                                                    <option value="" selected>--全部--</option>
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="row clearfix form-inline" ng-if="isShow">
                                     <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>职务</label>
+                                        <label>党派</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <input name="position" class="form-control" type="text"
-                                                       ng-keypress="($event.which === 13)?search():0"
-                                                       ng-model="selectparams.position"
-                                                       placeholder=""/>
+                                                <input name="party" class="form-control" type="text"
+                                                ng-keypress="($event.which === 13)?search():0"
+                                                ng-model="selectparams.party"
+                                                placeholder=""/>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>性别</label>
+                                        <label>入党时间</label>
                                     </div>
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <select class="form-control show-tick" ng-model="dataModel.sex"
-                                                        ng-options="type.dickey as type.dicvalue for type in sexList"
-                                                        class="form-control"
-                                                        name="sex" ng-change="search()">
-                                                    <option value="" selected>--全部--</option>
-                                                </select>
-
+                                                <input name="joinStartDate" class="form-control fm-ct-first"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.joinStartDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                                <input name="joinEndDate" class="form-control fm-ct-last"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.joinEndDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
                                             </div>
                                         </div>
                                     </div>
@@ -117,27 +116,28 @@
                         </div>
                         <div class="search-btn" style="margin-right: 20px;">
                             <div style="min-width: 13em">
-                                <span class="moreSpan" ng-click="isShowClick()" style='padding-right:1em;cursor:pointer;'>{{moreTxt}}<i class="material-icons" style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
+                                <span class="moreSpan" ng-click="isShowClick()" style='padding-right:1em;cursor:pointer;'>
+                                    {{moreTxt}}<i class="material-icons" style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
                             </div>
                         </div>
                     </div>
                     <div class="search-btn" style="margin-right: 20px;">
                         <div style="float: right">
                             <button class="btn btn-default1"
-                                    ng-click="task()">下发通知
+                                    ng-click="add()">新增
                             </button>
                             <button class="btn btn-default1"
-                                    ng-click="edit()">新增
+                                    ng-click="delete()">删除
                             </button>
                             <button class="btn btn-default1"
                                     ng-click="import()">导入
                             </button>
-                            <button class="btn btn-default1"
-                                    ng-click="delete()">删除
-                            </button>
                             <button class="btn btn-default1"
                                     ng-click="export()">导出
                             </button>
@@ -153,29 +153,19 @@
                                     <th class="th-select" th-select-all datalist="dataList"></th>
                                     <th class="th-rownum"><div>序号</div></th>
                                     <th>机构</th>
-                                    <th>职位</th>
-                                    <th>工号</th>
-                                    <th>姓名</th>
                                     <th>职务</th>
-                                    <th>职务级别</th>
-                                    <th>现职时间</th>
-                                    <th>同职时间</th>
+                                    <th>姓名</th>
                                     <th>性别</th>
-                                    <th>出生年月</th>
                                     <th>籍贯</th>
-                                    <th>出生地</th>
-                                    <th>政治面貌</th>
-                                    <th>专业技术职务</th>
-                                    <th>入党时间</th>
+                                    <th>出生年月</th>
                                     <th>参加工作时间</th>
-                                    <th>全日制教育学历</th>
-                                    <th>全日制教育学位</th>
-                                    <th>全日制教育毕业院校及专业</th>
-                                    <th>在职教育学历</th>
-                                    <th>在职教育学位</th>
-                                    <th>在职教育毕业院校及专业</th>
-                                    <th ng-if="leaderTeamType==2">本科专业</th>
-                                    <th ng-if="leaderTeamType==2">硕士专业</th>
+                                    <th>党派</th>
+                                    <th>加入时间</th>
+                                    <th>专业</th>
+                                    <th>专业技术职务</th>
+                                    <th>专业技术职务聘任时间</th>
+                                    <th>任行政现职时间</th>
+                                    <th>任行政同职级时间</th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -186,30 +176,20 @@
                                                for="{{pageId}}_md_checkbox_{{$index+1}}"></label>
                                     </td>
                                     <td class="text-center" td-rownum index="$index" pageindex="selectparams.pageindex" pagesize="selectparams.pagesize"></td>
-                                    <td class="text-center">{{it.departmentName}}</td>
-                                    <td class="text-center">{{it.jobTitle}}</td>
-                                    <td class="text-center">{{it.no}}</td>
+                                    <td class="text-center">{{it.departmentname}}</td>
+                                    <td class="text-center">{{it.position}}</td>
                                     <td class="text-center">{{it.name}}</td>
-                                    <td>{{it.position}}</td>
-                                    <td class="text-center">{{it.positionLevelName}}</td>
-                                    <td class="text-center">{{it.nowPositionDate|date:'yyyyMM'}}</td>
-                                    <td class="text-center">{{it.samePositionDate|date:'yyyyMM'}}</td>
-                                    <td class="text-center">{{it.sexName}}</td>
-                                    <td class="text-center">{{it.birthDate|date:'yyyyMM'}}</td>
-                                    <td class="text-center">{{it.nativePlace}}</td>
-                                    <td class="text-center">{{it.birthplace}}</td>
-                                    <td class="text-center">{{it.politicsStatusName}}</td>
-                                    <td class="text-center">{{it.professionalName}}</td>
-                                    <td class="text-center">{{it.joinDate|date:leaderTeamType==1?'yyyyMM':'yyyyMMdd'}}</td>
-                                    <td class="text-center">{{it.workDate|date:'yyyyMM'}}</td>
-                                    <td class="text-center">{{it.educationName}}</td>
-                                    <td class="text-center">{{it.qualificationName}}</td>
-                                    <td class="text-center">{{it.graduationSchoolMajor}}</td>
-                                    <td class="text-center">{{it.inJobEducationName}}</td>
-                                    <td class="text-center">{{it.inJobQualificationName}}</td>
-                                    <td class="text-center">{{it.inJobGraduationSchoolMajor}}</td>
-                                    <td ng-if="leaderTeamType==2" class="text-center">{{it.undergraduateProfessional}}</td>
-                                    <td ng-if="leaderTeamType==2" class="text-center">{{it.masterProfessional}}</td>
+                                    <td class="text-center">{{it.sexname}}</td>
+                                    <td class="text-center">{{it.nativeplace}}</td>
+                                    <td class="text-center">{{it.birthdate|date:'yyyyMM'}}</td>
+                                    <td class="text-center">{{it.workdate|date:'yyyyMM'}}</td>
+                                    <td class="text-center">{{it.party}}</td>
+                                    <td class="text-center">{{it.joindate|date:'yyyyMM'}}</td>
+                                    <td class="text-center">{{it.graduationschoolmajor}}</td>
+                                    <td class="text-center">{{it.professionalname}}</td>
+                                    <td class="text-center">{{it.engagedate|date:'yyyyMM'}}</td>
+                                    <td class="text-center">{{it.nowpositiondate|date:'yyyyMM'}}</td>
+                                    <td class="text-center">{{it.samepositiondate|date:'yyyyMM'}}</td>
                                 </tr>
                                 <tr ng-if="dataList.length<=0">
                                     <td colspan="20" style="text-align:center">暂无数据</td>
@@ -228,12 +208,17 @@
                                 <tr ng-repeat="it in dataList" zero-table-height>
                                     <td>
                                         <button class="btn td-btn bg-light-green waves-effect"
-                                                ng-click="edit(it.leaderTeamId)"
+                                                ng-click="detail(it.leaderteamid)"
+                                                title="查看">
+                                            查看
+                                        </button>
+                                        <button class="btn td-btn bg-light-green waves-effect"
+                                                ng-click="edit(it.leaderteamid)"
                                                 title="修改">
                                             修改
                                         </button>
                                         <button class="btn td-btn bg-light-green waves-effect"
-                                                ng-click="delete(it.leaderTeamId)"
+                                                ng-click="delete(it.leaderteamid)"
                                                 title="删除">
                                             删除
                                         </button>

src/main/resources/static/app/main/leaderwork/leaderteam/list.js

@@ -5,8 +5,10 @@
         $scope.isShow = false;
         $scope.moreTxt = "更多";
         $scope.leaderTeamType = $state.params.leaderTeamType;
-        $scope.title = $scope.leaderTeamType == 1 ? "副处以上中层干部信息" : "科级干部信息";
         $scope.pageId = "leaderTeamList" + $scope.leaderTeamType;
+        $scope.tabNameAdd = "home.leaderTeamAdd" + $scope.leaderTeamType;
+        $scope.tabNameEdit = "home.leaderTeamEdit" + $scope.leaderTeamType;
+        $scope.tabNameDetail = "home.leaderTeamDetail" + $scope.leaderTeamType;
 
         //定义数据集合
         $scope.dataList = []; //列表数据
@@ -16,29 +18,19 @@
             pagesize: 10,
             leaderTeamType: $scope.leaderTeamType,
             departmentName: '',
-            userName: '',
+            name: '',
             joinStartDate: null,
             joinEndDate: null,
             position: '',
+            party: '',
             sex: null,
             birthStartDate: null,
             birthEndDate: null
         };
+        $scope.resetSelectparams = angular.copy($scope.selectparams);
         $scope.pageInfo = {ptotal: 0};
         $scope.sexList = [];
-        //定义模态框
-        leaderTeam_editCtrl.$inject = ['$scope', '$http', '$alert', '$loading'];
-        leaderTeam_editModal = $modal({
-            resolve: {
-                load: ['$ocLazyLoad', function ($ocLazyLoad) {
-                }]
-            },
-            scope: $scope,
-            controller: leaderTeam_editCtrl,
-            templateUrl: '../main/leaderwork/leaderteam/edit.html',
-            show: false,
-            animation: 'am-fade-and-slide-top'
-        });
+
 
         //加载列表数据
         $scope.getList = function () {
@@ -57,16 +49,6 @@
             $scope.getList();
         };
 
-        $scope.edit = function (id) {
-            leaderTeam_editModal.params = {
-                id: id,
-                leaderTeamType: $scope.leaderTeamType,
-                title: (id ? "修改" : "新增") + $scope.title
-            };
-            leaderTeam_editModal.parentLoad = $scope.getList;
-            leaderTeam_editModal.$promise.then(leaderTeam_editModal.show);
-        };
-
         $scope.export = function () {
             var params = "?1=1";
             for (var p in $scope.selectparams) {
@@ -79,50 +61,37 @@
         $scope.excelConfig = {
             filetype: 1,
             columns: {
-                '机构': 'departmentName',
-                '职位': 'jobTitle',
-                '工号': 'no',
                 '姓名': 'name',
-                '职务': 'position',
-                '职务级别': 'positionLevel',
-                '现职时间': 'nowPositionDate',
-                '同职时间': 'samePositionDate',
-                '性别': 'sex',
-                '出生年月': 'birthDate',
-                '籍贯': 'nativePlace',
-                '出生地': 'birthplace',
-                '政治面貌': 'politicsStatus',
-                '专业技术职务': 'professionalType',
-                '入党时间': 'joinDate',
-                '参加工作时间': 'workDate',
-                '全日制教育学历': 'educationType',
-                '全日制教育学位': 'qualificationType',
-                '全日制教育毕业院校及专业': 'graduationSchoolMajor',
-                '在职教育学历': 'inJobEducationType',
-                '在职教育学位': 'inJobQualificationType',
-                '在职教育毕业院校及专业': 'inJobGraduationSchoolMajor',
-                '任职经历': 'workExperience'
+                '机构': 'departmentname',
+                '部门职务': 'position',
+                '性别': 'sexname',
+                '民族': 'birthplacename',
+                '籍贯': 'nativeplace',
+                '出生年月': 'birthdatestr',
+                '参加工作时间': 'workdatestr',
+                '学历': 'educationname',
+                '党派': 'party',
+                '加入时间': 'joindatestr',
+                '学位': 'qualificationname',
+                '专业': 'graduationschoolmajor',
+                '专业技术职务': 'professionalname',
+                '专业技术职务聘任时间': 'engagedatestr',
+                '任行政现职时间': 'nowpositiondatestr',
+                '任行政同职级时间': 'samepositiondatestr',
+                '相关管理工作经历': 'workexperience'
             },
             errorcolumns: {
-                'departmentName': '机构',
-                'jobTitle': '职位',
-                'no': '工号',
-                'name': '姓名',
+                'departmentname': '机构',
                 'position': '职务',
-                'positionLevel': '职务级别',
+                'name': '姓名',
+                'party': '党派',
                 'errorInfo': '错误信息'
             },
             readonly: false,
-            templateUrl: '/doc/template/' + ($scope.leaderTeamType == 1 ? "副处以上中层干部信息导入模板.xlsx" : "科级干部信息导入模板.xlsx")
+            templateUrl: '/doc/template/' + ($scope.leaderTeamType == 1 ? "中层干部信息导入模板.xlsx" : "科级干部信息导入模板.xlsx")
         };
 
         $scope.import = function () {
-
-            if ($scope.leaderTeamType == 2) {
-                $scope.excelConfig.columns.本科专业 = "undergraduateProfessional";
-                $scope.excelConfig.columns.硕士专业 = "masterProfessional";
-            }
-
             $excel.addFile($scope.excelConfig).then(function (items) {
                 $loading.show();
                 $http({
@@ -157,7 +126,7 @@
             if (id)
                 ids.push(id);
             else
-                ids = $scope.dataList.filter(it => it.rowChecked == true).map(it => it.leaderTeamId);
+                ids = $scope.dataList.filter(it => it.rowChecked == true).map(it => it.leaderteamid);
 
             if (ids.length == 0) {
                 $scope.showMsg('消息', "请选择需要删除的数据");
@@ -187,12 +156,31 @@
             }
         };
 
-        $scope.task = function(){
-            $bsRouterState.$closeTabName("home.systaskedti");
+        $scope.add = function(){
+            $bsRouterState.$closeTabName($scope.tabNameAdd);
             $timeout(function () {
-                $bsRouterState.go('home.systaskedti', {
+                $bsRouterState.go($scope.tabNameAdd, {
                     id: '',
-                    isDetail: true,
+                    leaderTeamUserType:$scope.leaderTeamType
+                });
+            }, 100);
+        };
+
+        $scope.edit = function(id){
+            $bsRouterState.$closeTabName($scope.tabNameEdit);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameEdit, {
+                    id: id,
+                    leaderTeamUserType:$scope.leaderTeamType
+                });
+            }, 100);
+        };
+
+        $scope.detail = function(id){
+            $bsRouterState.$closeTabName($scope.tabNameDetail);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameDetail, {
+                    id: id,
                     leaderTeamUserType:$scope.leaderTeamType
                 });
             }, 100);
@@ -227,6 +215,10 @@
                 $scope.moreTxt = "更多";
             }
         };
+        $scope.reset = function () {
+            $scope.selectparams = angular.copy($scope.resetSelectparams);
+            $scope.getList();
+        };
 
         $scope.getList();
         $scope.getSexList();

src/main/resources/static/app/main/partylife/meeting/edit.html

@@ -116,7 +116,7 @@
                                             </button>
                                         </td>
                                     </tr>
-                                    <tr ng-if="userList.length<=0">
+                                    <tr ng-if="personnellist.length<=0">
                                         <td colspan="7" style="text-align:center">暂无数据</td>
                                     </tr>
                                     </tbody>