1.收退换增加还款单

2.收退换输入编码后清空
3.工作流插件增加日志输出

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/common/constant/BillTypeConstants.java

@@ -40,4 +40,10 @@ public interface BillTypeConstants {
      * 借款单
      */
     String ER_DAILYLOANBILL = "er_dailyloanbill";
+    /**
+     * 还款单
+     */
+    String ER_REPAYMENTBILL = "er_repaymentbill";
+
+    String ER_REIMBURSEAMOUNT = "er_reimburseamount";
 }

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/HandInReceiveTicketPlugin.java

@@ -133,14 +133,16 @@ public class HandInReceiveTicketPlugin extends AbstractFormPlugin implements Row
         }
 
         String[] findBillArray = new String[]{BillTypeConstants.ER_PUBLICREIMBURSEBILL,BillTypeConstants.ER_DAILYREIMBURSEBILL,
-                BillTypeConstants.ER_TRIPREIMBURSEBILL,BillTypeConstants.ER_CHECKINGPAYBILL,BillTypeConstants.ER_PREPAYBILL,BillTypeConstants.ER_DAILYLOANBILL};
+                BillTypeConstants.ER_TRIPREIMBURSEBILL,BillTypeConstants.ER_CHECKINGPAYBILL,BillTypeConstants.ER_PREPAYBILL,
+                BillTypeConstants.ER_DAILYLOANBILL,BillTypeConstants.ER_REPAYMENTBILL};
         for(String billType : findBillArray){
             Boolean isFind = loadBillInfo(billType, scanNumber);
             if(isFind){
-                return;
+                break;
             }
         }
-
+        // 查询完之后清空数据
+        this.getModel().setValue(HandInReceiveTicketConstant.KEY_NCKD_SCANNUMBER,null);
     }
 
     protected Boolean loadBillInfo(String billlType , String billNo){

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/workflow/TaskApproverWorkflowPlugin.java

@@ -31,7 +31,7 @@ public class TaskApproverWorkflowPlugin implements IWorkflowPlugin {
         AgentTask currentTask = e.getCurrentTask();
         //获取当前节点实际审批人ID
         Long assigneeId = currentTask.getAssigneeId();
-
+        BizLog.log("工作流当前审批人：" + assigneeId);
         updateBillTaskApprover(businessKey,entityNumber, Collections.singletonList(assigneeId));
     }
 
@@ -53,7 +53,7 @@ public class TaskApproverWorkflowPlugin implements IWorkflowPlugin {
         DynamicObject[] taskTaskhistories = BusinessDataServiceHelper.load("task_taskhistory", "billnumber,id,apprevalmessage,personid,tasktypeid,state", new QFilter[]{
                 new QFilter("billnumber", QCP.equals,billInfo.getString("billno"))
         },"completetime desc");
-
+        BizLog.log("taskTaskhistories length：" + taskTaskhistories.length);
         // 优先取共享审核人
         if(taskTaskhistories.length > 0){
             billInfo.set(ErReimBurseBillConstant.KEY_NCKD_TASKAPPROVER,taskTaskhistories[0].getDynamicObject("personid"));