Commit 832285f4 by mayunfei

侦察指令详情页面添加 汇报详情信息

parent a8350cb5
......@@ -642,6 +642,82 @@ public class ZczlController {
sfqqzl = "0";
}
model.addObject("sfqqzl",sfqqzl);//是否请求指令
List<TbYwZczlHb> tbYwZczlHbList = new ArrayList<>();//回报内容
List<TbYwZczlFp> whbdwList = new ArrayList<>();//未回报的分派信息
//回报期限
Date hbqx = tbYwZczl.getHbqx_date();
//遍历分派信息,拿到回报信息
if(tbYwZczlFps!=null){
for(int i=0;i<tbYwZczlFps.size();i++){
//根据分派编号拿到所有回报信息
List<TbYwZczlHb> hbxxs = zczlService.getAllHbxxByFpbh(tbYwZczlFps.get(i).getFpbh());
//存在回报信息
if(hbxxs!=null&&hbxxs.size()>0){
for(int n=0;n<hbxxs.size();n++){
TbYwZczlHb hb = hbxxs.get(n);
//如果不是续报信息判断回报是否超期
if("0".equals(hb.getSfxb())){
//回报时间
Date hbsj = hb.getHbsj_date();
if(hbsj.getTime()>hbqx.getTime()+24*60*60*1000){
//超期回报
hb.setSfcqhb("1");
}
}
//回报等级赋值
if("0".equals(hb.getPjdj())){
hb.setPjdj("不合格");
}else if("1".equals(hb.getPjdj())){
hb.setPjdj("合格");
}else if("2".equals(hb.getPjdj())){
hb.setPjdj("优秀");
}
//操作文件
if (hb.getDzwjwz() != null) {
byte[] nr = hb.getDzwjnr();
//对于没有存的文件名,自己定义为临时文件
String fileUrl = hb.getDzwjwz();
if (nr != null) {
try {
//判断文件是否存在,若不存在新建文件并返回true
String trueUrl = creatFileByUrl(nr, fileUrl, request, hb.getZczlbh());
//两个位置不相同,更新电子文件的位置
if (!fileUrl.equals(trueUrl)) {
hb.setDzwjwz(trueUrl);
hb.setXxscpdbz("0");
TbYwZczlHb updateHb = new TbYwZczlHb();
updateHb.setDzwjwz(trueUrl);
updateHb.setHbbh(hb.getHbbh());
zczlService.updateZczlhbxx(updateHb);
hb.setDzwjwz(trueUrl);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
tbYwZczlHbList.add(hb);
}
//不存在回报信息
}else{
TbYwZczlFp fp = tbYwZczlFps.get(i);
String dwmc = zczlService.getUnitnameByUnitcode(tbYwZczlFps.get(i).getQsrgajgdm());
fp.setQsrdwmc(dwmc);
Date date = new Date();//拿到当前时间
if(date.getTime()>hbqx.getTime()+24*60*60*1000){
//超期回报
fp.setSfcqhb("1");
}
whbdwList.add(fp);
}
}
}
model.addObject("tbYwZczlHbList",tbYwZczlHbList);
model.addObject("whbdwList",whbdwList);
return model;
}
......@@ -3245,6 +3321,82 @@ public class ZczlController {
model.addObject("tbYwZczlFps",tbYwZczlFps);
model.addObject("tbYwZczlHbs",tbYwZczlHbs);
List<TbYwZczlHb> tbYwZczlHbList = new ArrayList<>();//回报内容
List<TbYwZczlFp> whbdwList = new ArrayList<>();//未回报的分派信息
//回报期限
Date hbqx = tbYwZczl.getHbqx_date();
//遍历分派信息,拿到回报信息
if(tbYwZczlFps!=null){
for(int i=0;i<tbYwZczlFps.size();i++){
//根据分派编号拿到所有回报信息
List<TbYwZczlHb> hbxxs = zczlService.getAllHbxxByFpbh(tbYwZczlFps.get(i).getFpbh());
//存在回报信息
if(hbxxs!=null&&hbxxs.size()>0){
for(int n=0;n<hbxxs.size();n++){
TbYwZczlHb hb = hbxxs.get(n);
//如果不是续报信息判断回报是否超期
if("0".equals(hb.getSfxb())){
//回报时间
Date hbsj = hb.getHbsj_date();
if(hbsj.getTime()>hbqx.getTime()+24*60*60*1000){
//超期回报
hb.setSfcqhb("1");
}
}
//回报等级赋值
if("0".equals(hb.getPjdj())){
hb.setPjdj("不合格");
}else if("1".equals(hb.getPjdj())){
hb.setPjdj("合格");
}else if("2".equals(hb.getPjdj())){
hb.setPjdj("优秀");
}
//操作文件
if (hb.getDzwjwz() != null) {
byte[] nr = hb.getDzwjnr();
//对于没有存的文件名,自己定义为临时文件
String fileUrl = hb.getDzwjwz();
if (nr != null) {
try {
//判断文件是否存在,若不存在新建文件并返回true
String trueUrl = creatFileByUrl(nr, fileUrl, request, hb.getZczlbh());
//两个位置不相同,更新电子文件的位置
if (!fileUrl.equals(trueUrl)) {
hb.setDzwjwz(trueUrl);
hb.setXxscpdbz("0");
TbYwZczlHb updateHb = new TbYwZczlHb();
updateHb.setDzwjwz(trueUrl);
updateHb.setHbbh(hb.getHbbh());
zczlService.updateZczlhbxx(updateHb);
hb.setDzwjwz(trueUrl);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
tbYwZczlHbList.add(hb);
}
//不存在回报信息
}else{
TbYwZczlFp fp = tbYwZczlFps.get(i);
String dwmc = zczlService.getUnitnameByUnitcode(tbYwZczlFps.get(i).getQsrgajgdm());
fp.setQsrdwmc(dwmc);
Date date = new Date();//拿到当前时间
if(date.getTime()>hbqx.getTime()+24*60*60*1000){
//超期回报
fp.setSfcqhb("1");
}
whbdwList.add(fp);
}
}
}
model.addObject("tbYwZczlHbList",tbYwZczlHbList);
model.addObject("whbdwList",whbdwList);
return model;
}
......
......@@ -2048,10 +2048,10 @@
<if test="zllx == 6004">
TB_XS_KYCL
</if>
<if test="zllx == 6004">
<if test="zllx == 7001">
TB_ST_LDBD
</if>
where XXZJBH = #{xxjzbh} and XXSC_PDBZ = 0
where XXZJBH = #{xxzjbh} and XXSC_PDBZ = 0
</select>
......
......@@ -13,6 +13,7 @@
<link rel="stylesheet" href="/zlxq/css/font-awesome.min.css">
<link rel="stylesheet" href="/zlxq/css/base_initialize.css">
<link rel="stylesheet" href="/zlxq/css/style.css">
<link rel="stylesheet" href="css/hbxq.css">
<link rel="stylesheet" href="/timeLine/css/jquery.eeyellow.Timeline.css">
<style type="text/css">
......@@ -449,6 +450,279 @@
</fieldset>
</div>
<div style="height:50px;"></div>
<!-- 时间轴 -->
<div class="xzzxyw_bg ajxx_wrap">
<fieldset>
<legend class="control_show">回报详情
<span class="arrow_span arrow_span_show"></span>
</legend>
<div class="flws_wrap" style="display:none;">
<div class="content_wrap">
<table class="mul-hb">
<thead>
<tr>
<th style="width: 12%;">操作</th>
<th style="width:15%">回报(签收)人</th>
<th style="width:20%">回报单位</th>
<th style="width:27%">回报内容</th>
<th style="width:13%">回报时间</th>
<th class="last-th" style="width:8%">回报附件</th>
<th style="width:15%">回报状态</th>
</tr>
</thead>
<tbody>
<c:if test="${!empty tbYwZczlHbList}">
<c:forEach var="hbs" items="${tbYwZczlHbList}">
<tr>
<td class="caozuo">
<a class="search-more">查询详情 </a>
</td>
<td class="text-overflow" title="${hbs.hbrxm }">${hbs.hbrxm }</td>
<td class="text-overflow" title="${hbs.hbrdwmc }">${hbs.hbrdwmc }</td>
<td class="text-overflow" title="${hbs.hbnr }">${hbs.hbnr }</td>
<td class="text-overflow" title="${hbs.hbsj }">${hbs.hbsj }</td>
<c:choose>
<c:when test="${not empty hbs.dzwjmc }">
<td class="text-overflow" title="${hbs.dzwjmc }"><a href="${hbs.dzwjwz}" download="${hbs.dzwjmc}"><span style="color: #cc3e6c;">${hbs.dzwjmc}</span></a></td>
</c:when>
<c:otherwise>
<td></td>
</c:otherwise>
</c:choose>
<td class="text-overflow" title="">
<span class="hb_hbzt pj">评:</span>
<span class="hb_content pj_content" style="margin-left: -5px;">
<c:choose>
<c:when test="${not empty hbs.pjdj }">
${hbs.pjdj}
</c:when>
<c:otherwise>
</c:otherwise>
</c:choose>
</span>
<span class="xv-cil">
<c:if test="${hbs.sfxb==0}">
</c:if>
<c:if test="${hbs.sfxb==1}">
</c:if>
</span>
<c:if test="${hbs.sfcqhb==1}">
<span class="over_da">
</span>
</c:if>
</td>
</tr>
<tr class="per-tr">
<td colspan="7">
<div class="content_wrap per-content" id="per_content">
<table class="per-hb">
<tr>
<td class="ar" style="width:12%">回报人:</td>
<td style="width:20%">${hbs.hbrxm }</td>
<td class="ar" style="width:13.3%">回报人联系电话:</td>
<td style="width:20%">${hbs.hbrlxdh }</td>
<td class="ar" style="width:13.3%">回报人单位:</td>
<td style="width:21.3%">${hbs.hbrdwmc }</td>
</tr>
<tr>
<td class="ar">回报时间:</td>
<td>${hbs.hbsj }</td>
<td class="ar"></td>
<td></td>
<td class="ar"></td>
<td></td>
</tr>
<c:if test="${hbs.zllx == '5001'||hbs.zllx == '5002'}">
<tr>
<td class="ar">反馈结果:</td>
<td>
<c:choose>
<c:when test="${hbs.fkjg == '0' }">
比中前抓获
</c:when>
<c:when test="${hbs.fkjg == '1' }">
比中后抓获
</c:when>
<c:when test="${hbs.fkjg == '2' }">
案件侦办中
</c:when>
<c:when test="${hbs.fkjg == '3' }">
无效比中
</c:when>
</c:choose>
</td>
<c:if test="${hbs.fkjg == '3'}">
<td class="ar">无效比中:</td>
<td colspan="3">
<c:choose>
<c:when test="${hbs.bzwxyy == '0' }">
比中非嫌疑人(被害人,被害人亲属等)
</c:when>
<c:when test="${hbs.bzwxyy == '1' }">
非刑事案件或其他情况(请在内容中说明)
</c:when>
<c:when test="${hbs.bzwxyy == '2' }">
信息不全(案件/人员)
</c:when>
<c:when test="${hbs.bzwxyy == '3' }">
无本地案件
</c:when>
</c:choose>
</td>
</c:if>
<c:if test="${hbs.fkjg != '3'}">
<td class="ar"></td>
<td></td>
<td class="ar"></td>
<td></td>
</c:if>
</tr>
<%--012条件展示案件信息--%>
<c:if test="${hbs.fkjg != '3'}">
<tr>
<td class="ar">案件警综编号:</td>
<td>
${hbs.asjbh }
</td>
<td class="ar">现场勘验编号:</td>
<td>
${hbs.xckybh }
</td>
<td class="ar">案件是否侦查终结:</td>
<td>
<c:choose>
<c:when test="${hbs.ajzt == '0' }">
</c:when>
<c:when test="${hbs.ajzt == '1' }">
</c:when>
</c:choose>
</td>
</tr>
</c:if>
<%--01情况展示嫌疑人信息--%>
<c:if test="${hbs.fkjg == '0' || hbs.fkjg == '1'}">
<tr>
<td class="ar">嫌疑人身份证:</td>
<td>
${hbs.xyrSfzh }
</td>
<td class="ar">嫌疑人姓名:</td>
<td>
${hbs.xyrXm }
</td>
<td class="ar">是否抓获:</td>
<td>
<c:choose>
<c:when test="${hbs.xyrSfyzh == '0' }">
</c:when>
<c:when test="${hbs.xyrSfyzh == '1' }">
</c:when>
</c:choose>
</td>
</tr>
<tr>
<td class="ar">抓获时间:</td>
<td>
${hbs.xyrZhsjStr }
</td>
<td class="ar">羁押场所:</td>
<td>
${hbs.xyrJycs }
</td>
<td class="ar"></td>
<td>
</td>
</tr>
</c:if>
</c:if>
<tr>
<td class="ar">回报内容:</td>
<td colspan="5">${hbs.hbnr }</td>
</tr>
<tr>
<td class="ar">回报附件:</td>
<c:choose>
<c:when test="${not empty hbs.dzwjmc }">
<td colspan="5"><a href="${hbs.dzwjwz}" download="${hbs.dzwjmc}"><span style="color: #cc3e6c;">${hbs.dzwjmc}</span></a></td>
</c:when>
<c:otherwise>
<td colspan="5"></td>
</c:otherwise>
</c:choose>
</tr>
<c:if test="${not empty hbs.pjdj }">
<tr>
<td class="ar">评价人:</td>
<td>${hbs.pjrxm}</td>
<td class="ar">评价人联系电话:</td>
<td>${hbs.pjrlxdh}</td>
<td class="ar">评价人单位:</td>
<td>${hbs.pjrdwmc}</td>
</tr>
<tr>
<td class="ar">评价时间:</td>
<td>${hbs.pjsj}</td>
<td class="ar">评价等级:</td>
<td>${hbs.pjdj}</td>
<td class="ar"></td>
<td></td>
</tr>
<tr>
<td class="ar">回报评价内容:</td>
<td colspan="5">${hbs.hbpj}</td>
</tr>
</c:if>
<tr>
<td colspan="7" class="empty"></td>
</tr>
</table>
</div>
</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${!empty whbdwList}">
<c:forEach var="whb" items="${whbdwList}">
<tr>
<td class="caozuo"></td>
<td>${whb.qsrxm}</td>
<td class="text-overflow" title="${whb.qsrdwmc}">${whb.qsrdwmc}</td>
<td class="text-overflow" title=""></td>
<td></td>
<td></td>
<td class="text-overflow" title="">
<span style="color:red;">未回报</span>
<c:if test="${whb.sfcqhb==1}">
<span class="over_da">
</span>
</c:if>
</td>
</tr>
</c:forEach>
</c:if>
<tr>
<td colspan="6" class="empty"></td>
</tr>
</tbody>
</table>
</div>
</div>
</fieldset>
</div>
<div style="height:50px;"></div>
</article>
<div id="goTop">
<a href="#">
......@@ -458,6 +732,7 @@
<script src="/js/jquery.min.js"></script>
<script src="/zlxq/js/base.js" type="text/javascript"></script>
<script src="/timeLine/js/jquery.eeyellow.Timeline.js" type="text/javascript"></script>
<script src="js/hbxq.js" type="text/javascript"></script>
<script type="text/javascript">
$(function(){
$(".DNA").hide();
......
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