Commit 8e10dd6f by liuyang

2024-04-17 报工管理功能优化

parent d84048fc
...@@ -131,6 +131,7 @@ public class ServiceHPSC010 extends ServiceEPBase { ...@@ -131,6 +131,7 @@ public class ServiceHPSC010 extends ServiceEPBase {
Map queryMap = new HashMap(); Map queryMap = new HashMap();
queryMap.put(HPSC010.FIELD_FACTORY_CODE,list.get(0).get(HPSC010.FIELD_FACTORY_CODE)); queryMap.put(HPSC010.FIELD_FACTORY_CODE,list.get(0).get(HPSC010.FIELD_FACTORY_CODE));
queryMap.put(HPSC010.FIELD_REGISTER_DATE,StringUtil.removeHorizontalLine(registerDate)); queryMap.put(HPSC010.FIELD_REGISTER_DATE,StringUtil.removeHorizontalLine(registerDate));
queryMap.put(HPSC010.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
queryFactoryCode(inInfo,queryMap); queryFactoryCode(inInfo,queryMap);
for (i = 0; i < list.size(); i++) { for (i = 0; i < list.size(); i++) {
Map<?, ?> map = list.get(i); Map<?, ?> map = list.get(i);
......
...@@ -177,11 +177,25 @@ public class ServiceHPSC096 extends ServiceEPBase { ...@@ -177,11 +177,25 @@ public class ServiceHPSC096 extends ServiceEPBase {
List<Map> listFactoryCode = this.dao.query(HPSC096.QUERY_FACTORY_CODE,queryMap,EiConstant.defaultOffset,100); List<Map> listFactoryCode = this.dao.query(HPSC096.QUERY_FACTORY_CODE,queryMap,EiConstant.defaultOffset,100);
int rowNo = 0; int rowNo = 0;
int detrowNo = 0; int detrowNo = 0;
queryMap.clear();
List<HPSC010A> listHpsc009 = new ArrayList<HPSC010A>();
if (listFactoryCode.size()>0){
queryMap.put(HPSC010.FIELD_FACTORY_CODE,listFactoryCode.get(0).get("factoryCode"));
queryMap.put("registerDates","select max(REGISTER_DATE) from hpjx.T_HPSC009 where COMPANY_CODE = '"+UserSessionUtils.getCompanyCode()+"' and FACTORY_CODE = '"+listFactoryCode.get(0).get("factoryCode")+"' AND DELETE_FLAG = 0");
listHpsc009 = this.dao.query(HPSC010A.QUERY,queryMap);
}
for (int i = 0; i < listFactoryCode.size(); i++) { for (int i = 0; i < listFactoryCode.size(); i++) {
Map result = new HashMap(); Map result = new HashMap();
result.putAll(listFactoryCode.get(i)); result.putAll(listFactoryCode.get(i));
result.put(HPSC010A.FIELD_WEIGHT,0); result.put(HPSC010A.FIELD_WEIGHT,0);
result.put(HPSC010A.FIELD_WEIGHT_JH,0); result.put(HPSC010A.FIELD_WEIGHT_JH,0);
for (HPSC010A hpsc010a: listHpsc009) {
if (listFactoryCode.get(i).get(HPSC010A.FIELD_FACTORY_CODE).equals(hpsc010a.getFactoryCode()) &&
listFactoryCode.get(i).get(HPSC010A.FIELD_GROUP_CODE).equals(hpsc010a.getGroupCode())){
result.put(HPSC010A.FIELD_PRDT_NAME,hpsc010a.getPrdtName());
}
}
if ("prodGroup".equals(listFactoryCode.get(i).get(HPSC096.FIELD_ORG_TYPE))) { if ("prodGroup".equals(listFactoryCode.get(i).get(HPSC096.FIELD_ORG_TYPE))) {
rowNo++; rowNo++;
result.put(HPSC010A.FIELD_GROUP_TYPE,"1"); result.put(HPSC010A.FIELD_GROUP_TYPE,"1");
......
...@@ -61,6 +61,9 @@ ...@@ -61,6 +61,9 @@
<isNotEmpty prepend=" AND " property="deleteFlag"> <isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag# DELETE_FLAG = #deleteFlag#
</isNotEmpty> </isNotEmpty>
<isEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = 0
</isEmpty>
<isNotEmpty prepend=" AND " property="registerDate"> <isNotEmpty prepend=" AND " property="registerDate">
REGISTER_DATE = #registerDate# REGISTER_DATE = #registerDate#
</isNotEmpty> </isNotEmpty>
......
...@@ -65,6 +65,9 @@ ...@@ -65,6 +65,9 @@
<isNotEmpty prepend=" AND " property="deleteFlag"> <isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag# DELETE_FLAG = #deleteFlag#
</isNotEmpty> </isNotEmpty>
<isEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = 0
</isEmpty>
<isNotEmpty prepend=" AND " property="createdBy"> <isNotEmpty prepend=" AND " property="createdBy">
CREATED_BY = #createdBy# CREATED_BY = #createdBy#
</isNotEmpty> </isNotEmpty>
...@@ -122,6 +125,9 @@ ...@@ -122,6 +125,9 @@
UPDATED_NAME as "updatedName" <!-- 修改时间 --> UPDATED_NAME as "updatedName" <!-- 修改时间 -->
FROM ${hpjxSchema}.T_HPSC009 WHERE 1=1 FROM ${hpjxSchema}.T_HPSC009 WHERE 1=1
<include refid="condition" /> <include refid="condition" />
<isNotEmpty prepend=" AND " property="registerDates">
REGISTER_DATE in ($registerDates$)
</isNotEmpty>
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
...@@ -158,6 +164,9 @@ ...@@ -158,6 +164,9 @@
UPDATED_NAME as "updatedName" <!-- 修改时间 --> UPDATED_NAME as "updatedName" <!-- 修改时间 -->
FROM ${hpjxSchema}.T_HPSC009 WHERE 1=1 and GROUP_TYPE in ('1','2') FROM ${hpjxSchema}.T_HPSC009 WHERE 1=1 and GROUP_TYPE in ('1','2')
<include refid="condition" /> <include refid="condition" />
<isNotEmpty prepend=" AND " property="registerDates">
REGISTER_DATE in ($registerDates$)
</isNotEmpty>
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
......
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