Procházet zdrojové kódy

fix

release_toaliyun_real
winter před 1 rokem
rodič
revize
fbbafcf8a5
4 změnil soubory, kde provedl 42 přidání a 5 odebrání
  1. +11
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java
  4. +26
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java

+ 11
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java Zobrazit soubor

@@ -316,12 +316,21 @@ public class WxAgileContractController extends WxContractBaseController {
}
/**
* 查询非押金
* 查询非押金明细
*/
@GetMapping("getUnDeposits")
public ResultData getUnDeposits(@ModelAttribute WxRentContractAgileUnDeposit unDeposit) {
unDeposit.updateTenantInfo(getTenantInfo());
return new ResultData(wxAgileContractService.findUnDeposit(unDeposit));
return new ResultData(wxAgileContractService.findUnDepositDetail(unDeposit));
}
/**
* 查询非押金
*/
@GetMapping("getUnDepositList")
public ResultData getUnDepositList(@ModelAttribute WxRentContractAgileUnDeposit unDeposit) {
unDeposit.updateTenantInfo(getTenantInfo());
return new ResultData(wxAgileContractService.findUnDepositDetail(unDeposit));
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDeposit.java Zobrazit soubor

@@ -46,6 +46,8 @@ public class WxRentContractAgileUnDeposit extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId")
private Long feesId;
@TableField(exist = false)
private String feesName;
@io.swagger.annotations.ApiModelProperty(value="单价",name="price")
private String price;


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java Zobrazit soubor

@@ -27,7 +27,9 @@ public interface WxAgileContractService {
void saveUnDeposit(WxRentContractAgileUnDeposit unDeposit);
WxRentContractAgileUnDeposit findUnDeposit(WxRentContractAgileUnDeposit unDeposit);
WxRentContractAgileUnDeposit findUnDepositDetail(WxRentContractAgileUnDeposit unDeposit);
List<WxRentContractAgileUnDeposit> findUnDepositList(WxRentContractAgileUnDeposit unDeposit);
void createUnDepositBill(WxRentContractAgileUnDeposit unDeposit,MallUserInfo user);
}

+ 26
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java Zobrazit soubor

@@ -297,8 +297,12 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
}

@Override
public WxRentContractAgileUnDeposit findUnDeposit(WxRentContractAgileUnDeposit unDeposit) {
WxRentContractAgileUnDeposit ud = wxRentContractAgileUnDepositMapper.selectById(unDeposit.getId(), unDeposit.getTenantId());
public WxRentContractAgileUnDeposit findUnDepositDetail(WxRentContractAgileUnDeposit unDeposit) {
List<WxRentContractAgileUnDeposit> list = wxRentContractAgileUnDepositMapper.findList(unDeposit);
if (null == list || list.size() <= 0 ) {
return null;
}
WxRentContractAgileUnDeposit ud = list.get(0);
if (null == ud) {
return null;
}
@@ -308,6 +312,26 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
ud.setItems(wxRentContractAgileUnDepositItemMapper.findList(itemq));
return ud;
}
@Override
public List<WxRentContractAgileUnDeposit> findUnDepositList(WxRentContractAgileUnDeposit unDeposit) {
List<WxRentContractAgileUnDeposit> list = wxRentContractAgileUnDepositMapper.findList(unDeposit);
if (null == list || list.size() <= 0 ) {
return null;
}
WxEnergyFees fq = new WxEnergyFees();
fq.updateTenantInfo(unDeposit);
fq.setIsDel(EnumYesOrNo.NO.getCode());
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq);
for (int i = 0 ; i < list.size() ; i ++) {
WxRentContractAgileUnDeposit ud = list.get(i);
WxEnergyFees fees = feesMap.get(ud.getFeesId());
if (null != fees) {
ud.setFeesName(fees.getName());
}
}
return list;
}


@Override


Načítá se…
Zrušit
Uložit