From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index e00f2cc..5a8c128 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -1,7 +1,7 @@
package com.dg.core.api;
-import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
@@ -9,23 +9,23 @@
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
-import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.SmsUtil;
+import com.dg.core.util.TableDataInfo;
import com.dg.core.util.WxUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.Map;
-
-import static com.dg.core.util.WxUtil.httpGet;
+import java.util.List;
/**
@@ -41,6 +41,9 @@
@Autowired
private IGuideEvolveService iGuideEvolveService;
+
+ @Resource
+ IOrganizationChartService iOrganizationChartService;
private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
@@ -128,12 +131,11 @@
GuideEvolveEntity entity=new GuideEvolveEntity();
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setState("12");
+ entity.setState("10");
entity.setDepartmentalId(order.getGuideDepartmentId());
entity.setToUserId(order.getGuideUserId());
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
-
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
@@ -174,7 +176,7 @@
}
if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
order.setState("2");
- entity.setState("8");
+ entity.setState("9");
}
else if(StringUtils.equals(entity.getState(),"4")){
if (order.getSubmitType().equals(1))//小程序提交
@@ -187,22 +189,23 @@
throw new RuntimeException(e);
}
SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
- wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,order);
+ wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
}
else if (order.getSubmitType().equals(2)){
smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
}
//待评价
order.setState("4");
- entity.setState("9");
+ entity.setState("7");
}
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setDepartmentalId(order.getGuideDepartmentId());
- entity.setToUserId(order.getGuideUserId());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -271,12 +274,6 @@
{
return ResultData.error("工单id不能为空");
}
-
- if(!StringUtils.equals(entity.getState(),"4"))
- {
- return ResultData.error("该工单不能评价！");
- }
-
if(StringUtils.isEmpty(entity.getEvaluateState()))
{
return ResultData.error("满意程度不能为空！");
@@ -288,7 +285,7 @@
GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
- guideEvolveEntity.setState("3");
+ guideEvolveEntity.setState("13");
guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
int i = iGuideRepairOrderService.updateConfig(entity);
@@ -311,7 +308,31 @@
}
-
+ /**
+ * 小程序获取导办工单管理列表
+ * @return
+ */
+ @ApiOperation(value = "小程序获取导办工单管理列表",response = GuideRepairOrder.class)
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "state",required = false) String status,
+ @CurrentUser SysUser sysUser)
+ {
+ List<String> ids=null;
+ String userId=null;
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ userId=null;
+ ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ }
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
+ int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
+ return getDataTable(list,num);
+ }
}
--
Gitblit v1.7.1