db修改

sop-api/install/mysql/init/init.sql

@@ -3194,7 +3194,7 @@ INSERT INTO `sys_user_role` VALUES (1, 1, 1, NULL, 1);
 
 INSERT INTO `t_d_form_widget` VALUES (1, 'TEXT', 'FORM', 'problem_point', 'problem_point', '问题简要', 'STRING', 1, 0, 1, 1, NULL, 30, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 1, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (2, 'TEXTAREA', 'FORM', 'problem_remark', 'problem_remark', '问题情况说明', 'STRING', 1, 0, 1, 1, NULL, 300, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 1, 0, NULL, NULL, 1, 1);
-INSERT INTO `t_d_form_widget` VALUES (3, 'FILE', 'FORM', 'attachments_info', 'attachments_info', '附件说明', 'FILE', 0, 0, 1, 1, NULL, 3, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 1, 0, NULL, NULL, 1, 1);
+INSERT INTO `t_d_form_widget` VALUES (3, 'FILE', 'FORM', 'attachments_info', 'attachments_info', '附件说明', 'FILE', 0, 0, 1, 1, NULL, 5, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 1, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (4, 'TEXT', 'FORM', 'verify_point', 'verify_point', '核实情况简要', 'STRING', 1, 0, 1, 1, NULL, 50, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 2, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (5, 'TEXTAREA', 'FORM', 'verify_remark', 'verify_remark', '核实情况备注', 'STRING', 1, 0, 1, 1, NULL, 500, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 2, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (6, 'RADIO', 'FORM', 'problem_type', 'problem_type', '质量问题类型', 'ENUM', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"UPDATE\",\"label\":\"修正类\"},{\"value\":\"OPTIMIZE\",\"label\":\"优化类\"},{\"value\":\"NO_PROBLEM\",\"label\":\"不是问题\"}]', 'QUALITY_PROBLEM_FLOW', 2, 0, NULL, NULL, 1, 1);
@@ -3210,7 +3210,6 @@ INSERT INTO `t_d_form_widget` VALUES (15, 'RADIO', 'FORM', 'approve_radio', 'app
 INSERT INTO `t_d_form_widget` VALUES (16, 'SIGN', 'FORM', 'sign', 'sign', '添加签名', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 4, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (17, 'TEXTAREA', 'FORM', 'approve_remark', 'approve_remark', '备注', 'STRING', 0, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'QUALITY_PROBLEM_FLOW', 4, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (18, 'FORM_GROUP_TITLE', 'FORM', 'project_basic_info_title', 'project_basic_info_title', '项目基本信息', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'OFFICE_SOP_FLOW', 1, 0, NULL, NULL, 1, 1);
-INSERT INTO `t_d_form_widget` VALUES (19, 'NUMBER', 'FORM', 'course_count', 'course_count', '科目数量', 'INT', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 3, NULL, NULL, 'OFFICE_SOP_FLOW', 1, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (20, 'NUMBER', 'FORM', 'exam_student_course_count', 'exam_student_course_count', '考生科次', 'INT', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 3, NULL, NULL, 'OFFICE_SOP_FLOW', 1, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (21, 'NUMBER', 'FORM', 'scan_count', 'scan_count', '扫描仪数量(台)', 'INT', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 3, NULL, NULL, 'OFFICE_SOP_FLOW', 1, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (22, 'NUMBER', 'FORM', 'week_people_day', 'week_people_day', '现场标准服务周期（人天）', 'INT', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 3, NULL, NULL, 'OFFICE_SOP_FLOW', 1, 0, NULL, NULL, 1, 1);
@@ -3323,7 +3322,7 @@ INSERT INTO `t_d_form_widget` VALUES (128, 'DATE', 'FORM', 'mark_start_time', 'm
 INSERT INTO `t_d_form_widget` VALUES (129, 'DATE', 'FORM', 'mark_end_time', 'mark_end_time', '评卷结束时间', 'LONG', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, 'yyyy-MM-dd', 6, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 2, 1, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (130, 'TEXT', 'FORM', 'choose_course_count', 'choose_course_count', '有选做题的科目数量（门）', 'INT', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 2, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (131, 'TEXTAREA', 'FORM', 'ramark', 'ramark', '其它特殊要求', 'STRING', 0, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 2, 0, NULL, NULL, 1, 1);
-INSERT INTO `t_d_form_widget` VALUES (132, 'FILE', 'FORM', 'project_info_photos', 'project_info_photos', '上传项目关键信息表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 3, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 2, 0, NULL, NULL, 1, 1);
+INSERT INTO `t_d_form_widget` VALUES (132, 'FILE', 'FORM', 'project_info_photos', 'project_info_photos', '上传项目关键信息表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 5, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 2, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (133, 'FORM_GROUP_TITLE', 'FORM', 'inside_title_region', 'inside_title_region', '大区经理项目内审（请于24小时内完成内审）', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 3, 0, 1, 'REGION_MANAGER', 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (134, 'RADIO', 'FORM', 'approve_radio_region', 'approve_radio_region', '我对以上项目关键信息已审核，确认内容无误：', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"1\",\"label\":\"同意\"},{\"value\":\"0\",\"label\":\"不同意\"}]', 'CLOUD_MARK_SOP_FLOW', 3, 0, 1, 'REGION_MANAGER', 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (135, 'SIGN', 'FORM', 'sign_region', 'sign_region', '添加签名', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 3, 0, 1, 'REGION_MANAGER', 1, 1);
@@ -3357,16 +3356,16 @@ INSERT INTO `t_d_form_widget` VALUES (162, 'CHECKBOX', 'FORM', 'missing_list_cb'
 INSERT INTO `t_d_form_widget` VALUES (163, 'NUMBER', 'FORM', 'missing_course_count', 'missing_course_count', '缺考科次数量', 'INT', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 7, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (164, 'FORM_GROUP_TITLE', 'FORM', 'paper_form_upload_title', 'paper_form_upload_title', '纸质表单上传', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 7, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (165, 'RADIO', 'FORM', 'school_sign_radio', 'school_sign_radio', '学校是否确认签字', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"YES\",\"label\":\"是\"},{\"value\":\"NO\",\"label\":\"否\"}]', 'CLOUD_MARK_SOP_FLOW', 7, 0, NULL, NULL, 1, 1);
-INSERT INTO `t_d_form_widget` VALUES (166, 'FILE', 'FORM', 'paper_form_photos', 'paper_form_photos', '上传关键节点检查表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 4, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 7, 0, NULL, NULL, 1, 1);
+INSERT INTO `t_d_form_widget` VALUES (166, 'FILE', 'FORM', 'paper_form_photos', 'paper_form_photos', '上传关键节点检查表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 5, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 7, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (167, 'FORM_GROUP_TITLE', 'FORM', 'mark_param_check_title', 'mark_param_check_title', '评卷参数核对', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 8, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (168, 'CHECKBOX', 'FORM', 'mark_param_check_cb', 'mark_param_check_cb', '评卷参数核对', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"1\",\"label\":\"1、核查每个科目的满分是否正确(100分、150分、300分)\"},{\"value\":\"2\",\"label\":\"2、检查所有科目结构和分组是否全部导入。（评卷管理>评卷进度查看分组状态）\"}]', 'CLOUD_MARK_SOP_FLOW', 8, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (169, 'FORM_GROUP_TITLE', 'FORM', 'paper_form_upload_title', 'paper_form_upload_title', '纸质表单上传', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 8, 0, NULL, NULL, 1, 1);
-INSERT INTO `t_d_form_widget` VALUES (170, 'FILE', 'FORM', 'paper_form_photos', 'paper_form_photos', '上传关键节点检查表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 3, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 8, 0, NULL, NULL, 1, 1);
+INSERT INTO `t_d_form_widget` VALUES (170, 'FILE', 'FORM', 'paper_form_photos', 'paper_form_photos', '上传关键节点检查表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 5, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 8, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (171, 'FORM_GROUP_TITLE', 'FORM', 'score_check_title', 'score_check_title', '分数复核', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 9, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (172, 'CHECKBOX', 'FORM', 'score_check_cb', 'score_check_cb', '分数复核', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"1\",\"label\":\"是否建议学校复核小题0分，大题0分，全卷0分的情况\"}]', 'CLOUD_MARK_SOP_FLOW', 9, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (173, 'RADIO', 'FORM', 'school_score_check_radio', 'school_score_check_radio', '学校是否选择复核', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"YES\",\"label\":\"复核(推荐)\"},{\"value\":\"NO\",\"label\":\"不复核\",\"remark\":[{\"content\":\"若选择该项，则需要学校签字确认，签字随关键节点检查表上传\",\"color\":\"red\"}]}]', 'CLOUD_MARK_SOP_FLOW', 9, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (175, 'FORM_GROUP_TITLE', 'FORM', 'paper_form_upload_title', 'paper_form_upload_title', '纸质表单上传', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 9, 0, NULL, NULL, 1, 1);
-INSERT INTO `t_d_form_widget` VALUES (176, 'FILE', 'FORM', 'paper_form_photos', 'paper_form_photos', '上传关键节点检查表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 2, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 9, 0, NULL, NULL, 1, 1);
+INSERT INTO `t_d_form_widget` VALUES (176, 'FILE', 'FORM', 'paper_form_photos', 'paper_form_photos', '上传关键节点检查表(纸质)拍照', 'ARRAY', 1, 0, 1, 1, NULL, 5, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 9, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (177, 'FORM_GROUP_TITLE', 'FORM', 'mark_progress_title', 'mark_progress_title', '评卷进度核查', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 10, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (178, 'CHECKBOX', 'FORM', 'mark_progress_cb', 'mark_progress_cb', '评卷进度核查', 'STRING', 1, 0, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, '[{\"value\":\"1\",\"label\":\"1、核对评卷进度是否为100%\"},{\"value\":\"2\",\"label\":\"2、核对未评数量是否为0\"},{\"value\":\"3\",\"label\":\"3、问题卷是否处理完成\"},{\"value\":\"4\",\"label\":\"4、所有科目状态点击“结束”\"}]', 'CLOUD_MARK_SOP_FLOW', 10, 0, NULL, NULL, 1, 1);
 INSERT INTO `t_d_form_widget` VALUES (179, 'FORM_GROUP_TITLE', 'FORM', 'cross_check_title', 'cross_check_title', '交叉比对', 'STRING', 0, 1, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, 12, NULL, NULL, 'CLOUD_MARK_SOP_FLOW', 10, 0, NULL, NULL, 1, 1);

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -58,7 +58,7 @@
                tbp.name as productName,
                tbc.exam_start_time as examStartTime,
                tbc.exam_end_time as examEndTime,
-               tfcfe.flow_id as flowId,
+               cast(tfcfe.flow_id as char) as flowId,
                cast(tfcfe.create_id as char) as flowCreateId,
                su2.real_name as flowCreateName,
                tffa.create_time as flowCreateTime,