计量

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/ChangeTokenForm.java

@@ -126,5 +126,9 @@ public class ChangeTokenForm extends BaseEntity {
     @ApiModelProperty(value = "下达状态0未下达1已下达")
     private Integer commandStatus;
 
+    @ApiModelProperty(value = "下达日期")
+    private LocalDate commandDate;
+
+
 
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/InterimPayCertificateController.java

@@ -118,5 +118,17 @@ public class InterimPayCertificateController extends BladeController {
 		return R.success("删除成功");
 	}
 
+
+	/**
+	 * 重新计算 中期支付证书
+	 */
+	@GetMapping("/recalculate")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "重新计算", notes = "传入ids")
+	public R recalculate(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+		interimPayCertificateService.recalculate(id);
+		return R.success("计算完成");
+	}
+
 	
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IInterimPayCertificateService.java

@@ -40,4 +40,6 @@ public interface IInterimPayCertificateService extends BaseService<InterimPayCer
     void locking(Long id, Integer isLock);
 
     InterimPayCertificateVO detail(Long id);
+
+    void recalculate(Long id);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/InterimPayCertificateServiceImpl.java

@@ -55,7 +55,12 @@ public class InterimPayCertificateServiceImpl extends BaseServiceImpl<InterimPay
     @Override
     @Transactional
     public void update2(InterimPayCertificate interimPayCertificate) {
-        //生成报表,计算之后生成金额设置进支付证书
+        //获取支付证书
+        InterimPayCertificate certificate = this.getById(interimPayCertificate.getId());
+        //判断是否锁定
+        if (certificate.getIsLock() == 1){
+            throw new ServiceException("修改失败，当前证书已锁定");
+        }
         this.updateById(interimPayCertificate);
     }
 
@@ -95,4 +100,18 @@ public class InterimPayCertificateServiceImpl extends BaseServiceImpl<InterimPay
         //设置支付项集合
         return vo;
     }
+
+    /**
+     * 重新计算 中期支付证书
+     */
+    @Override
+    public void recalculate(Long id) {
+        //获取支付证书
+        InterimPayCertificate certificate = this.getById(id);
+        //判断是否锁定
+        if (certificate.getIsLock() == 1){
+            throw new ServiceException("生成失败，当前证书已锁定");
+        }
+        //生成报表,计算之后生成金额设置进支付证书
+    }
 }