协会

src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java

@@ -53,12 +53,12 @@ public class ActivityPlan {
     private Double money;
 
     @Column
-    @Comment("计划类型(1-校活动、2-分工会活动、3协会社团活动)")
+    @Comment("计划类型(1-校活动、2-分工会活动、3协会协会活动)")
     @ColDefine(type = ColType.VARCHAR, width = 7)
     private String type;
 
     @Column
-    @Comment("分工会ID或社团ID")
+    @Comment("分工会ID或协会ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String tissueId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java

@@ -158,7 +158,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
     private Boolean close;
 
     @Column
-    @Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）")
+    @Comment("活动级别（40001-校级、40002-分工会、40003-协会或协会）")
     @ColDefine(type = ColType.INT, width = 10)
     private Integer activityLevel;
 
@@ -182,7 +182,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
     private String belongUnionId;
 
     @Column
-    @Comment("活动所属社团")
+    @Comment("活动所属协会")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String belongClubId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java

@@ -17,12 +17,12 @@ import java.util.List;
 /**
  * @author: Aaron
  * @create: 2021-03-09 13:57
- * @description: 社团或分工会活动校工会活动
+ * @description: 协会或分工会活动校工会活动
  **/
 
 @Data
 @Table("activity_tissue")
-@Comment("社团或分工会活动校工会活动")
+@Comment("协会或分工会活动校工会活动")
 public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert {
 
     @Column
@@ -138,7 +138,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
     private String unionId;
 
     @Column
-    @Comment("创建人所属社团")
+    @Comment("创建人所属协会")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java

@@ -22,7 +22,7 @@ public class ActivityTissuePerson {
     private String id;
 
     @Column
-    @Comment("分工会或社团活动ID")
+    @Comment("分工会或协会活动ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String tissueId;
 

src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java

@@ -44,7 +44,7 @@ public class ActivityYearSummary {
     private String summaryType;
 
     @Column
-    @Comment("总结来源（1-校活动、2-分工会活动、3协会社团活动）")
+    @Comment("总结来源（1-校活动、2-分工会活动、3协会协会活动）")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String summaryFrom;
 

src/main/java/io/v/nutz/zhgh/jf/controller/club/ClubDataInputController.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 /**
  * @Author:xsb
- * @Description: 社团模板数据导入
+ * @Description: 协会模板数据导入
  * @Date:Created in 19:45 2021/2/1
  */
 @IocBean
@@ -40,10 +40,10 @@ import java.util.stream.Collectors;
 public class ClubDataInputController {
 
 
-    @Inject  // 已交社团
+    @Inject  // 已交协会
     private jfClubService jfClubService;
 
-    @Inject  // 系统原本社团
+    @Inject  // 系统原本协会
     private SysClubService sysClubService;
 
 
@@ -65,7 +65,7 @@ public class ClubDataInputController {
             file = new File("src/main/resources/docTemplate/clubQuota.xlsx");
             fin = new FileInputStream(file);
             // 设置浏览器以下载的方式处理该文件名
-            String fileName = "批量导入社团预算分配" + ".xlsx";
+            String fileName = "批量导入协会预算分配" + ".xlsx";
             response.setHeader("Content-Disposition", "attachment;filename="
                     .concat(String.valueOf(URLEncoder.encode(fileName, "UTF-8"))));
 
@@ -92,9 +92,9 @@ public class ClubDataInputController {
         int count = 0;
         int success_count = 0;
         try {
-            // 查出现在已交社团表中的已交社团
+            // 查出现在已交协会表中的已交协会
             List<jf_club> jf_clubs = jfClubService.query();
-            // 查出所有系统社团
+            // 查出所有系统协会
             List<Sys_club> sysClubs = sysClubService.query();
             Map<String, String> collect = sysClubs.stream().collect(Collectors.toMap(v -> v.getName(), v -> v.getId()));
             //获得excel表格中的数据并封装成一个个对象
@@ -111,10 +111,10 @@ public class ClubDataInputController {
 
                     jf_club yj_club = jf_clubs.stream().filter(v -> v.getYear().equals(obj.getYear()) && v.getClub_id().equals(obj.getClub_id())).findFirst().orElse(null);
 
-                    // 遍历所有的已交社团
+                    // 遍历所有的已交协会
                     boolean has = jf_clubs.stream().anyMatch(v -> v.getYear().equals(obj.getYear()) && v.getClub_id().equals(obj.getClub_id()));
                     if (has) {
-                        yj_club.setClub_id(obj.getClub_id()); //社团id
+                        yj_club.setClub_id(obj.getClub_id()); //协会id
                         yj_club.setState(1); //状态1
                         yj_club.setHistory_member(obj.getHistory_member()); //历史会员人数
                         yj_club.setHistory_club_avg(obj.getHistory_club_avg()); //历史品均值

src/main/java/io/v/nutz/zhgh/jf/controller/club/clubController.java

@@ -30,7 +30,7 @@ import java.util.List;
 /**
  * @author zhf
  * @date 2020/11/5 10:24
- * @description 社团活动经费分配
+ * @description 协会活动经费分配
  */
 @IocBean
 @At("/platform/jf/st/fp")

src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java

@@ -133,7 +133,7 @@ public class ActivityReimbursementBoardController {
 
                 list.add(new NutMap() {{
                     put("year", year);
-                    put("type", "社团活动");
+                    put("type", "协会活动");
                     put("num", activityBxService.count(sql3.setParam("year", year)));
                 }});
             }
@@ -164,7 +164,7 @@ public class ActivityReimbursementBoardController {
                 put("num", activityBxService.count(sql2));
             }});
             list.add(new NutMap() {{
-                put("type", "社团活动");
+                put("type", "协会活动");
                 put("num", activityBxService.count(sql3));
             }});
             return Result.success().addData(list);
@@ -207,7 +207,7 @@ public class ActivityReimbursementBoardController {
 
                 list.add(new NutMap() {{
                     put("year", year);
-                    put("type", "社团经费");
+                    put("type", "协会经费");
                     put("num", activityBxService.list(sql3.setParam("year", year)).get(0).getDouble("jf"));
                 }});
             }
@@ -237,7 +237,7 @@ public class ActivityReimbursementBoardController {
                 put("num", activityBxService.count(unionSql));
             }});
             list.add(new NutMap() {{
-                put("type", "社团经费");
+                put("type", "协会经费");
                 put("num", activityBxService.count(clubSql));
             }});
             return Result.success().addData(list);

src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java

@@ -164,7 +164,7 @@ public class ActivityBx {
     private Integer apply_type;
 
     @Column
-    @Comment("活动类型（1.基层工会，3.校工会，2.社团）")
+    @Comment("活动类型（1.基层工会，3.校工会，2.协会）")
     @ColDefine(type = ColType.INT, width = 10)
     private Integer activity_type;
 

src/main/java/io/v/nutz/zhgh/jf/model/jf_club.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
  * @author: Aaron
  * @create: 2020-08-18 15:01
- * @description: 社团预算管理
+ * @description: 协会预算管理
  **/
 @Table("jf_club")
 @Data
@@ -26,7 +26,7 @@ public class jf_club implements Serializable {
 
 
     @Column
-    @Comment("社团ID")
+    @Comment("协会ID")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String club_id;
 
@@ -37,7 +37,7 @@ public class jf_club implements Serializable {
     private Integer year;
 
     @Column
-    @Comment("社团活动费")
+    @Comment("协会活动费")
     @ColDefine(type = ColType.INT)
     private Integer club_activity_cost;
 

src/main/java/io/v/nutz/zhgh/reimbursement/controller/applyNewController.java

@@ -228,7 +228,7 @@ public class applyNewController {
             int count = baseService.dao().count(Sys_club_user.class, Cnd.where("userid", "=", ShiroUtil.getPrincipalProperty("id"))
                     .and("sf", "=", 1));
             if (count == 0) {
-                return Result.error("协会/社团报销只能由会长操作");
+                return Result.error("协会/协会报销只能由会长操作");
             }
         }
         return Result.success();

src/main/java/io/v/nutz/zhgh/reimbursement/models/ReimbursementNew.java

@@ -60,7 +60,7 @@ public class ReimbursementNew {
     private String unitId;
 
     @Column
-    @Comment("社团id")
+    @Comment("协会id")
     @ColDefine(type = ColType.VARCHAR, width = 32)
     private String clubId;
 
@@ -299,7 +299,7 @@ public class ReimbursementNew {
     private String activity_number;
 
     @Column
-    @Comment("活动类型（1.基层工会，2.校工会，3.社团）")
+    @Comment("活动类型（1.基层工会，2.校工会，3.协会）")
     @ColDefine(type = ColType.INT, width = 2)
     private Integer activity_type;
 

src/main/java/io/v/nutz/zhgh/xhkh/controller/XhKhZpController.java

@@ -86,7 +86,7 @@ public class XhKhZpController {
 
 
     /**
-     * 查社团名称
+     * 查协会名称
      * @return
      */
     @At