优化专账日结和月结计算

新增专账日结和月结手动触发接口

jmai-physic/src/main/java/com/jmai/physic/controller/PhysicBillController.java

@@ -49,4 +49,18 @@ public class PhysicBillController {
         PhysicBill  bill = physicBillService.sign(physicBillSignReq);
         PhysicBill  bill = physicBillService.sign(physicBillSignReq);
         return ResponseData.ok(bill);
         return ResponseData.ok(bill);
     }
     }
+    
+    @PostMapping("/triggerDailySettlement")
+    @ApiOperation(value = "手动触发指定日期的日结")
+    public ResponseData<Void> triggerDailySettlement(@RequestBody BillSettlementTriggerReq req) {
+        physicBillService.triggerDailySettlement(req.getDate());
+        return ResponseData.ok();
+    }
+    
+    @PostMapping("/triggerMonthlySettlement")
+    @ApiOperation(value = "手动触发指定月份的月结")
+    public ResponseData<Void> triggerMonthlySettlement(@RequestBody BillSettlementTriggerReq req) {
+        physicBillService.triggerMonthlySettlement(req.getMonth());
+        return ResponseData.ok();
+    }
 }
 }
\ No newline at end of file

jmai-physic/src/main/java/com/jmai/physic/dto/BillSettlementTriggerReq.java

+package com.jmai.physic.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "触发结算请求")
+public class BillSettlementTriggerReq {
+
+    @ApiModelProperty(value = "日期，格式：yyyy-MM-dd，用于日结")
+    private String date;
+
+    @ApiModelProperty(value = "月份，格式：yyyy-MM，用于月结")
+    private String month;
+}
\ No newline at end of file

jmai-physic/src/main/java/com/jmai/physic/dto/PhysicDestroyCheckDetailQueryReq.java

+package com.jmai.physic.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PhysicDestroyCheckDetailQueryReq {
+
+    @ApiModelProperty(value = "销毁审批ID", required = true)
+    private Long checkId;
+
+}
\ No newline at end of file

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicBill.java

@@ -6,8 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
-import java.time.LocalDate;
-import java.time.YearMonth;
+
 
 
 @Data
 @Data
 @ApiModel(description = "药品专账")
 @ApiModel(description = "药品专账")
@@ -44,10 +43,10 @@ public class PhysicBill extends BaseVersionEntity {
     private Integer expendNum;
     private Integer expendNum;
 
 
     @ApiModelProperty(value = "结算日期")
     @ApiModelProperty(value = "结算日期")
-    private LocalDate settleDate;
+    private String settleDate;
 
 
     @ApiModelProperty(value = "结算月份（年月）")
     @ApiModelProperty(value = "结算月份（年月）")
-    private YearMonth settleMonth;
+    private String settleMonth;
 
 
     @ApiModelProperty(value = "相关申请、入库id")
     @ApiModelProperty(value = "相关申请、入库id")
     private Long refId;
     private Long refId;

jmai-physic/src/main/java/com/jmai/physic/service/PhysicBillService.java

@@ -24,4 +24,8 @@ public interface PhysicBillService {
     PhysicBillHandover handover(PhysicBillHandoverCreateReq req);
     PhysicBillHandover handover(PhysicBillHandoverCreateReq req);
     PhysicBillHandover signHandover(PhysicBillHandoverSignReq req);
     PhysicBillHandover signHandover(PhysicBillHandoverSignReq req);
     void cancelHandover(PhysicBillHandoverCancelReq req);
     void cancelHandover(PhysicBillHandoverCancelReq req);
+    
+    // 结算功能
+    void triggerDailySettlement(String settleDateStr);
+    void triggerMonthlySettlement(String settleMonthStr);
 }
 }