Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/enums/code/questiontype/QuestionTypeEnum.java

@@ -6,6 +6,7 @@ package com.tuoheng.admin.enums.code.questiontype;
  */
 public enum QuestionTypeEnum {
 
+    LONGITUDINAL_CRACK_NAME(0, "纵向裂缝"),
     ABEAM_CRACK_NAME(1, "横向裂缝"),
     RETICULAR_CRACK_NAME(3, "网状裂纹"),
     PIT_GROOVE_NAME(4, "坑槽"),

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/InspectionFileServiceImpl.java

@@ -191,7 +191,10 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         ListByDeptUserTypeVo vo2 = new ListByDeptUserTypeVo();
         ListByDeptUserTypeVo vo3 = new ListByDeptUserTypeVo();
         ListByDeptUserTypeVo vo4 = new ListByDeptUserTypeVo();
+        ListByDeptUserTypeVo vo5 = new ListByDeptUserTypeVo();
         //坑槽 积水 裂缝
+        //0纵向裂缝
+        Integer longitudinalCrackNum = 0;
         //4坑槽
         Integer pitGrooveNum = 0;
         //6积水
@@ -240,6 +243,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 }else if(name == QuestionTypeEnum.PON_DING_NAME.getCode()){
                     //6积水
                     ponDingNum+=1;
+                }else if(name == QuestionTypeEnum.LONGITUDINAL_CRACK_NAME.getCode()){
+                    //0纵向裂缝
+                    longitudinalCrackNum+=1;
                 }
             }
             vo.setType(QuestionTypeEnum.ABEAM_CRACK_NAME.getCode());
@@ -252,7 +258,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
             vo3.setNum(massiveCrack);
             vo4.setType(QuestionTypeEnum.PON_DING_NAME.getCode());
             vo4.setNum(ponDingNum);
-            Collections.addAll(list,vo,vo1,vo2,vo3,vo4);
+            vo5.setType(QuestionTypeEnum.LONGITUDINAL_CRACK_NAME.getCode());
+            vo5.setNum(longitudinalCrackNum);
+            Collections.addAll(list,vo,vo1,vo2,vo3,vo4,vo5);
 //            list.add(vo);
 //            list.add(vo1);
 //            list.add(vo2);
@@ -310,6 +318,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 }else if(name == QuestionTypeEnum.PON_DING_NAME.getCode()){
                     //6积水
                     ponDingNum+=1;
+                }else if(name == QuestionTypeEnum.LONGITUDINAL_CRACK_NAME.getCode()){
+                    //0纵向裂缝
+                    longitudinalCrackNum+=1;
                 }
             }
             vo.setType(QuestionTypeEnum.ABEAM_CRACK_NAME.getCode());
@@ -322,12 +333,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
             vo3.setNum(massiveCrack);
             vo4.setType(QuestionTypeEnum.PON_DING_NAME.getCode());
             vo4.setNum(ponDingNum);
-            Collections.addAll(list,vo,vo1,vo2,vo3,vo4);
-//            list.add(vo);
-//            list.add(vo1);
-//            list.add(vo2);
-//            list.add(vo3);
-//            list.add(vo4);
+            vo5.setType(QuestionTypeEnum.LONGITUDINAL_CRACK_NAME.getCode());
+            vo5.setNum(longitudinalCrackNum);
+            Collections.addAll(list,vo,vo1,vo2,vo3,vo4,vo5);
 
         }
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -194,13 +194,21 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
     @Override
     public JsonResult questionIdentification(QuestionIdentificationDto dto) {
         if (StringUtils.isEmpty(dto.getId())) return JsonResult.error("问题id不存在");
+        //获取当前登录用户的租户id
+        String tenantId = CurrentUserUtil.getTenantId();
         //查询任务此问题
         InspectionFile inspectionFile = inspectionFileMapper.selectOne(Wrappers.<InspectionFile>lambdaQuery()
                 .eq(InspectionFile::getId, dto.getId())
                 .eq(InspectionFile::getMark, 1)
-                .eq(StringUtils.isNotEmpty(dto.getTenantId()), InspectionFile::getTenantId, dto.getTenantId()));
-        //修改对应的问题类型
+                .eq(StringUtils.isNotEmpty(dto.getTenantId()), InspectionFile::getTenantId, tenantId));
+        //修改对应的问题类型和code及questionName
         inspectionFile.setQuestionId(dto.getQuestionId());
+        QuestionType questionType = questionTypeMapper.selectById(dto.getQuestionId());
+        if(ObjectUtil.isNotNull(questionType)){
+            inspectionFile.setQuestionCode(questionType.getCode());
+            inspectionFile.setQuestionName(questionType.getContent());
+        }
+
         int count = inspectionFileMapper.updateById(inspectionFile);
         if (count <= 0) {
             return JsonResult.error();
@@ -297,7 +305,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
             String getHandlerImage = getMultipleUrl(vo.getHandlerImage());
             vo.setHandlerImage(getHandlerImage);
         }
-        //处理人员返回username
+        //处理人员返回realname
         String handleUserId = vo.getHandlerUser();
         if(StringUtils.isNotEmpty(handleUserId)){
             User user = userMapper.selectById(handleUserId);
@@ -494,6 +502,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 if (StringUtils.isNotEmpty(questionType.getContent())) {
                     vo.setContent(questionType.getContent());
                 }
+                if(StringUtils.isNotEmpty(questionType.getCode())){
+                    vo.setQuestionCode(questionType.getCode());
+                }
             }
 
             return vo;

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/InspectionFileInfoVo.java

@@ -65,4 +65,9 @@ public class InspectionFileInfoVo {
      */
     private String fileImage;
 
+    /**
+     * 问题code
+     */
+    private String questionCode;
+
 }