Преглед на файлове

缺失功能:
私有协议应收-结算报表,结算报表-结算记录,加个删除操作,删除要加二次确认弹出框

jiakai преди 4 месеца
родител
ревизия
d3fbead345

+ 6 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -475,6 +475,12 @@ public class ReceivableController {
         return HttpResult.ok(receivableService.platformSettlementExcel(page,settlementQueryVo));
     }
 
+    @DeleteMapping("/deleteSettlementById/{id}")
+    @Operation(summary = "删除结算记录")
+    public HttpResult<Boolean> deleteSettlementById(@PathVariable String id) {
+        return HttpResult.ok(receivableService.deleteSettlementById(id) ? "删除成功":"删除失败");
+    }
+
 
     @PostMapping("exportSuperviseSettlementExcel")
     @Operation(summary = "导出应收手续费结算记录excel文件")

+ 7 - 0
tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -385,4 +385,11 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      * @return
      */
     ImportUpdateExcelResultVo importAccountsReceivableInvoice(MultipartFile file);
+
+    /**
+     * 删除结算记录
+     * @param id
+     * @return
+     */
+    boolean deleteSettlementById(String id);
 }

+ 6 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1335,6 +1335,12 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         return importExcelResultVo;
     }
 
+    @Override
+    public boolean deleteSettlementById(String id) {
+        log.info("私有协议-结算记录-删除: id=[{}]",id);
+        return insPlyIncomeInvoiceSettlementMapper.deleteById(id) > 0;
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)

+ 5 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -601,6 +601,11 @@
         LEFT JOIN ins_orders io ON ipi.order_no = io.id
         LEFT JOIN ptl_agreement agree ON io.agreement_id = agree.id
         WHERE 1 = 1
+        AND ipiis.is_delete = 0
+        AND ipii.is_delete = 0
+        AND ipi.is_delete = 0
+        AND io.is_delete = 0
+        AND agree.is_delete = 0
         <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
             AND ipiis.id IN
             <foreach collection="settlementQueryVo.settlementIds" item="settlementId" open="(" separator="," close=")">