patton99/hyzp_ybqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyzp_ybqx-Commit119：版本号更新为1.4.24+20220409。按公司要求修改审核逻辑，即使 当前时间 > 抓拍时间 + 审核间隔，也允许用户进行初审和复审审核，只是禁止推送

Browse Source
This commit is contained in:
WinUser01
2022-04-09 21:50:15 +08:00
parent 55a95cb3aa
commit 38ce516148
2 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/Works/HYSH/hysh_group.dart
+91 -93
View File
@@ -176,72 +176,70 @@ class _HyshGroupState extends State<HyshGroup> {
getBtnSizeX(
text: '复审提交',
fontColor: 0 == _selectedRadio ? Colors.red : Colors.green,
onPressedFun: 1 == sfyc
? null
: () async {
int ret = -1;
print('等待复审提交确认');
await Navigator.of(context)
.push(
PageRouteBuilder(
opaque: false,
pageBuilder: (context, animation, secondaryAnimation) =>
CustomDialogHysh(
shjg: 0 == _selectedRadio ? hyc_text : fhyc_text,
title: '复审',
content:
'是否进行复审提交${tsjj && 0 == sfyc ? '、同时推送交警' : ''}？\n${1 == sfyc ? _sfcyTextTrue : ''}'),
),
)
.then((value) async {
print('value = $value');
if (value) {
print('用户已确认，开始处理复审提交！');
// onPressedFun: 1 == sfyc
// ? null
// : () async {
onPressedFun: () async {
int ret = -1;
print('等待复审提交确认');
await Navigator.of(context)
.push(
PageRouteBuilder(
opaque: false,
pageBuilder: (context, animation, secondaryAnimation) => CustomDialogHysh(
shjg: 0 == _selectedRadio ? hyc_text : fhyc_text,
title: '复审',
content:
'是否进行复审提交${tsjj && 0 == sfyc ? '、同时推送交警' : ''}？\n${1 == sfyc ? _sfcyTextTrue : ''}'),
),
)
.then((value) async {
print('value = $value');
if (value) {
print('用户已确认，开始处理复审提交！');
//复审接口增加是否延迟字段 sfyc （是否延迟）整型 必须 是否延误，0-正常 1-延误。延误状态的不推送
// 初审不用判断，sfyc 直接提交0即可。只有复审的时候才判断时间
// A、若在规定时间内，则 int sfyc = 0，审核完毕后正常推送交警。
// B、若超出规定时间，即当前时间>抓拍时间+间隔时间，则 sfyc = 1，不推送交警。
//设置 sfyc 和 tsjj
set_sfyc_tsjj(int.parse(listGetZpjl[widget.index]['zpsj']))
.then((value) async {
hyshContentFirstAudit(
widget.id,
widget.index,
mapHyshlx[hyshlx]['audit_workflow'],
topTabs_map['auditShuoming_Controller_List'][widget.index]
.text,
topTabs_map['auditTitle'][widget.index],
sfyc: sfyc,
).then((value) {
eventBus.fire(HycsDataUpdateEvent(
'${mapHyshlx[hyshlx]['text']}数据已更新'));
//必须等待审核过程完成后，再处理同时推送交警，否则推送交警总是失败
print('tsjj = $tsjj');
if (tsjj) {
print('before tsjjFun(widget.id, _plateAndID)');
//设置 sfyc 和 tsjj
set_sfyc_tsjj(int.parse(listGetZpjl[widget.index]['zpsj']))
.then((value) async {
hyshContentFirstAudit(
widget.id,
widget.index,
mapHyshlx[hyshlx]['audit_workflow'],
topTabs_map['auditShuoming_Controller_List'][widget.index].text,
topTabs_map['auditTitle'][widget.index],
sfyc: sfyc,
).then((value) {
eventBus.fire(
HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新'));
//必须等待审核过程完成后，再处理同时推送交警，否则推送交警总是失败
print('tsjj = $tsjj');
if (tsjj) {
print('before tsjjFun(widget.id, _plateAndID)');
String _plateAndID =
topTabs_map['car_number_List'].toString() +
'(ID:${widget.id.toString()})';
String _plateAndID = topTabs_map['car_number_List'].toString() +
'(ID:${widget.id.toString()})';
tsjjFun(widget.id, _plateAndID);
tsjjFun(widget.id, _plateAndID);
print('after tsjjFun(widget.id, _plateAndID)');
print('after tsjjFun(widget.id, _plateAndID)');
Fluttertoast.showToast(
msg: '$_plateAndID 已推送交警，请等待返回结果。',
gravity: ToastGravity.CENTER);
}
});
});
} else {
print('用户取消了复审提交');
Fluttertoast.showToast(
msg: '$_plateAndID 已推送交警，请等待返回结果。',
gravity: ToastGravity.CENTER);
}
});
Navigator.pop(context, ret);
},
});
} else {
print('用户取消了复审提交');
}
});
Navigator.pop(context, ret);
},
width: 90.0,
height: 34.0), //'复审提交'
getBtnSizeX(
@@ -271,46 +269,46 @@ class _HyshGroupState extends State<HyshGroup> {
getBtnSizeX(
text: '初审提交',
fontColor: 0 == _selectedRadio ? Colors.red : Colors.green,
onPressedFun: 1 == sfyc
? null
: () async {
int ret = -1;
print('等待初审提交确认');
await Navigator.of(context)
.push(
PageRouteBuilder(
opaque: false,
pageBuilder: (context, animation, secondaryAnimation) =>
CustomDialogHysh(
shjg: 0 == _selectedRadio ? hyc_text : fhyc_text,
title: '初审',
content: '是否进行初审提交？'),
),
)
.then((value) async {
print('value = $value');
if (value) {
print('用户已确认，开始处理初审提交！');
//return;
// onPressedFun: 1 == sfyc
// ? null
// : () async {
onPressedFun: () async {
int ret = -1;
print('等待初审提交确认');
await Navigator.of(context)
.push(
PageRouteBuilder(
opaque: false,
pageBuilder: (context, animation, secondaryAnimation) =>
CustomDialogHysh(
shjg: 0 == _selectedRadio ? hyc_text : fhyc_text,
title: '初审',
content: '是否进行初审提交？'),
),
)
.then((value) async {
print('value = $value');
if (value) {
print('用户已确认，开始处理初审提交！');
//return;
hyshContentFirstAudit(
widget.id,
widget.index,
mapHyshlx[hyshlx]['audit_workflow'],
topTabs_map['auditShuoming_Controller_List'][widget.index]
.text,
topTabs_map['auditTitle'][widget.index],
sfyc: 0,
).then((value) {
eventBus.fire(
HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新'));
});
} else {
print('用户取消了初审提交');
}
});
Navigator.pop(context, ret);
},
hyshContentFirstAudit(
widget.id,
widget.index,
mapHyshlx[hyshlx]['audit_workflow'],
topTabs_map['auditShuoming_Controller_List'][widget.index].text,
topTabs_map['auditTitle'][widget.index],
sfyc: 0,
).then((value) {
eventBus
.fire(HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新'));
});
} else {
print('用户取消了初审提交');
}
});
Navigator.pop(context, ret);
},
width: 90.0), //'初审提交'
getBtnSizeX(
text: "取消",