feat: 一些调整

nflg-mobilebroken-admin/src/main/resources/bootstrap-dev.properties

@@ -1,5 +1,6 @@
 # Nacos 地址
 nacos.server-addr=112.74.186.154:8848
+#nacos.server-addr=192.168.0.194:8848
 #spring.cloud.nacos.discovery.username=nacos
 #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
 #spring.config.activate.on-profile=dev

nflg-mobilebroken-auth/src/main/resources/bootstrap-dev.properties

@@ -1,5 +1,6 @@
 # Nacos 地址
 nacos.server-addr=112.74.186.154:8848
+#nacos.server-addr=192.168.0.194:8848
 #spring.cloud.nacos.discovery.username=nacos
 #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
 #spring.config.activate.on-profile=dev

nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java

@@ -14,7 +14,6 @@ import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.PageData;
 import com.nflg.mobilebroken.common.pojo.request.*;
 import com.nflg.mobilebroken.common.pojo.vo.*;
-import com.nflg.mobilebroken.common.util.AdminUserUtil;
 import com.nflg.mobilebroken.common.util.AppUserUtil;
 import com.nflg.mobilebroken.common.util.MultilingualUtil;
 import com.nflg.mobilebroken.common.util.VUtils;
@@ -330,6 +329,6 @@ public class UserController extends ControllerBase {
      */
     @GetMapping("getFollowUrl")
     public ApiResult<String> getFollowUrl(){
-        return ApiResult.success(wxQRCodeService.getFollowUrl(AdminUserUtil.getUserId()));
+        return ApiResult.success(wxQRCodeService.getFollowUrl(AppUserUtil.getUserId()));
     }
 }

nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/event/TicketReplyEvent.java

@@ -60,7 +60,7 @@ public class TicketReplyEvent extends ApplicationEvent implements ApplicationCon
 
     public void send(){
         sendUserMessage();
-        sendEmail();
+//        sendEmail();
     }
 
     private void sendUserMessage(){

nflg-mobilebroken-cfs-app/src/main/resources/bootstrap-dev.properties

@@ -1,5 +1,6 @@
 # Nacos 地址
 nacos.server-addr=112.74.186.154:8848
+#nacos.server-addr=192.168.0.194:8848
 #spring.cloud.nacos.discovery.username=nacos
 #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
 #spring.config.activate.on-profile=dev

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java

@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.repository.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nflg.mobilebroken.common.constant.AppUserApplyForState;
 import com.nflg.mobilebroken.common.constant.AppUserApplyforType;
@@ -24,7 +25,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -109,23 +113,34 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
         AppUserApplyfor applyfor = getById(id);
         VUtils.trueThrowBusinessError(Objects.isNull(applyfor)).throwMessage("审批信息不存在");
         AppUserApplyforVO vo = new AppUserApplyforVO();
-        AppArea area = appAreaService.getById(applyfor.getAreaId());
+        AppUserApplyforInfoVO applyforInfo=new AppUserApplyforInfoVO()
-        TBasePosition position = positionService.getById(applyfor.getTitleId());
-        String titleName = Objects.isNull(position) ? "" : position.getPositionName();
-        TBaseCustomer customer =customerService.getById(applyfor.getCompanyId());
-        vo.setApplyfor(new AppUserApplyforInfoVO()
                 .setType(applyfor.getType())
-                .setAreaName(area.getName())
                 .setPhone(applyfor.getUserPhone())
                 .setEmail(applyfor.getUserEmail())
                 .setAvatar(applyfor.getUserAvatar())
                 .setUserName(applyfor.getUserName())
-                .setTitleName(titleName)
-                .setPhone(applyfor.getUserPhone())
-                .setCompanyName(customer.getAgencyCompanyName())
                 .setReason(applyfor.getReason())
-                .setCreateTime(applyfor.getCreateTime()));
+                .setCreateTime(applyfor.getCreateTime());
-        AppUser appUser = appUserService.getById(applyfor.getCreateBy());
+        AppUser appUser;
+        if (Objects.nonNull(applyfor.getId())) {
+            appUser = appUserService.getById(applyfor.getUserId());
+            applyfor.setAreaId(appUser.getAreaId());
+            applyfor.setTitleId(appUser.getTitleId());
+            List<TBaseCustomer> customers =customerService.listByIds(Arrays.stream(appUser.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()));
+            applyforInfo.setCompanyName(StrUtil.join(",",customers.stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList())));
+            applyforInfo
+                    .setPhone(appUser.getPhone())
+                    .setUserName(appUser.getName())
+                    .setEmail(appUser.getEmail());
+        }
+        AppArea area = appAreaService.getById(applyfor.getAreaId());
+        applyforInfo.setAreaName(area.getName());
+        if (Objects.nonNull(applyfor.getTitleId())) {
+            TBasePosition position = positionService.getById(applyfor.getTitleId());
+            applyforInfo.setTitleName(position.getPositionName());
+        }
+        vo.setApplyfor(applyforInfo);
+        appUser = appUserService.getById(applyfor.getCreateBy());
         area = appAreaService.getById(appUser.getAreaId());
         vo.setUser(new AppUserVO()
                 .setAreaName(area.getName())

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java

@@ -100,8 +100,8 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
         Ticket ticket = getById(request.getTicketId());
         VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("未找到工单");
         VUtils.trueThrowBusinessError(ticket.getState() != TicketState.PendingProcessing.getState().byteValue()).throwMessage("工单状态异常");
-        VUtils.trueThrowBusinessError(Objects.nonNull(ticket.getCqm()) && !Objects.equals(ticket.getCqm(), AdminUserUtil.getUserId()))
+//        VUtils.trueThrowBusinessError(Objects.nonNull(ticket.getCqm()) && !Objects.equals(ticket.getCqm(), AdminUserUtil.getUserId()))
-                .throwMessage("当前工单已归属别的CQM负责人");
+//                .throwMessage("当前工单已归属别的CQM负责人");
         ticket.setUrgency(TicketUrgency.findByValue(request.getUrgency()).getState());
         ticket.setQuestion(request.getQuestion());
         ticket.setState(TicketState.Processing.getState());
@@ -166,8 +166,8 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
         VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("未找到工单");
         VUtils.trueThrowBusinessError(!Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState()))
                 .throwMessage("工单状态不允许关闭");
