大中型申报列表查询bug处理

dao/src/main/resources/mapper/CommissionDeclareMapper.xml

@@ -32,9 +32,12 @@
         FROM
         (
         SELECT
-        IFNULL( cd.id,( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = major.businessId AND production_id IS NULL and declare_user_id =#{marketUserId}) ) id,
-        IFNULL( cd.commission_rate_id,( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND business_id = major.businessId AND production_id IS NULL and declare_user_id =#{marketUserId} ) ) commission_rate_id,
-        IFNULL( cd.declare_result,( SELECT declare_result FROM commission_declare WHERE deleted = 0 AND business_id = major.businessId AND production_id IS NULL and declare_user_id =#{marketUserId}) ) declare_result,
+        IFNULL( cd.id,( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = major.businessId AND production_id IS NULL
+        AND business_type ='COMMISSION_DECLARE_MAJOR_MARKET' and declare_user_id =#{marketUserId}) ) id,
+        IFNULL( cd.commission_rate_id,( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND business_id = major.businessId AND production_id IS NULL
+        AND business_type ='COMMISSION_DECLARE_MAJOR_MARKET' and declare_user_id =#{marketUserId} ) ) commission_rate_id,
+        IFNULL( cd.declare_result,( SELECT declare_result FROM commission_declare WHERE deleted = 0 AND business_id = major.businessId AND production_id IS NULL
+        AND business_type ='COMMISSION_DECLARE_MAJOR_MARKET' and declare_user_id =#{marketUserId}) ) declare_result,
         major.*
         FROM
         (
@@ -120,9 +123,12 @@
 
     <select id="majorEvaluateDeclarePage" parameterType="com.dayou.vo.CommissionDeclareVO" resultType="com.dayou.vo.CommissionDeclareVO">
         select bus.*,dd.name as commissionType from (SELECT
-        IFNULL(cd.id,(SELECT id from commission_declare where deleted = 0 and business_id= major.businessId and production_id is null and declare_user_id =#{evaluateUserId}) ) id,
-        IFNULL(cd.commission_rate_id,(SELECT commission_rate_id from commission_declare where deleted = 0 and business_id= major.businessId and production_id is null and declare_user_id = #{evaluateUserId}) ) commission_rate_id,
-        IFNULL(cd.declare_result,(SELECT declare_result from commission_declare where deleted = 0 and business_id= major.businessId and production_id is null and declare_user_id = #{evaluateUserId}) ) declare_result,
+        IFNULL(cd.id,(SELECT id from commission_declare where deleted = 0 and business_id= major.businessId and production_id is null
+        AND business_type ='COMMISSION_DECLARE_MAJOR_EVALUATE' and declare_user_id =#{evaluateUserId}) ) id,
+        IFNULL(cd.commission_rate_id,(SELECT commission_rate_id from commission_declare where deleted = 0 and business_id= major.businessId and production_id is null
+        AND business_type ='COMMISSION_DECLARE_MAJOR_EVALUATE' and declare_user_id = #{evaluateUserId}) ) commission_rate_id,
+        IFNULL(cd.declare_result,(SELECT declare_result from commission_declare where deleted = 0 and business_id= major.businessId and production_id is null
+        AND business_type ='COMMISSION_DECLARE_MAJOR_EVALUATE' and declare_user_id = #{evaluateUserId}) ) declare_result,
         major.*
         FROM
         (

domain/src/main/java/com/dayou/enums/GlobalConfigEnum.java

@@ -226,6 +226,9 @@ public enum GlobalConfigEnum implements CodeMsgEnumInterface<String,CodeMsgEnumI
 
         MAJOR_MARKET_1("MAJOR_MARKET_1",null,"市场一部"),
         MAJOR_MARKET_2("MAJOR_MARKET_2",null,"市场二部"),
+        MAJOR_MARKET_3("MAJOR_MARKET_3",null,"评估一部"),
+        MAJOR_MARKET_4("MAJOR_MARKET_4",null,"评估二部"),
+        MAJOR_MARKET_5("MAJOR_MARKET_5",null,"评估三部"),
         ;
 
         private String filed;