Commit 333aeff3 authored by xuwang's avatar xuwang

报表全部修改完

parent bc8e9e6c
......@@ -5,6 +5,7 @@ import com.yxproject.start.entity.FindStationCountByViewEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.service.*;
import com.yxproject.start.utils.YXJSONResponse;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -118,11 +119,15 @@ public class YingxinApi {
*
* */
@RequestMapping("addRemainCard")
public String addRemainingCardInfo(@RequestParam("acceptNo")List accept_Number,HttpServletResponse resp){
List<SpecialCardEntity> list=addRemainingCardService.getRemainingCardData(accept_Number);
public String addRemainCardInfo(@RequestParam("acceptNo")String accept_Number,HttpServletResponse resp){
JSONObject jsonObject = JSONObject.fromObject(accept_Number);
Map<String, List> jsonArray1 = (Map<String, List>)jsonObject;
List list = jsonArray1.get("list");
List<SpecialCardEntity> taskEntity=addRemainingCardService.getRemainingCardData(list);
YXJSONResponse yxjsonResponse =new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(list);
yxjsonResponse.outPutSuccess(taskEntity);
Map map=new HashMap();
return yxjsonResponse.toJSONString();
}
/*
......
......@@ -29,7 +29,35 @@
</update>
<select id="findCbCountByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FINDCBCOUNTBYDEALDATE_VIEW WHERE FIND_CBCOUNT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_CBCOUNT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
WITH
t_body_card
AS(
SELECT TO_CHAR(SAVE_DATE,'YYYY-MM-DD')SAVE_DATE,CTD.CARD_TYPE,CB.TOTAL_COUNT,DECODE(CB.IS_ACTIVE,1,TOTAL_COUNT,0)IS_ACTIVE
FROM CARD_BODY CB,CARD_TYPE_DIC CTD
WHERE CB.CARD_TYPE_ID=CTD.CARD_TYPE_ID AND SAVE_DATE>=to_date(#{startTime},'yyyy-mm-dd') AND to_date(#{endTime},'yyyy-mm-dd')>=SAVE_DATE
),
t_total_count
AS(
SELECT * FROM (SELECT SAVE_DATE,CARD_TYPE,TOTAL_COUNT FROM t_body_card) PIVOT(SUM(TOTAL_COUNT) FOR CARD_TYPE IN ('普通证' AS PUTONGZHENG,'快证' AS KUAIZHENG,'省内异地快速通道邮' AS YIDIKSYOU,'省内异地快速通道普' AS YIDIKSPU,'省内异地邮' AS YIDIYOU,'省内异地普' AS YIDIPU,'军人证' AS JUNRENZHENG,'快速通道普' AS KSPU,'快速通道邮' AS KSYOU,'邮寄证' AS YOUJIZHENG,'全国证' AS QUANGUOZHENG))),
t_active_count
AS(
SELECT SAVE_DATE,SUM(IS_ACTIVE)ACTIVE_COUNT FROM t_body_card GROUP BY SAVE_DATE
)
SELECT DECODE(GROUPING(t_total_count.SAVE_DATE),1,'总计',t_total_count.SAVE_DATE)SAVE_DATE,
NVL(SUM(PUTONGZHENG),0)AS PUTONGZHENG,
NVL(SUM(KUAIZHENG),0)AS KUAIZHENG,
NVL(SUM(YIDIKSYOU),0)AS YIDIKSYOU,
NVL(SUM(YIDIKSPU),0)AS YIDIKSPU,
NVL(SUM(YIDIYOU),0)AS YIDIYOU,
NVL(SUM(YIDIPU),0)AS YIDIPU,
NVL(SUM(JUNRENZHENG),0)AS JUNRENZHENG,
NVL(SUM(KSPU),0)AS KSPU,
NVL(SUM(KSYOU),0)AS KSYOU,
NVL(SUM(YOUJIZHENG),0)AS YOUJIZHENG,
NVL(SUM(QUANGUOZHENG),0)AS QUANGUOZHENG,
NVL(SUM(ACTIVE_COUNT),0)AS ACTIVE_COUNT
FROM t_total_count,t_active_count WHERE t_total_count.save_date = t_active_count.save_date
GROUP BY ROLLUP(t_total_count.SAVE_DATE)
</select>
<select id="findCbCountByDealdate" resultType="java.util.HashMap">
......
......@@ -19,6 +19,36 @@
</resultMap>
<select id="findFinancialReportByView" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FIND_FINANCIAL_REPORT_BY_VIEW WHERE FIND_FINANCIAL_REPORT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_FINANCIAL_REPORT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime} AND FIND_FINANCIAL_REPORT_LIST.SET_CARDTYPE_PARAM(#{cardType})=#{cardType} AND FIND_FINANCIAL_REPORT_LIST.SET_CITYCODE_PARAM(SUBSTR(#{cityCode},1,4))=SUBSTR(#{cityCode},1,4) AND FIND_FINANCIAL_REPORT_LIST.SET_COUNTYCODE_PARAM(SUBSTR(#{cityCode},1,6))=SUBSTR(#{cityCode},1,6) AND FIND_FINANCIAL_REPORT_LIST.SET_GAJGDM_PARAM(SUBSTR(#{cityCode},1,8))=SUBSTR(#{cityCode},1,8)
WITH t_body_card AS(
SELECT GAJG_DM.GAJG_MC,CARD_TYPE_DIC.CARD_TYPE,CARD_BODY.TOTAL_COUNT
FROM GAJG_DM
LEFT JOIN POLICE_STATION_APPLY_REASON PSAR ON PSAR.POLICE_STATION_CODE=GAJG_DM.GAJG_DM
LEFT JOIN CARD_BODY ON PSAR.TASK_ID=CARD_BODY.TASK_ID
LEFT JOIN CARD_TYPE_DIC ON CARD_BODY.CARD_TYPE_ID=CARD_TYPE_DIC.CARD_TYPE_ID
WHERE PSAR.SAVE_DATE>=to_date(#{startTime},'yyyyMMdd')
AND to_date(#{endTime},'yyyyMMdd')>=PSAR.SAVE_DATE
AND CARD_BODY.CARD_TYPE_ID=#{cardType}
AND (substr(PSAR.POLICE_STATION_CODE,1,4)=substr(#{cityCode},1,4)
OR substr(PSAR.POLICE_STATION_CODE,1,6)=substr(#{cityCode},1,6)
OR PSAR.POLICE_STATION_CODE=#{cityCode})
),
p_count_card AS(
SELECT * FROM t_body_card
PIVOT(SUM(TOTAL_COUNT) FOR CARD_TYPE IN('普通证' AS PUTONGZHENG,'快证' AS KUAIZHENG,'省内异地快速通道邮' AS YIDIKSYOU,'省内异地快速通道普' AS YIDIKSPU,'省内异地邮' AS YIDIYOU,'省内异地普' AS YIDIPU,'军人证' AS JUNRENZHENG,'快速通道普' AS KSPU,'快速通道邮' AS KSYOU,'邮寄证' AS YOUJIZHENG,'全国证' AS QUANGUOZHENG)))
SELECT DECODE(GROUPING(p_count_card.GAJG_MC),1,'总计',p_count_card.GAJG_MC)GAJG_MC,
nvl(SUM(PUTONGZHENG),0) AS PUTONGZHENG,
nvl(SUM(KUAIZHENG),0) AS KUAIZHENG,
nvl(SUM(YIDIKSYOU),0) AS YIDIKSYOU,
nvl(SUM(YIDIKSPU),0) AS YIDIKSPU,
nvl(SUM(YIDIYOU),0) AS YIDIYOU,
nvl(SUM(YIDIPU),0) AS YIDIPU,
nvl(SUM(JUNRENZHENG),0) AS JUNRENZHENG,
nvl(SUM(KSPU),0) AS KSPU,
nvl(SUM(KSYOU),0) AS KSYOU,
nvl(SUM(YOUJIZHENG),0) AS YOUJIZHENG,
nvl(SUM(QUANGUOZHENG),0) AS QUANGUOZHENG
FROM p_count_card
GROUP BY ROLLUP(p_count_card.GAJG_MC)
</select>
</mapper>
\ No newline at end of file
......@@ -17,7 +17,29 @@
</resultMap>
<select id="findStationCountByDealDate" resultType="com.yxproject.start.entity.FindStationCountByViewEntity"
parameterType="String">
SELECT * FROM FIND_STATE_COUNT_VIEW WHERE FIND_STATE_COUNT_LIST.SET_SUBMITDATE_PARAM(#{submitDate})=#{submitDate} AND FIND_STATE_COUNT_LIST.SET_STATE_PARAM(#{state})=#{state}
WITH
s_count_card
AS(
SELECT TO_CHAR(SUBMIT_DATE,'YYYY-MM-DD')SUBMIT_DATE,TSD.TASK_STATE,GN.VALID_COUNT,GN.SPECIAL_CARD_COUNT,PSAR.APPLY_COUNT
FROM TASK,TASK_STATE_DIC TSD,GROUP_NO GN,POLICE_STATION_APPLY_REASON PSAR
WHERE TASK.TASK_STATE_ID=TSD.TASK_STATE_ID AND TASK.TASK_ID=GN.TASK_ID AND TASK.TASK_ID=PSAR.TASK_ID AND SUBMIT_DATE>to_date(#{submitDate},'yyyyMMdd') AND to_date(#{submitDate},'yyyyMMdd')+1>SUBMIT_DATE AND TASK.TASK_STATE_ID=#{state}
),
s_total_count
AS(
SELECT * FROM(SELECT SUBMIT_DATE,TASK_STATE,(NVL(VALID_COUNT,0)-NVL(SPECIAL_CARD_COUNT,0))AS FINSHEDCOUNT,APPLY_COUNT FROM s_count_card) PIVOT(SUM(FINSHEDCOUNT) FOR TASK_STATE IN ('数据核验'AS SHUJUHEYAN,'打印分配'AS DAYINFENPEI,'卸载打印' AS XIEZAIDAYIN,'车间预订位' AS CHEJIANYUDINGWEI,'车间转出' AS CHEJIANZHUANCHU,'人工质检' AS RENGONGZHIJINA,'仓库管理'AS CANGKUGUANLI,'财务管理' AS CAIWUGUANLI )))
SELECT DECODE(GROUPING(s_total_count.SUBMIT_DATE),1,'总计',s_total_count.SUBMIT_DATE)SUBMIT_DATE,
NVL(SUM(SHUJUHEYAN),0)AS SHUJUHEYAN,
NVL(SUM(DAYINFENPEI),0)AS DAYINFENPEI,
NVL(SUM(XIEZAIDAYIN),0)AS XIEZAIDAYIN,
NVL(SUM(CHEJIANYUDINGWEI),0)AS CHEJIANYUDINGWEI,
NVL(SUM(CHEJIANZHUANCHU),0)AS CHEJIANZHUANCHU,
NVL(SUM(RENGONGZHIJINA),0)AS RENGONGZHIJINA,
NVL(SUM(CANGKUGUANLI),0)AS CANGKUGUANLI,
NVL(SUM(CAIWUGUANLI),0)AS CAIWUGUANLI,
NVL(SUM(APPLY_COUNT),0)AS APPLY_COUNT
FROM s_total_count
GROUP BY ROLLUP(s_total_count.SUBMIT_DATE)
</select>
</mapper>
\ No newline at end of file
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