1、新增公司查询接口。

2、优化分类定义接口，方法等。

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java

@@ -45,6 +45,21 @@ public class BdController extends DefaultController {
     @Autowired
     private IMdmDbFiledVODAO mdmDbFiledVODAO;
 
+
+    /**
+     * 查询所有公司
+     */
+    @RequestMapping(value = "/queryOrgVO", method = RequestMethod.POST)
+    public JsonResultEntity queryOrgVO(@RequestBody OrgBookVO vo) {
+        try {
+            List<OrgBookVO> all = aeConfBdOrgBookVODao.queryOrgVO(vo);
+            return getSuccessMessageEntity("请求成功", all);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return getFailureMessageEntity(e.getMessage());
+        }
+    }
+
     /**
      * 查询所有公司账簿信息
      */
@@ -55,7 +70,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -69,7 +84,7 @@ public class BdController extends DefaultController {
 //            return getSuccessMessageEntity("请求成功", all);
 //        } catch (Exception e) {
 //            e.printStackTrace();
-//            return getFailureMessageEntity("请求失败", e.getMessage());
+//            return getFailureMessageEntity(e.getMessage());
 //        }
 //    }
 
@@ -81,9 +96,16 @@ public class BdController extends DefaultController {
         try {
             MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO();
             mdmDbFiledVO.setMdmType("1");//1、档案 2、单据
+            mdmDbFiledVO.setMdmId(entity.getPkBdinfo());
             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());
+                dbFiledVO.setTablepkname("id");
+            }
 
             if (entity.getMdmName() != null) {
                 for (MdmDbFiledVO mdmDbFiled : mdmDbFiledVOList) {
@@ -97,7 +119,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", all);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -113,7 +135,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", tree);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -135,7 +157,7 @@ public class BdController extends DefaultController {
 //            return getSuccessMessageEntity("请求成功", objectList);
 //        } catch (Exception e) {
 //            e.printStackTrace();
-//            return getFailureMessageEntity("请求失败", e.getMessage());
+//            return getFailureMessageEntity(e.getMessage());
 //        }
 //    }
 
@@ -153,7 +175,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", objectList);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 
@@ -173,7 +195,7 @@ public class BdController extends DefaultController {
             return getSuccessMessageEntity("请求成功", pageInfo);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 }

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java

@@ -14,6 +14,7 @@ import java.util.List;
 public interface IAeConfBdOrgBookVODao extends IBaseDao<OrgBookVO, String> {
 
     public List<OrgBookVO> queryOrgBookVO(OrgBookVO vo);
+    public List<OrgBookVO> queryOrgVO(OrgBookVO vo);
 
 }
 

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java

@@ -17,4 +17,10 @@ public class AeConfBdOrgBookVODaoImpl extends MybatisGenericDao<OrgBookVO, Strin
         List<OrgBookVO> orgBookVOList = (List<OrgBookVO>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgBookVO", vo);
         return orgBookVOList;
     }
+
+    @Override
+    public List<OrgBookVO> queryOrgVO(OrgBookVO vo) {
+        List<OrgBookVO> orgBookVOList = (List<OrgBookVO>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgVO", vo);
+        return orgBookVOList;
+    }
 }

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdAccsubjDaoImpl">
 
     <resultMap id="get-AeConfBdAccsubjEntity-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
+        <result property="id" column="id"/>
         <result property="dispname" column="dispname" jdbcType="VARCHAR"/>
         <result property="dr" column="dr" jdbcType="VARCHAR"/>
         <result property="endflag" column="endflag" jdbcType="VARCHAR"/>
@@ -17,7 +18,8 @@
     </resultMap>
     <!-- 查询的字段-->
     <sql id="AeConfBdAccsubjEntity_Base_Column_List">
-        dispname
+        id
+        ,dispname
         ,dr
         ,endflag
         ,pk_accsubj

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;
     /** 对应表名 */

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDbFiledVO.xml

@@ -36,8 +36,8 @@
             db.db_name      as tablename,
             db.remark       as dbName,
             fileds.sys_pk   as tablepkname,
-            fileds.sys_code as namefieldname,
+            fileds.sys_code AS codefieldname,
-            fileds.sys_name as codefieldname
+            fileds.sys_name AS namefieldname
         FROM
             mdm_module mdm
             LEFT JOIN mdm_module_db db ON db.mdm_id = mdm.id
@@ -49,6 +49,7 @@
                        GROUP BY db_id) fileds ON fileds.db_id = db.id
         WHERE
             1=1
+        <if test="mdmId != null and mdmId != ''">and mdm.id = #{mdmId}</if>
             AND mdm.sts = 'Y'
             AND db.db_type = '1'
     </select>

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/OrgBookVO.xml

@@ -46,13 +46,35 @@
             LEFT JOIN mdm_bd_glorg glorg ON glorg.pk_glorg=glorgbook.pk_glorg
             LEFT JOIN mdm_bd_glbook glbook ON glbook.pk_glbook=glorgbook.pk_glbook
         <trim prefix="where" prefixOverrides="and">
-            <if test="pkentityorg != null and pkentityorg != ''">and glorg.pk_entityorg = #{pkentityorg}</if>
+            <if test="pkentityorg != null and pkentityorg != ''">and glorg.pk_entityorg like concat('%',#{pkentityorg},'%')</if>
-            <if test="glorgcode != null and glorgcode != ''">and glorg.glorgcode = #{glorgcode}</if>
+            <if test="glorgcode != null and glorgcode != ''">and glorg.gl_orgcode like concat('%',#{glorgcode},'%')</if>
-            <if test="glorgname != null and glorgname != ''">and glorg.glorgname = #{glorgname}</if>
+            <if test="glorgname != null and glorgname != ''">and glorg.gl_orgname like concat('%',#{glorgname},'%')</if>
+
             and glorgbook.dr=0
         </trim>
         order by glorgbook.pk_glorg asc
     </select>
 
+    <!-- 查询 采用==查询 -->
+    <select id="queryOrgVO" resultMap="get-OrgBookVO-result"
+            parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO">
+        SELECT
+            DISTINCT
+            glorg.pk_entityorg AS pkentityorg,
+            glorg.gl_orgcode AS glorgcode,
+            glorg.gl_orgname AS glorgname
+        FROM
+            mdm_bd_glorgbook glorgbook
+            LEFT JOIN mdm_bd_glorg glorg ON glorg.pk_glorg = glorgbook.pk_glorg
+            LEFT JOIN mdm_bd_glbook glbook ON glbook.pk_glbook = glorgbook.pk_glbook
+        <trim prefix="where" prefixOverrides="and">
+            <if test="glorgcode != null and glorgcode != ''">and glorg.gl_orgcode like concat('%',#{glorgcode},'%')</if>
+            <if test="glorgname != null and glorgname != ''">and glorg.gl_orgname like concat('%',#{glorgname},'%')</if>
+            and glorgbook.dr=0
+        </trim>
+        order by glorgbook.pk_glorg asc
+    </select>
+
+
 </mapper>
 

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());
         }
     }
 

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());
         }
     }
 

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());
         }
     }
 

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);
+            Map<String, Integer> deleteMap = aeConfBusinessModuleMdmService.deleteList(list);
-            return getSuccessMessageEntity("请求成功",deleteMap);
+            return getSuccessMessageEntity("请求成功", deleteMap);
         } catch (Exception e) {
             e.printStackTrace();
-            return getFailureMessageEntity("请求失败", e.getMessage());
+            return getFailureMessageEntity(e.getMessage());
         }
     }
 

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());
         }
     }
 

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());
         }
     }
 

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());
         }
     }
 

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());
         }
     }
 }

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());
         }
     }
 }

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java

