From 83fe57abf6233e69b98e3b0af266cade54883e53 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 18:42:12 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 201 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 141 insertions(+), 60 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 5b5b311..51efed1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -45,6 +45,8 @@
@Autowired
private YwContractMapper ywContractMapper;
@Autowired
+ private YwContractRoomMapper ywContractRoomMapper;
+ @Autowired
private YwContractDetailMapper ywContractDetailMapper;
@Autowired
private YwContractBillMapper ywContractBillMapper;
@@ -82,11 +84,32 @@
ywContractMapper.insert(model);
dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
dealMultifileBiz(model);//澶勭悊闄勪欢淇℃伅
- dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//璁板綍鏂板缓鏃ュ織
+ dealRoomsForContract(model);//澶勭悊鎴挎簮鍏宠仈琛�
+ dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,model.getLoginUserInfo().getRealname(),"銆�"+model.getRemark().replace("鍚堝悓鎽樿锛�","")+"銆�");//璁板綍鏂板缓鏃ュ織
+
return model.getId();
}
+
+ private void dealRoomsForContract(YwContract model) {
+ List<YwContractRoom> list = new ArrayList<>();
+ for(YwRoom room :model.getRoomList()){
+ YwContractRoom t = new YwContractRoom();
+ t.setContractId(model.getId());
+ t.setRoomId(room.getId());
+ t.setCreator(model.getCreator());
+ t.setIsdeleted(Constants.ZERO);
+ t.setCreateDate(model.getCreateDate());
+ t.setEditDate(model.getCreateDate());
+ t.setEditor(model.getCreator());
+ t.setType(Constants.ZERO);
+ list.add(t);
+ }
+ ywContractRoomMapper.insert(list);
+ }
+
@Override
public List<YwContractBill> getBillList(YwContract model){
+
isParamValidForBill(model);
model.setCreateDate(new Date());
model.setEditDate(model.getCreateDate());
@@ -120,6 +143,8 @@
||model.getZlDetailList().size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅");
}
+ model.setType(Constants.TWO);
+ model.setWyDetailList(null);
if(!(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()==null) && (
(model.getZlFreeEndDate()!=null && model.getZlFreeStartDate()==null)
||(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()!=null)
@@ -158,6 +183,8 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅");
}
+ model.setType(Constants.ONE);
+ model.setZlDetailList(null);
if(!(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()==null) && (
(model.getWyFreeEndDate()!=null && model.getWyFreeStartDate()==null)
||(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()!=null)
@@ -184,7 +211,7 @@
}
}
- YwProject project = projectMapper.selectById(model.getCompanyId());
+ YwProject project = projectMapper.selectById(model.getProjectId());
if(project ==null || Constants.equalsInteger(project.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勯」鐩俊鎭紒");
}
@@ -202,13 +229,12 @@
for(YwRoom r : rooms){
model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
}
+ model.setRoomList(rooms);
}
private String getRemarlByParam(YwContract model) {
String str = "";
- YwContractDetail zl = model.getZlDetailList()!=null&&model.getZlDetailList().size()>0?model.getZlDetailList().get(0):null;
- YwContractDetail yw = model.getWyDetailList()!=null&&model.getWyDetailList().size()>0?model.getWyDetailList().get(0):null;
//璧风鏃�2024/06/01锛岀璧佹暟涓�500銕°�傞鏈熺璧佷笁鏈堜竴浠橈紝绉熼噾鍗曚环35鍏�/銕÷锋湀銆傞鏈熺墿涓氫笁鏈堜竴浠橈紝鐗╀笟鍗曚环4.3鍏�/銕÷锋湀
String str0 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆傞鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
String str1 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆�";
@@ -216,20 +242,20 @@
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
str= str0;
}
- if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ if(Constants.equalsInteger(model.getType(),Constants.TWO)){
str= str1;
}
- if(Constants.equalsInteger(model.getType(),Constants.TWO)){
+ if(Constants.equalsInteger(model.getType(),Constants.ONE)){
str= str2;
}
str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getStartDate()))
.replace("{param2}",model.getTotalArea().intValue()+"")
.replace("{param3}",Constants.getPayTypeByNum(model.getZlPayType()))
- .replace("{param4}",zl!=null&&zl.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
- .replace("{param5}",Constants.getPayTypeByNum(model.getWyPayType()))
- .replace("{param6}",Constants.getUnitTypeByNum(zl!=null?zl.getCircleType():null))
- .replace("{param7}",zl!=null&&yw.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
- .replace("{param8}",Constants.getUnitTypeByNum(yw!=null?yw.getCircleType():null));
+ .replace("{param4}",Constants.formatBigdecimal(model.getZlFirstPrice()).intValue()+"")
+ .replace("{param5}",Constants.getUnitTypeByNum(model.getZlFirstCircle())
+ .replace("{param6}",Constants.getPayTypeByNum(model.getWyPayType()))
+ .replace("{param7}",Constants.formatBigdecimal(model.getWyFirstPrice()).intValue()+"")
+ .replace("{param8}",Constants.getUnitTypeByNum(model.getWyFirstCircle())));
return str;
}
private String getbackRentRemarkByParam(YwContract model) {
@@ -241,6 +267,14 @@
.replace("{param4}",(fee.compareTo(new BigDecimal(0)) >=0?
Constants.formatBigdecimal(model.getBtFee()).intValue()
:(Constants.formatBigdecimal(model.getBtFee()).intValue() * -1))+"" );
+ return str;
+ }
+ private String getbackRentLogByParam(YwContract model) {
+ BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
+ String str = "銆愰��绉熸棩{param1}锛岄��绉熷師鍥狅細{param2},閫�绉熷崗璁腑缁熻鐨勮垂鐢ㄦ�昏{param3}鍏冦�傘��";
+ str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getBtDate()))
+ .replace("{param2}",StringUtils.defaultString(model.getBtInfo(),""))
+ .replace("{param3}",Constants.formatBigdecimal2Float(model.getBtFee()).doubleValue()+"");
return str;
}
@@ -272,7 +306,7 @@
update.setBtFee(param.getBtFee());
update.setBtRemark(getbackRentRemarkByParam(param));
ywContractMapper.updateById(update);
- dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK,null,null);
+ dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK, param.getLoginUserInfo().getRealname(),getbackRentLogByParam(param));
return param.getId();
}
@@ -458,7 +492,7 @@
List<YwContractDetail> details = new ArrayList<>();
int num = 0;
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
- || Constants.equalsInteger(model.getType(),Constants.ONE)){
+ || Constants.equalsInteger(model.getType(),Constants.TWO)){
for(YwContractDetail d :model.getZlDetailList()){
d.setCreateDate(model.getEditDate());
d.setCreator(model.getEditor());
@@ -472,7 +506,7 @@
}
num = 0;
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
- || Constants.equalsInteger(model.getType(),Constants.TWO)){
+ || Constants.equalsInteger(model.getType(),Constants.ONE)){
for(YwContractDetail d :model.getWyDetailList()){
d.setCreateDate(model.getEditDate());
d.setCreator(model.getEditor());
@@ -500,11 +534,11 @@
List<YwContractBill> billList1 = new ArrayList<>();
List<YwContractBill> billList2 = new ArrayList<>();
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
- || Constants.equalsInteger(model.getType(),Constants.ONE)){
+ || Constants.equalsInteger(model.getType(),Constants.TWO)){
//濡傛灉鏈夌璧佹潯娆�
if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList1.add(initDepoistBill(Constants.THREE,model));
+ billList1.add(initDepoistBill(Constants.THREE,model,details));
}
if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
@@ -521,11 +555,11 @@
}
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
- || Constants.equalsInteger(model.getType(),Constants.TWO)){
+ || Constants.equalsInteger(model.getType(),Constants.ONE)){
//濡傛灉鐗╀笟鏉℃
if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList2.add(initDepoistBill(Constants.FOUR,model));
+ billList2.add(initDepoistBill(Constants.FOUR,model,details));
}
if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
@@ -547,19 +581,25 @@
}else if(model.getBillType() == 0){
model.setBillList(billList2);
}
+ int num =1;
+ for(int i=0;i<billList1.size();i++){
+ if(Constants.equalsInteger( billList1.get(i).getCostType(),Constants.ZERO)){
+ billList1.get(i).setSortnum(num++);
+ }
+ }
+ num =1;
+ for(int i=0;i<billList2.size();i++){
+ if(Constants.equalsInteger( billList2.get(i).getCostType(),Constants.ONE)){
+ billList2.get(i).setSortnum(num++);
+ }
+ }
if(model.getId()!=null){
- for(int i=0;i<billList1.size();i++){
- billList1.get(i).setSortnum(i+1);
- }
- for(int i=0;i<billList2.size();i++){
- billList2.get(i).setSortnum(i+1);
- }
ywContractBillMapper.insert(billList1);
ywContractBillMapper.insert(billList2);
}
}
- private YwContractBill initDepoistBill(int type, YwContract model) {
+ private YwContractBill initDepoistBill(int type, YwContract model, List<YwContractDetail> details) {
YwContractBill bill = new YwContractBill();
bill.setCreateDate(model.getEditDate());
bill.setCreator(model.getEditor());
@@ -572,8 +612,13 @@
bill.setEndDate(model.getEndDate());
bill.setType(Constants.ZERO);
bill.setCostType(type);
+ bill.setPlanPayDate(bill.getStartDate());
bill.setTotleFee(type==Constants.THREE?model.getZlDeposit():model.getWyDeposit());//鎶奸噾璐圭敤
+ bill.setReceivableFee(bill.getTotleFee());
+ bill.setBillType(Constants.ZERO);
+ bill.setPayStatus(Constants.ZERO);
bill.setSortnum(0);
+ bill.setCompanyId(model.getCompanyId());
return bill;
}
@@ -620,13 +665,12 @@
int monthSix = months / 6;//6涓湀缁村害鏁伴噺
int restMonth = months % 6;//鍓╀綑鐨勬暣鏈�
int monthDays = dateCompare.getMonthDays();//涓嶆弧涓�涓湀鐨勫ぉ鏁�
- Date date = new Date();
List<Date> list = new ArrayList<>();
for (int i = 0; i < monthSix; i++) {
- list.add(DateUtil.addMonthToDate(date,i*6));
+ list.add(DateUtil.addMonthToDate(startDate,i*6));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addDaysToDate(date,monthSix));
+ list.add(DateUtil.addMonthToDate(startDate,monthSix*6));
}
return list;
}
@@ -636,13 +680,12 @@
int monthThree = months / 3;//3涓湀缁村害鏁伴噺
int restMonth = months % 3;//鍓╀綑鐨勬暣鏈�
int monthDays = dateCompare.getMonthDays();//涓嶆弧涓�涓湀鐨勫ぉ鏁�
- Date date = new Date();
List<Date> list = new ArrayList<>();
for (int i = 0; i < monthThree; i++) {
- list.add(DateUtil.addMonthToDate(date,i*3));
+ list.add(DateUtil.addMonthToDate(startDate,i*3));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addDaysToDate(date,monthThree));
+ list.add(DateUtil.addMonthToDate(startDate,monthThree*3));
}
return list;
}
@@ -667,30 +710,36 @@
}
private void dealCircleDateBillBiz( List<Date> dateList ,YwContract model, YwContractDetail d, Date freeStart, Date freeEnd, List<YwContractBill> list ) {
+ int temp = 0;
for(Date start : dateList){
- Date end = DateUtil.addDaysToDate(DateUtil.addYearToDate(start,1),-1);//缁撴潫鏃ユ湡涓轰笅涓�涓懆鏈熺殑鍓嶄竴澶�
- if(end.getTime()> d.getEndDate().getTime() ){
- end = d.getEndDate();
+ Date end = d.getEndDate();
+ if(temp+1 < dateList.size()){
+ end =DateUtil.addDaysToDate(dateList.get(temp+1),-1);
}
+ temp++;
YwContractBill bill = initCreateBillModel(model,d );
bill.setStartDate(start);//璐﹀崟寮�濮�
bill.setEndDate(end);//璐﹀崟缁撴潫
- bill.setPlanPayDate(DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
- BigDecimal totalFee =getTotalFeeByStartEnd(model,d,freeStart,freeEnd);
+ Date planPayDate = DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1);
+ bill.setPlanPayDate(planPayDate.getTime()>System.currentTimeMillis()?planPayDate:new Date());
+ BigDecimal totalFee =getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd);
bill.setTotleFee(totalFee);
+ bill.setReceivableFee(totalFee);
+ bill.setBillType(Constants.ZERO);
+
+ bill.setCompanyId(model.getCompanyId());
list.add(bill);
}
}
-
- private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d,Date freeStart,Date freeEnd) {
+ private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d, YwContractBill bill,Date freeStart,Date freeEnd) {
BigDecimal totalFee = new BigDecimal(0);
- DateCompare dateCompare = DateCompare.dayCompare(d.getStartDate(),d.getEndDate(),freeStart,freeEnd);
+ DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),DateUtil.addDaysToDate(bill.getEndDate(),1),freeStart,DateUtil.addDaysToDate(freeEnd,1));
if(Constants.equalsInteger(d.getCircleType(),Constants.ZERO)){
//0=鍏冩瘡骞崇背澶�
- int days = dateCompare.getDay();
+ int days = dateCompare.getDay() ;
BigDecimal areas = getAreasNumBYRooms(model.getRoomList());
totalFee = new BigDecimal(days).multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.ONE)){
@@ -705,7 +754,7 @@
totalFee = year.multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.THREE)){
//3=鍏冩瘡澶�
- int days = dateCompare.getDay();
+ int days = dateCompare.getDay() ;
totalFee = new BigDecimal(days).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.FOUR)){
//4=鍏冩瘡鏈�
@@ -733,13 +782,12 @@
DateCompare dateCompare = DateCompare.monthYearCompare(startDate, endDate );
int years = dateCompare.getYear();
int yeardays = dateCompare.getYearDays();
- Date date = new Date();
List<Date> list = new ArrayList<>();
for (int i = 0; i < years; i++) {
- list.add(DateUtil.addYearToDate(date,i));
+ list.add(DateUtil.addYearToDate(startDate,i));
}
if(yeardays>0){
- list.add(DateUtil.addYearToDate(date,years));
+ list.add(DateUtil.addYearToDate(startDate,years));
}
return list;
}
@@ -757,8 +805,10 @@
YwContractBill bill = initCreateBillModel(model,d);
bill.setStartDate(d.getStartDate());//璐﹀崟寮�濮�
bill.setEndDate(d.getEndDate());//璐﹀崟缁撴潫
- bill.setPlanPayDate(DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
- bill.setTotleFee(getTotalFeeByStartEnd(model,d,freeStart,freeEnd));
+ bill.setPlanPayDate(DateUtil.addDaysToDate(bill.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1));
+ bill.setTotleFee(getTotalFeeByStartEnd(model,d,bill,freeStart,freeEnd));
+ bill.setReceivableFee(bill.getTotleFee());
+ bill.setBillType(Constants.ZERO);
list.add(bill);
}
return list;
@@ -774,6 +824,7 @@
bill.setIsdeleted(Constants.ZERO);
bill.setContractId(model.getId());
bill.setStatus(Constants.ZERO);
+ bill.setPayStatus(Constants.ZERO);
bill.setDetailId(d.getId());
bill.setCostType(d.getType());
bill.setType(Constants.ZERO);
@@ -783,15 +834,21 @@
private BigDecimal getAreasNumBYRooms(List<YwRoom> roomList) {
BigDecimal data= new BigDecimal(0);
- for(YwRoom r :roomList){
- data = data.add(Constants.formatBigdecimal(r.getArea()));
+ if(roomList!=null){
+ for(YwRoom r :roomList){
+ data = data.add(Constants.formatBigdecimal(r.getArea()));
+ }
}
+
return data;
}
private void initFiles(YwContract model) {
- List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getObjId, model.getId() )
+ List<Multifile> multifiles = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
+ .selectAll(Multifile.class)
+ .selectAs(SystemUser::getRealname,Multifile::getUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
+ .eq(Multifile::getObjId,model.getId())
.in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.YW_CONTRACT_FILE.getKey()}))
.eq(Multifile::getIsdeleted,Constants.ZERO));
if(multifiles!=null){
@@ -857,9 +914,8 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚堝悓鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
-
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
- || Constants.equalsInteger(model.getType(),Constants.ONE)){
+ || Constants.equalsInteger(model.getType(),Constants.TWO)){
if( model.getZlDeposit() == null
||model.getZlPayType() == null
|| model.getZlPayType()>3
@@ -868,12 +924,18 @@
||model.getZlDetailList().size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅");
}
+
if(!(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()==null) && (
(model.getZlFreeEndDate()!=null && model.getZlFreeStartDate()==null)
||(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()!=null)
||model.getZlFreeEndDate().getTime()<= model.getZlFreeStartDate().getTime())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭璧佹潯娆惧厤绉熸湡淇℃伅锛�");
+ }
+ if((model.getZlFreeStartDate()!=null && model.getZlFreeEndDate()!=null)
+ && (model.getZlFreeEndDate().getTime()>model.getEndDate().getTime()
+ || model.getZlFreeStartDate().getTime()<model.getStartDate().getTime())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍏嶇鏈熷紑濮嬫棩鏈熷拰缁撴潫鏃ユ湡闄愬埗鍦ㄥ悎鍚屾椂闂磋寖鍥村唴锛�");
}
for(YwContractDetail d :model.getZlDetailList()){
if( d.getStartDate() == null
@@ -888,6 +950,9 @@
if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
+ if(d.getEndDate().getTime()>model.getEndDate().getTime() ||d.getStartDate().getTime()<model.getStartDate().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏉℃寮�濮嬫棩鏈熷拰缁撴潫鏃ユ湡闄愬埗鍦ㄥ悎鍚屾椂闂磋寖鍥村唴锛�");
+ }
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
@@ -899,7 +964,7 @@
}
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
- || Constants.equalsInteger(model.getType(),Constants.TWO)){
+ || Constants.equalsInteger(model.getType(),Constants.ONE)){
if( model.getWyDeposit() == null
||model.getWyPayType() == null
|| model.getWyPayType()>3
@@ -909,15 +974,21 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅");
}
+
if(!(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()==null) && (
(model.getWyFreeEndDate()!=null && model.getWyFreeStartDate()==null)
||(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()!=null)
||model.getWyFreeEndDate().getTime()<= model.getWyFreeStartDate().getTime())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭墿涓氭潯娆惧厤绉熸湡淇℃伅锛�");
}
+ if((model.getWyFreeStartDate()!=null && model.getWyFreeEndDate()!=null)
+ && (model.getWyFreeEndDate().getTime()>model.getEndDate().getTime()
+ || model.getWyFreeStartDate().getTime()<model.getStartDate().getTime())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍏嶇鏈熷紑濮嬫棩鏈熷拰缁撴潫鏃ユ湡闄愬埗鍦ㄥ悎鍚屾椂闂磋寖鍥村唴锛�");
+ }
for(YwContractDetail d :model.getWyDetailList()){
if( d.getStartDate() == null
- ||d.getEditDate() == null
+ ||d.getEndDate() == null
||d.getPrice() == null
||d.getCircleType() == null
|| d.getCircleType()>6
@@ -927,6 +998,9 @@
}
if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+ if(d.getEndDate().getTime()>model.getEndDate().getTime() ||d.getStartDate().getTime()<model.getStartDate().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏉℃寮�濮嬫棩鏈熷拰缁撴潫鏃ユ湡闄愬埗鍦ㄥ悎鍚屾椂闂磋寖鍥村唴锛�");
}
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
@@ -940,7 +1014,7 @@
}
}
- YwProject project = projectMapper.selectById(model.getCompanyId());
+ YwProject project = projectMapper.selectById(model.getProjectId());
if(project ==null || Constants.equalsInteger(project.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勯」鐩俊鎭紒");
}
@@ -958,6 +1032,7 @@
for(YwRoom r : rooms){
model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
}
+ model.setRoomList(rooms);
YwCustomer customer = customerMapper.selectById(model.getRenterId());
if(customer ==null || Constants.equalsInteger(customer.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝閫夋嫨绉熷淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲埛鏂伴噸璇曪紒");
@@ -1026,6 +1101,7 @@
log.setObjType(type.getKey());
log.setParam1(param1);
log.setParam2(param2);
+ log.setContent(param2);
log.setTitle(type.getNoteinfo());
ywWorkorderLogMapper.insert(log);
}
@@ -1037,12 +1113,13 @@
.selectAs(SystemUser::getRealname,YwContract::getUserName )
.selectAs(YwCustomer::getName,YwContract::getRenterName )
.selectAs(YwProject::getName,YwContract::getProjectName )
- .select("t4.realname",YwContract::getCreatorName )
+ .select("t3.realname",YwContract::getCreatorName )
.leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContract::getUserId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContract::getCreator)
.leftJoin(YwProject.class,YwProject::getId,YwContract::getProjectId)
- .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .eq( YwContract::getId,id);
YwContract model = ywContractMapper.selectJoinOne(YwContract.class,queryWrapper);
if(model != null){
//鍚堝悓闄勪欢
@@ -1057,7 +1134,7 @@
.leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
.leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
.eq(YwRoom::getIsdeleted,Constants.ZERO)
- .exists("(select a.id from yw_contract_room a where a.isdeleted=1 and a.room_id=t.id and a.contract_id="+model.getId()+")");
+ .exists("(select a.id from yw_contract_room a where a.isdeleted=0 and a.type=0 and a.room_id=t.id and a.contract_id="+model.getId()+")");
model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));
model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
@@ -1134,7 +1211,9 @@
@Override
public List<YwContract> findList(YwContract ywContract) {
- QueryWrapper<YwContract> wrapper = new QueryWrapper<>(ywContract);
+ QueryWrapper<YwContract> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(YwContract::getIsdeleted,Constants.ZERO);
+ wrapper.lambda().in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO);
return ywContractMapper.selectList(wrapper);
}
@@ -1144,8 +1223,10 @@
MPJLambdaWrapper<YwContract> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(YwContract.class )
.selectAs(Company::getName,YwContract::getCompanyName )
+ .selectAs(YwCustomer::getName,YwContract::getRenterName )
.select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
- .leftJoin(Company.class,Company::getId,YwContract::getCompanyId);
+ .leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId);
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(YwContract::getId, pageWrap.getModel().getId());
--
Gitblit v1.9.3