内控系统更新回款信息

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/ControlContractInfoDTO.java

@@ -16,6 +16,10 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ControlContractInfoDTO extends ControlContractInfo {
+
+    @ApiModelProperty(value = "合同id")
+    private String contractId;
+
     @ApiModelProperty(value = "搜索值")
     private String queryValue;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ContractReturnedInfo.java

@@ -1,5 +1,7 @@
 package org.springblade.control.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -50,9 +52,11 @@ public class ContractReturnedInfo extends BaseEntity {
     @JsonFormat(
             pattern = "yyyy-MM-dd"
     )
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "实际回款时间")
     private LocalDate practicalReturnedTime;
 
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "实际回款金额")
     private BigDecimal practicalReturnedMoney;
 

blade-service/blade-control/src/main/java/org/springblade/control/controller/ContractReturnedInfoController.java

@@ -32,11 +32,11 @@ public class ContractReturnedInfoController {
     private final IContractReturnedInfoService contractReturnedInfoService;
 
     /**
-     * 批量新增或修改回款信息
+     * 合同回款更新，修改时间和金额
      */
     @PostMapping("/saveOrUpdateBatchReturned")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "批量新增或修改回款信息")
+    @ApiOperation(value = "合同回款更新，修改时间和金额")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "合同id", required = true),
             @ApiImplicitParam(name = "projectId", value = "项目id", required = true),
@@ -44,7 +44,7 @@ public class ContractReturnedInfoController {
     })
     public R saveOrUpdateBatchReturned(@RequestBody ControlContractInfoDTO dto) {
         contractReturnedInfoService.saveOrUpdateBatchReturned(dto);
-        return R.success("保存成功");
+        return R.success("修改成功");
     }
 
     /**

blade-service/blade-control/src/main/java/org/springblade/control/service/IContractReturnedInfoService.java

@@ -20,8 +20,11 @@ import java.util.List;
  **/
 public interface IContractReturnedInfoService extends BaseService<ContractReturnedInfo> {
 
+    //合同回款更新，修改时间和金额
     void saveOrUpdateBatchReturned(ControlContractInfoDTO dto);
 
+    void saveOrUpdateBatchReturned2(ControlContractInfoDTO dto);
+
     /**
      * 根据合同id获取合同已回款金额
      */

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ContractInfoServiceImpl.java

@@ -141,7 +141,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             jdbcTemplate.execute("update c_control_project_info set start_time = '"+dto.getStartTime() + "', end_time = '"+ dto.getEndTime() +"' where id = "+ dto.getProjectId());
         }
         this.updateById(contractInfo);
-        returnedInfoService.saveOrUpdateBatchReturned(dto);
+        returnedInfoService.saveOrUpdateBatchReturned2(dto);
     }
 
     /**

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ContractReturnedInfoServiceImpl.java

@@ -34,12 +34,21 @@ public class ContractReturnedInfoServiceImpl extends BaseServiceImpl<ContractRet
 
 
     /**
-     * 批量新增或保存合同回款信息
+     * 合同回款更新，修改时间和金额
      * @param dto
      */
     @Override
     @Transactional
     public void saveOrUpdateBatchReturned(ControlContractInfoDTO dto) {
+        //获取所有回款信息
+        List<ContractReturnedInfo> list = dto.getList();
+        this.updateBatchById(list);
+
+    }
+
+    @Override
+    @Transactional
+    public void saveOrUpdateBatchReturned2(ControlContractInfoDTO dto) {
         //删除所有回款信息
         baseMapper.deleteOldInfo(dto.getId());
         List<ContractReturnedInfo> list = dto.getList();