施工大屏首页
This commit is contained in:
parent
cd3394233e
commit
d25d38ca39
|
|
@ -6,6 +6,7 @@ import com.google.common.collect.Maps;
|
||||||
import com.securitycontrol.common.core.constant.HttpStatus;
|
import com.securitycontrol.common.core.constant.HttpStatus;
|
||||||
import com.securitycontrol.common.core.constant.SecurityConstants;
|
import com.securitycontrol.common.core.constant.SecurityConstants;
|
||||||
import com.securitycontrol.common.core.domain.Result;
|
import com.securitycontrol.common.core.domain.Result;
|
||||||
|
import com.securitycontrol.common.core.utils.StringUtils;
|
||||||
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
|
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
|
||||||
import com.securitycontrol.common.core.utils.aes.StringHelper;
|
import com.securitycontrol.common.core.utils.aes.StringHelper;
|
||||||
import com.securitycontrol.common.core.web.domain.AjaxResult;
|
import com.securitycontrol.common.core.web.domain.AjaxResult;
|
||||||
|
|
@ -227,6 +228,7 @@ public class XcIndexServiceImpl implements XcIndexService {
|
||||||
}
|
}
|
||||||
dataMap.put("time",monList);
|
dataMap.put("time",monList);
|
||||||
dataMap.put("cost",costList);
|
dataMap.put("cost",costList);
|
||||||
|
dataMap.put("proCost", StringUtils.isNotEmpty(proVo.getProCost()) ? proVo.getProCost() : "0");
|
||||||
return AjaxResult.success(dataMap);
|
return AjaxResult.success(dataMap);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.error(e.toString(),e);
|
log.error(e.toString(),e);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<mapper namespace="com.securitycontrol.screen.mapper.XcIndexMapper">
|
<mapper namespace="com.securitycontrol.screen.mapper.XcIndexMapper">
|
||||||
|
|
||||||
<select id="getProDetails" resultType="com.securitycontrol.entity.system.base.vo.ProVo">
|
<select id="getProDetails" resultType="com.securitycontrol.entity.system.base.vo.ProVo">
|
||||||
select pro_brief AS proBrief,pro_id AS proId,plan_start_time planStartTime,plan_end_time planEndTime
|
select pro_brief AS proBrief,pro_id AS proId,plan_start_time planStartTime,plan_end_time planEndTime,pro_cost AS proCost
|
||||||
from tb_project
|
from tb_project
|
||||||
where bid_code=#{bidCode}
|
where bid_code=#{bidCode}
|
||||||
</select>
|
</select>
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
select count(1) num
|
select count(1) num
|
||||||
from jj_week_plan jwp
|
from jj_week_plan jwp
|
||||||
where #{startTime} BETWEEN jwp.start_date AND jwp.end_date
|
where #{startTime} BETWEEN jwp.start_date AND jwp.end_date
|
||||||
AND jwp.bid_no={bidCode}
|
AND jwp.bid_no=#{bidCode}
|
||||||
</select>
|
</select>
|
||||||
<select id="getWarnNum" resultType="java.lang.Integer">
|
<select id="getWarnNum" resultType="java.lang.Integer">
|
||||||
select count(1) num
|
select count(1) num
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue