Merge branch 'develop_tzs_register_to_0715' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/Amos96333Application.java

@@ -20,6 +20,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.net.InetAddress;
@@ -57,6 +58,7 @@ public class Amos96333Application {
     public static void main(String[] args) throws UnknownHostException {
         ConfigurableApplicationContext context = SpringApplication.run(Amos96333Application.class, args);
         Environment env = context.getEnvironment();
+        GlobalExceptionHandler.setAlwaysOk(true);
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");
         String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchPaperServiceImpl.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.DispatchPaperFormDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.DispatchRepairFeedbackDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.DispatchSaveFeedbackDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.RescueProcessDto;
+import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
 import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
@@ -320,7 +321,13 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     @Transactional
     @Override
     public Boolean saveDispatchSaveFeedback(DispatchSaveFeedbackDto dispatchSaveFeedbackDto, AgencyUserModel user) {
-        Boolean flag = false;
+        // 困人救援 需先维护救援过程信息 再保存回访信息
+        AlertCalled alertCalled = alertCalledServiceImpl.getById(dispatchSaveFeedbackDto.getAlertId());
+        if (DispatchPaperEnums.KRJY.getId().equals(alertCalled.getAlarmTypeCode()) &&
+                !DispatchPaperEnums.rescued.getId().equals(alertCalled.getAlertStageCode())){
+            throw new BadRequest("请先完善救援过程信息！");
+        }
+        boolean flag = false;
         // 保存救援回访信息
         DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(dispatchSaveFeedbackDto.getAlertId());
         DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();