Commit d9d74eca by wancheng

项目档案概况

parent dfa644d0
...@@ -61,6 +61,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -61,6 +61,7 @@ public class HPSC002 extends DaoEPBase {
public static final String FIELD_REMARK = "remark"; /* 备注*/ public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_PGSTATUS = "pgStatus"; /* 派工状态*/ public static final String FIELD_PGSTATUS = "pgStatus"; /* 派工状态*/
public static final String FIELD_DELIVERY_DATE = "deliveryDate"; public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String FIELD_PROJ_STATUS = "projStatus";
public static final String FIELD_LV = "lv"; /* 树的层级*/ public static final String FIELD_LV = "lv"; /* 树的层级*/
...@@ -167,6 +168,8 @@ public class HPSC002 extends DaoEPBase { ...@@ -167,6 +168,8 @@ public class HPSC002 extends DaoEPBase {
private Integer cknum ;/* 出库数量*/ private Integer cknum ;/* 出库数量*/
private Integer rknum;/* 出库数量*/ private Integer rknum;/* 出库数量*/
private Integer projStatus;/* app项目状态*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -355,6 +358,11 @@ public class HPSC002 extends DaoEPBase { ...@@ -355,6 +358,11 @@ public class HPSC002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_RKNUM); eiColumn = new EiColumn(FIELD_RKNUM);
eiColumn.setDescName("入库数量"); eiColumn.setDescName("入库数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PROJ_STATUS);
eiColumn.setDescName("APP项目状态");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -982,6 +990,15 @@ public class HPSC002 extends DaoEPBase { ...@@ -982,6 +990,15 @@ public class HPSC002 extends DaoEPBase {
this.deliveryDate = deliveryDate; this.deliveryDate = deliveryDate;
} }
public Integer getProjStatus() {
return projStatus;
}
public void setProjStatus(Integer projStatus) {
this.projStatus = projStatus;
}
/** /**
* get the rknum - 入库数量. * get the rknum - 入库数量.
* @return the rknum * @return the rknum
...@@ -1066,6 +1083,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -1066,6 +1083,7 @@ public class HPSC002 extends DaoEPBase {
setRknum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_RKNUM)), rknum)); setRknum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_RKNUM)), rknum));
setPgStatus(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PGSTATUS)), pgStatus)); setPgStatus(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PGSTATUS)), pgStatus));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate)); setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
setProjStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PROJ_STATUS)), projStatus));
} }
/** /**
...@@ -1116,6 +1134,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -1116,6 +1134,7 @@ public class HPSC002 extends DaoEPBase {
map.put(FIELD_RKNUM, StringUtils.toString(rknum, eiMetadata.getMeta(FIELD_RKNUM))); map.put(FIELD_RKNUM, StringUtils.toString(rknum, eiMetadata.getMeta(FIELD_RKNUM)));
map.put(FIELD_PGSTATUS, StringUtils.toString(pgStatus, eiMetadata.getMeta(FIELD_PGSTATUS))); map.put(FIELD_PGSTATUS, StringUtils.toString(pgStatus, eiMetadata.getMeta(FIELD_PGSTATUS)));
map.put(FIELD_DELIVERY_DATE,StringUtils.toString(deliveryDate,eiMetadata.getMeta(FIELD_DELIVERY_DATE))); map.put(FIELD_DELIVERY_DATE,StringUtils.toString(deliveryDate,eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
map.put(FIELD_PROJ_STATUS, StringUtils.toString(projStatus, eiMetadata.getMeta(FIELD_PROJ_STATUS)));
return map; return map;
} }
} }
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<select id="appQuery" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002"> <select id="appQuery" parameterClass="java.util.HashMap" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002">
SELECT SELECT
<include refid="column1"/> <include refid="column1"/>
,ifnull(C.CKNUM,0) as "cknum",ifnull(C.RKNUM,0) as "rknum",C.PROJ_STATUS as "proj_status" ,ifnull(C.CKNUM,0) as "cknum",ifnull(C.RKNUM,0) as "rknum",ifnull(C.PROJ_STATUS,1) as "projStatus"
FROM hpjx.t_hpsc002 A FROM hpjx.t_hpsc002 A
LEFT JOIN hpjx.t_hpsc005 B on A.ID = B.MAT_ID LEFT JOIN hpjx.t_hpsc005 B on A.ID = B.MAT_ID
LEFT JOIN (select A.COMPANY_CODE,A.PROJ_CODE,A.PRDT_CODE,A.PARENT_PRDT_NAME,sum(ifnull(A.NUM,0)) as JHNUM,sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) as RKNUM,sum(ifnull(B.AMOUNT,0)) as CKNUM, LEFT JOIN (select A.COMPANY_CODE,A.PROJ_CODE,A.PRDT_CODE,A.PARENT_PRDT_NAME,sum(ifnull(A.NUM,0)) as JHNUM,sum(ifnull(A.ACTUAL_COMPLETION_NUM,0)) as RKNUM,sum(ifnull(B.AMOUNT,0)) as CKNUM,
...@@ -220,6 +220,9 @@ ...@@ -220,6 +220,9 @@
AND PARENT_ID NOT IN ('root') AND PARENT_ID NOT IN ('root')
AND DEL_STATUS = 0 AND DEL_STATUS = 0
<include refid="condition1"/> <include refid="condition1"/>
<isNotEmpty prepend=" AND " property="projStatus">
C.PROJ_STATUS = #projStatus#
</isNotEmpty>
<include refid="order"/> <include refid="order"/>
</select> </select>
......
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