commit

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java

@@ -173,6 +173,9 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
                     delegateGroupList.get(i).get(j).put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
                     delegateGroupList.get(i).get(j).put("sex" + j, delegateGroupList.get(i).get(j).getString("sex"));
                     buildMap.put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
+                    if(StrUtil.isNotBlank(delegateGroupList.get(i).get(j).getString("sex"))) {
+						buildMap.put("sex" + j, "(" + delegateGroupList.get(i).get(j).getString("sex") + ")");
+					}
                 }
                 buildMaps.add(buildMap);
             }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/models/Teacher_congress_institution.java

@@ -61,6 +61,11 @@ public class Teacher_congress_institution extends BaseModel {
     @Default(value = "0")
     private Integer location;
 
+	@Column
+	@Comment("描述")
+	@ColDefine(type = ColType.VARCHAR, width = 100)
+	private String introduce;
+
     //子数据
     private List<Teacher_congress_institution> children;
 

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/controller/TeacherCongressSessionController.java

@@ -55,6 +55,7 @@ public class TeacherCongressSessionController {
         cnd.andEX("YEAR(startDate)", "=", year);
         cnd.andEX("j", "=", j);
         cnd.andEX("c", "=", c);
+		cnd.desc("startDate");
         sql.setCondition(cnd);
         Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);