Merge remote-tracking branch 'origin/main'
# Conflicts: # resources/mybatis/index/IndexHomeDetailsMapper.xml
This commit is contained in:
commit
052bb6d687
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
|
||||||
<select id="getMaTypeDetails" parameterType="com.bonus.index.beans.IndexHomeDetailsBean" resultMap="index">
|
<select id="getMaTypeDetails" parameterType="com.bonus.index.beans.IndexHomeDetailsBean" resultMap="index">
|
||||||
|
select * from (
|
||||||
SELECT
|
SELECT
|
||||||
rs.typeId,
|
rs.typeId,
|
||||||
mat2.`NAME` maType,
|
mat2.`NAME` maType,
|
||||||
|
|
@ -272,11 +272,18 @@
|
||||||
<if test="maType != null and maType != ''">
|
<if test="maType != null and maType != ''">
|
||||||
and mat2.`NAME` like concat ('%',#{maType},'%')
|
and mat2.`NAME` like concat ('%',#{maType},'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="isCount != null and isCount != ''">
|
|
||||||
and rs.isCount = #{isCount}
|
|
||||||
</if>
|
|
||||||
</where>
|
</where>
|
||||||
GROUP BY rs.typeId
|
GROUP BY rs.typeId
|
||||||
|
) a WHERE
|
||||||
|
typeId IN (
|
||||||
|
SELECT DISTINCT
|
||||||
|
mt.ID
|
||||||
|
FROM
|
||||||
|
mm_type mt
|
||||||
|
WHERE
|
||||||
|
mt.`LEVEL` = 4
|
||||||
|
AND mt.IS_ACTIVE = 1
|
||||||
|
)
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -991,6 +998,114 @@
|
||||||
|
|
||||||
GROUP BY
|
GROUP BY
|
||||||
wla.ID
|
wla.ID
|
||||||
|
union
|
||||||
|
SELECT
|
||||||
|
bp.id AS id,
|
||||||
|
bp.`NAME` AS projectName,
|
||||||
|
bc.ID AS companyId,
|
||||||
|
bc.`NAME` AS companyName,
|
||||||
|
"" AS agreementCode,
|
||||||
|
"0" AS leaseNum,
|
||||||
|
"0" AS backNum,
|
||||||
|
"0" AS agreementId,
|
||||||
|
"" AS firstTime,
|
||||||
|
"" AS lastTime,
|
||||||
|
"" AS backTime,
|
||||||
|
"" AS subName
|
||||||
|
FROM
|
||||||
|
bm_project bp
|
||||||
|
LEFT JOIN bm_company bc ON bp.COMPANY_ID = bc.ID
|
||||||
|
WHERE
|
||||||
|
bp.IS_ACTIVE = 1
|
||||||
|
AND bp.id NOT IN (
|
||||||
|
SELECT
|
||||||
|
id
|
||||||
|
FROM
|
||||||
|
(
|
||||||
|
SELECT
|
||||||
|
wla.PROJECT AS id,
|
||||||
|
bp.`NAME` AS projectName,
|
||||||
|
bc.ID AS companyId,
|
||||||
|
bc.`NAME` AS companyName,
|
||||||
|
wla.`CODE` AS agreementCode,
|
||||||
|
SUM( wir.NUM ) AS leaseNum,
|
||||||
|
"0" AS backNum,
|
||||||
|
wla.ID AS agreementId,
|
||||||
|
min( wir.time ) AS firstTime,
|
||||||
|
max( wir.time ) AS lastTime,
|
||||||
|
wir.time AS backTime,
|
||||||
|
real_sub.subName
|
||||||
|
FROM
|
||||||
|
wf_task_record wtr
|
||||||
|
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
|
||||||
|
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT
|
||||||
|
wla.PROJECT proId,
|
||||||
|
GROUP_CONCAT( DISTINCT bu.`NAME` ) subName
|
||||||
|
FROM
|
||||||
|
wf_task_record wtr
|
||||||
|
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
|
||||||
|
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
|
||||||
|
LEFT JOIN bm_unit bu ON bu.id = wla.LEASE_COMPANY
|
||||||
|
WHERE
|
||||||
|
bu.`NAME` IS NOT NULL
|
||||||
|
AND wtr.IS_ACTIVE = 1
|
||||||
|
GROUP BY
|
||||||
|
wla.PROJECT
|
||||||
|
) real_sub ON real_sub.proId = wla.PROJECT
|
||||||
|
LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
|
||||||
|
LEFT JOIN bm_company bc ON bp.COMPANY_ID = bc.ID
|
||||||
|
LEFT JOIN wf_task_record wte ON wtr.ID = wte.SUP_ID
|
||||||
|
LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
|
||||||
|
WHERE
|
||||||
|
wir.TYPE = 2
|
||||||
|
AND wtr.IS_ACTIVE = 1
|
||||||
|
GROUP BY
|
||||||
|
wla.ID UNION
|
||||||
|
SELECT
|
||||||
|
wla.PROJECT AS id,
|
||||||
|
bp.`NAME` AS projectName,
|
||||||
|
bc.ID AS companyId,
|
||||||
|
bc.`NAME` AS companyName,
|
||||||
|
wla.`CODE` AS agreementCode,
|
||||||
|
"0" AS leaseNum,
|
||||||
|
SUM( wir.NUM ) AS backNum,
|
||||||
|
wla.ID AS agreementId,
|
||||||
|
"" AS firstTime,
|
||||||
|
"" AS lastTime,
|
||||||
|
max( wir.time ) AS backTime,
|
||||||
|
real_sub.subName
|
||||||
|
FROM
|
||||||
|
wf_task_record wtr
|
||||||
|
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
|
||||||
|
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
|
||||||
|
LEFT JOIN (
|
||||||
|
SELECT
|
||||||
|
wla.PROJECT proId,
|
||||||
|
GROUP_CONCAT( DISTINCT bu.`NAME` ) subName
|
||||||
|
FROM
|
||||||
|
wf_task_record wtr
|
||||||
|
LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
|
||||||
|
LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
|
||||||
|
LEFT JOIN bm_unit bu ON bu.id = wla.LEASE_COMPANY
|
||||||
|
WHERE
|
||||||
|
bu.`NAME` IS NOT NULL
|
||||||
|
AND wtr.IS_ACTIVE = 1
|
||||||
|
GROUP BY
|
||||||
|
wla.PROJECT
|
||||||
|
) real_sub ON real_sub.proId = wla.PROJECT
|
||||||
|
LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
|
||||||
|
LEFT JOIN bm_company bc ON bp.COMPANY_ID = bc.ID
|
||||||
|
LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
|
||||||
|
LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
|
||||||
|
WHERE
|
||||||
|
wtr.IS_ACTIVE = 1
|
||||||
|
AND wir.TYPE = 4
|
||||||
|
GROUP BY
|
||||||
|
wla.ID
|
||||||
|
) a
|
||||||
|
)
|
||||||
) a
|
) a
|
||||||
<where>
|
<where>
|
||||||
<if test="subName != null and subName != ''">
|
<if test="subName != null and subName != ''">
|
||||||
|
|
@ -1002,7 +1117,7 @@
|
||||||
</where>
|
</where>
|
||||||
GROUP BY
|
GROUP BY
|
||||||
a.projectName
|
a.projectName
|
||||||
order by diffCount desc
|
order by diffCount,subName desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getProjectMaDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
|
<select id="getProjectMaDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
|
||||||
|
|
@ -1460,7 +1575,7 @@
|
||||||
and tpd.`NAME` like concat('%', #{maName}, '%')
|
and tpd.`NAME` like concat('%', #{maName}, '%')
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<select id="getNewlyStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
|
<select id="getNewlyStored">
|
||||||
select mt2.NAME as maType,
|
select mt2.NAME as maType,
|
||||||
mt.NAME as maName,
|
mt.NAME as maName,
|
||||||
wir.CODE as maCode,
|
wir.CODE as maCode,
|
||||||
|
|
@ -1471,7 +1586,7 @@
|
||||||
left join mm_type mt2 on mt.PARENT_ID = mt2.ID
|
left join mm_type mt2 on mt.PARENT_ID = mt2.ID
|
||||||
where wir.TYPE = #{type}
|
where wir.TYPE = #{type}
|
||||||
</select>
|
</select>
|
||||||
<select id="getInventoryStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
|
<select id="getInventoryStored">
|
||||||
select mt2.NAME as maType,
|
select mt2.NAME as maType,
|
||||||
mt.NAME as maName,
|
mt.NAME as maName,
|
||||||
mt.UNIT as maUnit,
|
mt.UNIT as maUnit,
|
||||||
|
|
|
||||||
|
|
@ -325,17 +325,15 @@
|
||||||
|
|
||||||
<select id="getOverview" parameterType="com.bonus.index.beans.IndexHomeBean" resultType="com.bonus.index.beans.PartOneBean">
|
<select id="getOverview" parameterType="com.bonus.index.beans.IndexHomeBean" resultType="com.bonus.index.beans.PartOneBean">
|
||||||
SELECT
|
SELECT
|
||||||
SUM(projectCount) projectCount,
|
SUM( projectCount ) projectCount,
|
||||||
SUM(equipmentTypes) equipmentTypes,
|
SUM( equipmentTypes ) equipmentTypes,
|
||||||
SUM(totalCount) totalCount,
|
SUM( totalCount ) totalCount,
|
||||||
SUM(stockCount) stockCount,
|
SUM( stockCount ) stockCount,
|
||||||
SUM(inUseCount) inUseCount,
|
SUM( inUseCount ) inUseCount,
|
||||||
SUM(repairCount) repairCount,
|
SUM( repairCount ) repairCount,
|
||||||
SUM(scrappedCount) scrappedCount
|
SUM( scrappedCount ) scrappedCount
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
|
|
||||||
|
|
||||||
SELECT
|
SELECT
|
||||||
COUNT( DISTINCT bp.ID ) AS projectCount,
|
COUNT( DISTINCT bp.ID ) AS projectCount,
|
||||||
0 AS equipmentTypes,
|
0 AS equipmentTypes,
|
||||||
|
|
@ -364,31 +362,43 @@
|
||||||
SELECT
|
SELECT
|
||||||
0 AS projectCount,
|
0 AS projectCount,
|
||||||
0 AS equipmentTypes,
|
0 AS equipmentTypes,
|
||||||
ROUND(
|
sum( maTotal ) AS totalCount,
|
||||||
IF
|
sum( storageNum ) AS stockCount,
|
||||||
|
SUM( inuseNum ) AS inUseCount,
|
||||||
|
SUM( repairNum ) AS repairCount,
|
||||||
|
SUM( scrapNum ) AS scrappedCount
|
||||||
|
FROM
|
||||||
(
|
(
|
||||||
SUM( storageNum ) IS NULL,
|
SELECT
|
||||||
0,
|
rs.typeId,
|
||||||
SUM( storageNum )))+ ROUND(
|
mat2.`NAME` maType,
|
||||||
sum( leaseNum ))+ ROUND(
|
mat1.`NAME` maName,
|
||||||
SUM( repairNum )) + ROUND(
|
mat1.UNIT AS maUnit,
|
||||||
SUM( checkNum )) + ROUND( SUM( waitInputNum ) ) AS totalCount,
|
SUM( rs.storageNum )+ SUM( rs.inuseNum ) + SUM( rs.repairNum ) AS maTotal,
|
||||||
0 AS stockCount,
|
SUM( rs.storageNum ) storageNum,
|
||||||
0 AS inUseCount,
|
SUM( rs.inuseNum ) inuseNum,
|
||||||
0 AS repairCount,
|
SUM( rs.repairNum ) repairNum,
|
||||||
0 AS scrappedCount
|
SUM( rs.scrapNum ) scrapNum,
|
||||||
|
SUM( rs.projectNum ) projectNum,
|
||||||
|
SUM( rs.inuseCount ) inuseCount,
|
||||||
|
SUM( rs.backCount ) backCount,
|
||||||
|
SUM( rs.pyNum ) AS pyNum,
|
||||||
|
SUM( rs.pkNum ) AS pkNum,
|
||||||
|
rs.isCount
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
mat1.ID AS typeId,
|
mat1.ID AS typeId,
|
||||||
mat1.NUM storageNum,
|
mat1.NUM storageNum,
|
||||||
0 leaseNum,
|
0 inuseNum,
|
||||||
0 repairNum,
|
0 repairNum,
|
||||||
0 checkNum,
|
|
||||||
0 scrapNum,
|
0 scrapNum,
|
||||||
0 loseNum,
|
0 projectNum,
|
||||||
0 waitInputNum,
|
0 inuseCount,
|
||||||
1 AS isCount
|
0 backCount,
|
||||||
|
0 AS pyNum,
|
||||||
|
0 AS pkNum,
|
||||||
|
mat1.IS_COUNT AS isCount
|
||||||
FROM
|
FROM
|
||||||
mm_type mat1
|
mm_type mat1
|
||||||
LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
|
LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
|
||||||
|
|
@ -401,13 +411,15 @@
|
||||||
SELECT
|
SELECT
|
||||||
typeId,
|
typeId,
|
||||||
0 storageNum,
|
0 storageNum,
|
||||||
sum( leaseNum ) - SUM( backNum ) leaseNum,
|
sum( leaseNum ) - SUM( backNum ) inuseNum,
|
||||||
0 repairNum,
|
0 repairNum,
|
||||||
0 checkNum,
|
|
||||||
0 scrapNum,
|
0 scrapNum,
|
||||||
0 loseNum,
|
0 projectNum,
|
||||||
0 waitInputNum,
|
sum( leaseNum ) inuseCount,
|
||||||
1 AS isCount
|
SUM( backNum ) backCount,
|
||||||
|
0 AS pyNum,
|
||||||
|
0 AS pkNum,
|
||||||
|
isCount AS isCount
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
|
|
@ -460,6 +472,20 @@
|
||||||
) a
|
) a
|
||||||
GROUP BY
|
GROUP BY
|
||||||
typeId UNION
|
typeId UNION
|
||||||
|
SELECT
|
||||||
|
typeId,
|
||||||
|
0 storageNum,
|
||||||
|
0 inuseNum,
|
||||||
|
SUM( repairNum ) + SUM( checkNum ) + SUM( waitInputNum ) AS repairNum,
|
||||||
|
0 scrapNum,
|
||||||
|
0 projectNum,
|
||||||
|
0 inuseCount,
|
||||||
|
0 backCount,
|
||||||
|
0 AS pyNum,
|
||||||
|
0 AS pkNum,
|
||||||
|
isCount
|
||||||
|
FROM
|
||||||
|
(
|
||||||
SELECT
|
SELECT
|
||||||
mat1.ID AS typeId,
|
mat1.ID AS typeId,
|
||||||
0 storageNum,
|
0 storageNum,
|
||||||
|
|
@ -469,7 +495,7 @@
|
||||||
0 scrapNum,
|
0 scrapNum,
|
||||||
0 loseNum,
|
0 loseNum,
|
||||||
0 waitInputNum,
|
0 waitInputNum,
|
||||||
1 AS isCount
|
mat1.IS_COUNT AS isCount
|
||||||
FROM
|
FROM
|
||||||
wf_repair_details wrd
|
wf_repair_details wrd
|
||||||
LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
|
LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
|
||||||
|
|
@ -486,7 +512,7 @@
|
||||||
0 scrapNum,
|
0 scrapNum,
|
||||||
0 loseNum,
|
0 loseNum,
|
||||||
0 waitInputNum,
|
0 waitInputNum,
|
||||||
1 AS isCount
|
mat1.IS_COUNT AS isCount
|
||||||
FROM
|
FROM
|
||||||
wf_repair_check wrc
|
wf_repair_check wrc
|
||||||
LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
|
LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
|
||||||
|
|
@ -505,7 +531,7 @@
|
||||||
SUM(
|
SUM(
|
||||||
IFNULL( PRE_PUT_NUM, 0 )) - sum(
|
IFNULL( PRE_PUT_NUM, 0 )) - sum(
|
||||||
IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
|
IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
|
||||||
1 AS isCount
|
mat1.IS_COUNT AS isCount
|
||||||
FROM
|
FROM
|
||||||
wf_put_storage_details wpd
|
wf_put_storage_details wpd
|
||||||
LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
|
LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
|
||||||
|
|
@ -515,152 +541,21 @@
|
||||||
wpd.IS_SURE = 0
|
wpd.IS_SURE = 0
|
||||||
GROUP BY
|
GROUP BY
|
||||||
wpd.MODEL_ID
|
wpd.MODEL_ID
|
||||||
) res UNION
|
) res
|
||||||
SELECT
|
|
||||||
0 AS projectCount,
|
|
||||||
0 AS equipmentTypes,
|
|
||||||
0 AS totalCount,
|
|
||||||
SUM( mat1.NUM ) AS stockCount,
|
|
||||||
0 AS inUseCount,
|
|
||||||
0 AS repairCount,
|
|
||||||
0 AS scrappedCount
|
|
||||||
FROM
|
|
||||||
mm_type mat1
|
|
||||||
WHERE
|
|
||||||
mat1.`LEVEL` = 4
|
|
||||||
AND mat1.IS_ACTIVE = '1' UNION
|
|
||||||
SELECT
|
|
||||||
0 AS projectCount,
|
|
||||||
0 AS equipmentTypes,
|
|
||||||
0 AS totalCount,
|
|
||||||
0 AS stockCount,
|
|
||||||
sum( leaseNum ) - SUM( backNum ) inUseCount,
|
|
||||||
0 AS repairCount,
|
|
||||||
0 AS scrappedCount
|
|
||||||
FROM
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
mmt1.`NAME` AS pMachineName,
|
|
||||||
mmt.`NAME` AS machineName,
|
|
||||||
mt.`NAME` AS machineModel,
|
|
||||||
mt.ID AS typeId,
|
|
||||||
mt.BUY_PRICE AS buyPrice,
|
|
||||||
mt.UNIT,
|
|
||||||
SUM( wir.NUM ) AS leaseNum,
|
|
||||||
0 AS backNum,
|
|
||||||
mt.IS_COUNT AS isCount
|
|
||||||
FROM
|
|
||||||
wf_info_record wir
|
|
||||||
LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
|
|
||||||
LEFT JOIN wf_task_record wtr2 ON wtr.SUP_ID = wtr2.ID
|
|
||||||
LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
|
|
||||||
LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
|
|
||||||
LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
|
|
||||||
LEFT JOIN wf_collar_details wcd ON wcd.TASK_ID = wtr.SUP_ID
|
|
||||||
AND wcd.MODEL_ID = wir.MODEL_ID
|
|
||||||
WHERE
|
|
||||||
wir.TYPE = 2
|
|
||||||
AND wtr2.IS_ACTIVE = 1
|
|
||||||
AND wcd.IS_APPROVAL = 1
|
|
||||||
GROUP BY
|
GROUP BY
|
||||||
mt.ID UNION
|
typeId UNION
|
||||||
SELECT
|
|
||||||
mmt1.`NAME` AS pMachineName,
|
|
||||||
mmt.`NAME` AS machineName,
|
|
||||||
mt.`NAME` AS machineModel,
|
|
||||||
mt.ID AS typeId,
|
|
||||||
mt.BUY_PRICE AS buyPrice,
|
|
||||||
mt.UNIT,
|
|
||||||
0 AS leaseNum,
|
|
||||||
SUM( wir.NUM ) AS backNum,
|
|
||||||
mt.IS_COUNT AS isCount
|
|
||||||
FROM
|
|
||||||
wf_info_record wir
|
|
||||||
LEFT JOIN wf_return_material_details wrd ON wir.SUP_ID = wrd.ID
|
|
||||||
LEFT JOIN wf_task_record wtr ON wrd.TASK_ID = wtr.ID
|
|
||||||
LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
|
|
||||||
LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
|
|
||||||
LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
|
|
||||||
WHERE
|
|
||||||
wir.TYPE = 4
|
|
||||||
AND wtr.IS_ACTIVE = 1
|
|
||||||
GROUP BY
|
|
||||||
mt.ID
|
|
||||||
) a UNION
|
|
||||||
SELECT
|
|
||||||
0 AS projectCount,
|
|
||||||
0 AS equipmentTypes,
|
|
||||||
0 AS totalCount,
|
|
||||||
0 AS stockCount,
|
|
||||||
0 inUseCount,
|
|
||||||
SUM( repairNum )+ SUM( checkNum )+ SUM( waitInputNum ) AS repairCount,
|
|
||||||
0 AS scrappedCount
|
|
||||||
FROM
|
|
||||||
(
|
|
||||||
SELECT
|
SELECT
|
||||||
mat1.ID AS typeId,
|
mat1.ID AS typeId,
|
||||||
0 storageNum,
|
0 storageNum,
|
||||||
0 leaseNum,
|
0 inuseNum,
|
||||||
SUM( wrd.REPAIR_NUM ) - SUM( wrd.ALREPAIR_NUM ) - SUM( SCRAP_NUM ) AS repairNum,
|
0 AS repairNum,
|
||||||
0 checkNum,
|
SUM( wsd.ALSCRAP_NUM ) AS scrapNum,
|
||||||
0 scrapNum,
|
0 projectNum,
|
||||||
0 loseNum,
|
0 inuseCount,
|
||||||
0 waitInputNum,
|
0 backCount,
|
||||||
1 AS isCount
|
0 AS pyNum,
|
||||||
FROM
|
0 AS pkNum,
|
||||||
wf_repair_details wrd
|
mat1.IS_COUNT AS isCount
|
||||||
LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
|
|
||||||
LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
|
|
||||||
LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
|
|
||||||
GROUP BY
|
|
||||||
wrd.MODEL_ID UNION
|
|
||||||
SELECT
|
|
||||||
mat1.ID AS typeId,
|
|
||||||
0 storageNum,
|
|
||||||
0 leaseNum,
|
|
||||||
0 repairNum,
|
|
||||||
SUM( wrc.CHECK_NUM ) - SUM( wrc.ALCHECK_NUM ) AS checkNum,
|
|
||||||
0 scrapNum,
|
|
||||||
0 loseNum,
|
|
||||||
0 waitInputNum,
|
|
||||||
1 AS isCount
|
|
||||||
FROM
|
|
||||||
wf_repair_check wrc
|
|
||||||
LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
|
|
||||||
LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
|
|
||||||
LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
|
|
||||||
GROUP BY
|
|
||||||
wrc.MODEL_ID UNION
|
|
||||||
SELECT DISTINCT
|
|
||||||
mat1.ID AS typeId,
|
|
||||||
0 storageNum,
|
|
||||||
0 leaseNum,
|
|
||||||
0 repairNum,
|
|
||||||
0 checkNum,
|
|
||||||
0 AS scrapNum,
|
|
||||||
0 loseNum,
|
|
||||||
SUM(
|
|
||||||
IFNULL( PRE_PUT_NUM, 0 )) - sum(
|
|
||||||
IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
|
|
||||||
1 AS isCount
|
|
||||||
FROM
|
|
||||||
wf_put_storage_details wpd
|
|
||||||
LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
|
|
||||||
LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
|
|
||||||
LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
|
|
||||||
WHERE
|
|
||||||
wpd.IS_SURE = 0
|
|
||||||
GROUP BY
|
|
||||||
wpd.MODEL_ID
|
|
||||||
) res UNION
|
|
||||||
SELECT
|
|
||||||
0 AS projectCount,
|
|
||||||
0 AS equipmentTypes,
|
|
||||||
0 AS totalCount,
|
|
||||||
0 AS stockCount,
|
|
||||||
0 inUseCount,
|
|
||||||
0 AS repairCount,
|
|
||||||
SUM( wsd.ALSCRAP_NUM ) AS scrappedCount
|
|
||||||
FROM
|
FROM
|
||||||
wf_scrap_details wsd
|
wf_scrap_details wsd
|
||||||
LEFT JOIN mm_type mat1 ON wsd.MODEL_ID = mat1.ID
|
LEFT JOIN mm_type mat1 ON wsd.MODEL_ID = mat1.ID
|
||||||
|
|
@ -668,6 +563,67 @@
|
||||||
LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
|
LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
|
||||||
WHERE
|
WHERE
|
||||||
wsd.IS_SURE = 1
|
wsd.IS_SURE = 1
|
||||||
|
GROUP BY
|
||||||
|
wsd.MODEL_ID UNION
|
||||||
|
SELECT
|
||||||
|
mps.type AS typeId,
|
||||||
|
0 storageNum,
|
||||||
|
0 inuseNum,
|
||||||
|
0 AS repairNum,
|
||||||
|
0 AS scrapNum,
|
||||||
|
COUNT( DISTINCT wla.PROJECT ) AS projectNum,
|
||||||
|
0 inuseCount,
|
||||||
|
0 backCount,
|
||||||
|
0 AS pyNum,
|
||||||
|
0 AS pkNum,
|
||||||
|
mat1.IS_COUNT AS isCount
|
||||||
|
FROM
|
||||||
|
ma_type_project_storage mps
|
||||||
|
LEFT JOIN wf_lease_agreement wla ON mps.agreement_id = wla.ID
|
||||||
|
LEFT JOIN mm_type mat1 ON mps.type = mat1.ID
|
||||||
|
WHERE
|
||||||
|
mps.`status` = 1
|
||||||
|
GROUP BY
|
||||||
|
mps.type UNION
|
||||||
|
SELECT
|
||||||
|
typeId,
|
||||||
|
0 storageNum,
|
||||||
|
0 inuseNum,
|
||||||
|
0 AS repairNum,
|
||||||
|
0 AS scrapNum,
|
||||||
|
0 AS projectNum,
|
||||||
|
0 inuseCount,
|
||||||
|
0 backCount,
|
||||||
|
SUM( pyNum ) AS pyNum,
|
||||||
|
SUM( pkNum ) AS pkNum,
|
||||||
|
isCount
|
||||||
|
FROM
|
||||||
|
(
|
||||||
|
SELECT
|
||||||
|
mli.TYPE_ID AS typeId,
|
||||||
|
mli.IS_PROFIT AS type,
|
||||||
|
IF
|
||||||
|
( mli.IS_PROFIT = 1, SUM( mli.IN_NUMS ), 0 ) AS pyNum,
|
||||||
|
IF
|
||||||
|
( mli.IS_PROFIT = 0, SUM( mli.IN_NUMS ), 0 ) AS pkNum,
|
||||||
|
mat1.IS_COUNT AS isCount
|
||||||
|
FROM
|
||||||
|
ma_lib_inventroy mli
|
||||||
|
LEFT JOIN mm_type mat1 ON mli.TYPE_ID = mat1.ID
|
||||||
|
GROUP BY
|
||||||
|
mli.TYPE_ID,
|
||||||
|
mli.IS_PROFIT
|
||||||
|
) res
|
||||||
|
GROUP BY
|
||||||
|
typeId
|
||||||
|
) rs
|
||||||
|
LEFT JOIN mm_type mat1 ON rs.typeId = mat1.ID
|
||||||
|
LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
|
||||||
|
GROUP BY
|
||||||
|
rs.typeId
|
||||||
|
) a
|
||||||
|
WHERE
|
||||||
|
typeId IN ( SELECT DISTINCT mt.ID FROM mm_type mt WHERE mt.`LEVEL` = 4 AND mt.IS_ACTIVE = 1 )
|
||||||
) rs
|
) rs
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,7 @@ import org.json.JSONObject;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
import org.springframework.ui.Model;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
|
|
||||||
import com.bonus.core.DateTimeHelper;
|
import com.bonus.core.DateTimeHelper;
|
||||||
import com.bonus.index.service.IndexHomeService;
|
import com.bonus.index.service.IndexHomeService;
|
||||||
|
|
@ -42,6 +39,18 @@ public class IndexHomeController extends BaseController<IndexHomeBean> {
|
||||||
return "/equipment/equipmentTypesDetail";
|
return "/equipment/equipmentTypesDetail";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping("dataOverview/equipmentProportion/index")
|
||||||
|
public String dataOverviewProportionDetails(@RequestParam("type") String type, Model model) {
|
||||||
|
model.addAttribute("type",type);
|
||||||
|
return "/equipment/equipmentProportionDetail";
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequestMapping("dataOverview/equipmentType/index")
|
||||||
|
public String dataOverviewTypeDetails(@RequestParam("type") String type, Model model) {
|
||||||
|
model.addAttribute("type",type);
|
||||||
|
return "/equipment/equipmentTypeDetail";
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping("dataOverview/equipment/detail")
|
@RequestMapping("dataOverview/equipment/detail")
|
||||||
public String showEquipmentTypeInfo(Model model) {
|
public String showEquipmentTypeInfo(Model model) {
|
||||||
return "/equipment/equipmentTypesInfo";
|
return "/equipment/equipmentTypesInfo";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue