Commit d75906ac by mayunfei

Merge remote-tracking branch 'origin/master_sc' into master_sc

parents 17c6ec8d ac372635
......@@ -64,6 +64,16 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<!-- servlet依赖. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
......
......@@ -145,7 +145,7 @@ public class ZczlController {
private TbYwZczlTj getTj(String dwdm,String sfbdw,Date fbsj_s,Date fbsj_e,String unitcode,String userUnitcode){
TbYwZczlTj tj = new TbYwZczlTj();
tj.setDwdm(dwdm);
tj.setDwmc(zczlService.getUnitnameByUnitcode(dwdm));
tj.setDwmc((dwdm.startsWith("510000"))?"合计":zczlService.getUnitnameByUnitcode(dwdm));//省厅不显示单位名称 以合计代替
//拿到所有的统计所用分派信息
//本单位拿qsrgajgdm=本单位代码 下级单位拿是本单位分派的,且qsrdwdm
......@@ -5096,6 +5096,235 @@ public class ZczlController {
return message;
}
/**
* 导出指令信息统计Excel
* @param request
* @param response
* @param tbYwZczlTj
* @throws Exception
*/
@ResponseBody
@RequestMapping(value="/exportJszlCntExcel")
public void exportJszlCntExcel(HttpServletRequest request, HttpServletResponse response, TbYwZczlTj tbYwZczlTj) throws Exception{
//拿到登录用户
User user = (User)request.getSession().getAttribute("user");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String fbsj_s_str = request.getParameter("fbsj_s");
String fbsj_e_str = request.getParameter("fbsj_e");
Date fbsj_s = null;
Date fbsj_e = null;
try {
fbsj_s = sdf.parse(fbsj_s_str);
} catch (ParseException e) {
fbsj_s = null;
}
try {
fbsj_e = sdf.parse(fbsj_e_str);
} catch (ParseException e) {
fbsj_e = null;
}
//统计时公安厅的单位==总队,显示总队和支队的统计信息
String tjUnitcode = user.getUnitcode();
//公安厅,拿到其直接下级的单位代码(总队的单位代码)
if("0000000000".equals(tjUnitcode.substring(2,12))){
tjUnitcode = zczlService.getGatXjdw(tjUnitcode);
}
String dwdm = request.getParameter("dwdm");
String userUnitcode = user.getUnitcode();
String sfbdw = "0";
//是本单位
if(user.getUnitcode().equals(dwdm)){
sfbdw = "1";
}
List<TbYwZczlFp> fps = zczlService.getAllTjfpxx(fbsj_s,fbsj_e,dwdm,sfbdw,tjUnitcode,userUnitcode);
List<TbYwZczlTj> tjListAll = new ArrayList<>();
Integer totalCount = 0;
if(fps!=null&&fps.size()>0){
//拿到所有的状态
for(int i=0;i<fps.size();i++){
TbYwZczlFp fpxx = fps.get(i);
TbYwZczlTj tjxx = new TbYwZczlTj();
String qszt = null;//签收状态 0-已签收 1-超期签收 2-未签收 3-超期未签收
Date fpsj = fpxx.getFpsj();
Date qssj = fpxx.getQssj();
long qssjc = getTimesByFpsj(fpsj);//签收时间差
Date nowDate = new Date();
if(qssj!=null){
if(qssj.getTime()-fpsj.getTime()>qssjc){
qszt = "1";//超期签收
}else{
qszt = "0";//已经签收
}
}else{
if(nowDate.getTime()-fpsj.getTime()>qssjc){
qszt = "3";//超期未签收
}else{
qszt = "2";//未签收
}
}
tjxx.setQszt(qszt);
String hbzt = null;//回报状态 0-已回报 1-超期回报 2-未回报 3-超期未回报
String pjddj = null;//评价等级 0-不合格 1-合格 2-优秀
String fpbh = fpxx.getFpbh();
String zczlbh = fpxx.getZczlbh();
//通过指令编号拿到指令信息
TbYwZczl zczl = zczlService.getZczlxxByZczlbh(zczlbh);
Date hbqx = zczl.getHbqx_date();//回报期限
String zlwh = zczl.getZlwh();//指令文号
TbYwZczlHb hbxx = zczlService.getAllSchbxxByFpbh(fpbh);
Date date = new Date();
if(hbxx!=null){
//回报时间
Date hbsj = hbxx.getHbsj_date();
//超期回报数
if(hbsj.getTime()>hbqx.getTime()+24*60*60*1000){
hbzt = "1";
}else{
hbzt = "0";//已回报
}
Date pjsj = hbxx.getPjsj_date();
String pjdj = hbxx.getPjdj();
//评价数
if(pjsj!=null){
//评价等级 0-不合格 1-合格 2-优秀
if("0".equals(pjdj)){
pjddj = "0";
}else if("1".equals(pjdj)){
pjddj = "1";
}else if("2".equals(pjdj)){
pjddj = "2";
}
}
}else{//未回报
//超期未回报
if(date.getTime()>hbqx.getTime()+24*60*60*1000){
hbzt = "3";
}else{//未回报
hbzt = "2";
}
}
tjxx.setHbzt(hbzt);
tjxx.setPjdj(pjddj);
tjxx.setDwmc(zczlService.getUnitnameByUnitcode(fpxx.getQsrgajgdm()));//拿到负责的单位的单位名称
tjxx.setZlwh(zlwh);//指令文号
tjxx.setHbqx(zczl.getHbqx());//回报期限
tjxx.setDwmc(zczlService.getUnitnameByUnitcode(fpxx.getQsrgajgdm()));//负责单位
//判断是否回报
if(hbxx!=null){
tjxx.setHbsj(hbxx.getHbsj());//回报时间
}
//分派时间、签收时间转换---时间转换为字符串
SimpleDateFormat sjzh = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
tjxx.setFpsj(sjzh.format(fpsj));//分派时间
if(qssj!=null){
tjxx.setQssj(sjzh.format(qssj));//签收时间
}
tjxx.setZczlbh(zczlbh);//侦查指令编号
tjListAll.add(tjxx);
}
}
List<TbYwZczlTj> tjListShowAll = new ArrayList<>();
if(tjListAll.size()>0){
String qszt = tbYwZczlTj.getQszt();//签收状态
String hbzt = tbYwZczlTj.getHbzt();//回报状态
String pjdj = tbYwZczlTj.getPjdj();//评价登记
//将所有符合条件的统计信息放入
for(int i=0;i<tjListAll.size();i++){
TbYwZczlTj tjxx = tjListAll.get(i);
String qsztTemp = tjxx.getQszt();
String hbztTemp = tjxx.getHbzt();
String pjdjTemp = tjxx.getPjdj();
boolean qsBool = false;
boolean hbBool = false;
boolean pjBool = false;
//签收状态 0-已签收 1-超期签收 2-未签收 3-超期未签收
if(qszt!=null&&!"".equals(qszt)){//签收状态不为空
if("0".equals(qszt)){//已签收 -----正常签收与超期签收
if("0".equals(qsztTemp)||"1".equals(qsztTemp)){
qsBool = true;
}
}else if("2".equals(qszt)){//未签收 -----未签收与超期未签收
if("2".equals(qsztTemp)||"3".equals(qsztTemp)){
qsBool = true;
}
}else if(qszt.equals(qsztTemp)){
qsBool = true;
}
}else{
qsBool = true;
}
//回报状态 0-已回报 1-超期回报 2-未回报 3-超期未回报
if(hbzt!=null&&!"".equals(hbzt)){//回报状态不为空
if("0".equals(hbzt)){//已回报 -----已回报+超期回报
if("0".equals(hbztTemp)||"1".equals(hbztTemp)){
hbBool = true;
}
}else if("2".equals(hbzt)){//未回报 -----未回报+超期未回报
if("2".equals(hbztTemp)||"3".equals(hbztTemp)){
hbBool = true;
}
}else if(hbzt.equals(hbztTemp)){
hbBool = true;
}
}else{
hbBool = true;
}
if(pjdj!=null&&!"".equals(pjdj)){//评价状态不为空
if(pjdj.equals(pjdjTemp)){
pjBool = true;
}
}else{
pjBool = true;
}
//签收代码转汉字
if("0".equals(tjxx.getQszt())){ tjxx.setQszt("已签收"); }
else if("1".equals(tjxx.getQszt())){ tjxx.setQszt("超期签收"); }
else if("2".equals(tjxx.getQszt())){ tjxx.setQszt("未签收"); }
else if("3".equals(tjxx.getQszt())){ tjxx.setQszt("超期未签收"); }
//回报代码转汉字
if("0".equals(tjxx.getHbzt())){ tjxx.setHbzt("已回报"); }
else if("1".equals(tjxx.getHbzt())){ tjxx.setHbzt("超期回报"); }
else if("2".equals(tjxx.getHbzt())){ tjxx.setHbzt("未回报"); }
else if("3".equals(tjxx.getHbzt())){ tjxx.setHbzt("超期未回报"); }
//评价代码转汉字
if("0".equals(tjxx.getPjdj())){ tjxx.setPjdj("不合格"); }
else if("1".equals(tjxx.getPjdj())){ tjxx.setPjdj("合格"); }
else if("2".equals(tjxx.getPjdj())){ tjxx.setPjdj("优秀"); }
else{ tjxx.setPjdj("未评价"); }
if(qsBool&&hbBool&&pjBool){
tjListShowAll.add(tjxx);
}
}
}
//导出Excel
ExportExcelUtil<TbYwZczlTj> exportExcelUtil = new ExportExcelUtil<TbYwZczlTj>();
String[] headersName = {"指令文号","负责单位","分派时间","签收时间","签收状态","回报期限","回报时间","回报状态","评价等级"};
String[] headersField = {"zlwh","dwmc","fpsj","qssj","qszt","hbqx","hbsj","hbzt","pjdj"};
exportExcelUtil.exportExcel("指令信息统计表", headersName, headersField, tjListShowAll, response);
}
}
spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
spring.datasource.url=jdbc:oracle:thin:@47.92.129.99:1600:orcl
spring.datasource.username=XZXT
spring.datasource.password=XZXT
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
......
......@@ -1282,24 +1282,15 @@
</select>
<select id="getAllTjfpxx" parameterType="java.util.Map" resultType="com.founder.model.TbYwZczlFp">
select fp.* from TB_YW_ZCZL_FP fp,TB_YW_ZCZL zl where fp.xxscpdbz='0'
and zl.xxscpdbz='0' and fp.zczlbh=zl.zczlbh
<if test="fbsj_s!=null">and zl.fbsj <![CDATA[>=]]> #{fbsj_s}</if>
<if test="fbsj_e!=null">and zl.fbsj <![CDATA[<=]]> #{fbsj_e}</if>
select fp.* from TB_YW_ZCZL_FP fp where fp.xxscpdbz='0' and fp.fprgajgdm like '510000%'
<if test="fbsj_s!=null">and fp.fpsj <![CDATA[>=]]> #{fbsj_s}</if>
<if test="fbsj_e!=null">and fp.fpsj <![CDATA[<=]]> #{fbsj_e}</if>
<if test="sfbdw==1">
<if test="dwdm!=null and dwdm!=''">
and fp.QSRGAJGDM = #{dwdm}
</if>
</if>
<if test="sfbdw==0">
<!--<if test="userUnitcode!=null and userUnitcode!=''">
and fp.FPRGAJGDM = #{userUnitcode}
</if>
<if test="userUnitcode==null or userUnitcode==''">
<if test="dadCodes!=null and dadCodes!=''">
and fp.FPRGAJGDM in ${dadCodes}
</if>
</if>-->
<if test="inString!=null and inString!=''">
and (fp.QSRGAJGDM in ${inString})
</if>
......
......@@ -121,3 +121,17 @@ function toZczlDetail(zczlbh,fpbh){
function doBack(){
$("#jszl_count").dialog("close");
}*/
function exportExcel(){
var params = serializeObject($("form[name='jszlCountForm']"));
var fbsj_s = params.fbsj_s;
var fbsj_e = params.fbsj_e;
var dwdm = params.dwdm;
var qszt = params.qszt;
var hbzt = params.hbzt;
var pjdj = params.pjdj;
if (confirm('确定导出excel附件吗?')) {
location.href = "/exportJszlCntExcel?fbsj_s="+fbsj_s+"&fbsj_e="+fbsj_e+"&dwdm="+dwdm+"&qszt="+qszt+"&hbzt="+hbzt+"&pjdj="+pjdj;
}
}
\ No newline at end of file
......@@ -41,8 +41,12 @@ function toZlzs(dwdm,fbsj_s,fbsj_e){
}
function toDwZlxx(dwdm,fbsj_s,fbsj_e){
var url = '/toGetDwZlxx?dwdm='+dwdm+"&isZjdw=1&fbsj_s="+fbsj_s+"&fbsj_e="+fbsj_e;
window.open(url);
if(dwdm.substr(0, 6) == "510000"){
return;
}else{
var url = '/toGetDwZlxx?dwdm='+dwdm+"&isZjdw=1&fbsj_s="+fbsj_s+"&fbsj_e="+fbsj_e;
window.open(url);
}
}
function doQuery(obj){
......@@ -66,8 +70,8 @@ function doQuery(obj){
checkOnSelect : false,
fit:false,
pagination : true,
pageSize : 10,
pageList : [10,20], //rows
pageSize : 25,
pageList : [25,50], //rows
pageNumber : 1,
loadFilter: function(data){
$(".total").html(data.total);
......
......@@ -87,6 +87,7 @@
<a class="btn_a btn_search" onclick="doQuery()">查询</a>
<a class="btn_a btn_empty" onclick="doClear()">清空</a>
<%--<a class="btn_a btn_empty" onclick="doBack()">关闭</a>--%>
<a class="btn_a btn_add" onclick="exportExcel()" id="exportExcel">导出Excel</a>
</td>
</tr>
</tbody>
......
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