Commit 01ca85ef authored by zhoucong's avatar zhoucong

首页数据代码提交

parent 08a3c90c
...@@ -7,6 +7,7 @@ import com.pangding.web.authority.vo.resvo.WithdrawalResVo; ...@@ -7,6 +7,7 @@ import com.pangding.web.authority.vo.resvo.WithdrawalResVo;
import com.pangding.web.vo.order.req.CapitalFlowReqVo; import com.pangding.web.vo.order.req.CapitalFlowReqVo;
import com.pangding.web.vo.order.req.back.CashWithdrawalBackReqVo; import com.pangding.web.vo.order.req.back.CashWithdrawalBackReqVo;
import com.pangding.web.vo.order.res.CapitalFlowListResVo; import com.pangding.web.vo.order.res.CapitalFlowListResVo;
import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo; import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo; import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
import com.yanzuoguang.util.helper.CheckerHelper; import com.yanzuoguang.util.helper.CheckerHelper;
...@@ -108,6 +109,10 @@ public class FinanceController { ...@@ -108,6 +109,10 @@ public class FinanceController {
return ResponseResult.result(companyMoneyService.findCompanyMoney(req)); return ResponseResult.result(companyMoneyService.findCompanyMoney(req));
} }
@RequestMapping(value = "/findLastInfo")
@ApiOperation(value = "查询最后一条数据的finalMoney", notes = "查询最后一条数据的finalMoney")
public ResponseResult<CompanyMoneyVo> findLastInfo(@RequestBody CompanyMoneyReqVo req){
return ResponseResult.result(companyMoneyService.findLastInfo(req));
}
} }
...@@ -28,4 +28,5 @@ public interface CompanyMoneyDao extends BaseDao { ...@@ -28,4 +28,5 @@ public interface CompanyMoneyDao extends BaseDao {
*/ */
Integer updateCompanyMoney(CompanyMoneyVo req); Integer updateCompanyMoney(CompanyMoneyVo req);
CompanyMoneyVo findLastInfo(CompanyMoneyReqVo req);
} }
...@@ -16,6 +16,8 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao ...@@ -16,6 +16,8 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
private final static String UPDATE_MONEY = "UPDATE_MONEY"; private final static String UPDATE_MONEY = "UPDATE_MONEY";
public static final String LAST_INFO = "LAST_INFO";
@Override @Override
protected void init() { protected void init() {
...@@ -42,6 +44,12 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao ...@@ -42,6 +44,12 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
"final_money = init_money + in_money + refund_money + out_money " + "final_money = init_money + in_money + refund_money + out_money " +
" where company_money_id = @companyMoneyId"); " where company_money_id = @companyMoneyId");
table.add(LAST_INFO, "SELECT * FROM pd_company_money WHERE 1=1 {WHERE} order by daily_date desc")
.add("companyId", " AND company_id = ? ")
.add("startDate", " AND daily_date >= ?")
.add("endDate", " AND daily_date <= ?")
.add("companyName", " AND company_name like concat('%',?,'%') ");
} }
@Override @Override
...@@ -59,4 +67,9 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao ...@@ -59,4 +67,9 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
return this.updateSql(UPDATE_MONEY, req); return this.updateSql(UPDATE_MONEY, req);
} }
@Override
public CompanyMoneyVo findLastInfo(CompanyMoneyReqVo req) {
return this.queryFirst(CompanyMoneyVo.class, LAST_INFO, req);
}
} }
package com.pangding.web.authority.service; package com.pangding.web.authority.service;
import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo; import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo; import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
...@@ -8,4 +9,5 @@ public interface CompanyMoneyService { ...@@ -8,4 +9,5 @@ public interface CompanyMoneyService {
CompanyMoneyTotalResVo findCompanyMoney(CompanyMoneyReqVo req); CompanyMoneyTotalResVo findCompanyMoney(CompanyMoneyReqVo req);
CompanyMoneyVo findLastInfo(CompanyMoneyReqVo req);
} }
...@@ -5,6 +5,7 @@ import com.pangding.web.authority.service.CompanyMoneyService; ...@@ -5,6 +5,7 @@ import com.pangding.web.authority.service.CompanyMoneyService;
import com.pangding.web.vo.system.pd.company.CompanyMoneyVo; import com.pangding.web.vo.system.pd.company.CompanyMoneyVo;
import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo; import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo; import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData; import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -30,8 +31,21 @@ public class CompanyMoneyServiceImpl implements CompanyMoneyService { ...@@ -30,8 +31,21 @@ public class CompanyMoneyServiceImpl implements CompanyMoneyService {
CompanyMoneyVo companyMoneyVo = companyMoneyDao.findReport(req); CompanyMoneyVo companyMoneyVo = companyMoneyDao.findReport(req);
companyMoneyTotalResVo.setCompanyMoneyVo(companyMoneyVo); companyMoneyTotalResVo.setCompanyMoneyVo(companyMoneyVo);
if(!StringHelper.isEmpty(req.getCompanyId())){
CompanyMoneyReqVo companyMoney = new CompanyMoneyReqVo();
companyMoney.setCompanyId(req.getCompanyId());
CompanyMoneyVo company = companyMoneyDao.findLastInfo(companyMoney);
if(!StringHelper.isEmpty(company)){
companyMoneyTotalResVo.setLastFinalMoney(company.getFinalMoney());
}
}
return companyMoneyTotalResVo; return companyMoneyTotalResVo;
} }
@Override
public CompanyMoneyVo findLastInfo(CompanyMoneyReqVo req) {
return companyMoneyDao.findLastInfo(req);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment