commit

src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java

@@ -27,6 +27,7 @@ import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
 
@@ -49,7 +50,8 @@ public class ClubUserJoinMineController {
 
     @At
     @SaCheckPermission("club.join.mine")
-    public Result pageData(@Valid PageForm pageForm){
+    public Result pageData(@Valid PageForm pageForm,
+						   @Param("year") Integer year){
         Sql sql = Sqls.create("""
                 SELECT
                 	info.*,
@@ -83,6 +85,7 @@ public class ClubUserJoinMineController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.and("info.userId", "=", SecurityUtil.getUserId());
+		cnd.andEX("year(info.applyDate)", "=", year);
         cnd.groupBy("info.id");
         cnd.desc("info.applyDate");
         sql.setCondition(cnd);
@@ -117,7 +120,8 @@ public class ClubUserJoinMineController {
                 	u.unionName,
                 	u.technicalTitle,
                 	u.education,
-                	u.academicDegree
+                	u.academicDegree,
+                	u.position
                 FROM
                 	club_user_apply cua
                 	LEFT JOIN vw_user u ON u.id = cua.userId

src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java

@@ -337,8 +337,8 @@ public class ClubStatisticsController {
                  	sum( CASE WHEN cu.userId is not null $myCondition THEN 1 ELSE 0 END ) AS total,
                  	sum( CASE WHEN su.userState in ('在职', '在岗')  $myCondition THEN 1 ELSE 0 END ) AS `work`,
                  	sum( CASE WHEN su.userState in ('退休') $myCondition THEN 1 ELSE 0 END ) AS retire,
-                 	sum( CASE WHEN su.sex = '男' $myCondition THEN 1 ELSE 0 END ) AS man,
-                 	sum( CASE WHEN su.sex = '女' $myCondition THEN 1 ELSE 0 END ) AS woman,
+                 	sum( CASE WHEN su.sex like '%男%' $myCondition THEN 1 ELSE 0 END ) AS man,
+                 	sum( CASE WHEN su.sex like '%女%' $myCondition THEN 1 ELSE 0 END ) AS woman,
                  	sum( CASE WHEN cu.roleCode != 'CLUB_MEMBER' AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body
                 FROM
                  	sys_club club

src/main/java/com/budwk/app/zhgh/club/vo/ClubUserImportVo.java

@@ -27,9 +27,6 @@ public class ClubUserImportVo {
     @ExcelProperty("姓名")
     private String username;
 
-    @ExcelProperty("协会职务")
-    private String clubPosition;
-
     @ExcelIgnore
     private String errorInfo;
 }

src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinVo.java

@@ -18,4 +18,8 @@ public class ClubUserJoinVo extends ClubUserApply {
     private String unionName;
     private String sex;
     private String mobile;
+    private String technicalTitle;
+    private String education;
+    private String academicDegree;
+    private String position;
 }