张延森 2 年前
父节点
当前提交
bca273786a

+ 1
- 7
src/main/java/com/njyunzhi/invoice/controller/TaInvoiceDetailController.java 查看文件

120
         if (StringUtils.isEmpty(taInvoiceDetail.getInvoicePersonId())) {
120
         if (StringUtils.isEmpty(taInvoiceDetail.getInvoicePersonId())) {
121
             return ResponseBean.error("未选择报销人员");
121
             return ResponseBean.error("未选择报销人员");
122
         }
122
         }
123
-//
123
+
124
 //        if (null == taInvoiceDetail.getItemList() || taInvoiceDetail.getItemList().size() < 1) {
124
 //        if (null == taInvoiceDetail.getItemList() || taInvoiceDetail.getItemList().size() < 1) {
125
 //            return ResponseBean.error("未找到报销明细");
125
 //            return ResponseBean.error("未找到报销明细");
126
 //        }
126
 //        }
185
         TaInvoiceDetail taInvoiceDetailTPl = null;
185
         TaInvoiceDetail taInvoiceDetailTPl = null;
186
         if (!StringUtils.isEmpty(invoicePersonId)) {
186
         if (!StringUtils.isEmpty(invoicePersonId)) {
187
             taInvoiceDetailTPl = iTaInvoiceDetailService.getTplByPerson(invoiceId, invoicePersonId);
187
             taInvoiceDetailTPl = iTaInvoiceDetailService.getTplByPerson(invoiceId, invoicePersonId);
188
-            if (null != taInvoiceDetailTPl) {
189
-                taInvoiceDetailTPl.setIsFinished(isFinished);
190
-            }
191
         }
188
         }
192
 
189
 
193
         TaInvoiceDetail taInvoiceDetail = null;
190
         TaInvoiceDetail taInvoiceDetail = null;
194
         if (!StringUtils.isEmpty(personId)) {
191
         if (!StringUtils.isEmpty(personId)) {
195
             taInvoiceDetail = iTaInvoiceDetailService.getByPerson(invoiceId, personId);
192
             taInvoiceDetail = iTaInvoiceDetailService.getByPerson(invoiceId, personId);
196
-            if (null != taInvoiceDetail) {
197
-                taInvoiceDetail.setIsFinished(isFinished);
198
-            }
199
         }
193
         }
200
 
194
 
201
         if (null == taInvoiceDetail && null == taInvoiceDetailTPl) {
195
         if (null == taInvoiceDetail && null == taInvoiceDetailTPl) {

+ 0
- 4
src/main/java/com/njyunzhi/invoice/entity/TaInvoiceDetail.java 查看文件

114
     @ApiModelProperty(value = "创建日期")
114
     @ApiModelProperty(value = "创建日期")
115
     private LocalDateTime createDate;
115
     private LocalDateTime createDate;
116
 
116
 
117
-    @ApiModelProperty("是否结束")
118
-    @TableField(exist = false)
119
-    private Boolean isFinished;
120
-
121
     @ApiModelProperty("报销明细")
117
     @ApiModelProperty("报销明细")
122
     @TableField(exist = false)
118
     @TableField(exist = false)
123
     private List<TaInvoiceItem> itemList;
119
     private List<TaInvoiceItem> itemList;