diff --git a/api/main.js b/api/main.js index 0039f9d..0997090 100644 --- a/api/main.js +++ b/api/main.js @@ -48,9 +48,9 @@ router.post("/", upload.single('file'), async function(req, res) { console.log("No file"); } // data - const apply_infos = req.body.apply_infos; // get data from request - const application_units = req.body.application_units; - const subsidy_amounts = req.body.subsidy_amounts; + const apply_infos_str = req.body.apply_infos; // get data from request + const application_units_str = req.body.application_units; + const subsidy_amounts_str = req.body.subsidy_amounts; const student_id = req.body.student_id; const student_name = req.body.student_name; const department_and_grade = req.body.department_and_grade; @@ -78,18 +78,17 @@ router.post("/", upload.single('file'), async function(req, res) { // const application_unit = "test unit"; // const subsidy = 1000; - console.log(scholarship_application_info.insertId); - console.log(apply_infos); - // insert each apply item into item_form - console.log(scholarship_application_id); - console.log(apply_infos); - console.log(application_units); - console.log(subsidy_amounts); + const apply_infos = apply_infos_str.split(','); + const application_units = application_units_str.split(','); + const subsidy_amounts = subsidy_amounts_str.split(','); for (let i = 0;i < apply_infos.length;i++) { console.log("i="+i); console.log([scholarship_application_id, apply_infos[i], application_units[i], subsidy_amounts[i]]); - await conn.batch("INSERT INTO item_form(`application_id`, `item_info_id`, `application_unit`, `subsidy`) VALUES(?, ?, ?, ?);", [scholarship_application_id, apply_infos[i], application_units[i], subsidy_amounts[i]]); + await conn.batch("INSERT INTO item_form(`application_id`, `item_info_id`, `application_unit`, `subsidy`) VALUES(?, ?, ?, ?);", + [scholarship_application_id, apply_infos[i], + application_units[i]!=''?application_units[i]:null, + subsidy_amounts[i]!=''?subsidy_amounts[i]:null]); } await conn.commit(); diff --git a/js/main.js b/js/main.js index 68f49a2..4f7aef4 100644 --- a/js/main.js +++ b/js/main.js @@ -105,12 +105,15 @@ async function sendApplyData() { } } - const data = {student_id,student_name,department_and_grade, advisor_name, - apply_infos, - application_units, - subsidy_amounts, - file - }; + const data = new FormData(); + data.append('student_id', student_id); + data.append('student_name', student_name); + data.append('department_and_grade', department_and_grade); + data.append('advisor_name', advisor_name); + data.append('apply_infos', apply_infos); + data.append('application_units', application_units); + data.append('subsidy_amounts', subsidy_amounts); + data.append('file', file); console.log(data); // send data let result = await axios.post('/api/main', data, {headers: {'Content-Type': 'multipart/form-data'}});