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

@@ -81,7 +81,7 @@ public interface WorkflowFeignService {
 	 * @param taskID
 	 * @return
 	 */
-	@RequestMapping(value = "/task/pickuptask/{taskID}", method = RequestMethod.GET)
+	@RequestMapping(value = "/task/pickuptask/{taskID}", method = RequestMethod.PUT)
 	JSONObject pickuptask(@PathVariable("taskID") String taskID) ;
 	/**
 	 * 直接完成任务

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;
@@ -19,12 +20,16 @@ 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;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ESAlertCalledService;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
 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;
@@ -49,6 +54,7 @@ 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;
@@ -147,7 +153,7 @@ public class AlertCalledController extends BaseController {
         alertCallInfoDto.setCallTime(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd HH:mm:ss "));
         alertCallInfoDto.setWorkOrderNumber(workOrderNumber);
         alertCallInfoDto.setRecUserId(getUserInfo().getUserId());
-        alertCallInfoDto.setRecUserName(getUserInfo().getUserName());
+        alertCallInfoDto.setRecUserName(getUserInfo().getRealName());
 		return ResponseHelper.buildResponse(alertCallInfoDto);
 	}
 
@@ -162,12 +168,13 @@ public class AlertCalledController extends BaseController {
 		String number =  DateUtils.stampToDate(SystemClock.now(),"yyyy-MM-dd HH:mm:ss SSS");
 		String newNumber =   number.replace("-","").replace(" ","").replace(":","");
 		ReginParams reginParams =getSelectedOrgInfo();
-//		Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
-//				DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
-//				reginParams.getUserModel().getUserId());
-				Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_TIME_PATTERN),
-				DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_TIME_PATTERN),null,
-				null);
+		AgencyUserModel user = reginParams.getUserModel();
+	    String orgCode = ValidationUtil.isEmpty(user.getCompanys()) ? null : user.getCompanys().get(0).getOrgCode();
+
+		Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_TIME_PATTERN),
+		DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_TIME_PATTERN),orgCode,
+				user.getUserId());
+
 		StringBuilder stringBuilder = new StringBuilder();
 		stringBuilder.append(newNumber);
 		String workOrderNumber = stringBuilder.append(map.get("calledCount") == null  ? "1" : String.valueOf(Integer.parseInt(map.get("calledCount").toString()) + 1)).toString() ;
@@ -257,7 +264,7 @@ public class AlertCalledController extends BaseController {
 		page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
 	    IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
 		calledVoIPage.getRecords().stream().forEach(e->{
-			e.setAlertAddress(e.getCity()+e.getDistrict());
+			getResponseLevel(e.getSequenceNbr(), e,null);
 		});
 		return ResponseHelper.buildResponse(calledVoIPage);
 	}
@@ -317,6 +324,28 @@ 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)
@@ -344,43 +373,39 @@ public class AlertCalledController extends BaseController {
 
 	/**
 	 * 冻结工单-维修
-	 * @param forzenResult
-	 * @param alertId
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveForzen")
 	@ApiOperation(httpMethod = "POST", value = "冻结工单-维修", notes = "冻结工单-维修")
-	public ResponseModel<Boolean> forzenAlertById(@ApiParam(value = "冻结原因", required = true) @RequestParam String forzenResult, @ApiParam(value = "警情id", required = true) @RequestParam Long alertId) {
-		if (ValidationUtil.isEmpty(alertId)
-				|| ValidationUtil.isEmpty(forzenResult)){
+	public ResponseModel<Boolean> forzenAlertById(@RequestBody AlertCalledDto alertCalledDto) {
+		if (ValidationUtil.isEmpty(alertCalledDto.getSequenceNbr())
+				|| ValidationUtil.isEmpty(alertCalledDto.getForzenResult())){
 			throw new BadRequest("参数校验失败.");
 		}
 		LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
-		updateWrapper.set(AlertCalled::getForzenResult,forzenResult);
+		updateWrapper.set(AlertCalled::getForzenResult,alertCalledDto.getForzenResult());
 		updateWrapper.set(AlertCalled::getAlertStage,1);
-		updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
+		updateWrapper.eq(AlertCalled::getSequenceNbr,alertCalledDto.getSequenceNbr());
 		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
 	}
 
 	/**
 	 * 工单结案-投诉
-	 * @param finalReason
-	 * @param alertId
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveFinalReason")
 	@ApiOperation(httpMethod = "POST", value = "工单结案-投诉", notes = "工单结案-投诉")
-	public ResponseModel<Boolean> finishAlertById(@ApiParam(value = "结案说明", required = true) @RequestParam String finalReason, @ApiParam(value = "警情id", required = true) @RequestParam Long alertId) {
-		if (ValidationUtil.isEmpty(finalReason)
-				|| ValidationUtil.isEmpty(alertId)){
+	public ResponseModel<Boolean> finishAlertById(@RequestBody AlertCalledDto alertCalledDto) {
+		if (ValidationUtil.isEmpty(alertCalledDto.getFinalReason())
+				|| ValidationUtil.isEmpty(alertCalledDto.getSequenceNbr())){
 			throw new BadRequest("参数校验失败.");
 		}
 		LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
-		updateWrapper.set(AlertCalled::getFinalReason,finalReason);
+		updateWrapper.set(AlertCalled::getFinalReason,alertCalledDto.getFinalReason());
 		updateWrapper.set(AlertCalled::getAlertStage,1);
-		updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
+		updateWrapper.eq(AlertCalled::getSequenceNbr,alertCalledDto.getSequenceNbr());
 		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
 	}
 

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

@@ -297,7 +297,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     dispatchSaveFeedbackDto.setErrorResult(value);
                     break;
                 case TzsCommonParam.FIX_REMARK:
-                    value = alertFormValue.getFieldValueCode();
+                    value = alertFormValue.getFieldValue();
                     dispatchSaveFeedbackDto.setFixRemark(value);
                     break;
             }
@@ -365,12 +365,14 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                             break;
                     }
         });
-        dispatchPaper.setFeedbackCode(dispatchSaveFeedbackDto.getFeedbackCode());
-        dispatchPaper.setFeedbackType(dispatchSaveFeedbackDto.getFeedbackType());
+        if(StringUtils.isNotBlank(dispatchSaveFeedbackDto.getFeedbackCode())) {
+            dispatchPaper.setFeedbackCode(dispatchSaveFeedbackDto.getFeedbackCode());
+            dispatchPaper.setFeedbackType(DispatchPaperEnums.getEnumById(dispatchSaveFeedbackDto.getFeedbackCode()).getValue());
+        }
         dispatchPaper.setFeedbackFinishTime(dispatchSaveFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchSaveFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchSaveFeedbackDto.getFeedbackUname());
-        if(dispatchPaper.getFeedbackTime() == null && dispatchSaveFeedbackDto.getFeedbackTime() != null) {
+        if(dispatchPaper.getFeedbackTime() == null && dispatchSaveFeedbackDto.getFeedbackFinishTime() != null) {
             // 维修反馈
             Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
             if(taskId == null) {
@@ -379,8 +381,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK,taskId,user);
             // 修改警情到维修反馈
             alertCalledServiceImpl.updateAlertStageByAlertId(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK);
+            dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackFinishTime()); // 没有回访时间只有维修完成时间
         }
-        dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
         iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
@@ -568,8 +570,10 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     break;
             }
         });
-        dispatchPaper.setFeedbackCode(dispatchRepairFeedbackDto.getFeedbackCode());
-        dispatchPaper.setFeedbackType(dispatchRepairFeedbackDto.getFeedbackType());
+        if(StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFeedbackCode())) {
+            dispatchPaper.setFeedbackCode(dispatchRepairFeedbackDto.getFeedbackCode());
+            dispatchPaper.setFeedbackType(DispatchPaperEnums.getEnumById(dispatchRepairFeedbackDto.getFeedbackCode()).getValue());
+        }
         dispatchPaper.setFeedbackFinishTime(dispatchRepairFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchRepairFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchRepairFeedbackDto.getFeedbackUname());
@@ -772,8 +776,10 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     break;
             }
         });
-        dispatchPaper.setFeedbackCode(dispatchConsultFeedbackDto.getFeedbackCode());
-        dispatchPaper.setFeedbackType(dispatchConsultFeedbackDto.getFeedbackType());
+        if(StringUtils.isNotBlank(dispatchConsultFeedbackDto.getFeedbackCode())) {
+            dispatchPaper.setFeedbackCode(dispatchConsultFeedbackDto.getFeedbackCode());
+            dispatchPaper.setFeedbackType(DispatchPaperEnums.getEnumById(dispatchConsultFeedbackDto.getFeedbackCode()).getValue());
+        }
         if(dispatchPaper.getFeedbackTime() == null && dispatchConsultFeedbackDto.getFeedbackTime() != null) {
             tempMap.put("FEEDBACK",true);
         }

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

@@ -93,7 +93,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$call",emergency_call);
             content = content.replace("$area",area).replace("$alertType",alertType);
         } else if(TzsCommonParam.PQ.equals(type)) {
-            String createUser = user.getUserName();
+            String createUser =  user.getRealName();
             DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
             String unit = dispatchTask.getResponseOrgName();
             if(unit == null)
@@ -129,7 +129,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             String FKFS = rescueProcessDto.getArriveFeedbackType();
             content = content.replace("$FKFS",FKFS);
         } else if(TzsCommonParam.JYHF.equals(type)) {
-            String createUser = user.getUserName();
+            String createUser =  user.getRealName();
             String create = alertCalledVo.getEmergencyPerson();
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create);
         } else if(TzsCommonParam.WXFK.equals(type)) { //从派遣单获取数据