|
@@ -291,7 +291,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
|
|
|
if (baseProcess.getProcessType() == 2 || baseProcess.getProcessType() == 1) {
|
|
|
return new Result(10001, "修改失败!该申请已提前结束或者被拒绝", false);
|
|
|
} else {
|
|
|
- if (billPcr.getDestId() >= billPcr.getTestLocationId()||billPcr.getTestLocationId()==9||billPcr.getTestLocationId()==10||billPcr.getTestLocationId()==11) { //说明当前不是目的地
|
|
|
+ if (billPcr.getDestId() >= billPcr.getTestLocationId() || billPcr.getTestLocationId() == 9 || billPcr.getTestLocationId() == 10 || billPcr.getTestLocationId() == 11 || billPcr.getTestLocationId() == 6) { //说明当前不是目的地
|
|
|
+
|
|
|
if ("1".equals(result)) {
|
|
|
billPcr.setBillStatus(1);
|
|
|
billPcr.setPassUserName(TokenSign.getUserNameByJwtToken(httpServletRequest));
|