Merge branch 'feat-hr-psms_1.0'

code/base/nckd-jxccl-base-common/src/main/java/nckd/jxccl/base/common/constant/FormConstant.java

@@ -250,5 +250,7 @@ public class FormConstant {
     public static final String NCKD_ENDDATE = "nckd_enddate";
     /** 描述*/
     public static final String DESCRIPTION_KEY = "description";
+    /** 部门*/
+    public static final String NCKD_DEP = "nckd_dep";
 
 }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/business/AnnualAdjustmentService.java

@@ -805,7 +805,7 @@ public class AnnualAdjustmentService {
         DynamicObject empPosOrgRel = ac.positionAppointment.getEmpPosOrgRel();
         newPersonPosFile.set(PositionStructureConstant.NCKD_PERSON, ac.personInfo);
 
-        //管理组织
+       /* //管理组织
         newPersonPosFile.set(PositionStructureConstant.ORG_KEY, UserServiceHelper.getUserMainOrgId(UserServiceHelper.getCurrentUserId()));
 
         DynamicObject company = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
@@ -818,7 +818,10 @@ public class AnnualAdjustmentService {
         //使用组织
         DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
         dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
-        newPersonPosFile.set(PositionStructureConstant.USEORG_KEY, dep);
+        newPersonPosFile.set(PositionStructureConstant.USEORG_KEY, dep);*/
+        DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+        dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
+        newPersonPosFile.set(PositionStructureConstant.NCKD_DEP, dep);
 
         newPersonPosFile.set(PositionStructureConstant.NCKD_TYPESTATE, "3");
         newPersonPosFile.set(PositionStructureConstant.NCKD_EXECUTEYEAR, ac.executeYear);
@@ -863,10 +866,16 @@ public class AnnualAdjustmentService {
         if(ac.data.getRankingResultInfo() != null) {
             newPersonPosFile.set(PositionStructureConstant.NCKD_TOPRANK, ac.data.getRankingResultInfo().topRank);
             newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANK, ac.data.getRankingResultInfo().allowanceRank);
-            newPersonPosFile.set(PositionStructureConstant.NCKD_TOPRANKPERCENT,  new BigDecimal(ac.data.getRankingResultInfo().topRankPercent.toString()));
+            BigDecimal topRankPercent = Optional.ofNullable(ac.data.getRankingResultInfo().topRankPercent)
+                    .map(BigDecimal::new)
+                    .orElse(BigDecimal.ZERO);
+            newPersonPosFile.set(PositionStructureConstant.NCKD_TOPRANKPERCENT,  topRankPercent);
             newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKMARK, ac.data.getRankingResultInfo().allowanceRankMark);
             newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKSEL, ac.data.getRankingResultInfo().allowanceRankSel);
-            newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKPCT, new BigDecimal(ac.data.getRankingResultInfo().allowanceRankPercent.toString()));
+            BigDecimal allowanceRankPercent = Optional.ofNullable(ac.data.getRankingResultInfo().allowanceRankPercent)
+                    .map(BigDecimal::new)
+                    .orElse(BigDecimal.ZERO);
+            newPersonPosFile.set(PositionStructureConstant.NCKD_ALLOWANCERANKPCT, allowanceRankPercent);
         }
         //上年度考核结果
         newPersonPosFile.set(PositionStructureConstant.NCKD_APPRAISALRESULT, ac.data.getAppraisalResult());

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/adjust/NewDynamicAdjustmentOperationPlugIn.java

@@ -234,7 +234,7 @@ public class NewDynamicAdjustmentOperationPlugIn extends AbstractOperationServic
         DynamicObject empPosOrgRel = positionAppointment.getEmpPosOrgRel();
         newPersonPosFile.set(PositionStructureConstant.NCKD_PERSON, person);
 
-        //管理组织
+        /*//管理组织
         newPersonPosFile.set(PositionStructureConstant.ORG_KEY, UserServiceHelper.getUserMainOrgId(UserServiceHelper.getCurrentUserId()));
         DynamicObject company = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
         company.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.COMPANY_KEY,FormConstant.ID_KEY)));
@@ -245,7 +245,11 @@ public class NewDynamicAdjustmentOperationPlugIn extends AbstractOperationServic
         //使用组织
         DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
         dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
-        newPersonPosFile.set(PositionStructureConstant.USEORG_KEY, dep);
+        newPersonPosFile.set(PositionStructureConstant.USEORG_KEY, dep);*/
+
+        DynamicObject dep = BusinessDataServiceHelper.newDynamicObject(FormConstant.ADMINORGHR_ENTITYID);
+        dep.set(FormConstant.ID_KEY, empPosOrgRel.getLong(String.join(".",FormConstant.ADMINORG,FormConstant.ID_KEY)));
+        newPersonPosFile.set(PositionStructureConstant.NCKD_DEP, dep);
 
 
 

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/initial/BaseInitialOperationPlugIn.java

@@ -372,10 +372,12 @@ public abstract class BaseInitialOperationPlugIn extends AbstractOperationServic
         personPosFile.set(PositionStructureConstant.CREATEORG_KEY, data.dep);
         personPosFile.set(PositionStructureConstant.ORG_KEY, data.dep);*/
 
-        personPosFile.set(PositionStructureConstant.ORG_KEY, UserServiceHelper.getUserMainOrgId(UserServiceHelper.getCurrentUserId()));
+       /* personPosFile.set(PositionStructureConstant.ORG_KEY, UserServiceHelper.getUserMainOrgId(UserServiceHelper.getCurrentUserId()));
         personPosFile.set(PositionStructureConstant.SRCCREATEORG_KEY, data.company);
         personPosFile.set(PositionStructureConstant.CREATEORG_KEY, data.company);
-        personPosFile.set(PositionStructureConstant.USEORG_KEY, data.dep);
+        personPosFile.set(PositionStructureConstant.USEORG_KEY, data.dep);*/
+
+        personPosFile.set(PositionStructureConstant.NCKD_DEP, data.dep);
 
         personPosFile.set(PositionStructureConstant.NCKD_ALLSUMSCORE, allSumScore);
         personPosFile.set(PositionStructureConstant.NCKD_SUMSCORE, sumScore);