Skip to content

Z
zczlService
Commit d2904672 by mayunfei
Options

侦查指令我辖区的回报信息展示问题修改回复

parent 86befca9
Showing with 93 additions and 174 deletions
src/main/java/com/founder/model/TbYwZczl.java
......@@ -18,10 +18,9 @@ import java.util.List;
public class TbYwZczl extends BaseModel{
private String username = null;
private String zdsprjh = null;//指定审批人警号
private List ywbhList;//业务编号list
private List ywbhList;//业务编号list
private String ifFirst;//是否首次查询 no表示非第一次查询
private String zlfpdwHtml = "";//指令分派单位拼接用的html
private String zlhbHtml = "";//指令回报拼接用html
private String zlqszt = null;//指令签收状态(0-未签收；1-超期未签收；2-已签收；3-超期签收；)
private String zlhbzt = null;//指令回报状态(0-未回报；1-超期未回报；2-已回报（评价等级）；3-超期回报（评价等级）；)
......@@ -30,7 +29,7 @@ public class TbYwZczl extends BaseModel{
private String xbpjdj = null;//续报报评价等级（0-不合格 1-合格 2-优秀）
private String bxqdwdms = null;//本辖区单位代码
private String isFirst = null;//统计时使用-是否进行查询 1-不是进行查询 0-进行查询
private String isFirst = null;//统计时使用-是否进行查询 1-不是进行查询 0-进行查询
private String nfxbxg = "0";//能否续报修改 0-不能 1-能
private String nfxb = "0";//能否续报 0-不能 1-能
private int zlqsgs = 0;//指令签收个数
......@@ -38,127 +37,127 @@ public class TbYwZczl extends BaseModel{
private int zlfpgs = 0;//指令分派个数
private String zczlzt = null;//侦查指令状态 0-未签收 1-已签收（回报状态任意） 2-已签收未回报 3-已签收已回报
private String sfczhbxx = null;//是否存在回报信息 1-存在
private String sfnsp = null;//是否能审批
private String trueUnitcode = null;//用于查询本辖区
private String unitcode = null;//用于查询本辖区
private String fpbh = null;//分派编号
private String spyj = null;//审批意见
private String fqrjh = null;//发起人警号
private String zczlbh = null;//侦查指令编号
private String zlwh = null;//指令文号
private Date djsj = null;//登记时间
private String djsj_str = null;
private String fbsj = null;//发布时间
private String ywbh = null;//业务编号
private String zllx = null;//指令类型
private String zllx_str = null;
private String hbqx = null;//回报期限
private Date hbqx_date = null;
private String ywmc = null;//业务名称
private String zlsy = null;//指令事由
private String zlfqrxm = null;//指令发起人姓名
private String zlfqrlxdh = null;//指令发起人联系电话
private String zlfqrgajgdm = null;//指令发起人公安机构代码
private String spsftg = null;//审批是否通过
private String sprxm = null;//审批人姓名
private Date spsj = null;//审批时间
private String spsj_str = null;
private String spdwdm = null;//审批单位代码
private String spdwmc = null;//审批单位名称
private String zlfqrdwmc = null;//指令发起人单位名称
private String sprlxdh = null;//审批人联系电话
private String sprgmsfhm = null;//审批人身份证号码
private String zlfqrgmsfhm = null;//指令发起人身份证号码
private String gzyq = null;//工作要求
private String zljsdwdm = null;//指令接收单位代码
private String zjjsdwdm_name = null;//指令接收单位名
private String zlzt = null;//指令状态
private String ywlx = null;//业务类型 0-跨区域 1-通用 2-非接触性诈骗
private String ywlx_str = null;
private byte[] dzwjnr = null;//电子文件内容
private String dzwjmc = null;//电子文件名称
private String sfcqwhbbts = null;//是否超期未回报被投诉
private String cqwhbtsnr = null;//超期未回报投诉内容
private String sftscl = null;//是否投诉处理
private String tsclyj = null;//投诉处理意见
private Date tssj = null;//投诉时间
private Date tsclsj = null;//投诉处理时间
private String tsclrxm = null;//投诉处理人姓名
private String tsclrlxdh = null;//投诉处理人联系电话
private String tsclrsfzhm = null;//投诉处理人身份证号码
private String tsclrdwdm = null;//投诉处理人单位代码
private String tsclrdwmc = null;//投诉处理人单位名称
private String xxscpdbz = null;//信息删除判断标志
private String dzwjwz = null;//电子文件位置
private String fileurl = null;//非数据库字段
private String nffp = null;//能否分派 0-不能 1-能
private String nfhb = null;//能否回报 0-不能 1-能 （每个人只能回报一次）
private String nfqs = null;//能否签收 非数据库字段
private String sflly = null;//是否联络员 非数据库字段
private String fbsj_s = null;
private String fbsj_e = null;
private String qsrgmsfhm = null;//签收人公民身份号码
private String zlsfhb = null;//指令是否回报
private String zlsfqs = null;//指令是否签收
private String nfhbxg = null;//能否回报修改
private String zlsffp = null;//指令是否分派
private String qqfqrxm= null;//请求发起人姓名
......@@ -872,13 +871,13 @@ public class TbYwZczl extends BaseModel{
this.ifFirst = ifFirst;
}
public List getYwbhList() {
return ywbhList;
}
public List getYwbhList() {
return ywbhList;
}
public void setYwbhList(List ywbhList) {
this.ywbhList = ywbhList;
}
public void setYwbhList(List ywbhList) {
this.ywbhList = ywbhList;
}
public String getZdsprjh() {
return zdsprjh;
......@@ -895,12 +894,4 @@ public class TbYwZczl extends BaseModel{
public void setUsername(String username) {
this.username = username;
}
public String getZlhbHtml() {
return zlhbHtml;
}
public void setZlhbHtml(String zlhbHtml) {
this.zlhbHtml = zlhbHtml;
}
}
src/main/java/com/founder/zczl/controller/ZczlController.java
......@@ -9,7 +9,6 @@ import com.founder.zczl.service.IZczlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
......@@ -2548,7 +2547,6 @@ public class ZczlController {
String zlfpdwHtml = "";//指令分派单位所用html
String fpdwHtml = "";//分派单位html
String qsztHtml = "";//签收状态htmlhtml
String zlhbHtml = "";//签收状态htmlhtml
List<String> fpbhs = new ArrayList<>();
for(int n=0;n<fps.size();n++){
String sfqspdbz = fps.get(n).getSfqspdbz();
......@@ -2559,7 +2557,6 @@ public class ZczlController {
String qsrdwmc = zczlService.getUnitnameByUnitcode(fps.get(n).getQsrgajgdm());
fpdwHtml = "<tr><td>"+qsrdwmc+"</td>";
zlfpdwHtml = zlfpdwHtml+fpdwHtml;
zlhbHtml = zlhbHtml + fpdwHtml;
Date fpsj = fps.get(n).getFpsj();//分派时间
long qssjc = getTimesByFpsj(fpsj);//签收时间差
//拿到签收个数
......@@ -2582,17 +2579,12 @@ public class ZczlController {
}
}
zlfpdwHtml = zlfpdwHtml+qsztHtml;
//通过分派信息list拿到回报信息list
TbYwZczlHb hbxx = zczlService.getHbxxByFpbh(fpbh);
if(hbxx!=null&& !StringUtils.isEmpty(hbxx)){
zlhbHtml = zlhbHtml + "<td style='color:green;'>已回报</td></tr>";//已回报
zlhbcs ++;
}else{
zlhbHtml = zlhbHtml + "<td style='color:red;'>未回报</td></tr>";//为回报
}
}
zczl.setZlhbHtml(zlhbHtml);
//通过分派信息list拿到回报信息list
List<TbYwZczlHb> hbs = zczlService.getAllHbsByAllFps(fpbhs);
if(hbs!=null){
zlhbcs = hbs.size();
}
zczl.setZlfpdwHtml(zlfpdwHtml);
zczl.setZlqsgs(zlqsgs);
zczl.setZlhbcs(zlhbcs);
......@@ -2608,7 +2600,6 @@ public class ZczlController {
objectMap.put("zlfpgs", zczl.getZlfpgs());//指令分派个数
objectMap.put("zlhbcs", zczl.getZlhbcs());//指令回报个数
objectMap.put("zlfpdwHtml", zczl.getZlfpdwHtml());//指令分派单位拼接用的html
objectMap.put("zlhbHtml",zczl.getZlhbHtml());//指令回报Html
objectMap.put("fbsj", zczl.getFbsj());//发布时间
objectMap.put("zlsy", zczl.getZlsy());//指令事由
objectMap.put("spsftg", zczl.getSpsftg());//审批状态 0-未通过 1-通过 2-待审批
......
src/main/resources/static/css/style.css
......@@ -4,15 +4,15 @@ html,body{
margin: 0;
padding: 0;
}
a:hover{
a:hover{
color: #56AADC;
text-decoration: none;
cursor: pointer;
}
a:visited {
color: #56AADC;
text-decoration: none;
}
a:visited {
color: #56AADC;
text-decoration: none;
}
/* 选中a标签 */
.xzA:hover{
......@@ -192,7 +192,7 @@ a.left-list-ftitle:hover{
margin-left: 3px;
}
.cxtj table textarea{
resize: vertical;
resize: vertical;
border: 1px solid #ccc;
width: 95.5%;
}
......@@ -269,17 +269,17 @@ a.left-list-ftitle:hover{
margin: 10px;
border-radius: 5px;
/*padding-left: 10px;*/
}
.left-list-ftitle{
margin:0 10px;
margin:0 10px;
border-radius: 5px;
}
.bot{
font-size: 0;
width: 0px;
height: 0px;
line-height: 0;
line-height: 0;
border-width: 8px;
border-style: solid dashed dashed dashed;
border-color:transparent transparent #fff transparent;
......@@ -469,11 +469,6 @@ div.layout_yj{
a.re_hb{
background-color: #71a29e;
}
/* 试验添加右侧弹出框 */
.re_hb {
position: relative;
/*width: fit-content;*/
}
a.re_hb:hover{
background-color:#50a099;
color:#fff;
......@@ -510,7 +505,6 @@ a.re_qs:hover{
/*width: fit-content;*/
}
.right_po{
z-index:900;
width: fit-content;
border: 1px solid #ccc;
position: absolute;
......@@ -543,40 +537,6 @@ a.re_qs:hover{
padding: 3px 5px;
white-space: nowrap;
}
.left_pro{
width: fit-content;
border: 1px solid #ccc;
position: absolute;
display: none;
left: 59px;
top: 0px;
background:#d9f2ed;
box-shadow: 3px 3px 15px #666;
max-height: 400px;
overflow-y: auto;
}
.left_pro table{
width: 100%;
font-size: 12px;
}
.left_pro table tr{
border-bottom: 1px dashed #ccc;
}
.left_pro table tr:last-child{
border-bottom: none;
}
.left_pro table th{
background:-webkit-gradient(linear, 0 0, 0 100%, from(#a3dfe6), to(#d9f2ed));
min-width: 100px;
}
.left_pro table td,.left_pro table th{
text-align: center;
height: 30px;
line-height: 30px;
padding: 3px 5px;
white-space: nowrap;
}
table.datagrid-btable td[field="zlwh"] .datagrid-cell{
overflow: visible;
}
......
src/main/resources/static/js/listBxqjsdzczl.js
......@@ -5,9 +5,7 @@ $(function(){
title: false,
closeBtn: 0,
shadeClose: true,
area: ['500px', '120px'],
icon: 1,
btn: ['我明白了'],
skin: 'layer-ext-moon' //该皮肤由layer.seaning.com友情扩展。关于皮肤的扩展规则，去这里查阅
})
})
......@@ -48,47 +46,27 @@ function getZlwhzt(row){
}
//存在回报信息显示回报数
if(row.zlqsgs!=null&&row.zlqsgs!=0&&row.zlqsgs!=""){
str = str + "&nbsp;&nbsp;<a onclick='qs_hb(this,event)' class=\"re_hqzt re_hb\">报:<span class=\"n_hq\">"+row.zlhbcs+"</span>/<span class=\"n_totle\">"+row.zlfpgs+"</span><div class=\"left_pro\"><table><tr><th width=\"60%\">单位名称</th><th width=\"40%\">回报状态</th></tr>"+row.zlhbHtml+"</table></div></a>";
/*str = str + "&nbsp;&nbsp;<a onclick=\"toHbDetail('"+row.zczlbh+"')\" class=\"re_hqzt re_hb\">报:<span class=\"n_hq\">"+row.zlhbcs+"</span>/<span class=\"n_totle\">"+row.zlfpgs+"</span></a>";*/
str = str + "&nbsp;&nbsp;<a onclick=\"toHbDetail('"+row.zczlbh+"')\" class=\"re_hqzt re_hb\">报:<span class=\"n_hq\">"+row.zlhbcs+"</span>/<span class=\"n_totle\">"+row.zlfpgs+"</span></a>";
}
}
return str;
}
/* 添加右侧弹出框 */
function qs_tk(el,event) {
window.top.aa(el,event,'0');
// $('.right_po').dialog('open');
}
/* 添加右侧弹出框 */
function qs_hb(el,event) {
window.top.aa(el,event,'1');
window.top.aa(el,event);
// $('.right_po').dialog('open');
}
function aa(el,event,flag) {
function aa(el,event) {
var top = $(el).offset().top;
var height = $(window).height();
var bottom = height - top;
if(flag == '0'){
var div_height = $(el).find('.right_po').height();
$('.right_po').hide();
$('.left_pro').hide();
if (div_height < bottom) {
$(el).find('.right_po').show();
} else {
$(el).find('.right_po').show().css("top", -div_height + 'px');
}
}else{
var div_height = $(el).find('.left_pro').height();
$('.left_pro').hide();
$('.right_po').hide();
if (div_height < bottom) {
$(el).find('.left_pro').show();
} else {
$(el).find('.left_pro').show().css("top", -div_height + 'px');
}
var div_height = $(el).find('.right_po').height();
$('.right_po').hide();
if (div_height < bottom) {
$(el).find('.right_po').show();
} else {
$(el).find('.right_po').show().css("top", -div_height + 'px');
}
// 解决easyui相应元素设置overflow:hidden属性导致定位的弹窗溢出不显示问题--待定
$('.datagrid-body').css({'overflow':'visible','overflow-x':'visible'});
$('.datagrid-view2').css('overflow','visible');
......@@ -104,29 +82,28 @@ function toHbDetail(zczlbh){
}
$(document).click(function (event) {
$('.right_po').slideUp(200);
$('.left_pro').slideUp(200);
});
var table_title = [
{title:"操作",field:"cz",align:'center',width:'10%',formatter:function(val,row,index){
return getCzColumn(row);
}},
return getCzColumn(row);
}},
{title:"指令文号",field:"zlwh",align:'center',width:'20%',formatter : function(val,row,index){
return getZlwhzt(row) ;
}},
}},
{title:"业务类型",field:"ywlx_str",align:'center',width:'10%',formatter : function(val,row,index){
return row.ywlx_str ;
}},
return row.ywlx_str ;
}},
{title:"指令类型",field:"zllx_str",align:'center',width:'10%',formatter : function(val,row,index){
return row.zllx_str ;
}},
return row.zllx_str ;
}},
/*{title:"业务名称",field:"ywmc",align:'center',width:'10%'},*/
{title:"回报期限",field:"hbqx",align:'center',width:'10%'},
{title:"发布时间",field:"fbsj",align:'center',width:'10%'},
{title:"指令事由",field:"zlsy",align:'center',width:'20%'},
{title:"审批状态",field:"spsftg",align:'center',width:'10%',formatter : function(val,row,index){
return getSpztColumn(row);
}}
return getSpztColumn(row);
}}
];
function doQuery(obj){
......
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