Feature/chenmin

ServiceSite/src/main/java/com/seasky/flowportal/service/impl/DianZiXinXi_VerifyReimbursementServiceImpl.java

@@ -96,7 +96,7 @@ public class DianZiXinXi_VerifyReimbursementServiceImpl extends VerifyReimbursem
             if (isSalary) {
                 ExtendFieldCmd extendFieldCmd = cmd.getExtendFieldCmd();
                 String extendedField1 = ObjectUtils.isEmpty(extendFieldCmd) ? "" : extendFieldCmd.getExtendedfield1();
-                if ("劳务费".equals(extendedField1) || "校内代发劳务费".equals(extendedField1)) {
+                if ("劳务费".equals(extendedField1) || "校内代发劳务费".equals(extendedField1) || "在编财政工资".equals(extendedField1)) {
                     String eP2_IsComeGoProject = super.getProjectExtendPropertyValue(instanceId, cmd.getFundsProject(), 2);
                     isSalaryComeGoProject = "是".equals(eP2_IsComeGoProject);
                 }
@@ -414,6 +414,14 @@ public class DianZiXinXi_VerifyReimbursementServiceImpl extends VerifyReimbursem
                 if ("是".equals(eP0_IsResearchOrgProject)) {
                     result.add(AssigneeEnum.OrgResearchSubLeader.getNodeName());
                     String eP3_IsLumpSumProject = super.getProjectExtendPropertyValue(instanceId, cmd.getFundsProject(), 3);
+                    if (amount.compareTo(Constant.Amount._2W) <= 0) {
+                        List<String> projectChargeList = super.getProjectChargeList(cmd);
+                        List<String> projectOrgChargeList = super.getProjectOrgChargeList(cmd);
+                        boolean applicantIsProjectCharge = projectChargeList.contains(cmd.getApplicantNo());
+                        boolean projectChargeIsProjectOrgCharge = !Collections.disjoint(projectChargeList, projectOrgChargeList);
+                        if (applicantIsProjectCharge || projectChargeIsProjectOrgCharge)
+                            result.add(AssigneeEnum.ClaimsEndorser.getNodeName());
+                    }
                     if (amount.compareTo(Constant.Amount._2W) > 0 || "是".equals(eP3_IsLumpSumProject)) {
                         result.add(AssigneeEnum.ResearchOrg.getNodeName());
                         if (amount.compareTo(Constant.Amount._5W) > 0) {