Merge branch 'master' of git.taauav.net:gitadmin/taauav_nanjing

src/main/java/com/taauav/admin/entity/TauvInspectQuestion.java

@@ -33,6 +33,10 @@ public class TauvInspectQuestion extends Entity {
      * 问题单号
      */
     private String questionNo;
+    /**
+     * 问题选项id
+     */
+    private Integer questionId;
     /**
      * 指派负责人
      */

src/main/java/com/taauav/admin/mapper/TauvInspectQuestionMapper.xml

@@ -9,9 +9,9 @@
         from tauv_inspect_question as q
         left join tauv_inspect_driver as d on q.inspect_driver_id = d.id
         left join tauv_inspect_file as f on q.inspect_file_id = f.id
-        left join tauv_question_options as o on f.question_id = o.id
+        left join tauv_question_options as o on q.question_id = o.id
         left join sys_city as t on d.driver_area = t.id
-        where q.mark = 1 and d.mark = 1
+        where q.mark = 1 and d.mark = 1 and o.mark = 1
         <if test="param != null and param.questionNo != null and param.questionNo != ''">
             and q.question_no like concat('%', #{param.questionNo}, '%')
         </if>
@@ -38,7 +38,7 @@
         from tauv_inspect_question as q
         left join tauv_inspect_driver as d on q.inspect_driver_id = d.id
         left join tauv_inspect_file as f on q.inspect_file_id = f.id
-        left join tauv_question_options as o on f.question_id = o.id
+        left join tauv_question_options as o on q.question_id = o.id
         left join user_admin as a on q.create_user = a.id
         left join sys_city as a1 on a.driver_area = a1.id
         left join user_admin as b on q.assign_user = b.id

src/main/java/com/taauav/admin/service/impl/TauvInspectFileServiceImpl.java

@@ -1191,6 +1191,7 @@ public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileM
                     question.setInspectDriverId(inspectDriver.getId());
                     question.setInspectFileId(item.getId());
                     question.setQuestionNo(createQuestionNo());
+                    question.setQuestionId(item.getQuestionId());
                     question.setCreateUser(1);
                     question.setCreateTime(DateUtil.now());
                     inspectQuestionMapper.insert(question);

src/main/java/com/taauav/front/service/impl/UserWaterAlarmServiceImpl.java

@@ -244,6 +244,8 @@ public class UserWaterAlarmServiceImpl extends BaseServiceImpl<UserWaterAlarmMap
         TauvInspectQuestion entity = new TauvInspectQuestion();
         entity.setInspectDriverId(waterAlarm.getInspectDriverId());
         entity.setQuestionNo(createQuestionNo());
+        // 问题类型：按照相关水体标准，监测段面水质不达标 by 朱志刚
+        entity.setQuestionId(13);
         entity.setAssignUser(waterAlarmAssignDto.getAssignUser());
         entity.setAssignContact(waterAlarmAssignDto.getAssignContact());
         entity.setAssignNote(waterAlarmAssignDto.getAssignNote());