From 40783813e914e79c0a9878b5c42aaef191cd8df3 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 23 May 2024 18:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java     | 1 +
 .../kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java | 9 +++++++++
 .../jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java | 8 ++++++++
 .../jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java | 4 ++++
 .../jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml  | 2 +-
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java
index d8703c07..ce65b62a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxx.java
@@ -79,6 +79,7 @@ public class WjxDjxx {
 	@ApiModelProperty(value = "问卷描述")
 	@TableField(exist = false)
 	private java.lang.String content;
+	@TableField(exist = false)
 	@ApiModelProperty(value = "问卷作答用时时分秒")
 	private String answerSfm;
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java
index c7061828..87096ba6 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java
@@ -287,4 +287,13 @@ public class WjxWjxxTmlbController {
 		 return Result.OK(WjxWjxxTmlbList);
 	 }
 
+
+	 @AutoLog(value = "设为共有私有")
+	 @ApiOperation(value="设为共有私有", notes="设为共有私有")
+	 @RequestMapping(value = "/editSwgysy", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> editSwgysy(@RequestBody WjxWjxxTmlb wjxWjxxTmlb) {
+		 wjxWjxxTmlbService.updateById(wjxWjxxTmlb);
+		 return Result.OK("设置成功!");
+	 }
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java
index b4492e31..bbe017da 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java
@@ -91,6 +91,14 @@ public class WjxWjxxTmlb implements Serializable {
     @ApiModelProperty(value = "填写提示")
     private java.lang.String prompt;
 
+
+    @Dict(dicCode = "yn")
+    private java.lang.String wjSytype;//私有类型（0私有，1共有）
+
+    private java.lang.String wjLeixing;//问卷类型（0作业，1问卷）
+
+
+
     @TableField(exist = false)
     private String itemSelected;
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java
index 89231b6b..6304164a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java
@@ -90,6 +90,10 @@ public class WjxWjxxTmlbPage {
 
 	private String itemSelected;
 
+
+	private java.lang.String wjSytype;//私有类型（0私有，1共有）
+	private java.lang.String wjLeixing;//问卷类型（6作业，1问卷）
+
 	@ExcelCollection(name="选项信息")
 	@ApiModelProperty(value = "选项信息")
 	private List<WjxWjxxTmxx> wjxWjxxTmxxList;
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
index 1999cff7..884dff8b 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/mapper/xml/ZyInfoMapper.xml
@@ -13,7 +13,7 @@
         id, create_by, create_time, update_by, update_time, title, zy_type,
         content, start_time, end_time, zy_status, xnxq,
         wwcc, wwtgl, nwcc, nwtgl,  aigccc, aigctgl, rwbh, file_path, xkxs,
-        ifnull(b.num,0) as wtjnum,ifnull(c.num,0) as ytjnum,ifnull(b.num,0) as wpynum,ifnull(c.num,0) as ypynum
+        ifnull(b.num,0) as wtjnum,ifnull(c.num,0) as ytjnum,ifnull(d.num,0) as wpynum,ifnull(e.num,0) as ypynum
         FROM
         zy_info a
         left join (select count(*) as num,main_id from zy_info_student where file_path is null  GROUP BY main_id ) b on a.id = b.main_id