Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -1544,6 +1544,7 @@ public class CheckServiceImpl implements ICheckService {
                     d.setBizId(c.getId());
                     d.setBizType(contextPath.substring(1));
                     d.setCheckMode(DangerHandleTypeEnum.SUPERVISION.getCode());
+                    d.setInputItemName(c.getInputName());
                 });
                 allDanger.addAll(c.getDangerDtoList());
 
@@ -1587,6 +1588,7 @@ public class CheckServiceImpl implements ICheckService {
                 hiddenDangerDto.setPlanId(planTask.getPlanId());
                 hiddenDangerDto.setPointId(recordParam.getPointId());
                 hiddenDangerDto.setCheckInputId(dangerDto.getBizId());
+                hiddenDangerDto.setInputItemName(dangerDto.getInputItemName());
                 hiddenDangerDto.setDangerType(DangerHandleTypeEnum.SUPERVISION.getCode());
                 try {
                     dangerDto.setBizInfo(iHiddenDangerService.buildBizInfo(hiddenDangerDto));

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -468,7 +468,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             // 警情报送
             alertCalled.setAlertStatus(false);
             alertCalled.setAlertSource(AlertStageEnums.APPJJ.getValue());
-            alertCalled.setAlertSourceCode(AlertStageEnums.APPJJ.getCode());
+            alertCalled.setAlertSourceCode(AlertStageEnums.APPJJ.getId());
             alertCalled.setIsDelete(false);
             alertCalled.setAlertStage(AlertStageEnums.JJ.getValue());
             alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());