Update test.txt

test.txt

@@ -144,7 +144,7 @@ RNPolicyServicerChgRecord queryLastTimeServicerChg(Map<String,String> paramMap);
                             }
                             }
                             
                             
                             
                             
-                             //服务人员转岗
+     //服务人员转岗
     private Map<String,String> transferPost(String policyNo,String newEmpNo){
     private Map<String,String> transferPost(String policyNo,String newEmpNo){
         
         
         Map<String,String> retMap=new HashMap<String,String>();
         Map<String,String> retMap=new HashMap<String,String>();
@@ -157,15 +157,25 @@ RNPolicyServicerChgRecord queryLastTimeServicerChg(Map<String,String> paramMap);
         int nowMonth = DateUtil.getMonth(nowDate);
         int nowMonth = DateUtil.getMonth(nowDate);
         //1:收展服务人员转岗的情况下，该人员在原岗位时已分配的保单不同意调整，
         //1:收展服务人员转岗的情况下，该人员在原岗位时已分配的保单不同意调整，
         //应由该服务人员继续服务至过保单考核，此类保单次年再按照规则分配给其他相应收展服务人员
         //应由该服务人员继续服务至过保单考核，此类保单次年再按照规则分配给其他相应收展服务人员
-        if(!surrenderEmp(oldEmpNo,policyNo,nowYear)){
-            retMap.put("flag", MyConstant.ISPASS_NO);
-            retMap.put("msg", "该保单原收展服务人员转岗后已分配的保单不能调整");
-            return retMap;
-        }
-        //收展服务人员转岗当月，可以进行次月应收保单分配
-        if(!receiveEmp(newEmpNo,policyNo,nowYear,nowMonth)){
+        try
+        {
+            if(!surrenderEmp(oldEmpNo,policyNo,nowYear)){
+                retMap.put("flag", MyConstant.ISPASS_NO);
+                retMap.put("msg", "该保单原收展服务人员转岗后已分配的保单不能调整(过保单考核后次年才可调整)");
+                return retMap;
+            }
+            //收展服务人员转岗当月，可以进行次月应收保单分配
+            if(!receiveEmp(newEmpNo,policyNo,nowYear,nowMonth)){
+                retMap.put("flag", MyConstant.ISPASS_NO);
+                retMap.put("msg", "该服务人员为当月转岗，只能分配应缴日在次月之后的保单");
+                return retMap;
+            }
+            }
+        catch (Exception e)
+        {
+            e.printStackTrace();
             retMap.put("flag", MyConstant.ISPASS_NO);
             retMap.put("flag", MyConstant.ISPASS_NO);
-            retMap.put("msg", "该保单原收展服务人员转岗后已分配的保单不能调整");
+            retMap.put("msg", "系统繁忙");
             return retMap;
             return retMap;
         }
         }
        retMap.put("flag", MyConstant.ISPASS_YES);
        retMap.put("flag", MyConstant.ISPASS_YES);
@@ -221,8 +231,9 @@ RNPolicyServicerChgRecord queryLastTimeServicerChg(Map<String,String> paramMap);
         }
         }
         Date dueMonth=oldEmpNoChangeHistory.getUpdatedDate();
         Date dueMonth=oldEmpNoChangeHistory.getUpdatedDate();
         int year = DateUtil.getYear(dueMonth);
         int year = DateUtil.getYear(dueMonth);
+        //1:转岗当年（已测）   2：转岗次年后
         //原收展服务人员名下的保单，次年才可以交接给其他服务人员
         //原收展服务人员名下的保单，次年才可以交接给其他服务人员
-        if(year>nowYear){
+        if(nowYear>year){
             return true;
             return true;
         }else{
         }else{
             return false;
             return false;
@@ -230,16 +241,16 @@ RNPolicyServicerChgRecord queryLastTimeServicerChg(Map<String,String> paramMap);
         
         
     }
     }
     
     
-    
-    <select id="queryTransferPostByEmpNo" parameterType="java.lang.String" resultMap="BaseResultMap">
-
+   <select id="queryTransferPostByEmpNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+     select * from (
         select rsch.emp_no,rsch.post_code,rsch.change_type,rsch.change_status,rsch.updated_date
         select rsch.emp_no,rsch.post_code,rsch.change_type,rsch.change_status,rsch.updated_date
         from renewal_staff_change_history rsch
         from renewal_staff_change_history rsch
          where rsch.emp_no = #{empNo,jdbcType=VARCHAR}
          where rsch.emp_no = #{empNo,jdbcType=VARCHAR}
                  and rsch.change_status = '3'
                  and rsch.change_status = '3'
                  and rsch.change_type = '04'
                  and rsch.change_type = '04'
-
-    </select>
+                 order by rsch.created_date DESC
+                   )where rownum = 1
+</select>
 
 
 <resultMap id="BaseResultMap" type="com.funde.gras.api.domain.RenewalStaffChangeHistory">
 <resultMap id="BaseResultMap" type="com.funde.gras.api.domain.RenewalStaffChangeHistory">
     <!--
     <!--