问卷次数增加问卷2

medical_history-vue/src/views/admin/modules/AdminSpecialistUserForm.vue

@@ -75,7 +75,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="银行预留手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cardholderPhone">
+            <a-form-model-item label="  银行预留手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cardholderPhone">
               <a-input v-model="model.cardholderPhone" placeholder="请输入银行预留手机号"  ></a-input>
             </a-form-model-item>
           </a-col>

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc/mapper/AdminTopicMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.adminwjdc.entity.AdminTopic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo;
 
 /**
  * @Description: 问卷调查
@@ -18,4 +19,8 @@ public interface AdminTopicMapper extends BaseMapper<AdminTopic> {
 
     List<AdminTopic> listNum(@Param(Constants.WRAPPER) Wrapper<AdminTopic> wrapper);
 
+
+    List<AdminTopicTwo> listNum2(@Param(Constants.WRAPPER) Wrapper<AdminTopicTwo> wrapper);
+
+
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc/mapper/xml/AdminTopicMapper.xml

@@ -6,4 +6,8 @@
             select * from  admin_topic ${ew.customSqlSegment} and DATE_FORMAT(create_time,'%Y%m')=DATE_FORMAT(CURDATE(),'%Y%m')
     </select>
 
-</mapper>
+
+    <select id="listNum2" resultType="org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo">
+            select * from  admin_topic2 ${ew.customSqlSegment} and DATE_FORMAT(create_time,'%Y%m')=DATE_FORMAT(CURDATE(),'%Y%m')
+    </select>
+</mapper>

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc/service/IAdminTopicService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.adminwjdc.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.adminwjdc.entity.AdminTopic;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ public interface IAdminTopicService extends IService<AdminTopic> {
 
     List<AdminTopic> listNum(QueryWrapper<AdminTopic> queryWrapper);
 
+    List<AdminTopicTwo> listNum2(QueryWrapper<AdminTopicTwo> queryWrapper);
+
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc/service/impl/AdminTopicServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.adminwjdc.entity.AdminTopic;
 import org.jeecg.modules.adminwjdc.mapper.AdminTopicMapper;
 import org.jeecg.modules.adminwjdc.service.IAdminTopicService;
+import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,5 +27,10 @@ public class AdminTopicServiceImpl extends ServiceImpl<AdminTopicMapper, AdminTo
     public List<AdminTopic> listNum(QueryWrapper<AdminTopic> queryWrapper) {
         return adminTopicMapper.listNum(queryWrapper);
     }
+    @Override
+    public List<AdminTopicTwo> listNum2(QueryWrapper<AdminTopicTwo> queryWrapper) {
+        return adminTopicMapper.listNum2(queryWrapper);
+    }
+
 
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc2/mapper/AdminTopicMapper2.java

@@ -3,8 +3,11 @@ package org.jeecg.modules.adminwjdc2.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.adminwjdc.entity.AdminTopic2;
 import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,8 +17,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Date:   2023-02-25
  * @Version: V1.0
  */
+@Mapper
 public interface AdminTopicMapper2 extends BaseMapper<AdminTopicTwo> {
 
-    List<AdminTopicTwo> listNum(@Param(Constants.WRAPPER) Wrapper<AdminTopicTwo> wrapper);
+    List<AdminTopicTwo> listNum2(@Param(Constants.WRAPPER) Wrapper<AdminTopicTwo> wrapper);
 
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc2/mapper/xml/AdminTopicMapper2.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.adminwjdc2.mapper.AdminTopicMapper2">
 
-    <select id="listNum" resultType="org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo">
+    <select id="listNum2" resultType="org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo">
             select * from  admin_topic2 ${ew.customSqlSegment} and DATE_FORMAT(create_time,'%Y%m')=DATE_FORMAT(CURDATE(),'%Y%m')
     </select>
 
-</mapper>
+</mapper>

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc2/service/IAdminTopicaTwoService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.adminwjdc2.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.modules.adminwjdc.entity.AdminTopic2;
 import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo4;
@@ -19,4 +20,7 @@ public interface IAdminTopicaTwoService extends IService<AdminTopicTwo> {
     List<AdminTopicTwo> listNum(QueryWrapper<AdminTopicTwo> queryWrapper);
 
     List<AdminTopicTwo4> exportXls1(HttpServletRequest request);
+
+    List<AdminTopicTwo> listNum2(QueryWrapper<AdminTopicTwo> queryWrapper3);
+
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminwjdc2/service/impl/AdminTopicServiceTwoImplTopic.java

@@ -5,6 +5,7 @@ import net.sf.json.JSONArray;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.adminwjdc.entity.AdminTopic2;
 import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo;
 import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo2;
 import org.jeecg.modules.adminwjdc2.entity.AdminTopicTwo4;
@@ -34,7 +35,7 @@ public class AdminTopicServiceTwoImplTopic extends ServiceImpl<AdminTopicMapper2
 
     @Override
     public List<AdminTopicTwo> listNum(QueryWrapper<AdminTopicTwo> queryWrapper) {
-        return adminTopicMapper2.listNum(queryWrapper);
+        return adminTopicMapper2.listNum2(queryWrapper);
     }
 
     @Override
@@ -483,4 +484,10 @@ public class AdminTopicServiceTwoImplTopic extends ServiceImpl<AdminTopicMapper2
         return adminTopics4;
     }
 
+    @Override
+    public List<AdminTopicTwo> listNum2(QueryWrapper<AdminTopicTwo> queryWrapper3) {
+        return adminTopicMapper2.listNum2(queryWrapper3);
+
+    }
+
 }