Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
platform
hg-smart
Commits
43a24ecc
Commit
43a24ecc
authored
Nov 14, 2024
by
宋祥
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
cf913abf
10c9c72f
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
25 additions
and
19 deletions
+25
-19
ServiceHGCW012.java
.../java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java
+3
-3
HGSB004.java
src/main/java/com/baosight/hggp/hg/sb/domain/HGSB004.java
+2
-2
HGSB005.java
src/main/java/com/baosight/hggp/hg/sb/domain/HGSB005.java
+2
-2
HGSB006.xml
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB006.xml
+4
-3
HGSB007.xml
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB007.xml
+4
-3
HGSC007.xml
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
+1
-1
HGYX011.java
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX011.java
+2
-1
HGYX012.java
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX012.java
+2
-1
HGYX013.java
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX013.java
+2
-1
HGYX014.java
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX014.java
+2
-1
HGCW016.js
src/main/webapp/HG/CW/HGCW016.js
+1
-1
No files found.
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java
View file @
43a24ecc
...
@@ -286,7 +286,7 @@ public class ServiceHGCW012 extends ServiceBase {
...
@@ -286,7 +286,7 @@ public class ServiceHGCW012 extends ServiceBase {
hgcw012
.
setCompanyCode
(
hgcw013List
.
get
(
0
).
getCompanyCode
());
hgcw012
.
setCompanyCode
(
hgcw013List
.
get
(
0
).
getCompanyCode
());
hgcw012
.
setCompanyName
(
hgcw013List
.
get
(
0
).
getCompanyName
());
hgcw012
.
setCompanyName
(
hgcw013List
.
get
(
0
).
getCompanyName
());
hgcw012
.
setReviewStatus
(
0
);
hgcw012
.
setReviewStatus
(
0
);
hgcw012
.
setBillState
(
0
);
hgcw012
.
setBillState
(
1
);
hgcw012
.
setBillTybe
(
1
);
hgcw012
.
setBillTybe
(
1
);
hgcw012
.
setContractType
(
ContractTypeEnum
.
LZHT
.
getCode
());
hgcw012
.
setContractType
(
ContractTypeEnum
.
LZHT
.
getCode
());
//hgcw012.setSigningDate(DateUtils.shortDate());
//hgcw012.setSigningDate(DateUtils.shortDate());
...
@@ -387,7 +387,7 @@ public class ServiceHGCW012 extends ServiceBase {
...
@@ -387,7 +387,7 @@ public class ServiceHGCW012 extends ServiceBase {
hgcw012
.
setCompanyCode
(
hgcw013List
.
get
(
0
).
getCompanyCode
());
hgcw012
.
setCompanyCode
(
hgcw013List
.
get
(
0
).
getCompanyCode
());
hgcw012
.
setCompanyName
(
hgcw013List
.
get
(
0
).
getCompanyName
());
hgcw012
.
setCompanyName
(
hgcw013List
.
get
(
0
).
getCompanyName
());
hgcw012
.
setReviewStatus
(
0
);
hgcw012
.
setReviewStatus
(
0
);
hgcw012
.
setBillState
(
0
);
hgcw012
.
setBillState
(
1
);
hgcw012
.
setBillTybe
(
1
);
hgcw012
.
setBillTybe
(
1
);
hgcw012
.
setContractType
(
ContractTypeEnum
.
CGSH
.
getCode
());
hgcw012
.
setContractType
(
ContractTypeEnum
.
CGSH
.
getCode
());
//hgcw012.setSigningDate(DateUtils.shortDate());
//hgcw012.setSigningDate(DateUtils.shortDate());
...
@@ -520,7 +520,7 @@ public class ServiceHGCW012 extends ServiceBase {
...
@@ -520,7 +520,7 @@ public class ServiceHGCW012 extends ServiceBase {
hgcw012
.
setCompanyCode
(
hgcw013List
.
get
(
0
).
getCompanyCode
());
hgcw012
.
setCompanyCode
(
hgcw013List
.
get
(
0
).
getCompanyCode
());
hgcw012
.
setCompanyName
(
hgcw013List
.
get
(
0
).
getCompanyName
());
hgcw012
.
setCompanyName
(
hgcw013List
.
get
(
0
).
getCompanyName
());
hgcw012
.
setReviewStatus
(
ReviewStatusEnum
.
UNREVIEWED
.
getCode
());
hgcw012
.
setReviewStatus
(
ReviewStatusEnum
.
UNREVIEWED
.
getCode
());
hgcw012
.
setBillState
(
0
);
hgcw012
.
setBillState
(
1
);
hgcw012
.
setBillTybe
(
1
);
hgcw012
.
setBillTybe
(
1
);
hgcw012
.
setContractType
(
ContractTypeEnum
.
ZLHT
.
getCode
());
hgcw012
.
setContractType
(
ContractTypeEnum
.
ZLHT
.
getCode
());
//hgcw012.setSigningDate(DateUtils.shortDate());
//hgcw012.setSigningDate(DateUtils.shortDate());
...
...
src/main/java/com/baosight/hggp/hg/sb/domain/HGSB004.java
View file @
43a24ecc
...
@@ -582,8 +582,8 @@ public class HGSB004 extends DaoEPBase {
...
@@ -582,8 +582,8 @@ public class HGSB004 extends DaoEPBase {
setInspecDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_INSPEC_DATE
))),
inspecDate
));
setInspecDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_INSPEC_DATE
))),
inspecDate
));
setInspecCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_INSPEC_CODE
)),
inspecCode
));
setInspecCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_INSPEC_CODE
)),
inspecCode
));
setPlanCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_CODE
)),
planCode
));
setPlanCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_CODE
)),
planCode
));
setPlanStartDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_START_DATE
)),
planStartDate
));
setPlanStartDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_PLAN_START_DATE
)
)),
planStartDate
));
setPlanEndDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_END_DATE
)),
planEndDate
));
setPlanEndDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_PLAN_END_DATE
)
)),
planEndDate
));
setInspecUserId
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_INSPEC_USER_ID
)),
inspecUserId
));
setInspecUserId
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_INSPEC_USER_ID
)),
inspecUserId
));
setInspecUserName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_INSPEC_USER_NAME
)),
inspecUserName
));
setInspecUserName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_INSPEC_USER_NAME
)),
inspecUserName
));
setCheckStatus
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_CHECK_STATUS
)),
checkStatus
));
setCheckStatus
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_CHECK_STATUS
)),
checkStatus
));
...
...
src/main/java/com/baosight/hggp/hg/sb/domain/HGSB005.java
View file @
43a24ecc
...
@@ -581,8 +581,8 @@ public class HGSB005 extends DaoEPBase {
...
@@ -581,8 +581,8 @@ public class HGSB005 extends DaoEPBase {
setUpkeepDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_UPKEEP_DATE
))),
upkeepDate
));
setUpkeepDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_UPKEEP_DATE
))),
upkeepDate
));
setUpkeepCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPKEEP_CODE
)),
upkeepCode
));
setUpkeepCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPKEEP_CODE
)),
upkeepCode
));
setPlanCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_CODE
)),
planCode
));
setPlanCode
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_CODE
)),
planCode
));
setPlanStartDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_START_DATE
)),
planStartDate
));
setPlanStartDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_PLAN_START_DATE
)
)),
planStartDate
));
setPlanEndDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PLAN_END_DATE
)),
planEndDate
));
setPlanEndDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_PLAN_END_DATE
)
)),
planEndDate
));
setUpkeepUserId
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPKEEP_USER_ID
)),
upkeepUserId
));
setUpkeepUserId
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPKEEP_USER_ID
)),
upkeepUserId
));
setUpkeepUserName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPKEEP_USER_NAME
)),
upkeepUserName
));
setUpkeepUserName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPKEEP_USER_NAME
)),
upkeepUserName
));
setCheckStatus
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_CHECK_STATUS
)),
checkStatus
));
setCheckStatus
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_CHECK_STATUS
)),
checkStatus
));
...
...
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB006.xml
View file @
43a24ecc
...
@@ -164,12 +164,13 @@
...
@@ -164,12 +164,13 @@
SELECT
<include
refid=
"column001"
/>
SELECT
<include
refid=
"column001"
/>
FROM ${hggpSchema}.HGSB004A A
FROM ${hggpSchema}.HGSB004A A
LEFT JOIN ${hggpSchema}.HGSB004 B ON A.PARENT_ID = B.ID
LEFT JOIN ${hggpSchema}.HGSB004 B ON A.PARENT_ID = B.ID
WHERE 1=1
<include
refid=
"condition"
/>
WHERE 1=1 and B.DELETE_FLAG = 0
<include
refid=
"condition"
/>
UNION ALL
UNION ALL
SELECT
<include
refid=
"column002"
/>
SELECT
<include
refid=
"column002"
/>
from ${hggpSchema}.HGSB002A A
from ${hggpSchema}.HGSB002A A
join ${hggpSchema}.HGSB002 B on A.PARENT_ID = B.ID
AND B.DELETE_FLAG = '0'
join ${hggpSchema}.HGSB002 B on A.PARENT_ID = B.ID
where 1 = 1
where 1 = 1
AND B.DELETE_FLAG = 0
and PLAN_END_DATE
<
DATE_FORMAT(CURDATE(), '%Y%m%d')
and PLAN_END_DATE
<
DATE_FORMAT(CURDATE(), '%Y%m%d')
AND B.PLAN_STATUS = '1' and B.TASK_STATUS = '0' AND B.PLAN_TYPE = '1'
AND B.PLAN_STATUS = '1' and B.TASK_STATUS = '0' AND B.PLAN_TYPE = '1'
<include
refid=
"authCondition"
/>
<include
refid=
"authCondition"
/>
...
...
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB007.xml
View file @
43a24ecc
...
@@ -169,14 +169,15 @@
...
@@ -169,14 +169,15 @@
FROM (
FROM (
SELECT
<include
refid=
"column001"
/>
SELECT
<include
refid=
"column001"
/>
FROM ${hggpSchema}.HGSB005A A
FROM ${hggpSchema}.HGSB005A A
JOIN ${hggpSchema}.HGSB005 B ON A.PARENT_ID = B.ID AND B.DELETE_FLAG = '0' WHERE 1=1
JOIN ${hggpSchema}.HGSB005 B ON A.PARENT_ID = B.ID
WHERE 1=1 and B.DELETE_FLAG = 0
<include
refid=
"authCondition"
/>
<include
refid=
"authCondition"
/>
<include
refid=
"condition"
/>
<include
refid=
"condition"
/>
UNION ALL
UNION ALL
SELECT
<include
refid=
"column002"
/>
SELECT
<include
refid=
"column002"
/>
from ${hggpSchema}.HGSB002A A
from ${hggpSchema}.HGSB002A A
join ${hggpSchema}.HGSB002 B on A.PARENT_ID = B.ID
AND B.DELETE_FLAG = '0'
join ${hggpSchema}.HGSB002 B on A.PARENT_ID = B.ID
where 1 = 1
where 1 = 1
AND B.DELETE_FLAG = 0
AND PLAN_END_DATE
<
DATE_FORMAT(CURDATE(), '%Y%m%d')
AND PLAN_END_DATE
<
DATE_FORMAT(CURDATE(), '%Y%m%d')
AND B.PLAN_STATUS = '1' AND TASK_STATUS = '0' AND B.PLAN_TYPE = '2'
AND B.PLAN_STATUS = '1' AND TASK_STATUS = '0' AND B.PLAN_TYPE = '2'
<include
refid=
"authCondition"
/>
<include
refid=
"authCondition"
/>
...
...
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
View file @
43a24ecc
...
@@ -1138,7 +1138,7 @@
...
@@ -1138,7 +1138,7 @@
a.finish_date as completeDate,
a.finish_date as completeDate,
ROUND(ifnull(sum(a.total_weight),0)/1000, 4) as totalWeight,
ROUND(ifnull(sum(a.total_weight),0)/1000, 4) as totalWeight,
ROUND(ifnull(sum(a.finish_weight),0)/1000, 4) as finishWeight,
ROUND(ifnull(sum(a.finish_weight),0)/1000, 4) as finishWeight,
ROUND(ifnull(sum(a.finish_weight),0) / ifnull(sum(a.total_weight),0) / 1000, 4)*
100 as schedule,
ifnull(sum(a.finish_weight),0) / ifnull(sum(a.total_weight),0) *
100 as schedule,
a.updated_time as updatedTime
a.updated_time as updatedTime
from (
from (
select
select
...
...
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX011.java
View file @
43a24ecc
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
import
com.baosight.hggp.util.DateUtils
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
...
@@ -481,7 +482,7 @@ public class HGYX011 extends DaoEPBase {
...
@@ -481,7 +482,7 @@ public class HGYX011 extends DaoEPBase {
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_SURVEY_DATE
)),
surveyDate
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_SURVEY_DATE
)
)),
surveyDate
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setPolicyEnv
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_POLICY_ENV
)),
policyEnv
));
setPolicyEnv
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_POLICY_ENV
)),
policyEnv
));
setEconomyEnv
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_ECONOMY_ENV
)),
economyEnv
));
setEconomyEnv
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_ECONOMY_ENV
)),
economyEnv
));
...
...
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX012.java
View file @
43a24ecc
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
import
com.baosight.hggp.util.DateUtils
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
...
@@ -462,7 +463,7 @@ public class HGYX012 extends DaoEPBase {
...
@@ -462,7 +463,7 @@ public class HGYX012 extends DaoEPBase {
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_SURVEY_DATE
)),
surveyDate
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_SURVEY_DATE
)
)),
surveyDate
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setClient
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_CLIENT
)),
client
));
setClient
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_CLIENT
)),
client
));
setBuyMotive
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_BUY_MOTIVE
)),
buyMotive
));
setBuyMotive
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_BUY_MOTIVE
)),
buyMotive
));
...
...
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX013.java
View file @
43a24ecc
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
import
com.baosight.hggp.util.DateUtils
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
...
@@ -465,7 +466,7 @@ public class HGYX013 extends DaoEPBase {
...
@@ -465,7 +466,7 @@ public class HGYX013 extends DaoEPBase {
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_SURVEY_DATE
)),
surveyDate
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_SURVEY_DATE
)
)),
surveyDate
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setProductName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRODUCT_NAME
)),
productName
));
setProductName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRODUCT_NAME
)),
productName
));
setQuantity
(
NumberUtils
.
toBigDecimal
(
StringUtils
.
toString
(
map
.
get
(
FIELD_QUANTITY
)),
quantity
));
setQuantity
(
NumberUtils
.
toBigDecimal
(
StringUtils
.
toString
(
map
.
get
(
FIELD_QUANTITY
)),
quantity
));
...
...
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX014.java
View file @
43a24ecc
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
package
com
.
baosight
.
hggp
.
hg
.
yx
.
domain
;
import
com.baosight.hggp.util.DateUtils
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.data.DaoEPBase
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.ei.EiColumn
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
import
com.baosight.iplat4j.core.util.NumberUtils
;
...
@@ -458,7 +459,7 @@ public class HGYX014 extends DaoEPBase {
...
@@ -458,7 +459,7 @@ public class HGYX014 extends DaoEPBase {
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedName
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_NAME
)),
updatedName
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setUpdatedTime
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_UPDATED_TIME
)),
updatedTime
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setDeleteFlag
(
NumberUtils
.
toInteger
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DELETE_FLAG
)),
deleteFlag
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_SURVEY_DATE
)),
surveyDate
));
setSurveyDate
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
DateUtils
.
formatShort
(
map
.
get
(
FIELD_SURVEY_DATE
)
)),
surveyDate
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setDistrict
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_DISTRICT
)),
district
));
setProductGoodBad
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRODUCT_GOOD_BAD
)),
productGoodBad
));
setProductGoodBad
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRODUCT_GOOD_BAD
)),
productGoodBad
));
setPriceGoodBad
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRICE_GOOD_BAD
)),
priceGoodBad
));
setPriceGoodBad
(
StringUtils
.
defaultIfEmpty
(
StringUtils
.
toString
(
map
.
get
(
FIELD_PRICE_GOOD_BAD
)),
priceGoodBad
));
...
...
src/main/webapp/HG/CW/HGCW016.js
View file @
43a24ecc
...
@@ -155,7 +155,7 @@ function choiceFunc() {
...
@@ -155,7 +155,7 @@ function choiceFunc() {
}
}
JSColorbox
.
open
({
JSColorbox
.
open
({
href
:
"HGCW016A?methodName=initLoad&inqu_status-0-hiddenConditions=1"
+
href
:
"HGCW016A?methodName=initLoad&inqu_status-0-hiddenConditions=1"
+
"&inqu_status-0-
billState
=1"
+
"&inqu_status-0-
reviewStatus
=1"
+
"&inqu_status-0-mainId="
+
mainId
+
"&inqu_status-0-mainId="
+
mainId
+
"&efParentFormEname=HGCW016"
,
"&efParentFormEname=HGCW016"
,
title
:
"<div style='text-align: center;'>采购收票</div>"
,
title
:
"<div style='text-align: center;'>采购收票</div>"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment