解决冲突

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -550,7 +550,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             optionCodeToId.put(info.getDropOptionCode(),info.getId());
             optionCodeToId.put(info.getDropOptionCode(),info.getId());
         }
         }
         Long refusedId = optionCodeToId.get("refused");
         Long refusedId = optionCodeToId.get("refused");
-        if (mdDropOptionId==refusedId){
+        if (mdDropOptionId.equals(refusedId)){
             return 1L;
             return 1L;
         }
         }
         return 0L;
         return 0L;
@@ -1599,7 +1599,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
     public PlayerSalesActivityQueryResponseVO playerSalesActivityQuery(PlayerSalesActivityQueryRequestVO requestVO) {
     public PlayerSalesActivityQueryResponseVO playerSalesActivityQuery(PlayerSalesActivityQueryRequestVO requestVO) {
         PlayerSalesActivityQueryResponseVO responseVO = new PlayerSalesActivityQueryResponseVO();
         PlayerSalesActivityQueryResponseVO responseVO = new PlayerSalesActivityQueryResponseVO();
         Long practitionerId = requestVO.getPractitionerId();
         Long practitionerId = requestVO.getPractitionerId();
-        MdDropOptions mdDropOptions = mdDropOptionsDALService.findByMasterCodeAndOptionsCode("bizchance_promotion_action","refused");
+        MdDropOptions mdDropOptions = mdDropOptionsDALService.selectByMasterCodeAndOptionsCode("bizchance_promotion_action","refused");
         List<PlayerSalesActivityInfo> playerSalesActivityInfos = aclPractitionerDALService.playerSalesActivityQuery(practitionerId,mdDropOptions.getId());
         List<PlayerSalesActivityInfo> playerSalesActivityInfos = aclPractitionerDALService.playerSalesActivityQuery(practitionerId,mdDropOptions.getId());
         //计算完成率
         //计算完成率
         Calendar cal = Calendar.getInstance();
         Calendar cal = Calendar.getInstance();
@@ -1615,7 +1615,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             //总分数
             //总分数
             Integer predictionScore = 0;
             Integer predictionScore = 0;
             for (MktLeadsGoalsActions actions : mktLeadsGoalsActions){
             for (MktLeadsGoalsActions actions : mktLeadsGoalsActions){
-                if (info.getPractitionerId() == actions.getPractitionerId()){
+                if (info.getPractitionerId().equals(actions.getPractitionerId())){
                     predictionScore += actions.getActionStandards() * optionsIdToScore.get(actions.getLeadsActionId());
                     predictionScore += actions.getActionStandards() * optionsIdToScore.get(actions.getLeadsActionId());
                 }
                 }
             }
             }

yd-api/src/main/java/com/yd/dal/mapper/meta/MdDropOptionsMapper.java

@@ -25,5 +25,5 @@ public interface MdDropOptionsMapper {
 
 
     List<MdDropOptions> findByMasterCodeAndOrderId(@Param("masterCode")String masterCode, @Param("orderId")int orderId);
     List<MdDropOptions> findByMasterCodeAndOrderId(@Param("masterCode")String masterCode, @Param("orderId")int orderId);
 
 
-    MdDropOptions findByMasterCodeAndOptionsCode(@Param("masterCode") String masterCode, @Param("optionsCode") String optionsCode);
+    MdDropOptions selectByMasterCodeAndOptionsCode(@Param("masterCode") String masterCode, @Param("optionsCode") String optionsCode);
 }
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/service/meta/MdDropOptionsDALService.java

@@ -15,5 +15,5 @@ public interface MdDropOptionsDALService {
 
 
     List<MdDropOptions> findByMasterCodeAndOrderId(String masterCode, int orderId);
     List<MdDropOptions> findByMasterCodeAndOrderId(String masterCode, int orderId);
 
 
-    MdDropOptions findByMasterCodeAndOptionsCode(String masterCode, String optionsCode);
+    MdDropOptions selectByMasterCodeAndOptionsCode(String masterCode, String optionsCode);
 }
 }

yd-api/src/main/java/com/yd/dal/service/meta/impl/MdDropOptionsDALServiceImpl.java

@@ -45,7 +45,7 @@ public class MdDropOptionsDALServiceImpl implements MdDropOptionsDALService {
     }
     }
 
 
     @Override
     @Override
-    public MdDropOptions findByMasterCodeAndOptionsCode(String masterCode, String optionsCode) {
-        return mdDropOptionsMapper.findByMasterCodeAndOptionsCode(masterCode, optionsCode);
+    public MdDropOptions selectByMasterCodeAndOptionsCode(String masterCode, String optionsCode) {
+        return mdDropOptionsMapper.selectByMasterCodeAndOptionsCode(masterCode, optionsCode);
     }
     }
 }
 }

yd-api/src/main/resources/mapper/meta/MdDropOptionsMapper.xml

@@ -218,11 +218,13 @@
       from ag_md_drop_master m left join ag_md_drop_options o on m.id = o.drop_master_id and o.is_active = 1 and o.drop_option_order = #{orderId,jdbcType=INTEGER}
       from ag_md_drop_master m left join ag_md_drop_options o on m.id = o.drop_master_id and o.is_active = 1 and o.drop_option_order = #{orderId,jdbcType=INTEGER}
       where m.scenario_code = #{masterCode,jdbcType=BIGINT}
       where m.scenario_code = #{masterCode,jdbcType=BIGINT}
     </select>
     </select>
-    <select id="findByMasterCodeAndOptionsCode" resultMap="BaseResultMap">
+    <select id="selectByMasterCodeAndOptionsCode" resultMap="BaseResultMap">
       SELECT o.*
       SELECT o.*
       FROM ag_md_drop_options o
       FROM ag_md_drop_options o
       LEFT JOIN ag_md_drop_master m ON m.id = o.drop_master_id
       LEFT JOIN ag_md_drop_master m ON m.id = o.drop_master_id
       WHERE m.scenario_code = #{masterCode,jdbcType=VARCHAR,jdbcType=VARCHAR}
       WHERE m.scenario_code = #{masterCode,jdbcType=VARCHAR,jdbcType=VARCHAR}
       and o.drop_option_code = #{optionsCode,jdbcType=VARCHAR}
       and o.drop_option_code = #{optionsCode,jdbcType=VARCHAR}
+      and o.is_active=1
+      and m.is_active=1
     </select>
     </select>
 </mapper>
 </mapper>
\ No newline at end of file