优化附件上传公共接口

修改手机端查询安全检查记录明细接口，增加返回模板

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSafetyinspectionitemController.java

@@ -1,14 +1,20 @@
+/*
 package com.sooka.sponest.mobile.data.housingconstruction;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionitem;
-import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionRealnameuserService;
+import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecords;
+import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecordsdetail;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionitemService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/AppSafetyinspectionitemController")
@@ -17,8 +23,6 @@ public class HousingconstructionSafetyinspectionitemController {
     @Resource
     RemoteHousingconstructionSafetyinspectionitemService housingconstructionSafetyinspectionitemService;
 
-    @GetMapping("/safetyinspectionitem/list")
-    public AjaxResult getList(HousingconstructionSafetyinspectionitem item){
-        return housingconstructionSafetyinspectionitemService.getList(item.getEnterpriseInspectionType());
-    }
+
 }
+*/

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSafetyinspectionrecordsController.java

@@ -1,15 +1,22 @@
 package com.sooka.sponest.mobile.data.housingconstruction;
 
-import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionitem;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecords;
+import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecordsdetail;
+import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionitemService;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionrecordsService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("AppHousingconstructionSafetyinspectionrecordsController")
@@ -18,32 +25,71 @@ public class HousingconstructionSafetyinspectionrecordsController {
     @Resource
     RemoteHousingconstructionSafetyinspectionrecordsService safetyinspectionrecordsService;
 
+    @Resource
+    RemoteHousingconstructionSafetyinspectionitemService housingconstructionSafetyinspectionitemService;
+
     @GetMapping("/safetyinspectionrecords/list")
-    public AjaxResult getList(HousingconstructionSafetyinspectionrecords records){
+    public AjaxResult getList(HousingconstructionSafetyinspectionrecords records) {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         TableDataInfo resultData = safetyinspectionrecordsService.getList(pageNum, pageSize, records.getEnterpriseInspectionType());
 
-        if(200 == resultData.getCode()){
+        if (200 == resultData.getCode()) {
             return AjaxResult.success(resultData.getRows());
-        }else{
-            return AjaxResult.error(resultData.getCode(),resultData.getMsg());
+        } else {
+            return AjaxResult.error(resultData.getCode(), resultData.getMsg());
         }
     }
 
     @GetMapping("/safetyinspectionrecords/edit")
-    public AjaxResult getRecordDetailById(String id){
-        return safetyinspectionrecordsService.getRecordDetailById(id);
+    public AjaxResult getRecordDetailById(HousingconstructionSafetyinspectionrecords record) {
+        if (StringUtils.isEmpty(record.getId())) {
+            return getTemplate(record.getEnterpriseInspectionType());
+        } else {
+            return safetyinspectionrecordsService.getRecordDetailById(record.getId());
+        }
     }
 
     @PostMapping("/safetyinspectionrecords")
-    public AjaxResult addSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record){
+    public AjaxResult addSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record) {
         return safetyinspectionrecordsService.addSafetyinspectionrecords(record);
     }
 
     @PostMapping("/safetyinspectionrecords/put")
-    public AjaxResult putSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record){
+    public AjaxResult putSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record) {
         return safetyinspectionrecordsService.putSafetyinspectionrecords(record);
     }
+
+
+    public AjaxResult getTemplate(String enterpriseInspectionType) {
+        // 获取列表数据
+        AjaxResult listResult = housingconstructionSafetyinspectionitemService.getList(enterpriseInspectionType);
+
+        // 从 AjaxResult 中提取数据
+        List<Map<String, Object>> data = (List<Map<String, Object>>) listResult.get("data");
+        if (data == null) {
+            return AjaxResult.error("No data found");
+        }
+
+        // 将数据转换为详细记录列表
+        List<HousingconstructionSafetyinspectionrecordsdetail> detailList = new ArrayList<>();
+        for (Map<String, Object> item : data) {
+            try {
+                String id = MapUtils.getString(item, "id");
+                String inspectionName = MapUtils.getString(item, "inspectionName");
+                int inspectionSort = MapUtils.getInteger(item, "inspectionSort");
+                HousingconstructionSafetyinspectionrecordsdetail detail = new HousingconstructionSafetyinspectionrecordsdetail(id, inspectionName, inspectionSort, "0", "", new ArrayList<>());
+                detailList.add(detail);
+            } catch (NumberFormatException e) {
+                // 处理解析整数失败的情况
+                return AjaxResult.error("Invalid data format");
+            }
+        }
+
+        // 创建并返回结果数据
+        HousingconstructionSafetyinspectionrecords resultData = new HousingconstructionSafetyinspectionrecords();
+        resultData.setDetailList(detailList);
+        return AjaxResult.success(resultData);
+    }
 }