feat: 企标新增-编辑回显稽查内容

laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java

@@ -5,6 +5,7 @@ import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
 import com.jero.modules.tag.entity.LawsTag;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
@@ -140,4 +141,11 @@ public interface ILawsCommonService {
      * @param tableName
      */
     void templateDownload(HttpServletResponse response, String tableName);
+
+    /**
+     * 导入
+     * @param request
+     * @param tableName
+     */
+    void importExcelWithData(HttpServletRequest request, String tableName);
 }

laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java

@@ -890,8 +890,19 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         if (initMap == null) {
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
+
+        Map<String, Object> stringObjectMap = processResultMap(initMap, fieldList);
+
+        if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
+            // 企标独有的稽查内容列表
+            LambdaQueryWrapper<EnterpriseStandardInspectContent> esIcWrapper = new LambdaQueryWrapper<>();
+            esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id);
+            List<EnterpriseStandardInspectContent> list = esInspectContentService.list(esIcWrapper);
+            stringObjectMap.put("checkList", list);
+        }
+
         // 对返回的字段做处理
-        return processResultMap(initMap, fieldList);
+        return stringObjectMap;
     }
 
     /**
@@ -1263,6 +1274,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         }
     }
 
+    @Override
+    public void importExcelWithData(HttpServletRequest request, String tableName) {
+        //TODO 该死的导入
+
+    }
+
     /**
      * 设置导入模板的第三行提示内容
      * @param row3

laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
@@ -213,4 +214,11 @@ public class LawsEnterpriseController {
     public void templateDownload(HttpServletResponse response) {
         lawsCommonService.templateDownload(response, TableNameEnum.ENTERPRISE_STANDARDS.getTableName());
     }
+
+    @AutoLog(value = "企业法规标准-导入")
+    @ApiOperation(value="企业法规标准-导入", notes="企业法规标准-导入")
+    @GetMapping("/importExcelWithData")
+    public void importExcelWithData(HttpServletRequest request) {
+        lawsCommonService.importExcelWithData(request, TableNameEnum.ENTERPRISE_STANDARDS.getTableName());
+    }
 }