工单wenjian

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -7,6 +7,7 @@ import api.entity.database.order.WorkOrderOperateLog;
 import api.entity.database.system.*;
 import api.entity.input.order.TransOrderInput;
 import api.entity.view.order.WorkOrderBaseView;
+import api.entity.view.system.WorkroderTypeView;
 import api.mapper.system.UserMapper;
 import api.service.call.ICallLogService;
 import api.service.call.IRecordService;
@@ -41,6 +42,8 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 
 import java.util.*;
+import java.util.stream.Collectors;
+
 //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
 @Api(value = "wo_workorderbase",tags = "wo_workorderbase")
 @RestController
@@ -433,9 +436,9 @@ public class WorkOrderBaseController extends BaseController {
             ov.setProjectname(dicdata.getDictLabel());
         }
         if (orderBase.getWorkordercate() > 0) {
-            WorkroderType ordertype = workrodertypeService.getEntity(orderBase.getWorkordercate() );
+            WorkroderTypeView ordertype = workrodertypeService.selectWorkroderTypeById(orderBase.getWorkordercate() );
             if(ordertype!=null){
-                ov.setWorkordercatename(ordertype.getTypeName());
+                ov.setWorkordercatename(ordertype.getAncestorsName());
             }
 
         }
@@ -469,7 +472,10 @@ public class WorkOrderBaseController extends BaseController {
         if (!StringHelper.isEmpty(orderBase.getFile())) {
             String captchaEnabled = configService.selectCaptchaEnabled("FileUrl");
             LambdaQueryWrapper<SysAccessories> qw = new LambdaQueryWrapper<>();
-            qw.in(SysAccessories::getFileid, orderBase.getFile());
+            List<Integer> intlist=Arrays.asList(orderBase.getFile().split(",")).stream().map(x->Integer.parseInt(x)).collect(Collectors.toList());
+
+
+            qw.in(SysAccessories::getFileid, intlist);
             List<SysAccessories> accessoriesList = sysaccessoriesService.getList(qw);
             if (accessoriesList != null && accessoriesList.stream().count() > 0) {
                 HashMap<String, String> fileInfo = new HashMap<String, String>();
@@ -683,7 +689,7 @@ public class WorkOrderBaseController extends BaseController {
         if (result) {
 
             if (StringHelper.isNotEmpty(reason)) {
-                reason = ",原因：" + reason;
+                reason = "，原因：" + reason;
             }
             boolean logresult = addlog("退回了工单" + reason, "处理人退回", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
             return Success("退回成功");
@@ -708,7 +714,7 @@ public class WorkOrderBaseController extends BaseController {
         boolean result = workorderbaseService.updateBatch(qw);
         if (result) {
             if (StringHelper.isNotEmpty(reason)) {
-                reason = ",原因：" + reason;
+                reason = "，原因：" + reason;
             }
             boolean logresult = addlog("退回了工单" + reason, "客服退回到已办待审核", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
             return Success("退回成功");

zxkf-mapper/src/main/java/api/mapper/system/WorkroderTypeMapper.java

@@ -14,4 +14,6 @@ import java.util.List;
 public interface WorkroderTypeMapper extends BaseMapper<WorkroderType> {
 
     public List<WorkroderTypeView> selectWorkroderType(long id);
+
+    public WorkroderTypeView selectWorkroderTypeById(long id);
 }

zxkf-mapper/src/main/resources/mapper/system/WorkroderTypeMapper.xml

@@ -26,4 +26,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by a.id
     </select>
+
+    <select id="selectWorkroderTypeById" resultType="Long" resultMap="SysWorkroderType">
+        select *,
+        (SELECT
+        GROUP_CONCAT(b.`type_name` SEPARATOR '/')   from workroder_type  b  where FIND_IN_SET(b.id,CONCAT( a.ancestors,',',a.id))  )   ancestorsName
+        FROM  workroder_type a where a.is_delete=0
+        <if test="id >0 ">
+            and  a.id=#{id}
+        </if>
+        order by a.id
+    </select>
+
 </mapper> 

zxkf-service/src/main/java/api/service/system/IWorkroderTypeService.java

@@ -27,5 +27,7 @@ public interface IWorkroderTypeService extends IBaseService<WorkroderType> {
 
     public List<WorkroderTypeView> selectWorkroderType(long id);
 
+    public  WorkroderTypeView selectWorkroderTypeById(long id);
+
 }
 

zxkf-service/src/main/java/api/service/system/impl/WorkroderTypeServiceImpl.java

@@ -27,6 +27,13 @@ public class WorkroderTypeServiceImpl extends BaseServiceImpl<WorkroderTypeMappe
     {
         return workroderTypeMapper.selectWorkroderType(id);
     }
+
+    @Override
+    public WorkroderTypeView selectWorkroderTypeById(long id)
+    {
+        return workroderTypeMapper.selectWorkroderTypeById(id);
+    }
+
     @Override
     public List<TreeSelect> buildMenuTreeSelect(List<WorkroderType> Type) {
         List<WorkroderType> menuTrees = buildMenuTree(Type);