企业端-项目详情修改,合同详情修改
This commit is contained in:
+4
@@ -43,6 +43,7 @@ import org.springframework.web.servlet.ModelAndView;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.math.BigDecimal;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -388,6 +389,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
|
||||
if(payIncomeContract==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
if(Objects.isNull(payIncomeContract.getContractAmount())){
|
||||
payIncomeContract.setContractAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
String str = JSON.toJSONString(payIncomeContract);
|
||||
PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class);
|
||||
// 获取关联项目id
|
||||
|
||||
+6
@@ -423,6 +423,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
}
|
||||
String strProject = JSON.toJSONString(payCommonProject);
|
||||
payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
|
||||
if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){
|
||||
payCompanyCommonProject.setPaidAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
if(Objects.isNull(payCompanyCommonProject.getReceivableAmount())){
|
||||
payCompanyCommonProject.setReceivableAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
|
||||
// 合同编号查找合同id
|
||||
if(!StringUtils.isBlank(payCommonProject.getContractNum())){
|
||||
|
||||
Reference in New Issue
Block a user