no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -30,6 +30,7 @@ import cn.ezhizao.project.system.service.ISysUserService;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelWriter;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.core.io.ResourceLoader;
@@ -83,6 +84,14 @@ public class BizCollectionController extends BaseController {
         BizCollection collection = getForId(id);
         return success(collection);
     }
+    @GetMapping(value = "/detail/{id}")
+    @ResponseBody
+    public AjaxResult getCollectionDetailByInputId(@PathVariable Long id) {
+        //实收金额
+        List<BizCollectionDetail> list = collectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>().eq(BizCollectionDetail::getContractId, id));
+        BigDecimal detailAmount  = list.stream().map(m -> m.getArriveAmount()).reduce(BigDecimal::add).get();
+        return success(detailAmount);
+    }
 
     @ApiOperation(value = "主从保存", notes = "主从保存")
     @PostMapping("/save")
@@ -230,7 +239,17 @@ public class BizCollectionController extends BaseController {
         BigDecimal collectedAmount = BigDecimal.valueOf(collected.stream().mapToDouble(v -> v.getArriveAmount().doubleValue()).sum());
 
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        bizCollection.setContractId(bizArchiveInput.getId()).setContractNo(bizArchiveInput.getContractNo()).setContractAmount(bizArchiveInput.getTrueAmount()).setCompanyName(bizArchiveInput.getCompanyName()).setApplierId(user.getUserId()).setApplierName(user.getNickName()).setCompanyId(bizArchiveInput.getCompanyId()).setPaymentAmount(collectedAmount).setNonpaymentAmount(bizArchiveInput.getTrueAmount().subtract(collectedAmount));
+        bizCollection.setContractId(bizArchiveInput.getId())
+                .setContractNo(bizArchiveInput.getContractNo())
+                .setContractAmount(bizArchiveInput.getTrueAmount())
+                .setCompanyName(bizArchiveInput.getCompanyName())
+                .setApplierId(user.getUserId())
+                .setApplierName(user.getNickName())
+                .setCompanyId(bizArchiveInput.getCompanyId())
+                .setPaymentAmount(collectedAmount)
+                .setNonpaymentAmount(bizArchiveInput.getTrueAmount().subtract(collectedAmount))
+                .setIsNew(bizArchiveInput.getContractType());
+
 
         BizArchiveInputDetail detailConditions = new BizArchiveInputDetail();
         detailConditions.setContractId(conditions.getId());

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollection.java

@@ -98,6 +98,7 @@ public class BizCollection extends BaseEntity implements Serializable {
     private List<SysFileStorage> files = new ArrayList<>();
 
     @ApiModelProperty("审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp verifyDate;
 
     @ApiModelProperty("审核意见")