update 法规分页查询字段sql拼接

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

@@ -597,24 +597,24 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         // 获取全部的字段列表
         List<String> tempFieldList = fieldList.stream().map(LawsTag::getDbFieldName).collect(Collectors.toList());
         // 创建一个新的用于返回的字段列表
-        List<String> selectFieldList = new ArrayList();
+        /*List<String> selectFieldList = new ArrayList();
         // 查询主键
-        selectFieldList.add("id");
+        selectFieldList.add("id");*/
+        StringBuilder selectFieldBuilder = new StringBuilder("id");
         tempFieldList.forEach(tempField -> {
             String endField;
             // 对日期格式和普通格式做处理
             if (dateFieldList.contains(tempField)) {
                 // 如果是日期格式
                 String newField = "date_format(" + tempField + ", '%Y-%m-%d')";
-                endField = "case when " + newField + " is null then \"\" else " + newField + " end " + tempField;
+                endField = ",case when " + newField + " is null then \"\" else " + newField + " end " + tempField;
-                selectFieldList.add(endField);
             } else {
                 // 如果是普通格式
-                endField = "case when " + tempField + " is null then \"\" else " + tempField + " end " + tempField;
+                endField = ",case when " + tempField + " is null then \"\" else " + tempField + " end " + tempField;
-                selectFieldList.add(endField);
             }
+            selectFieldBuilder.append(endField);
         });
-        return StringUtils.join(selectFieldList, ",");
+        return selectFieldBuilder.toString();
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.laws.common.service.ILawsCommonService;
@@ -100,7 +101,7 @@ public class LawsDomesticController {
     public Result<String> relatedStandard(@RequestParam(name="nodeCode") String nodeCode,
                                           @RequestParam("ids") String ids) {
         lawsNodeRelationService.relatedStandard(nodeCode, ids);
-        return Result.OK(ResultCommon.OK);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
     @AutoLog(value = "国内法规标准-移除标准")
@@ -109,7 +110,7 @@ public class LawsDomesticController {
     public Result<String> removeStandard(@RequestParam(name="nodeCode") String nodeCode,
                                           @RequestParam("ids") String ids) {
         lawsNodeRelationService.removeStandard(nodeCode, ids);
-        return Result.OK(ResultCommon.OK);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
 }

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

@@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.laws.common.service.ILawsCommonService;
@@ -100,7 +101,7 @@ public class LawsEnterpriseController {
     public Result<String> relatedStandard(@RequestParam(name="nodeCode") String nodeCode,
                                           @RequestParam("ids") String ids) {
         lawsNodeRelationService.relatedStandard(nodeCode, ids);
-        return Result.OK(ResultCommon.OK);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
     @AutoLog(value = "企业法规标准-移除标准")
@@ -109,7 +110,7 @@ public class LawsEnterpriseController {
     public Result<String> removeStandard(@RequestParam(name="nodeCode") String nodeCode,
                                          @RequestParam("ids") String ids) {
         lawsNodeRelationService.removeStandard(nodeCode, ids);
-        return Result.OK(ResultCommon.OK);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
 }

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

@@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.laws.common.service.ILawsCommonService;
@@ -100,7 +101,7 @@ public class LawsOverseasController {
     public Result<String> relatedStandard(@RequestParam(name="nodeCode") String nodeCode,
                                           @RequestParam("ids") String ids) {
         lawsNodeRelationService.relatedStandard(nodeCode, ids);
-        return Result.OK(ResultCommon.OK);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
     @AutoLog(value = "海外法规标准-移除标准")
@@ -109,7 +110,7 @@ public class LawsOverseasController {
     public Result<String> removeStandard(@RequestParam(name="nodeCode") String nodeCode,
                                          @RequestParam("ids") String ids) {
         lawsNodeRelationService.removeStandard(nodeCode, ids);
-        return Result.OK(ResultCommon.OK);
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
 }