Эх сурвалжийг харах

修改后管合同信息-强度报告可以修改为空

qianxb 1 жил өмнө
parent
commit
ca08b03d2f

+ 5 - 0
blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterContractInfo.java

@@ -1,5 +1,7 @@
 package org.springblade.meter.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -86,12 +88,15 @@ public class MeterContractInfo extends BaseEntity {
     private String farmersBankAccountName;
 
     @ApiModelProperty(value = "中期计量最高支付比例")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private BigDecimal middlePayRatio;
 
     @ApiModelProperty(value = "7天强度")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private BigDecimal sevenRatio;
 
     @ApiModelProperty(value = "28天强度")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private BigDecimal twentyEightRatio;
 
 }

+ 5 - 5
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -822,11 +822,11 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             }
             /*总承包合同段(计量合同段)*/
             //else if (contractInfo.getContractType().equals(4)) {
-            if (ObjectUtil.isNotEmpty(contractInfo.getMeterContractInfo())) {
-                MeterContractInfo meterContractInfo = contractInfo.getMeterContractInfo();
-                meterContractInfo.setContractId(contractInfo.getId());
-                meterContractInfoClient.saveOrUpdate(meterContractInfo);
-            }
+//            if (ObjectUtil.isNotEmpty(contractInfo.getMeterContractInfo())) {
+//                MeterContractInfo meterContractInfo = contractInfo.getMeterContractInfo();
+//                meterContractInfo.setContractId(contractInfo.getId());
+//                meterContractInfoClient.saveOrUpdate(meterContractInfo);
+//            }
             //}
 
             return this.submitContractRelevantInfo(row, contractInfo);