@@ -18,227 +18,177 @@ public class AeConfSubjectContrastBEntity extends BaseEntity {
     /**
      * 对照表id
      */
-    @JsonIgnore
     private Long contrastId;
     /**
      * 公司pk
      */
-    @JsonIgnore
     private String pkCorp;
     private String glorgname;
     /**
      * 目标档案id
      */
-    @JsonIgnore
     private String pkAccsubj;
     /**
      * 目标档案值（会计科目)
      */
-    @JsonIgnore
     private String desdocvalue;
     /**
      * 来源档案表1
      */
-    @JsonIgnore
     private String factortable1;
     /**
      * 来源档案表2
      */
-    @JsonIgnore
     private String factortable2;
     /**
      * 来源档案表3
      */
-    @JsonIgnore
     private String factortable3;
     /**
      * 来源档案表4
      */
-    @JsonIgnore
     private String factortable4;
     /**
      * 来源档案表5
      */
-    @JsonIgnore
     private String factortable5;
     /**
      * 来源档案表6
      */
-    @JsonIgnore
     private String factortable6;
     /**
      * 来源档案表7
      */
-    @JsonIgnore
     private String factortable7;
     /**
      * 来源档案表8
      */
-    @JsonIgnore
     private String factortable8;
     /**
      * 来源档案表9
      */
-    @JsonIgnore
     private String factortable9;
     /**
      * 来源档案主键1
      */
-    @JsonIgnore
     private String factorpk1;
     /**
      * 来源档案主键2
      */
-    @JsonIgnore
     private String factorpk2;
     /**
      * 来源档案主键3
      */
-    @JsonIgnore
     private String factorpk3;
     /**
      * 来源档案主键4
      */
-    @JsonIgnore
     private String factorpk4;
     /**
      * 来源档案主键5
      */
-    @JsonIgnore
     private String factorpk5;
     /**
      * 来源档案主键6
      */
-    @JsonIgnore
     private String factorpk6;
     /**
      * 来源档案主键7
      */
-    @JsonIgnore
     private String factorpk7;
     /**
      * 来源档案主键8
      */
-    @JsonIgnore
     private String factorpk8;
     /**
      * 来源档案主键9
      */
-    @JsonIgnore
     private String factorpk9;
     /**
      * 来源档案值1
      */
-    @JsonIgnore
     private String factorid1;
     /**
      * 来源档案值2
      */
-    @JsonIgnore
     private String factorid2;
     /**
      * 来源档案值3
      */
-    @JsonIgnore
     private String factorid3;
     /**
      * 来源档案值4
      */
-    @JsonIgnore
     private String factorid4;
     /**
      * 来源档案值5
      */
-    @JsonIgnore
     private String factorid5;
     /**
      * 来源档案值6
      */
-    @JsonIgnore
     private String factorid6;
     /**
      * 来源档案值7
      */
-    @JsonIgnore
     private String factorid7;
     /**
      * 来源档案值8
      */
-    @JsonIgnore
     private String factorid8;
     /**
      * 来源档案值9
      */
-    @JsonIgnore
     private String factorid9;
     /**
      * 来源档案名称1
      */
-    @JsonIgnore
     private String factorname1;
     /**
      * 来源档案名称2
      */
-    @JsonIgnore
     private String factorname2;
     /**
      * 来源档案名称3
      */
-    @JsonIgnore
     private String factorname3;
     /**
      * 来源档案名称4
      */
-    @JsonIgnore
     private String factorname4;
     /**
      * 来源档案名称5
      */
-    @JsonIgnore
     private String factorname5;
     /**
      * 来源档案名称6
      */
-    @JsonIgnore
     private String factorname6;
     /**
      * 来源档案名称7
      */
-    @JsonIgnore
     private String factorname7;
     /**
      * 来源档案名称8
      */
-    @JsonIgnore
     private String factorname8;
     /**
      * 来源档案名称9
      */
-    @JsonIgnore
     private String factorname9;
     /**
      * 备注
      */
     private String remark;
-    @JsonIgnore
     private String def1;
-    @JsonIgnore
     private String def2;
-    @JsonIgnore
     private String def3;
-    @JsonIgnore
     private String def4;
-    @JsonIgnore
     private String def5;
-    @JsonIgnore
     private String def6;
-    @JsonIgnore
     private String def7;
-    @JsonIgnore
     private String def8;
-    @JsonIgnore
     private String def9;
-    @JsonIgnore
     private String def10;
     /**
      * 创建人

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java

@@ -110,7 +110,7 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSu
 
 
     public void queryaeConfSubjectContrastBList(AeConfSubjectClassificationEntity entity) {
-        if (entity.getContrastId() != null || !"".equals(entity.getContrastId())) {
+        if (entity.getContrastId() != null && !"".equals(entity.getContrastId())) {
             //查询科目对照子表
             AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity();
             aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(entity.getContrastId()));

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java

@@ -184,7 +184,7 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
             aeConfInfluenceFactorEntity.setId(sourceId);
             List<AeConfInfluenceFactorEntity> query = iAeConfInfluenceFactorService.query(aeConfInfluenceFactorEntity);
             if (query.size() == 0 || query.size() > 1) {
-                Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查");
+                Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查", moduleId, sourceId);
             }
             sourceIdList.add(query.get(0).getMappingFileId());
         }