-        VUtils.trueThrowBusinessError(!Objects.equals(ticket.getCqm(), AdminUserUtil.getUserId()))
+//        VUtils.trueThrowBusinessError(!Objects.equals(ticket.getCqm(), AdminUserUtil.getUserId()))
-                .throwMessage("当前工单未归属当前CQM负责人");
+//                .throwMessage("当前工单未归属当前CQM负责人");
         ticket.setState(TicketState.Closed.getState());
         ticket.setSolution(request.getSolution());
         ticket.setSolutionAttachments(StrUtil.join(",", request.getAttachments()));

nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml

@@ -72,8 +72,8 @@
     </sql>
 
     <select id="searchMy" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
-        SELECT t.*,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed',u.`name` AS 'createBy'
+        SELECT t.*,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed'
-        ,IF(tf.id IS NULL, false, true) AS 'followed',t.handle
+        ,u.`name` AS 'createBy',t.handle
         FROM ticket t
         LEFT JOIN app_user u ON t.user_id=u.id
         LEFT JOIN t_base_area a1 ON u.area_id=a1.id
@@ -97,11 +97,13 @@
     </select>
 
     <select id="searchArea" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
-        SELECT t.*,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',u.`name` AS 'createBy',t.handle
+        SELECT t.*,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed'
+        ,u.`name` AS 'createBy',t.handle
         FROM ticket t
         LEFT JOIN app_user u ON t.user_id=u.id
         LEFT JOIN t_base_area a1 ON u.area_id=a1.id
         LEFT JOIN app_area a2 ON u.area_id=a2.id
+        LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.from=0
         WHERE t.state!=4 AND u.company_id IN
         <foreach collection="companyIds" item="companyId" open="(" separator="," close=")">
             #{companyId}