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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -94,5 +94,14 @@ public interface WorkflowFeignService {
 	
 	@RequestMapping(value = "/task/getTaskAssign/{taskId}", method = RequestMethod.GET)
 	JSONObject getTaskAssign(@PathVariable("taskId") String taskId) ;
+	/**
+	 * 不操作FormInstance直接完成任务
+	 * @param taskID
+	 * @param variable
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/task/completeTask/noFromInstanceAdd/{taskID}", method = RequestMethod.POST)
+	JSONObject completeNoExecuteFromInstanceAdd(@PathVariable("taskID") String taskID, @RequestBody(required = false) HashMap<String, Object> variable) throws Exception;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -344,7 +344,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		Map<String, Object> map = checkExcuteTaskAuthMap(sequenceNbr, userInfo);
 		if (Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			if (map.get("name").toString().startsWith(PROCESS_NAME[4])) {
-				workflowFeignService.completeByVariable(map.get("taskId").toString(), conditionMap);
+				workflowFeignService.completeNoExecuteFromInstanceAdd(map.get("taskId").toString(), conditionMap);
 
 			} else {
 				workflowFeignService.pickupAndCompleteTask(map.get("taskId").toString(), conditionMap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,9 +19,6 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledRequestDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
-import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
@@ -32,7 +28,6 @@ import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,7 +49,6 @@ import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -264,7 +258,7 @@ public class AlertCalledController extends BaseController {
 		page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
 	    IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
 		calledVoIPage.getRecords().stream().forEach(e->{
-			getResponseLevel(e.getSequenceNbr(), e,null);
+			e.setAlertAddress(e.getAddress());
 		});
 		return ResponseHelper.buildResponse(calledVoIPage);
 	}
@@ -324,28 +318,7 @@ public class AlertCalledController extends BaseController {
 		return queryWrapper;
 	}
 
-	void getResponseLevel(Long alertId, AlertCalledDto alertCalledDto, ESAlertCalledDto esAlertCalledDto) {
-		LambdaQueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new LambdaQueryWrapper<>();
-		dispatchPaperQueryWrapper.eq(DispatchPaper::getAlertId,alertId);
-		DispatchPaper dispatchPaper = dispatchPaperServiceImpl.getOne(dispatchPaperQueryWrapper);
-		if(null != dispatchPaper) {
-			LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(AlertFormValue::getAlertCalledId, dispatchPaper.getSequenceNbr()).eq(AlertFormValue::getAlertTypeCode, DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
-			// 派遣单动态表单数据
-			List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
-			// map 存取数据
-			Map<String,String> dynamicParms = new HashMap<String,String>();
-			list.stream().forEach(paperFormValue -> {
-				dynamicParms.put(paperFormValue.getFieldCode(),paperFormValue.getFieldValue());
-			});
-			String responseLevel = dynamicParms.get("response_level");
-			if(null != alertCalledDto) {
-				alertCalledDto.setResponseLevel(responseLevel);
-			} else {
-				esAlertCalledDto.setResponseLevel(responseLevel);
-			}
-		}
-	}
+
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)