Bläddra i källkod

fix:验证时没有注释没有放开

ly 11 månader sedan
förälder
incheckning
9dc600e7cb

+ 1 - 7
src/main/java/cn/ezhizao/project/business/upgrade/crmUpgradeController.java

@@ -146,15 +146,9 @@ public class crmUpgradeController extends BaseController {
      * 导出档案入库列表
      */
     @PreAuthorize("@ss.hasPermi('business:upgrade:workOrder:export')")
-    @Log(title = "档案入库", businessType = BusinessType.EXPORT)
+    @Log(title = "基础版升级", businessType = BusinessType.EXPORT)
     @RequestMapping("/export")
     public void export(HttpServletResponse response, @RequestBody importCheckModelVo importCheckModelVo) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
-//        JSONObject jsonObject = new JSONObject();
-//        ObjectMapper objectMapper = new ObjectMapper();
-//        Map map = objectMapper.readValue(data,Map.class);
-//
-//        jsonObject.put("data", data);
-//        jsonObject.get("startMonth");
         response.setHeader("Content-Disposition","attachment;filename"+"文件.xlsx");
         ExcelUtil<exportModel> util = new ExcelUtil<>(exportModel.class);
         if("1".equals(importCheckModelVo.getType())){

+ 2 - 2
src/main/java/cn/ezhizao/project/business/upgrade/service/impl/BizArchiveInputTempServiceImpl.java

@@ -130,7 +130,7 @@ public class BizArchiveInputTempServiceImpl extends ServiceImpl<BizArchiveInputT
             BizCompany company = companies.stream().filter(v -> v.getName().equals(loopModel.getCompanyName())).findFirst().orElse(null);
             if (company == null) {
                 failureNum++;
-//                failureMsg.append("<br/>").append(failureNum).append("、客户 ").append(loopModel.getCompanyName()).append(" 不存在");
+                failureMsg.append("<br/>").append(failureNum).append("、客户 ").append(loopModel.getCompanyName()).append(" 不存在");
                 continue;
             }
 
@@ -830,7 +830,7 @@ public class BizArchiveInputTempServiceImpl extends ServiceImpl<BizArchiveInputT
             BizCompany company = companies.stream().filter(v -> v.getName().equals(loopModel.getCompanyName())).findFirst().orElse(null);
             if (company == null) {
                 failureNum++;
-//                failureMsg.append("<br/>").append(failureNum).append("、客户 ").append(loopModel.getCompanyName()).append(" 不存在");
+                failureMsg.append("<br/>").append(failureNum).append("、客户 ").append(loopModel.getCompanyName()).append(" 不存在");
                 continue;
             }
             SysUser user = userService.selectUserByUserNameAndTenantId(loopModel.getSignerName(), String.valueOf(tenantId));