整改部门, 添加反馈核验接口

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -218,7 +218,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         }
                         //放附件
                         for (AppXunjianPictureVO pic : listDataBO.getPicturesBefore()) {
-                            ImageUtil.convertBase64StrToImage(pic.getPic_base64(), pictures_local_path + "/" + pic.getPic_key() + ".png");
+//                            ImageUtil.convertBase64StrToImage(pic.getPic_base64(), pictures_local_path + "/" + pic.getPic_key() + ".png");
                             TAttach tAttach = new TAttach();
                             tAttach.setAttachId(UUID.fastUUID().toString());
                             tAttach.setBusId(tBusTrack.getBusTrackId());

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjianimg/domain/AppXunjianimgYinhuanBO.java

@@ -21,6 +21,7 @@ public class AppXunjianimgYinhuanBO {
     String attachUrl;
 
     Integer xunjianListCount;
+    String riskStatus;
 
 
 }

src/main/java/com/sooka/sponest/data/emergency/controller/TBusTrackController.java

@@ -23,8 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/track")
-public class TBusTrackController extends BaseController
-{
+public class TBusTrackController extends BaseController {
     @Autowired
     private ITBusTrackService tBusTrackService;
 
@@ -33,8 +32,7 @@ public class TBusTrackController extends BaseController
      */
     @RequiresPermissions("system:track:list")
     @GetMapping("/list")
-    public TableDataInfo list(TBusTrack tBusTrack)
-    {
+    public TableDataInfo list(TBusTrack tBusTrack) {
         startPage();
         List<TBusTrack> list = tBusTrackService.selectTBusTrackList(tBusTrack);
         return getDataTable(list);
@@ -46,8 +44,7 @@ public class TBusTrackController extends BaseController
     @RequiresPermissions("system:track:export")
     @Log(title = "进度", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TBusTrack tBusTrack)
-    {
+    public void export(HttpServletResponse response, TBusTrack tBusTrack) {
         List<TBusTrack> list = tBusTrackService.selectTBusTrackList(tBusTrack);
         ExcelUtil<TBusTrack> util = new ExcelUtil<TBusTrack>(TBusTrack.class);
         util.exportExcel(response, list, "进度数据");
@@ -58,8 +55,7 @@ public class TBusTrackController extends BaseController
      */
     @RequiresPermissions("system:track:query")
     @GetMapping(value = "/{busTrackId}")
-    public AjaxResult getInfo(@PathVariable("busTrackId") String busTrackId)
-    {
+    public AjaxResult getInfo(@PathVariable("busTrackId") String busTrackId) {
         return success(tBusTrackService.selectTBusTrackByBusTrackId(busTrackId));
     }
 
@@ -69,8 +65,7 @@ public class TBusTrackController extends BaseController
     @RequiresPermissions("system:track:add")
     @Log(title = "进度", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TBusTrack tBusTrack)
-    {
+    public AjaxResult add(@RequestBody TBusTrack tBusTrack) {
         return toAjax(tBusTrackService.insertTBusTrack(tBusTrack));
     }
 
@@ -80,8 +75,7 @@ public class TBusTrackController extends BaseController
     @RequiresPermissions("system:track:edit")
     @Log(title = "进度", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TBusTrack tBusTrack)
-    {
+    public AjaxResult edit(@RequestBody TBusTrack tBusTrack) {
         return toAjax(tBusTrackService.updateTBusTrack(tBusTrack));
     }
 
@@ -90,9 +84,8 @@ public class TBusTrackController extends BaseController
      */
     @RequiresPermissions("system:track:remove")
     @Log(title = "进度", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{busTrackIds}")
-    public AjaxResult remove(@PathVariable String[] busTrackIds)
-    {
+    @DeleteMapping("/{busTrackIds}")
+    public AjaxResult remove(@PathVariable String[] busTrackIds) {
         return toAjax(tBusTrackService.deleteTBusTrackByBusTrackIds(busTrackIds));
     }
 }

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusDeptServiceImpl.java

@@ -1,6 +1,9 @@
 package com.sooka.sponest.data.emergency.service.impl;
 
+import com.alibaba.nacos.common.utils.UuidUtils;
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.uuid.UUID;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.emergency.domain.TBusDept;
 import com.sooka.sponest.data.emergency.mapper.TBusDeptMapper;
 import com.sooka.sponest.data.emergency.service.ITBusDeptService;
@@ -16,8 +19,7 @@ import java.util.List;
  * @date 2022-11-15
  */
 @Service
-public class TBusDeptServiceImpl implements ITBusDeptService
-{
+public class TBusDeptServiceImpl implements ITBusDeptService {
     @Autowired
     private TBusDeptMapper tBusDeptMapper;
 
@@ -28,8 +30,7 @@ public class TBusDeptServiceImpl implements ITBusDeptService
      * @return 业务部门
      */
     @Override
-    public TBusDept selectTBusDeptByBusDeptId(String busDeptId)
-    {
+    public TBusDept selectTBusDeptByBusDeptId(String busDeptId) {
         return tBusDeptMapper.selectTBusDeptByBusDeptId(busDeptId);
     }
 
@@ -40,8 +41,7 @@ public class TBusDeptServiceImpl implements ITBusDeptService
      * @return 业务部门
      */
     @Override
-    public List<TBusDept> selectTBusDeptList(TBusDept tBusDept)
-    {
+    public List<TBusDept> selectTBusDeptList(TBusDept tBusDept) {
         return tBusDeptMapper.selectTBusDeptList(tBusDept);
     }
 
@@ -52,9 +52,10 @@ public class TBusDeptServiceImpl implements ITBusDeptService
      * @return 结果
      */
     @Override
-    public int insertTBusDept(TBusDept tBusDept)
-    {
+    public int insertTBusDept(TBusDept tBusDept) {
+        tBusDept.setBusDeptId(UUID.fastUUID().toString());
         tBusDept.setCreateTime(DateUtils.getNowDate());
+        tBusDept.setUserId(SecurityUtils.getUserId());
         return tBusDeptMapper.insertTBusDept(tBusDept);
     }
 
@@ -65,8 +66,7 @@ public class TBusDeptServiceImpl implements ITBusDeptService
      * @return 结果
      */
     @Override
-    public int updateTBusDept(TBusDept tBusDept)
-    {
+    public int updateTBusDept(TBusDept tBusDept) {
         return tBusDeptMapper.updateTBusDept(tBusDept);
     }
 
@@ -77,8 +77,7 @@ public class TBusDeptServiceImpl implements ITBusDeptService
      * @return 结果
      */
     @Override
-    public int deleteTBusDeptByBusDeptIds(String[] busDeptIds)
-    {
+    public int deleteTBusDeptByBusDeptIds(String[] busDeptIds) {
         return tBusDeptMapper.deleteTBusDeptByBusDeptIds(busDeptIds);
     }
 
@@ -89,8 +88,7 @@ public class TBusDeptServiceImpl implements ITBusDeptService
      * @return 结果
      */
     @Override
-    public int deleteTBusDeptByBusDeptId(String busDeptId)
-    {
+    public int deleteTBusDeptByBusDeptId(String busDeptId) {
         return tBusDeptMapper.deleteTBusDeptByBusDeptId(busDeptId);
     }
 }

src/main/resources/mapper/emergency/appmin/AppXunjianimgMapper.xml

@@ -14,6 +14,7 @@
         i.bus_log_id as busLogId,
         i.bus_items_id as busItemId,
         i.bus_items_name as busItemName,
+        i.risk_status as riskStatus,
         (select parent_id from t_bus_items where bus_items_id= (select parent_id from t_bus_items where
         bus_items_id=i.bus_items_id)) yjId,
         (select bus_items_name from t_bus_items where bus_items_id = (select parent_id from t_bus_items where