From 105f67438563f1b2c9b5b9d6da59cd6342997c1c Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Fri, 17 Oct 2025 18:33:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E3=80=90=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=B7=B2?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=E6=80=BB=E9=87=91=E9=A2=9D=E3=80=81?= =?UTF-8?q?=E5=B7=B2=E7=94=9F=E6=88=90=E7=9A=84=E6=8A=A5=E5=91=8A=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E3=80=81=E5=85=B3=E8=81=94=E7=9A=84=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=A0=87=E8=AF=86=202.=20=E3=80=90=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=AE=A1=E7=90=86=E3=80=91=E6=89=B9=E6=AC=A1=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E5=8F=AF=E4=BB=A5=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=203.=20=E3=80=90=E7=AD=94=E9=A2=98=E8=AE=B0=E5=BD=95=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=204.=20=E3=80=90=E7=AD=94=E6=A1=88=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=91=E6=8C=89=E7=85=A7=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F(=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=A2=98=E7=9B=AE=E6=94=BE=E5=9C=A8=E4=B8=80=E8=B5=B7?= =?UTF-8?q?)=205.=20=E3=80=90=E6=B5=8B=E8=AF=84=E6=8A=A5=E5=91=8A=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E3=80=91=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98=E5=92=8C?= =?UTF-8?q?=E7=AD=94=E6=A1=88=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 【报告详情页】报告详情可以下载 2. 【批次标识生成逻辑】调整为：手机号(11位)+生成日期(6位)+2位数 --- .../controller/AssessmentAnswerLogController.java | 2 +- .../entity/AssessmentAnswerLog.java | 6 +- .../mapper/AssessmentAnswerLogMapper.java | 2 +- .../service/IAssessmentAnswerLogService.java | 2 +- .../impl/AssessmentAnswerLogServiceImpl.java | 2 +- .../vue/AssessmentAnswerLogList.vue | 28 +++++++- .../vue/modules/AssessmentAnswerLogForm.vue | 7 +- .../vue3/AssessmentAnswerLog.data.ts | 31 +++++++- .../controller/AssessmentExamLogController.java | 2 +- .../entity/AssessmentExamLog.java | 6 +- .../mapper/AssessmentExamLogMapper.java | 2 +- .../service/IAssessmentExamLogService.java | 2 +- .../service/impl/AssessmentExamLogServiceImpl.java | 2 +- .../vue/AssessmentExamLogList.vue | 26 +++++++ .../vue/modules/AssessmentExamLogForm.vue | 5 ++ .../vue3/AssessmentExamLog.data.ts | 25 +++++++ .../controller/AssessmentExamReportController.java | 2 +- .../entity/AssessmentExamReport.java | 10 ++- .../mapper/AssessmentExamReportMapper.java | 2 +- .../service/IAssessmentExamReportService.java | 2 +- .../impl/AssessmentExamReportServiceImpl.java | 2 +- .../vue/AssessmentExamReportList.vue | 32 +++++++++ .../vue/modules/AssessmentExamReportForm.vue | 10 +++ .../vue3/AssessmentExamReport.data.ts | 35 +++++++++ .../controller/AssessmentReportUserController.java | 2 +- .../entity/AssessmentReportUser.java | 2 +- .../mapper/AssessmentReportUserMapper.java | 2 +- .../service/IAssessmentReportUserService.java | 2 +- .../impl/AssessmentReportUserServiceImpl.java | 2 +- .../vue/AssessmentReportUserList.vue | 20 ++++++ .../vue3/AssessmentReportUser.data.ts | 15 ++++ .../controller/HanHaiMemberController.java | 32 ++++----- .../modules/hanHaiMember/entity/HanHaiMember.java | 31 +++++--- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 4 +- .../hanHaiMember/service/IHanHaiMemberService.java | 4 +- .../service/impl/HanHaiMemberServiceImpl.java | 4 +- .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 66 +++-------------- .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 27 ++----- .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 83 ++++------------------ .../modules/hanHaiMember/vue3/HanHaiMemberList.vue | 4 +- .../modules/api/service/impl/ExamServiceImpl.java | 37 +++++++++- .../api/service/impl/ReportServiceImpl.java | 16 +++++ 42 files changed, 395 insertions(+), 203 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/controller/AssessmentAnswerLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/controller/AssessmentAnswerLogController.java index 43ace42..346da08 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/controller/AssessmentAnswerLogController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/controller/AssessmentAnswerLogController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户测评答案记录表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ @Api(tags="用户测评答案记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/entity/AssessmentAnswerLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/entity/AssessmentAnswerLog.java index 2bb6bfb..99b2b8d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/entity/AssessmentAnswerLog.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/entity/AssessmentAnswerLog.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户测评答案记录表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ @Data @@ -51,6 +51,10 @@ public class AssessmentAnswerLog implements Serializable { @Excel(name = "批次标识", width = 15) @ApiModelProperty(value = "批次标识") private java.lang.String batchNo; + /**题目编号*/ + @Excel(name = "题目编号", width = 15) + @ApiModelProperty(value = "题目编号") + private java.lang.Integer questionNo; /**关联题目*/ @Excel(name = "关联题目", width = 15, dictTable = "assessment_question", dicText = "question", dicCode = "id") @Dict(dictTable = "assessment_question", dicText = "question", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/mapper/AssessmentAnswerLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/mapper/AssessmentAnswerLogMapper.java index 17addaf..1841129 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/mapper/AssessmentAnswerLogMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/mapper/AssessmentAnswerLogMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户测评答案记录表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface AssessmentAnswerLogMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/IAssessmentAnswerLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/IAssessmentAnswerLogService.java index 9511fc8..b539ac4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/IAssessmentAnswerLogService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/IAssessmentAnswerLogService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户测评答案记录表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface IAssessmentAnswerLogService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/impl/AssessmentAnswerLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/impl/AssessmentAnswerLogServiceImpl.java index 1e57ba0..0a293a4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/impl/AssessmentAnswerLogServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/service/impl/AssessmentAnswerLogServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户测评答案记录表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/AssessmentAnswerLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/AssessmentAnswerLogList.vue index 2fa2961..ec29af2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/AssessmentAnswerLogList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/AssessmentAnswerLogList.vue @@ -4,6 +4,26 @@
+ + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -127,6 +147,11 @@ align:"center", dataIndex: 'batchNo' }, + { + title:'题目编号', + align:"center", + dataIndex: 'questionNo' + }, { title:'关联题目', align:"center", @@ -177,9 +202,10 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'batchNo',text:'批次标识',dictCode:''}) + fieldList.push({type:'int',value:'questionNo',text:'题目编号',dictCode:''}) fieldList.push({type:'string',value:'questionId',text:'关联题目',dictCode:"assessment_question,question,id"}) fieldList.push({type:'string',value:'answerId',text:'关联答案',dictCode:"assessment_answer,answer,id"}) - fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/modules/AssessmentAnswerLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/modules/AssessmentAnswerLogForm.vue index 231737c..ce883b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/modules/AssessmentAnswerLogForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue/modules/AssessmentAnswerLogForm.vue @@ -8,6 +8,11 @@ + + + + + @@ -20,7 +25,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue3/AssessmentAnswerLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue3/AssessmentAnswerLog.data.ts index 97d3b4d..4936cd9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue3/AssessmentAnswerLog.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentAnswerLog/vue3/AssessmentAnswerLog.data.ts @@ -9,6 +9,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'batchNo' }, + { + title: '题目编号', + align:"center", + dataIndex: 'questionNo' + }, { title: '关联题目', align:"center", @@ -27,6 +32,21 @@ export const columns: BasicColumn[] = [ ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "批次标识", + field: "batchNo", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "关联用户", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -35,6 +55,11 @@ export const formSchema: FormSchema[] = [ field: 'batchNo', component: 'Input', }, + { + label: '题目编号', + field: 'questionNo', + component: 'InputNumber', + }, { label: '关联题目', field: 'questionId', @@ -54,9 +79,9 @@ export const formSchema: FormSchema[] = [ { label: '关联用户', field: 'userId', - component: 'JDictSelectTag', + component: 'JSearchSelect', componentProps:{ - dictCode:"han_hai_member,nick_name,id" - }, + dict:"han_hai_member,nick_name,id" + }, }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/controller/AssessmentExamLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/controller/AssessmentExamLogController.java index cc80c58..37a98cf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/controller/AssessmentExamLogController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/controller/AssessmentExamLogController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户测评答题记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ @Api(tags="用户测评答题记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/entity/AssessmentExamLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/entity/AssessmentExamLog.java index 59e1f8f..483780a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/entity/AssessmentExamLog.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/entity/AssessmentExamLog.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户测评答题记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ @Data @@ -63,6 +63,10 @@ public class AssessmentExamLog implements Serializable { @Excel(name = "总题量", width = 15) @ApiModelProperty(value = "总题量") private java.lang.Integer allNum; + /**电话号码*/ + @Excel(name = "电话号码", width = 15) + @ApiModelProperty(value = "电话号码") + private java.lang.String userPhone; /**关联用户*/ @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/mapper/AssessmentExamLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/mapper/AssessmentExamLogMapper.java index e8d495b..174570b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/mapper/AssessmentExamLogMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/mapper/AssessmentExamLogMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户测评答题记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface AssessmentExamLogMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/IAssessmentExamLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/IAssessmentExamLogService.java index e164221..ee925ab 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/IAssessmentExamLogService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/IAssessmentExamLogService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户测评答题记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface IAssessmentExamLogService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/impl/AssessmentExamLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/impl/AssessmentExamLogServiceImpl.java index 269db07..4f3c57b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/impl/AssessmentExamLogServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/service/impl/AssessmentExamLogServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户测评答题记录表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/AssessmentExamLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/AssessmentExamLogList.vue index 82b0fdb..14d515c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/AssessmentExamLogList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/AssessmentExamLogList.vue @@ -4,6 +4,26 @@
+ + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -142,6 +162,11 @@ align:"center", dataIndex: 'allNum' }, + { + title:'电话号码', + align:"center", + dataIndex: 'userPhone' + }, { title:'关联用户', align:"center", @@ -185,6 +210,7 @@ fieldList.push({type:'int',value:'finishNum',text:'已答题数量',dictCode:''}) fieldList.push({type:'int',value:'remainNum',text:'未答题数量',dictCode:''}) fieldList.push({type:'int',value:'allNum',text:'总题量',dictCode:''}) + fieldList.push({type:'string',value:'userPhone',text:'电话号码',dictCode:''}) fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/modules/AssessmentExamLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/modules/AssessmentExamLogForm.vue index 9bec5aa..9d39902 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/modules/AssessmentExamLogForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue/modules/AssessmentExamLogForm.vue @@ -23,6 +23,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue3/AssessmentExamLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue3/AssessmentExamLog.data.ts index 4b686b5..63dff32 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue3/AssessmentExamLog.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamLog/vue3/AssessmentExamLog.data.ts @@ -24,6 +24,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'allNum' }, + { + title: '电话号码', + align:"center", + dataIndex: 'userPhone' + }, { title: '关联用户', align:"center", @@ -32,6 +37,21 @@ export const columns: BasicColumn[] = [ ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "批次标识", + field: "batchNo", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "关联用户", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -55,6 +75,11 @@ export const formSchema: FormSchema[] = [ field: 'allNum', component: 'InputNumber', }, + { + label: '电话号码', + field: 'userPhone', + component: 'Input', + }, { label: '关联用户', field: 'userId', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/controller/AssessmentExamReportController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/controller/AssessmentExamReportController.java index 85ec2da..dbc8df3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/controller/AssessmentExamReportController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/controller/AssessmentExamReportController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户测评报告表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ @Api(tags="用户测评报告表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/entity/AssessmentExamReport.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/entity/AssessmentExamReport.java index fe33041..056e9df 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/entity/AssessmentExamReport.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/entity/AssessmentExamReport.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户测评报告表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ @Data @@ -51,6 +51,14 @@ public class AssessmentExamReport implements Serializable { @Excel(name = "批次标识", width = 15) @ApiModelProperty(value = "批次标识") private java.lang.String batchNo; + /**题目*/ + @Excel(name = "题目", width = 15) + @ApiModelProperty(value = "题目") + private java.lang.String questionId; + /**答案*/ + @Excel(name = "答案", width = 15) + @ApiModelProperty(value = "答案") + private java.lang.String answerId; /**风险*/ @Excel(name = "风险", width = 15) @ApiModelProperty(value = "风险") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/mapper/AssessmentExamReportMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/mapper/AssessmentExamReportMapper.java index 608c1e9..4817a99 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/mapper/AssessmentExamReportMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/mapper/AssessmentExamReportMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户测评报告表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface AssessmentExamReportMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/IAssessmentExamReportService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/IAssessmentExamReportService.java index 89b3952..8556c46 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/IAssessmentExamReportService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/IAssessmentExamReportService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户测评报告表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface IAssessmentExamReportService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/impl/AssessmentExamReportServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/impl/AssessmentExamReportServiceImpl.java index 838a5b7..4b9bfd9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/impl/AssessmentExamReportServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/service/impl/AssessmentExamReportServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户测评报告表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/AssessmentExamReportList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/AssessmentExamReportList.vue index 5677cc4..d5b9bf1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/AssessmentExamReportList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/AssessmentExamReportList.vue @@ -4,6 +4,26 @@
+ + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -127,6 +147,16 @@ align:"center", dataIndex: 'batchNo' }, + { + title:'题目', + align:"center", + dataIndex: 'questionId' + }, + { + title:'答案', + align:"center", + dataIndex: 'answerId' + }, { title:'风险', align:"center", @@ -187,6 +217,8 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'batchNo',text:'批次标识',dictCode:''}) + fieldList.push({type:'string',value:'questionId',text:'题目',dictCode:"assessment_question,question,id"}) + fieldList.push({type:'string',value:'answerId',text:'答案',dictCode:"assessment_answer,answer,id"}) fieldList.push({type:'Text',value:'risk',text:'风险',dictCode:''}) fieldList.push({type:'Text',value:'reason',text:'风险原因',dictCode:''}) fieldList.push({type:'string',value:'level',text:'风险等级',dictCode:'risk_level'}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/modules/AssessmentExamReportForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/modules/AssessmentExamReportForm.vue index 96ef4fd..07c0478 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/modules/AssessmentExamReportForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue/modules/AssessmentExamReportForm.vue @@ -8,6 +8,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue3/AssessmentExamReport.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue3/AssessmentExamReport.data.ts index 97a1faf..a190f19 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue3/AssessmentExamReport.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentExamReport/vue3/AssessmentExamReport.data.ts @@ -9,6 +9,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'batchNo' }, + { + title: '题目', + align:"center", + dataIndex: 'questionId' + }, + { + title: '答案', + align:"center", + dataIndex: 'answerId' + }, { title: '风险', align:"center", @@ -37,6 +47,21 @@ export const columns: BasicColumn[] = [ ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "批次标识", + field: "batchNo", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "关联用户", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -45,6 +70,16 @@ export const formSchema: FormSchema[] = [ field: 'batchNo', component: 'Input', }, + { + label: '题目', + field: 'questionId', + component: 'Input', + }, + { + label: '答案', + field: 'answerId', + component: 'Input', + }, { label: '风险', field: 'risk', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/controller/AssessmentReportUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/controller/AssessmentReportUserController.java index 57c0983..7380268 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/controller/AssessmentReportUserController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/controller/AssessmentReportUserController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户测评报告基本信息表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ @Api(tags="用户测评报告基本信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/entity/AssessmentReportUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/entity/AssessmentReportUser.java index ea6840d..722f334 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/entity/AssessmentReportUser.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/entity/AssessmentReportUser.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户测评报告基本信息表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/mapper/AssessmentReportUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/mapper/AssessmentReportUserMapper.java index 5e34abc..4bd82f4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/mapper/AssessmentReportUserMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/mapper/AssessmentReportUserMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户测评报告基本信息表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface AssessmentReportUserMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/IAssessmentReportUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/IAssessmentReportUserService.java index 1d1164d..5e734a7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/IAssessmentReportUserService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/IAssessmentReportUserService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户测评报告基本信息表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface IAssessmentReportUserService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/impl/AssessmentReportUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/impl/AssessmentReportUserServiceImpl.java index babf604..e0d0388 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/impl/AssessmentReportUserServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/service/impl/AssessmentReportUserServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户测评报告基本信息表 * @Author: jeecg-boot - * @Date: 2025-09-23 + * @Date: 2025-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/AssessmentReportUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/AssessmentReportUserList.vue index 89e7ed9..ee05c83 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/AssessmentReportUserList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue/AssessmentReportUserList.vue @@ -4,6 +4,26 @@
+ + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts index d1e08d6..f0d1296 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentReportUser/vue3/AssessmentReportUser.data.ts @@ -37,6 +37,21 @@ export const columns: BasicColumn[] = [ ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "批次标识", + field: "batchNo", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "关联用户", + field: "userId", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 6ef5388..b06a6a6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 用户表 + * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2025-10-17 * @Version: V1.0 */ -@Api(tags="用户表") +@Api(tags="han_hai_member") @RestController @RequestMapping("/hanHaiMember/hanHaiMember") @Slf4j @@ -59,8 +59,8 @@ public class HanHaiMemberController extends JeecgController> queryPageList(HanHaiMember hanHaiMember, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController add(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.save(hanHaiMember); @@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController edit(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.updateById(hanHaiMember); @@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { hanHaiMemberService.removeById(id); @@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { HanHaiMember hanHaiMember = hanHaiMemberService.getById(id); @@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 2d71e42..dc77ea1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 用户表 + * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2025-10-17 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index f03b897..af37e30 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 用户表 + * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2025-10-17 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 7a138c3..bcff3fc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -4,26 +4,6 @@
- - - - - - - - - - - - - 查询 - 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - - -
@@ -32,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -119,7 +99,6 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import HanHaiMemberModal from './modules/HanHaiMemberModal' - import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'HanHaiMemberList', @@ -129,7 +108,7 @@ }, data () { return { - description: '用户表管理页面', + description: 'han_hai_member管理页面', // 表头 columns: [ { @@ -142,12 +121,6 @@ return parseInt(index)+1; } }, - { - title:'创建日期', - align:"center", - sorter: true, - dataIndex: 'createTime' - }, { title:'昵称', align:"center", @@ -162,34 +135,22 @@ { title:'手机号码', align:"center", - sorter: true, dataIndex: 'phone' }, { - title:'公众号openid', - align:"center", - dataIndex: 'officialOpenid' - }, - { - title:'邀请人', - align:"center", - dataIndex: 'vid_dictText' - }, - { - title:'邀请时间', + title:'已支付金额', align:"center", - dataIndex: 'vtime' + dataIndex: 'amount' }, { - title:'性别', + title:'已生成报告数量', align:"center", - dataIndex: 'sex' + dataIndex: 'reportNum' }, { - title:'是否分销商', + title:'已关联的所有批次号', align:"center", - dataIndex: 'isDai', - customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isDai'], text) : ''), + dataIndex: 'batchNoNum' }, { title: '操作', @@ -213,7 +174,6 @@ } }, created() { - this.$set(this.dictOptions, 'isDai', [{text:'是',value:'Y'},{text:'否',value:'N'}]) this.getSuperFieldList(); }, computed: { @@ -226,16 +186,12 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'string',value:'token',text:'登录TOEKN',dictCode:''}) - fieldList.push({type:'string',value:'officialOpenid',text:'公众号openid',dictCode:''}) - fieldList.push({type:'sel_search',value:'vid',text:'邀请人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) - fieldList.push({type:'datetime',value:'vtime',text:'邀请时间'}) - fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) - fieldList.push({type:'switch',value:'isDai',text:'是否分销商'}) + fieldList.push({type:'BigDecimal',value:'amount',text:'已支付金额',dictCode:''}) + fieldList.push({type:'int',value:'reportNum',text:'已生成报告数量',dictCode:''}) + fieldList.push({type:'Text',value:'batchNoNum',text:'已关联的所有批次号',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index c9f56eb..641dcfc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -19,33 +19,18 @@ - - + + - - + + - - - - - - - - - - - - - - - - - + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 7f55387..3ea9138 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -5,12 +5,6 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '创建日期', - align:"center", - sorter: true, - dataIndex: 'createTime' - }, - { title: '昵称', align:"center", dataIndex: 'nickName' @@ -24,55 +18,26 @@ export const columns: BasicColumn[] = [ { title: '手机号码', align:"center", - sorter: true, dataIndex: 'phone' }, { - title: '公众号openid', - align:"center", - dataIndex: 'officialOpenid' - }, - { - title: '邀请人', + title: '已支付金额', align:"center", - dataIndex: 'vid_dictText' + dataIndex: 'amount' }, { - title: '邀请时间', + title: '已生成报告数量', align:"center", - dataIndex: 'vtime' + dataIndex: 'reportNum' }, { - title: '性别', + title: '已关联的所有批次号', align:"center", - dataIndex: 'sex' - }, - { - title: '是否分销商', - align:"center", - dataIndex: 'isDai', - customRender:({text}) => { - return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) - }, + dataIndex: 'batchNoNum' }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ - { - label: "昵称", - field: "nickName", - component: 'Input', - colProps: {span: 6}, - }, - { - label: "邀请人", - field: "vid", - component: 'JSearchSelect', - componentProps:{ - dict:"han_hai_member,nick_name,id" - }, - colProps: {span: 6}, - }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -94,38 +59,18 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '登录TOEKN', - field: 'token', - component: 'Input', - }, - { - label: '公众号openid', - field: 'officialOpenid', - component: 'Input', - }, - { - label: '邀请人', - field: 'vid', - component: 'JSearchSelect', - componentProps:{ - dict:"han_hai_member,nick_name,id" - }, + label: '已支付金额', + field: 'amount', + component: 'InputNumber', }, { - label: '邀请时间', - field: 'vtime', - component: 'Input', + label: '已生成报告数量', + field: 'reportNum', + component: 'InputNumber', }, { - label: '性别', - field: 'sex', + label: '已关联的所有批次号', + field: 'batchNoNum', component: 'Input', }, - { - label: '是否分销商', - field: 'isDai', - component: 'JSwitch', - componentProps:{ - }, - }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue index adff966..d91d68c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue @@ -53,7 +53,7 @@ //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ - title: '用户表', + title: 'han_hai_member', api: list, columns, canResize:false, @@ -70,7 +70,7 @@ }, }, exportConfig: { - name:"用户表", + name:"han_hai_member", url: getExportUrl, }, importConfig: { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java index 64334da..fdac994 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ExamServiceImpl.java @@ -163,7 +163,8 @@ public class ExamServiceImpl implements ExamService { map.put("pageList", pageList); - String batchNo = IdWorker.getIdStr();//生成批次标识 + //String batchNo = IdWorker.getIdStr();//生成批次标识 + String batchNo = getBatchNo(hanHaiMember); map.put("batchNo", batchNo); //生成用户测评答题记录 AssessmentExamLog assessmentExamLog = new AssessmentExamLog(); @@ -171,6 +172,7 @@ public class ExamServiceImpl implements ExamService { assessmentExamLog.setAllNum(pageList.size()); assessmentExamLog.setFinishNum(0); assessmentExamLog.setRemainNum(pageList.size()); + assessmentExamLog.setUserPhone(hanHaiMember.getPhone()); assessmentExamLog.setUserId(hanHaiMember.getId()); boolean result1 = assessmentExamLogService.save(assessmentExamLog); if(!result1){ @@ -182,6 +184,7 @@ public class ExamServiceImpl implements ExamService { for (AssessmentQuestion assessmentQuestion : pageList) { AssessmentAnswerLog assessmentAnswerLog = new AssessmentAnswerLog(); assessmentAnswerLog.setBatchNo(batchNo); + assessmentAnswerLog.setQuestionNo(assessmentQuestion.getQuestionNo()); assessmentAnswerLog.setQuestionId(assessmentQuestion.getId()); assessmentAnswerLog.setUserId(hanHaiMember.getId()); assessmentAnswerLogList.add(assessmentAnswerLog); @@ -470,6 +473,13 @@ public class ExamServiceImpl implements ExamService { code.setUserId(assessmentPayLog.getUserId()); assessmentCodeService.updateById(code); } + + //修改用户已支付金额 + HanHaiMember member = hanHaiMemberService.getById(assessmentPayLog.getUserId()); + BigDecimal oldAmount = member.getAmount(); + BigDecimal newAmount = oldAmount.add(assessmentPayLog.getPayAmount()); + member.setAmount(newAmount); + hanHaiMemberService.updateById(member); } } @@ -480,4 +490,29 @@ public class ExamServiceImpl implements ExamService { return null; } + /******************************************************************************************************************/ + //生成批次编号 + public String getBatchNo(HanHaiMember hanHaiMember){ + boolean flag = true; + int num = 1; + String batchNo = hanHaiMember.getPhone() + CommonUtils.getTime("yyMMdd") + "01"; + while (flag){ + + AssessmentExamLog one = assessmentExamLogService.lambdaQuery().eq(AssessmentExamLog::getBatchNo, batchNo).one(); + if(null == one){ + flag = false; + }else { + num++; + if(num < 10){ + batchNo = hanHaiMember.getPhone() + CommonUtils.getTime("yyMMdd") + "0" + num; + }else { + batchNo = hanHaiMember.getPhone() + CommonUtils.getTime("yyMMdd") + num; + } + } + } + + return batchNo; + + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java index 5570d4c..04da5ec 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ReportServiceImpl.java @@ -225,6 +225,8 @@ public class ReportServiceImpl implements ReportService { for (AssessmentAnswer assessmentAnswer : answerList) { AssessmentExamReport report = new AssessmentExamReport(); report.setBatchNo(batchNo); + report.setQuestionId(assessmentAnswer.getQuestionId()); + report.setAnswerId(assessmentAnswer.getId()); report.setRisk(assessmentAnswer.getRisk()); report.setReason(assessmentAnswer.getReason()); report.setLevel(assessmentAnswer.getLevel()); @@ -235,6 +237,20 @@ public class ReportServiceImpl implements ReportService { boolean result = assessmentExamReportService.saveBatch(reportList); if(!result){ log.info("测评报告生成失败"); + }else { + //添加用户测评报告数量、批次编号 + HanHaiMember member = hanHaiMemberService.getById(userId); + int reportNum = member.getReportNum() + 1; + String batchNoNum = ""; + if(StringUtils.isEmpty(member.getBatchNoNum())){ + batchNoNum = batchNo; + }else { + batchNoNum = member.getBatchNoNum() + ";" + batchNo; + } + member.setReportNum(reportNum); + member.setBatchNoNum(batchNoNum); + hanHaiMemberService.updateById(member); + } }catch (Exception e){ e.printStackTrace();