commit

src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java

@@ -137,7 +137,7 @@ public class ActivityCultureAuditActivityController {
     public Result doReview(@Param("data") String param, String id) {
         Dict args = Json.fromJson(Dict.class, param);
         ActivityTissue tissue = activityCultureService.dao().fetch(ActivityTissue.class, id);
-        if (tissue.getIsUnseal()!=null &&tissue.getIsUnseal() && args.getInt("submitType") == 1) {
+        if (args.getInt("submitType") == 1) {
             Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
             activityCultureService.insertOrUpdate(sysHomeActivity);
         }

src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java

@@ -183,9 +183,11 @@ public class ActivityCultureUserStatisticsController {
             ActivityTissue tissue = dao.fetch(ActivityTissue.class, id);
             Sql sql = Sqls.create("""
                     SELECT
-                    	atp.*
+                    	atp.*,
+                    	us.idcard idCard
                     FROM
                     	`activity_tissue_person` atp
+                    	left join sys_user us on us.id=atp.userId
                     $condition
                     """);
             Cnd cnd = Cnd.NEW();
@@ -221,7 +223,7 @@ public class ActivityCultureUserStatisticsController {
             entityList.add(new ExcelExportEntity("身份证号", "idCard", 20));
             entityList.add(new ExcelExportEntity("单位", "unitName", 20));
             entityList.add(new ExcelExportEntity("工会", "unionName", 20));
-            if (tissue.getSignUpMethod() == 3) {
+            if (List.of(2,3).contains(tissue.getSignUpMethod())) {
                 entityList.add(new ExcelExportEntity("报名人姓名", "applyUserUserName", 20));
             }
             entityList.add(new ExcelExportEntity("报名时间", "applyDateTime", 20));

src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java

@@ -231,7 +231,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
 
     @Column
     @Comment("是否开启")
-    @Default("0")
+    @Default("1")
     @ColDefine(type = ColType.BOOLEAN)
     private Boolean isUnseal;
 
@@ -240,6 +240,16 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
     @ColDefine(type = ColType.MYSQL_JSON)
     private List<NutMap> goods;
 
+    @Column
+    @Comment("主办单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> hostUnitIds;
+
+    @Column
+    @Comment("承办单位")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<String> undertakeUnitIds;
+
     @Column
     @Comment("报名表单配置")
     @ColDefine(type = ColType.MYSQL_JSON)

src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java

@@ -159,15 +159,19 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
                 	club.clubName,
                 	u.username,
                 	u.loginname,
-                	abs.`name` projectTypeName
+                	abs.`name` projectTypeName,
+                	aus.groupName
                 FROM
                 	activity_tissue tissue
                 	LEFT JOIN sys_union uni ON uni.id = tissue.unionId
                 	LEFT JOIN sys_club club ON club.id = tissue.clubId
                 	LEFT JOIN `vw_user` u ON u.id=tissue.userId
                 	LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode
+                	LEFT JOIN activity_user_scope aus on aus.groupId=tissue.groupId
                 WHERE
                 	tissue.id = @id
+                GROUP BY
+                  tissue.id
                 """).setParam("id", id);
         NutMap nutMap = (NutMap) dao().execute(sql.setCallback(Sqls.callback.map())).getResult();
 

src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvSurveyController.java

@@ -35,7 +35,7 @@ public class H5QsvSurveyController {
     private QsvUserAnswerRecordService qsvUserAnswerRecordService;
 
     @At("")
-    @Ok("beetl:/mobile/qsv/survey/index.html")
+    @Ok("beetl:/platform/zhghh5/dayofficework/qsv/survey/index.html")
     public void index() {
     }