修改问题

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java

@@ -69,6 +69,7 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
     private String purchaseSystemName;
 
     private String reason;
+    private String cotlectionBitiStateValue;
 
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -902,13 +902,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         vo.setImages(images);
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
         if(finCollectionConfirmation.getAuditState() ==2){
+            vo.setCotlectionBitiStateValue("驳回");
 //            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
 //            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
             vo.setReason(finCollectionConfirmation.getReason());
-        }/*else if(finCollectionConfirmation.getAuditState() == 3){
-            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
-            vo.setReason(confirmationDetails);
-        }*/
+        }else if(finCollectionConfirmation.getAuditState() == 3){
+//            String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
+//            vo.setReason(confirmationDetails);
+            vo.setCotlectionBitiStateValue("确认");
+        }
         return rb.success().setData(vo);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java

@@ -58,7 +58,9 @@ public class ConfirmationDetailedVo implements Vo {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
-
+    @ApiModelProperty("驳回原因")
     private String reason;
+    @ApiModelProperty("审批状态")
+    private String cotlectionBitiStateValue;
 }