添加政府,银行大屏,修改政府前后端代码
This commit is contained in:
@@ -28,10 +28,16 @@ exports.getSlaughterhouses = async (req, res) => {
|
||||
order: [['created_at', 'DESC']]
|
||||
});
|
||||
|
||||
// 转换状态为中文显示
|
||||
const processedRows = rows.map(row => ({
|
||||
...row.toJSON(),
|
||||
status: row.status === 'active' ? '正常' : row.status === 'inactive' ? '暂停营业' : row.status
|
||||
}));
|
||||
|
||||
res.json({
|
||||
code: 200,
|
||||
data: {
|
||||
list: rows,
|
||||
list: processedRows,
|
||||
total: count,
|
||||
page: parseInt(page),
|
||||
pageSize: parseInt(pageSize)
|
||||
@@ -61,9 +67,15 @@ exports.getSlaughterhouseById = async (req, res) => {
|
||||
});
|
||||
}
|
||||
|
||||
// 转换状态为中文显示
|
||||
const processedSlaughterhouse = {
|
||||
...slaughterhouse.toJSON(),
|
||||
status: slaughterhouse.status === 'active' ? '正常' : slaughterhouse.status === 'inactive' ? '暂停营业' : slaughterhouse.status
|
||||
};
|
||||
|
||||
res.json({
|
||||
code: 200,
|
||||
data: slaughterhouse,
|
||||
data: processedSlaughterhouse,
|
||||
message: '查询成功'
|
||||
});
|
||||
} catch (error) {
|
||||
@@ -80,6 +92,14 @@ exports.createSlaughterhouse = async (req, res) => {
|
||||
try {
|
||||
const { name, address, contactPerson, contactPhone, licenseNumber, status } = req.body;
|
||||
|
||||
// 验证必填字段
|
||||
if (!name || !address || !contactPerson || !contactPhone || !licenseNumber || !status) {
|
||||
return res.status(400).json({
|
||||
code: 400,
|
||||
message: '请填写所有必填字段'
|
||||
});
|
||||
}
|
||||
|
||||
// 检查名称是否重复
|
||||
const existingSlaughterhouse = await Slaughterhouse.findOne({
|
||||
where: { name }
|
||||
@@ -104,20 +124,23 @@ exports.createSlaughterhouse = async (req, res) => {
|
||||
});
|
||||
}
|
||||
|
||||
// 转换状态为英文存储
|
||||
const statusValue = status === '正常' ? 'active' : status === '暂停营业' ? 'inactive' : status;
|
||||
|
||||
const slaughterhouse = await Slaughterhouse.create({
|
||||
name,
|
||||
address,
|
||||
contactPerson,
|
||||
contactPhone,
|
||||
licenseNumber,
|
||||
status,
|
||||
status: statusValue,
|
||||
createTime: new Date(),
|
||||
created_by: req.user?.id || null,
|
||||
updated_by: req.user?.id || null
|
||||
});
|
||||
|
||||
res.json({
|
||||
code: 201,
|
||||
code: 200,
|
||||
data: slaughterhouse,
|
||||
message: '新增成功'
|
||||
});
|
||||
@@ -125,7 +148,7 @@ exports.createSlaughterhouse = async (req, res) => {
|
||||
console.error('新增屠宰场失败:', error);
|
||||
res.status(500).json({
|
||||
code: 500,
|
||||
message: '服务器内部错误'
|
||||
message: '服务器内部错误: ' + error.message
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -179,13 +202,16 @@ exports.updateSlaughterhouse = async (req, res) => {
|
||||
}
|
||||
}
|
||||
|
||||
// 转换状态为英文存储
|
||||
const statusValue = status === '正常' ? 'active' : status === '暂停营业' ? 'inactive' : status;
|
||||
|
||||
await slaughterhouse.update({
|
||||
name,
|
||||
address,
|
||||
contactPerson,
|
||||
contactPhone,
|
||||
licenseNumber,
|
||||
status,
|
||||
status: statusValue,
|
||||
updated_by: req.user?.id || null
|
||||
});
|
||||
|
||||
@@ -253,9 +279,15 @@ exports.toggleSlaughterhouseStatus = async (req, res) => {
|
||||
updated_by: req.user?.id || null
|
||||
});
|
||||
|
||||
// 转换状态为中文显示
|
||||
const processedSlaughterhouse = {
|
||||
...slaughterhouse.toJSON(),
|
||||
status: newStatus === 'active' ? '正常' : '暂停营业'
|
||||
};
|
||||
|
||||
res.json({
|
||||
code: 200,
|
||||
data: slaughterhouse,
|
||||
data: processedSlaughterhouse,
|
||||
message: '状态切换成功'
|
||||
});
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user