Merge remote-tracking branch 'origin/master'

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

@@ -18,4 +18,7 @@ import java.util.List;
 public class ControlContractInfoDTO extends ControlContractInfo {
     @ApiModelProperty(value = "搜索值")
     private String queryValue;
+
+    @ApiModelProperty(value = "合同回款集合")
+    private List<ContractReturnedInfo> list;
 }

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

@@ -2,6 +2,8 @@ package org.springblade.control.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,21 +35,26 @@ public class ProjectCostBudget extends BaseEntity {
     private Long deptId;
 
     @ApiModelProperty(value = "费用类型")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Integer costType;
 
     @ApiModelProperty(value = "项目环节")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Long projectProcess;
 
     @ApiModelProperty(value = "预算类型")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Integer budgetType;
 
     @ApiModelProperty(value = "任务类型")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Integer taskDetail;
 
     @ApiModelProperty(value = "预计天数")
     private BigDecimal budgetDays;
 
     @ApiModelProperty(value = "岗位类型")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Integer postType;
 
     @ApiModelProperty(value = "投入人员数量")

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.archive.utils.FileUtils;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.feign.ArchiveFileClient;
@@ -61,6 +62,7 @@ public class ArchiveFileController extends BladeController {
     private final WbsTreeContractClient wbsTreeContractClient;
     private final ContractClient contractClient;
     private final MetadataClassificationClient metadataClassificationClient;
+    private final IArchivesAutoService autoService;
 
     /**
      * 上传文件
@@ -319,7 +321,8 @@ public class ArchiveFileController extends BladeController {
     @ApiOperation(value = "档案统计-档案总存储")
     public R allArchiveFileSize(Long projectId) {
         //统计案卷文件大小
-        Long fileSize = archiveFileClient.getAllArchiveFileSize(projectId);
+//        Long fileSize = archiveFileClient.getAllArchiveFileSize(projectId);
+        Long fileSize = autoService.allArchiveFileSize(projectId);
         if (fileSize == null) {
             return R.data("0B");
         }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -134,4 +134,5 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 	List<ArchivesAutoVO> pageByArchivesAuto4(@Param("vo") ArchivesAutoVO vo);
 
+    Long getAllArchiveFileSize(@Param("projectId") Long projectId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -701,6 +701,9 @@
                                                           WHERE uaa.is_deleted = 1 AND  uaa.is_destroy = 1
                                                           GROUP BY uaa.update_user )
     </select>
+    <select id="getAllArchiveFileSize" resultType="java.lang.Long">
+        select sum(uaa.file_size)  from u_archives_auto uaa WHERE uaa.project_id = #{projectId} and is_deleted = 0
+    </select>
 
 
     <update id="splitFiles">

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -90,4 +90,6 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	R pageByArchivesAuto2(ArchivesAutoVO archivesAuto);
 
     void getArchivesAuthByUser(Long projectId,Long contractId,Integer archiveType);
+
+    Long allArchiveFileSize(Long projectId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -272,6 +272,15 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		}
 	}
 
+	@Override
+	public Long allArchiveFileSize(Long projectId) {
+		Long size = baseMapper.getAllArchiveFileSize(projectId);
+		if (size == null){
+			return 0L;
+		}
+		return size * 1024L;
+	}
+
 	/**
 	 * 根据搜索获取档案柜
 	 * @param archivesAuto

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

@@ -11,6 +11,7 @@ import org.springblade.control.dto.ControlProjectInfoDTO;
 import org.springblade.control.entity.ControlContractInfo;
 import org.springblade.control.service.IContractInfoService;
 import org.springblade.control.service.IProjectInfoService;
+import org.springblade.control.vo.ControlContractInfoVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
@@ -33,8 +34,8 @@ public class ContractInfoController {
     @PostMapping("/addContractInfo")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "新增合同")
-    public R addContractInfo(@RequestBody ControlContractInfo contractInfo) {
-        contractInfoService.addContractInfo(contractInfo);
+    public R addContractInfo(@RequestBody ControlContractInfoDTO dto) {
+        contractInfoService.addContractInfo(dto);
         return R.success("新增成功");
     }
 
@@ -58,8 +59,8 @@ public class ContractInfoController {
     @PostMapping("/updateContractInfo")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "修改合同")
-    public R updateContractInfo(@RequestBody ControlContractInfo contractInfo) {
-        contractInfoService.updateContractInfo(contractInfo);
+    public R updateContractInfo(@RequestBody ControlContractInfoDTO dto) {
+        contractInfoService.updateContractInfo(dto);
         return R.success("修改成功");
     }
 

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

@@ -27,16 +27,16 @@ public class ContractReturnedInfoController {
 
     private final IContractReturnedInfoService contractReturnedInfoService;
 
-    /**
-     * 批量新增或修改回款信息
-     */
-    @PostMapping("/saveOrUpdateBatchReturned")
-    @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "批量新增或修改回款信息")
-    public R saveOrUpdateBatchReturned(@RequestBody ContractReturnedInfoDTO dto) {
-        contractReturnedInfoService.saveOrUpdateBatchReturned(dto);
-        return R.success("保存成功");
-    }
+//    /**
+//     * 批量新增或修改回款信息
+//     */
+//    @PostMapping("/saveOrUpdateBatchReturned")
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation(value = "批量新增或修改回款信息")
+//    public R saveOrUpdateBatchReturned(@RequestBody ContractReturnedInfoDTO dto) {
+//        contractReturnedInfoService.saveOrUpdateBatchReturned(dto);
+//        return R.success("保存成功");
+//    }
 
     /**
      * 根据合同ID获取合同回款列表

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

@@ -22,7 +22,7 @@ import java.util.List;
 public interface IContractInfoService extends BaseService<ControlContractInfo> {
 
 
-    void addContractInfo(ControlContractInfo contractInfo);
+    void addContractInfo(ControlContractInfoDTO dto);
 
     List<DictInfo> getContractTypeDict();
 
@@ -30,7 +30,7 @@ public interface IContractInfoService extends BaseService<ControlContractInfo> {
 
     void deleteContractInfoById(Long id);
 
-    void updateContractInfo(ControlContractInfo contractInfo);
+    void updateContractInfo(ControlContractInfoDTO dto);
 
     ControlContractInfoVO getContractInfoById(Long id);
 

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

@@ -1,6 +1,7 @@
 package org.springblade.control.service;
 
 import org.springblade.control.dto.ContractReturnedInfoDTO;
+import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.entity.ContractReturnedInfo;
 import org.springblade.control.entity.ControlContractInfo;
 import org.springblade.control.entity.ControlProjectInfo;
@@ -19,7 +20,7 @@ import java.util.List;
  **/
 public interface IContractReturnedInfoService extends BaseService<ContractReturnedInfo> {
 
-    void saveOrUpdateBatchReturned(ContractReturnedInfoDTO dto);
+    void saveOrUpdateBatchReturned(ControlContractInfoDTO dto);
 
     /**
      * 根据合同id获取合同已回款金额

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

@@ -41,11 +41,16 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 
     /**
      * 添加合同信息
-     * @param contractInfo
      */
     @Override
-    public void addContractInfo(ControlContractInfo contractInfo) {
+    public void addContractInfo(ControlContractInfoDTO dto) {
+        ControlContractInfo contractInfo = new ControlContractInfo();
+        Long id = SnowFlakeUtil.getId();
+        dto.setId(id);
+        BeanUtils.copyProperties(dto,contractInfo);
         baseMapper.insert(contractInfo);
+        returnedInfoService.saveOrUpdateBatchReturned(dto);
+
     }
 
     /**
@@ -83,11 +88,14 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 
     /**
      * 修改合同
-     * @param contractInfo
      */
     @Override
-    public void updateContractInfo(ControlContractInfo contractInfo) {
-        baseMapper.updateById(contractInfo);
+    @Transactional
+    public void updateContractInfo(ControlContractInfoDTO dto) {
+        ControlContractInfo contractInfo = new ControlContractInfo();
+        BeanUtils.copyProperties(dto,contractInfo);
+        this.updateById(contractInfo);
+        returnedInfoService.saveOrUpdateBatchReturned(dto);
     }
 
     /**
@@ -99,8 +107,10 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
     public ControlContractInfoVO getContractInfoById(Long id) {
         ControlContractInfoVO contractInfo = baseMapper.getContractInfoById(id);
         BigDecimal returnedMoney = returnedInfoService.getContractReturnedMoney(id);
-        contractInfo.setReturnedMoney(returnedMoney);
-        contractInfo.setUnreturnedMoney(contractInfo.getContractMoney().subtract(returnedMoney));
+        if (contractInfo.getContractMoney() != null && returnedMoney != null) {
+            contractInfo.setReturnedMoney(returnedMoney);
+            contractInfo.setUnreturnedMoney(contractInfo.getContractMoney().subtract(returnedMoney));
+        }
         return contractInfo;
     }
 

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

@@ -3,6 +3,7 @@ package org.springblade.control.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springblade.control.dto.ContractReturnedInfoDTO;
+import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.entity.ContractReturnedInfo;
 import org.springblade.control.entity.ControlContractInfo;
 import org.springblade.control.entity.ControlProjectInfo;
@@ -36,8 +37,9 @@ public class ContractReturnedInfoServiceImpl extends BaseServiceImpl<ContractRet
      */
     @Override
     @Transactional
-    public void saveOrUpdateBatchReturned(ContractReturnedInfoDTO dto) {
-        baseMapper.deleteOldInfo(dto.getContractId());
+    public void saveOrUpdateBatchReturned(ControlContractInfoDTO dto) {
+        //删除所有回款信息
+        baseMapper.deleteOldInfo(dto.getId());
         List<ContractReturnedInfo> list = dto.getList();
         if (list != null && list.size() >0) {
             list.stream().forEach(l->l.setProjectId(dto.getProjectId()));