修改抢维修

msss-gps/msss-gps-boot/src/main/java/com/tofly/gpsboot/service/audit/impl/AuditRushRepairAuditServerImpl.java

@@ -171,7 +171,7 @@ public class AuditRushRepairAuditServerImpl implements IAuditRushRepairAuditServ
             IRushrepairauditService.savaBuildInfo(null, new_rushrepairauditdto);
         } else if (AuditSateEnum.AUDIT_NO.getCode().equals(auditResult)) {
             //如果上一步id等于本步骤id 且在第一步 进行驳回 不用增加审核记录
-            if (!RushRepairSateEnum.RUSHREPAIR_SATE_SAFE_AUDIT.getCode().equals(rushRepairType)) {
+            if (!RushRepairSateEnum.RUSHREPAIR_SATE_SAFE_AUDIT.getCode().equals(rushRepairType) && !RushRepairSateEnum.RUSHREPAIR_SATE_TO_BE_SUBMIT.getCode().equals(next_type)) {
                 //审核不通过-返回到上一步 新增一条上一步状态未审核记录
                 RushrepairauditDto new_rushrepairauditdto = new RushrepairauditDto();
                 new_rushrepairauditdto.setRushrepairId(id);
@@ -192,8 +192,12 @@ public class AuditRushRepairAuditServerImpl implements IAuditRushRepairAuditServ
         //endregion
 
         //region 如果是热线 则工单归档
-        if (RushRepairSateEnum.RUSHREPAIR_SATE_PLACE_FILE.getCode().equals(next_type) && info.getUploadType().equals("1")) {
-            gdglinfoClient.gdGdUpdateState(info.getId().toString(), 1);
+        if (RushRepairSateEnum.RUSHREPAIR_SATE_PLACE_FILE.getCode().equals(next_type)) {
+            if (null != info.getUploadType()) {
+                if (info.getUploadType().equals("1")) {
+                    gdglinfoClient.gdGdUpdateState(info.getId().toString(), 1);
+                }
+            }
         }
         //ednregion