From 082a6a1e6ec9731cfcf9e6be5ebb179ccf3a154f Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 12 Jun 2025 16:25:47 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=BF=94=E5=9B=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ae/comf/bd/controller/BdController.java   | 19 +++++----
 .../ae/comf/bd/entity/vo/MdmDbFiledVO.java    |  3 ++
 .../controller/InfluenceFactorController.java | 29 +++++++-------
 .../InfluenceFactorCorrelationController.java | 25 ++++++------
 .../controller/BusinessModuleController.java  | 31 ++++++++-------
 .../BusinessModuleMdmController.java          | 29 +++++++-------
 .../comf/module/controller/MdmController.java | 18 ++++-----
 .../controller/MdmFileMappingController.java  | 18 ++++-----
 .../controller/ClassificationController.java  | 20 +++++-----
 .../controller/ContrastBController.java       | 25 ++++++------
 .../controller/ContrastController.java        | 39 ++++++++++---------
 11 files changed, 138 insertions(+), 118 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
index 2c1acd99..47717970 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
@@ -55,7 +55,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -69,7 +69,7 @@ public class BdController extends DefaultController {
 //            return getSuccessMessageEntity("请求成功", all);
 //        } catch (Exception e) {
 //            e.printStackTrace();
-//            return getFailureMessageEntity("请求失败", e.getMessage());
+//            return getFailureMessageEntity(e.getMessage());
 //        }
 //    }
 
@@ -84,6 +84,11 @@ public class BdController extends DefaultController {
             List<MdmDbFiledVO> all = new ArrayList<>();
             List<MdmDbFiledVO> mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVO(mdmDbFiledVO);
 
+            for (MdmDbFiledVO dbFiledVO : mdmDbFiledVOList) {
+                dbFiledVO.setPkBdinfo(dbFiledVO.getMdmId());
+                dbFiledVO.setBdcode(dbFiledVO.getMdmCode());
+                dbFiledVO.setBdname(dbFiledVO.getMdmName());
+            }
 
             if (entity.getMdmName() != null) {
                 for (MdmDbFiledVO mdmDbFiled : mdmDbFiledVOList) {
@@ -97,7 +102,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -113,7 +118,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", tree);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -135,7 +140,7 @@ public class BdController extends DefaultController {
 //            return getSuccessMessageEntity("请求成功", objectList);
 //        } catch (Exception e) {
 //            e.printStackTrace();
-//            return getFailureMessageEntity("请求失败", e.getMessage());
+//            return getFailureMessageEntity(e.getMessage());
 //        }
 //    }
 
@@ -153,7 +158,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", objectList);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -173,7 +178,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", pageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java
index 9bf15efe..dcdc968d 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.java
@@ -14,10 +14,13 @@ public class MdmDbFiledVO extends BaseEntity {
     private String mdmType;
     /** 档案id */
     private String mdmId;
+    private String pkBdinfo;
     /** 档案编码 */
     private String mdmCode;
+    private String bdcode;
     /** 档案名称 */
     private String mdmName;
+    private String bdname;
     /** 表id */
     private String dbId;
     /** 对应表名 */
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java
index 1fbcefd3..c1cedcb3 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorController.java
@@ -28,10 +28,10 @@ public class InfluenceFactorController extends DefaultController {
     public JsonResultEntity queryPaged(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             PageInfo pageInfo = iAeConfInfluenceFactorService.queryEntityPaged(entity);
-            return getSuccessMessageEntity("请求成功",pageInfo);
+            return getSuccessMessageEntity("请求成功", pageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -39,10 +39,10 @@ public class InfluenceFactorController extends DefaultController {
     public JsonResultEntity queryAll(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             List<AeConfInfluenceFactorEntity> all = iAeConfInfluenceFactorService.queryAll(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -50,10 +50,10 @@ public class InfluenceFactorController extends DefaultController {
     public JsonResultEntity queryById(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = iAeConfInfluenceFactorService.queryById(entity);
-            return getSuccessMessageEntity("请求成功",aeConfInfluenceFactorEntity);
+            return getSuccessMessageEntity("请求成功", aeConfInfluenceFactorEntity);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -61,10 +61,10 @@ public class InfluenceFactorController extends DefaultController {
     public JsonResultEntity save(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = iAeConfInfluenceFactorService.save(entity);
-            return getSuccessMessageEntity("请求成功",aeConfInfluenceFactorEntity);
+            return getSuccessMessageEntity("请求成功", aeConfInfluenceFactorEntity);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -72,10 +72,10 @@ public class InfluenceFactorController extends DefaultController {
     public JsonResultEntity update(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = iAeConfInfluenceFactorService.updateById(entity);
-            return getSuccessMessageEntity("请求成功",aeConfInfluenceFactorEntity);
+            return getSuccessMessageEntity("请求成功", aeConfInfluenceFactorEntity);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -83,21 +83,22 @@ public class InfluenceFactorController extends DefaultController {
     public JsonResultEntity delete(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             iAeConfInfluenceFactorService.logicRemove(entity);
-            return getSuccessMessageEntity("请求成功",null);
+            return getSuccessMessageEntity("请求成功", null);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     //根据业务模块id查询相关影响因素列表
     @RequestMapping(value = "/queryFluenceFactorsByModuleId", method = RequestMethod.POST)
     public JsonResultEntity queryFluenceFactorsByModuleId(@RequestBody AeConfInfluenceFactorEntity entity) {
         try {
             List<AeConfInfluenceFactorEntity> all = iAeConfInfluenceFactorService.queryFluenceFactorsByModuleId(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorCorrelationController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorCorrelationController.java
index 35f27749..dbc4244a 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorCorrelationController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/controller/InfluenceFactorCorrelationController.java
@@ -31,7 +31,7 @@ public class InfluenceFactorCorrelationController extends DefaultController {
 //            return getSuccessMessageEntity("请求成功",pageInfo);
 //        } catch (Exception e) {
 //            e.printStackTrace();
-//            return getFailureMessageEntity("请求失败",e.getMessage());
+//            return getFailureMessageEntity(e.getMessage());
 //        }
 //    }
 
@@ -39,20 +39,21 @@ public class InfluenceFactorCorrelationController extends DefaultController {
     public JsonResultEntity queryAll(@RequestBody AeConfInfluenceFactorCorrelationEntity entity) {
         try {
             List<AeConfInfluenceFactorCorrelationEntity> all = aeConfInfluenceFactorCorrelationService.queryAll(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/queryByMdmId", method = RequestMethod.POST)
     public JsonResultEntity queryByMdmId(@RequestBody AeConfInfluenceFactorCorrelationEntity entity) {
         try {
             List<AeConfInfluenceFactorCorrelationEntity> all = aeConfInfluenceFactorCorrelationService.queryByMdmId(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -60,21 +61,21 @@ public class InfluenceFactorCorrelationController extends DefaultController {
     public JsonResultEntity saveList(@RequestBody List<AeConfInfluenceFactorCorrelationEntity> list) {
         try {
             List<AeConfInfluenceFactorCorrelationEntity> all = aeConfInfluenceFactorCorrelationService.saveList(list);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
-        @RequestMapping(value = "/updateList", method = RequestMethod.POST)
+    @RequestMapping(value = "/updateList", method = RequestMethod.POST)
     public JsonResultEntity updateList(@RequestBody List<AeConfInfluenceFactorCorrelationEntity> list) {
         try {
             List<AeConfInfluenceFactorCorrelationEntity> all = aeConfInfluenceFactorCorrelationService.updateList(list);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -82,10 +83,10 @@ public class InfluenceFactorCorrelationController extends DefaultController {
     public JsonResultEntity deleteList(@RequestBody List<AeConfInfluenceFactorCorrelationEntity> list) {
         try {
             Map<String, Integer> map = aeConfInfluenceFactorCorrelationService.deleteList(list);
-            return getSuccessMessageEntity("请求成功",map);
+            return getSuccessMessageEntity("请求成功", map);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java
index be8ecfae..d29d2dd3 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleController.java
@@ -26,20 +26,21 @@ public class BusinessModuleController extends DefaultController {
     public JsonResultEntity queryPaged(@RequestBody AeConfBusinessModuleEntity entity) {
         try {
             PageInfo pageInfo = aeConfBusinessModuleService.queryEntityPaged(entity);
-            return getSuccessMessageEntity("请求成功",pageInfo);
+            return getSuccessMessageEntity("请求成功", pageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
     public JsonResultEntity queryAll() {
         try {
             List<AeConfBusinessModuleEntity> all = aeConfBusinessModuleService.getAll();
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -47,10 +48,10 @@ public class BusinessModuleController extends DefaultController {
     public JsonResultEntity queryById(@RequestBody AeConfBusinessModuleEntity entity) {
         try {
             AeConfBusinessModuleEntity aeConfBusinessModuleEntity = aeConfBusinessModuleService.queryById(entity);
-            return getSuccessMessageEntity("请求成功",aeConfBusinessModuleEntity);
+            return getSuccessMessageEntity("请求成功", aeConfBusinessModuleEntity);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -58,32 +59,34 @@ public class BusinessModuleController extends DefaultController {
     public JsonResultEntity save(@RequestBody AeConfBusinessModuleEntity entity) {
         try {
             AeConfBusinessModuleEntity save = aeConfBusinessModuleService.save(entity);
-            return getSuccessMessageEntity("请求成功",save);
+            return getSuccessMessageEntity("请求成功", save);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public JsonResultEntity update(@RequestBody AeConfBusinessModuleEntity entity) {
         try {
-            Assert.notNull(entity.getId(),"更新时，id不能为空");
+            Assert.notNull(entity.getId(), "更新时，id不能为空");
             AeConfBusinessModuleEntity save = aeConfBusinessModuleService.update(entity);
-            return getSuccessMessageEntity("请求成功",save);
+            return getSuccessMessageEntity("请求成功", save);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     public JsonResultEntity delete(@RequestBody AeConfBusinessModuleEntity entity) {
         try {
-            Assert.notNull(entity.getId(),"删除时，id不能为空");
+            Assert.notNull(entity.getId(), "删除时，id不能为空");
             int i = aeConfBusinessModuleService.logicRemove(entity);
-            return getSuccessMessageEntity("请求成功",null);
+            return getSuccessMessageEntity("请求成功", null);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleMdmController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleMdmController.java
index 72844d8d..733c0027 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleMdmController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/BusinessModuleMdmController.java
@@ -33,10 +33,10 @@ public class BusinessModuleMdmController extends DefaultController {
     public JsonResultEntity queryAll(@RequestBody AeConfBusinessModuleMdmEntity entity) {
         try {
             List<AeConfBusinessModuleMdmEntity> all = aeConfBusinessModuleMdmService.queryAll(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -44,20 +44,21 @@ public class BusinessModuleMdmController extends DefaultController {
     public JsonResultEntity queryModuleIncludeMdmList(@RequestBody AeConfBusinessModuleMdmEntity entity) {
         try {
             List<AeConfBusinessModuleMdmEntity> all = aeConfBusinessModuleMdmService.queryModuleIncludeMdmList(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/queryMdmsByModuleId", method = RequestMethod.POST)
     public JsonResultEntity queryMdmsByModuleId(@RequestBody AeConfBusinessModuleMdmEntity entity) {
         try {
             List<AeConfBusinessModuleMdmEntity> all = aeConfBusinessModuleMdmService.queryMdmsByModuleId(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -68,7 +69,7 @@ public class BusinessModuleMdmController extends DefaultController {
 //            return getSuccessMessageEntity("请求成功",pageInfo);
 //        } catch (Exception e) {
 //            e.printStackTrace();
-//            return getFailureMessageEntity("请求失败", e.getMessage());
+//            return getFailureMessageEntity(e.getMessage());
 //        }
 //    }
 
@@ -79,10 +80,10 @@ public class BusinessModuleMdmController extends DefaultController {
     public JsonResultEntity save(@RequestBody List<AeConfBusinessModuleMdmEntity> list) {
         try {
             List<AeConfBusinessModuleMdmEntity> saveList = aeConfBusinessModuleMdmService.saveList(list);
-            return getSuccessMessageEntity("请求成功",saveList);
+            return getSuccessMessageEntity("请求成功", saveList);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -93,10 +94,10 @@ public class BusinessModuleMdmController extends DefaultController {
     public JsonResultEntity updateList(@RequestBody List<AeConfBusinessModuleMdmEntity> list) {
         try {
             List<AeConfBusinessModuleMdmEntity> saveList = aeConfBusinessModuleMdmService.updateList(list);
-            return getSuccessMessageEntity("请求成功",saveList);
+            return getSuccessMessageEntity("请求成功", saveList);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -107,11 +108,11 @@ public class BusinessModuleMdmController extends DefaultController {
     @RequestMapping(value = "/deleteList", method = RequestMethod.POST)
     public JsonResultEntity deleteList(@RequestBody List<AeConfBusinessModuleMdmEntity> list) {
         try {
-            Map<String,Integer> deleteMap = aeConfBusinessModuleMdmService.deleteList(list);
-            return getSuccessMessageEntity("请求成功",deleteMap);
+            Map<String, Integer> deleteMap = aeConfBusinessModuleMdmService.deleteList(list);
+            return getSuccessMessageEntity("请求成功", deleteMap);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmController.java
index 0a550391..33203efa 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmController.java
@@ -35,36 +35,36 @@ public class MdmController extends DefaultController {
 
 
     @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
-    public JsonResultEntity queryAll(@RequestBody MdmModuleEntity entity){
+    public JsonResultEntity queryAll(@RequestBody MdmModuleEntity entity) {
         try {
             entity.setMdmType("2");//1、档案 2、单据
             List<MdmModuleEntity> all = mdmModuleService.query(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/queryFiledsByDbId", method = RequestMethod.POST)
-    public JsonResultEntity queryFiledsByDbId(@RequestBody MdmModuleDbFiledsEntity entity){
+    public JsonResultEntity queryFiledsByDbId(@RequestBody MdmModuleDbFiledsEntity entity) {
         try {
             List<MdmModuleDbFiledsEntity> all = mdmModuleDbFiledsService.query(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/queryMdmAndFiledsByMdmId", method = RequestMethod.POST)
-    public JsonResultEntity queryMdmAndFiledsByMdmId(@RequestBody MdmModuleDbEntity entity){
+    public JsonResultEntity queryMdmAndFiledsByMdmId(@RequestBody MdmModuleDbEntity entity) {
         try {
             List<MdmModuleDbEntity> all = mdmService.queryMdmAndFiledsByMdmId(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java
index cc6b48bd..b2ea8c1c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/controller/MdmFileMappingController.java
@@ -33,36 +33,36 @@ public class MdmFileMappingController extends DefaultController {
 
 
     @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
-    public JsonResultEntity queryAll(@RequestBody MdmModuleEntity entity){
+    public JsonResultEntity queryAll(@RequestBody MdmModuleEntity entity) {
         try {
             entity.setMdmType("1");//1、档案 2、单据
             List<MdmModuleEntity> all = mdmModuleService.query(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/queryFiledsByDbId", method = RequestMethod.POST)
-    public JsonResultEntity queryFiledsByDbId(@RequestBody MdmModuleDbFiledsEntity entity){
+    public JsonResultEntity queryFiledsByDbId(@RequestBody MdmModuleDbFiledsEntity entity) {
         try {
             List<MdmModuleDbFiledsEntity> all = mdmModuleDbFiledsService.query(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/queryMdmAndFiledsByMdmId", method = RequestMethod.POST)
-    public JsonResultEntity queryMdmAndFiledsByMdmId(@RequestBody MdmModuleDbEntity entity){
+    public JsonResultEntity queryMdmAndFiledsByMdmId(@RequestBody MdmModuleDbEntity entity) {
         try {
             List<MdmModuleDbEntity> all = mdmService.queryMdmAndFiledsByMdmId(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java
index b6c616fa..27ae5e1c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java
@@ -25,26 +25,27 @@ public class ClassificationController extends DefaultController {
     private IAeConfSubjectClassificationService aeConfSubjectClassificationService;
 
     @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
-    public JsonResultEntity queryAll(@RequestBody AeConfSubjectClassificationEntity entity){
+    public JsonResultEntity queryAll(@RequestBody AeConfSubjectClassificationEntity entity) {
         try {
             List<AeConfSubjectClassificationEntity> all = aeConfSubjectClassificationService.queryAll(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/queryById", method = RequestMethod.POST)
-    public JsonResultEntity queryById(@RequestBody AeConfSubjectClassificationEntity entity){
+    public JsonResultEntity queryById(@RequestBody AeConfSubjectClassificationEntity entity) {
         try {
             AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity = aeConfSubjectClassificationService.queryById(entity);
-            return getSuccessMessageEntity("请求成功",aeConfSubjectClassificationEntity);
+            return getSuccessMessageEntity("请求成功", aeConfSubjectClassificationEntity);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public JsonResultEntity save(@RequestBody AeConfSubjectClassificationEntity entity) {
         try {
@@ -52,9 +53,10 @@ public class ClassificationController extends DefaultController {
             return getSuccessMessageEntity("请求成功", save);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public JsonResultEntity update(@RequestBody AeConfSubjectClassificationEntity entity) {
         try {
@@ -62,7 +64,7 @@ public class ClassificationController extends DefaultController {
             return getSuccessMessageEntity("请求成功", update);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -73,7 +75,7 @@ public class ClassificationController extends DefaultController {
             return getSuccessMessageEntity("请求成功", null);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java
index 572ae4a9..550e6751 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java
@@ -26,45 +26,46 @@ public class ContrastBController extends DefaultController {
     private IAeConfSubjectContrastBService contrastBService;
 
     @RequestMapping(value = "/queryAllByContrastId", method = RequestMethod.POST)
-    public JsonResultEntity queryAllByContrastId(@RequestBody AeConfSubjectContrastBEntity entity){
+    public JsonResultEntity queryAllByContrastId(@RequestBody AeConfSubjectContrastBEntity entity) {
         try {
             List<AeConfSubjectContrastBEntity> all = contrastBService.queryAllByContrastId(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/saveList", method = RequestMethod.POST)
-    public JsonResultEntity saveList(@RequestBody List<AeConfSubjectContrastBEntity> list){
+    public JsonResultEntity saveList(@RequestBody List<AeConfSubjectContrastBEntity> list) {
         try {
             List<AeConfSubjectContrastBEntity> all = contrastBService.saveListEntity(list);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/updateList", method = RequestMethod.POST)
-    public JsonResultEntity updateList(@RequestBody List<AeConfSubjectContrastBEntity> list){
+    public JsonResultEntity updateList(@RequestBody List<AeConfSubjectContrastBEntity> list) {
         try {
             List<AeConfSubjectContrastBEntity> all = contrastBService.updateList(list);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public JsonResultEntity delete(@RequestBody AeConfSubjectContrastBEntity entity){
+    public JsonResultEntity delete(@RequestBody AeConfSubjectContrastBEntity entity) {
         try {
             contrastBService.deleteList(entity);
-            return getSuccessMessageEntity("请求成功",null);
+            return getSuccessMessageEntity("请求成功", null);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
index 1ba31211..15aa818f 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
@@ -23,54 +23,57 @@ public class ContrastController extends DefaultController {
     private IAeConfSubjectContrastService aeConfSubjectContrastService;
 
     @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
-    public JsonResultEntity queryAll(@RequestBody AeConfSubjectContrastEntity entity){
+    public JsonResultEntity queryAll(@RequestBody AeConfSubjectContrastEntity entity) {
         try {
             List<AeConfSubjectContrastEntity> all = aeConfSubjectContrastService.queryAll(entity);
-            return getSuccessMessageEntity("请求成功",all);
+            return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/queryById", method = RequestMethod.POST)
-    public JsonResultEntity queryById(@RequestBody AeConfSubjectContrastEntity entity){
+    public JsonResultEntity queryById(@RequestBody AeConfSubjectContrastEntity entity) {
         try {
             AeConfSubjectContrastEntity queryById = aeConfSubjectContrastService.queryById(entity);
-            return getSuccessMessageEntity("请求成功",queryById);
+            return getSuccessMessageEntity("请求成功", queryById);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public JsonResultEntity save(@RequestBody AeConfSubjectContrastEntity entity){
+    public JsonResultEntity save(@RequestBody AeConfSubjectContrastEntity entity) {
         try {
             AeConfSubjectContrastEntity save = aeConfSubjectContrastService.saveEntity(entity);
-            return getSuccessMessageEntity("请求成功",save);
+            return getSuccessMessageEntity("请求成功", save);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public JsonResultEntity update(@RequestBody AeConfSubjectContrastEntity entity){
+    public JsonResultEntity update(@RequestBody AeConfSubjectContrastEntity entity) {
         try {
             AeConfSubjectContrastEntity save = aeConfSubjectContrastService.updateEntity(entity);
-            return getSuccessMessageEntity("请求成功",save);
+            return getSuccessMessageEntity("请求成功", save);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
+
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public JsonResultEntity delete(@RequestBody AeConfSubjectContrastEntity entity){
+    public JsonResultEntity delete(@RequestBody AeConfSubjectContrastEntity entity) {
         try {
             AeConfSubjectContrastEntity save = aeConfSubjectContrastService.deleteEntity(entity);
-            return getSuccessMessageEntity("请求成功",save);
+            return getSuccessMessageEntity("请求成功", save);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -78,13 +81,13 @@ public class ContrastController extends DefaultController {
     //2、再按顺序拼接写类型的ids，再去科目对照表中查询这个ids对应的对照表
     //3、返回对照表对象
     @RequestMapping(value = "/queryByInfluenceIds", method = RequestMethod.POST)
-    public JsonResultEntity queryByInfluenceIds(@RequestBody AeConfSubjectContrastEntity entity){
+    public JsonResultEntity queryByInfluenceIds(@RequestBody AeConfSubjectContrastEntity entity) {
         try {
             List<AeConfSubjectContrastEntity> list = aeConfSubjectContrastService.queryByInfluenceIds(entity);
-            return getSuccessMessageEntity("请求成功",list);
+            return getSuccessMessageEntity("请求成功", list);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败",e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 }