Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -25,6 +25,7 @@ import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.common.utils.excel.ExcelMergeUtil;
+import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.evaluate.dto.TeaEvaluateClassDto;
@@ -134,6 +135,8 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
     private final IQuotaFormulaRuleService quotaFormulaRuleService;
 
+    private final CommonPropertiesConfig commonPropertiesConfig;
+
     @Override
     public Page<BaseStudentAssessmentInspectionPageVo> getPage(Page<BaseStudentAssessmentInspectionPageDto> page, BaseStudentAssessmentInspectionPageDto dto) {
         Page<BaseStudentAssessmentInspectionPageVo> result = assessmentInspectionMapper.getPage(page, dto);
@@ -758,7 +761,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
             weChatSendMessageDto.setUserId(user.getOpenId());
             weChatSendMessageDto.setTemplateId(wechatTemplate);
             weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
-
+            weChatSendMessageDto.setUrl(StrUtil.format("{}pages/student/mentinspection/index", commonPropertiesConfig.getDomainApp()));
             JSONObject data = new JSONObject();
             String thing4 = "";
             String thing1 = "";

src/main/resources/sqlScript/20250212_sql.sql

@@ -0,0 +1,39 @@
+-- ---------------------------------------------------------------
+-- 学生复学流程
+-- ---------------------------------------------------------------
+DROP TABLE IF EXISTS wf_student_resume_schooling;
+CREATE TABLE `wf_student_resume_schooling`  (
+  `id` BIGINT NOT NULL COMMENT '主键',
+  `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME(3) NULL DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人id',
+  `modify_date` DATETIME(3) NULL DEFAULT NULL COMMENT '修改日期',
+  `delete_mark` SMALLINT NULL DEFAULT NULL COMMENT '删除标记(0:未删除 1:已删除)',
+  `enabled_mark` SMALLINT NULL DEFAULT NULL COMMENT '有效标记(0:未启用 1:已启用)',
+  `grade_id` BIGINT NULL DEFAULT NULL COMMENT '年级id(base_grade)',
+  `user_id` BIGINT NULL DEFAULT NULL COMMENT '学生id(xjr_user)',
+  `credential_number` VARCHAR(30) NULL DEFAULT NULL COMMENT '身份证',
+  `archives_status` VARCHAR(20) NULL DEFAULT NULL COMMENT '在校状态',
+  `class_id` BIGINT NULL DEFAULT NULL COMMENT '所在班级id(base_class)',
+  `class_name` VARCHAR(30) NULL DEFAULT NULL COMMENT '所在班级id',
+  `teacher_id` BIGINT NULL DEFAULT NULL COMMENT '班主任id(xjr_user)',
+  `teacher_name` VARCHAR(20) NULL DEFAULT NULL COMMENT '班主任姓名',
+  `remarks` VARCHAR(500) NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = INNODB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '学生复学流程';
+
+-- 异动类型字典
+INSERT INTO `xjr_dictionary_item` (`id`, `name`, `code`, `sort_code`, `remark`, `create_user_id`, `create_date`, `modify_user_id`, `modify_date`, `delete_mark`, `enabled_mark`) VALUES (1881186538301730818, '异动记录类型', 'student_change_type', NULL, NULL, 1000000000000000000, '2025-01-20 11:46:36.145', NULL, NULL, 0, 1);
+INSERT INTO `xjr_dictionary_detail` (`id`, `name`, `code`, `item_id`, `value`, `sort_code`, `remark`, `create_user_id`, `create_date`, `modify_user_id`, `modify_date`, `delete_mark`, `enabled_mark`, `p_id`, `extend_field1`, `extend_field2`, `extend_field3`, `extend_field4`, `extend_field5`) VALUES (1881186639761944577, '转班', 'change_class', 1881186538301730818, 'change_class', NULL, NULL, 1000000000000000000, '2025-01-20 11:47:00.335', NULL, NULL, 0, 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `xjr_dictionary_detail` (`id`, `name`, `code`, `item_id`, `value`, `sort_code`, `remark`, `create_user_id`, `create_date`, `modify_user_id`, `modify_date`, `delete_mark`, `enabled_mark`, `p_id`, `extend_field1`, `extend_field2`, `extend_field3`, `extend_field4`, `extend_field5`) VALUES (1881186682485125122, '就读方式', 'stduy_status', 1881186538301730818, 'stduy_status', NULL, NULL, 1000000000000000000, '2025-01-20 11:47:10.520', NULL, NULL, 0, 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `xjr_dictionary_detail` (`id`, `name`, `code`, `item_id`, `value`, `sort_code`, `remark`, `create_user_id`, `create_date`, `modify_user_id`, `modify_date`, `delete_mark`, `enabled_mark`, `p_id`, `extend_field1`, `extend_field2`, `extend_field3`, `extend_field4`, `extend_field5`) VALUES (1881186726055555073, '学生类别', 'student_type', 1881186538301730818, 'student_type', NULL, NULL, 1000000000000000000, '2025-01-20 11:47:20.909', NULL, NULL, 0, 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `xjr_dictionary_detail` (`id`, `name`, `code`, `item_id`, `value`, `sort_code`, `remark`, `create_user_id`, `create_date`, `modify_user_id`, `modify_date`, `delete_mark`, `enabled_mark`, `p_id`, `extend_field1`, `extend_field2`, `extend_field3`, `extend_field4`, `extend_field5`) VALUES (1881186764286636033, '学习形式', 'learn_status', 1881186538301730818, 'learn_status', NULL, NULL, 1000000000000000000, '2025-01-20 11:47:30.024', NULL, NULL, 0, 1, 0, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `xjr_dictionary_detail` (`id`, `name`, `code`, `item_id`, `value`, `sort_code`, `remark`, `create_user_id`, `create_date`, `modify_user_id`, `modify_date`, `delete_mark`, `enabled_mark`, `p_id`, `extend_field1`, `extend_field2`, `extend_field3`, `extend_field4`, `extend_field5`) VALUES (1881186814458900482, '在读状态', 'archives_status', 1881186538301730818, 'archives_status', NULL, NULL, 1000000000000000000, '2025-01-20 11:47:41.985', NULL, NULL, 0, 1, 0, NULL, NULL, NULL, NULL, NULL);
+
+
+ALTER TABLE `base_student_family`   
+  ADD INDEX (`user_id`);
+ALTER TABLE `xjr_role`   
+  ADD COLUMN `is_system` INT DEFAULT 0  NULL   COMMENT '是否是系统角色(1:是 0:否)' AFTER `enabled_mark`;
+
+UPDATE xjr_role SET is_system = 1 WHERE id IN (1,2,3,4,5,1745630294430511106);

src/main/resources/sqlScript/学生异动视图.sql

@@ -0,0 +1,32 @@
+DROP VIEW IF EXISTS cse_feeobj_change1;
+CREATE VIEW cse_feeobj_change1 AS
+SELECT '1001' AS Pk_corp,NULL AS remarks,t1.user_id AS pkfeeobj,t4.classcode,t7.speccode AS pkspec,
+IF(t1.change_type = 'student_type',t1.before_data,NULL) AS resourcecode, 
+IF(t1.change_type = 'stduy_status',t1.before_data,NULL) AS quartercode,t9.deptcode,
+NULL AS enteryear, NULL AS leaveyear,NULL AS ratetypecode,
+IF(t1.change_type = 'archives_status',t1.before_data,NULL) AS state,
+t10.classcode AS newclasscode,t13.speccode AS newpkspec,
+IF(t1.change_type = 'student_type',t1.after_data,NULL) AS newresourcecode, 
+IF(t1.change_type = 'stduy_status',t1.after_data,NULL) AS newquartercode,
+t15.deptcode AS newdeptcode,NULL AS newenteryear, NULL AS newleaveyear,NULL AS newratetypecode,
+IF(t1.change_type = 'archives_status',t1.after_data,NULL) AS newstate,
+t16.name AS operator,DATE_FORMAT(t1.create_date, '%Y-%m-%d') AS opertordate,t1.id AS pkfeeobjchange,t2.credential_number AS Personalid,t2.name AS Feeobjname,
+t17.student_id AS Studentcode,NULL AS biztype,NULL AS delflag,NULL AS updateflag,NULL AS fid
+FROM student_change_record t1
+INNER JOIN xjr_user t2 ON t1.user_id = t2.id
+LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
+LEFT JOIN pb_cse_class1 t4 ON t4.specname = t1.before_data AND t1.change_type = 'change_class'
+LEFT JOIN base_class t5 ON t1.before_data_code = t5.id AND t1.change_type = 'change_class'
+LEFT JOIN base_major_set t6 ON t5.major_set_id = t6.id
+LEFT JOIN pb_cse_spec1 t7 ON t6.name = t7.specname
+LEFT JOIN xjr_department t8 ON t5.org_id = t8.id AND t1.change_type = 'change_class'
+LEFT JOIN pb_bd_dept1 t9 ON t8.name = t9.deptname
+LEFT JOIN pb_cse_class1 t10 ON t10.specname = t1.after_data AND t1.change_type = 'change_class'
+LEFT JOIN base_class t11 ON t1.after_data_code = t11.id AND t1.change_type = 'change_class'
+LEFT JOIN base_major_set t12 ON t11.major_set_id = t12.id
+LEFT JOIN pb_cse_spec1 t13 ON t12.name = t13.specname
+LEFT JOIN xjr_department t14 ON t11.org_id = t14.id AND t1.change_type = 'change_class'
+LEFT JOIN pb_bd_dept1 t15 ON t14.name = t15.deptname
+LEFT JOIN xjr_user t16 ON t16.id = t1.create_user_id
+INNER JOIN base_student t17 ON t1.user_id = t17.user_id
+WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1;