Commit c9a9ce7d by mayunfei

株洲市侦查指令添加科所队用户级别 以及分派时的单位选择bug 无效必中添加多种类别选择

parent 8a63a1e6
......@@ -348,7 +348,9 @@ public class ZczlController {
tjUnitcode = zczlService.getGatXjdw(tjUnitcode);
}*/
String myUnitcode = "";
if("X".equals(user.getGrade())){
if("K".equals(user.getGrade())){
myUnitcode = user.getUnitcode().substring(0,8)+"0000";
}else if("X".equals(user.getGrade())){
myUnitcode = user.getUnitcode().substring(0,6)+"000000";
}else if("D".equals(user.getGrade())){
myUnitcode = user.getUnitcode().substring(0,4)+"00000000";
......@@ -459,7 +461,9 @@ public class ZczlController {
//拿到需要显示的单位的单位代码
TbYwZczl tbYwZczl = new TbYwZczl();
String myCode = "";
if("X".equals(user.getGrade())){
if("K".equals(user.getGrade())){
myCode = user.getUnitcode().substring(0,8)+"0000";
}else if("X".equals(user.getGrade())){
myCode = user.getUnitcode().substring(0,6)+"000000";
}else if("D".equals(user.getGrade())){
myCode = user.getUnitcode().substring(0,4)+"00000000";
......@@ -1693,7 +1697,9 @@ public class ZczlController {
TbYwZczlFp fpxx = new TbYwZczlFp();
fpxx.setZczlbh(zczlbh);
fpxx.setQsrgmsfhm(user.getIdentitycard());
if("X".equals(user.getGrade())){
if("K".equals(user.getGrade())){
fpxx.setQsrgajgdm(user.getUnitcode().substring(0,8));
}else if("X".equals(user.getGrade())){
fpxx.setQsrgajgdm(user.getUnitcode().substring(0,6));
}else if("D".equals(user.getGrade())){
fpxx.setQsrgajgdm(user.getUnitcode().substring(0,4) );
......
......@@ -61,6 +61,9 @@ public class ZczlService implements IZczlService {
}else if("X".equals(grade)){
map.put("unitcodegrade",unit.substring(0,6));
map.put("grade","X");
}else if("K".equals(grade)){
map.put("unitcodegrade",unit.substring(0,8));
map.put("grade","K");
}else{//这里条件使得sql查出为空
map.put("unitcodegrade","44");
map.put("grade","X");
......@@ -94,7 +97,9 @@ public class ZczlService implements IZczlService {
if(sflly){
tbYwZczl.setSflly("1");
tbYwZczl.setZljsdwdm(user.getUnitcode());
if("X".equals(user.getGrade())){
if("K".equals(user.getGrade())){
tbYwZczl.setZljsdwGradeDm(user.getUnitcode().substring(0,8)+"0000");
}else if("X".equals(user.getGrade())){
tbYwZczl.setZljsdwGradeDm(user.getUnitcode().substring(0,6)+"000000");
}else if("D".equals(user.getGrade())){
tbYwZczl.setZljsdwGradeDm(user.getUnitcode().substring(0,4)+"00000000");
......@@ -543,7 +548,9 @@ public class ZczlService implements IZczlService {
public List<TbYwZczlLly> toQueryAllUser(TbYwZczlLly tbYwZczlLly,User user) {
//进入默认查询本单位用户以及下级单位用户
String myUnitcode = user.getUnitcode();
if("X".equals(user.getGrade())){
if("K".equals(user.getGrade())){
myUnitcode = user.getUnitcode().substring(0,8)+"0000";
}else if("X".equals(user.getGrade())){
myUnitcode = user.getUnitcode().substring(0,6)+"000000";
}else if("D".equals(user.getGrade())){
myUnitcode = user.getUnitcode().substring(0,4)+"00000000";
......@@ -803,12 +810,15 @@ public class ZczlService implements IZczlService {
boolean bool = false;
Map map = new HashMap();
map.put("unitcode",unit);
if(unit.indexOf("00") == 4){
if(unit.indexOf("0000") == 4){
map.put("unitcodegrade",unit.substring(0,4));
map.put("grade","D");
}else if(unit.indexOf("00") == 6){
}else if(unit.indexOf("0000") == 6){
map.put("unitcodegrade",unit.substring(0,6));
map.put("grade","X");
}else if(unit.indexOf("0000") == 8){
map.put("unitcodegrade",unit.substring(0,8));
map.put("grade","K");
}else{//这里条件使得sql查出为空
map.put("unitcodegrade","44");
map.put("grade","X");
......
......@@ -8,7 +8,7 @@ $(function(){
});*/
var myGradeUnitcode = $("#myGradeUnitcode").val();//用户所属单位
$("#qsrgajgdm").combotree({
$("#qsrgajgdm").openCombotree({
onChange: function () {
//拿到选中的单位
var selectUnit = $("#qsrgajgdm").combotree('getValue');
......@@ -495,7 +495,7 @@ function toFp(zczlbh){
function doFp(){
var zczlbh = $("#zczlbh").val();
var fprUnitcode = $("#myUnitcode").val();//用户所属单位
var jsrUnitcode = $("#qsrgajgdm").combotree('getValue');//接收单位
var jsrUnitcode = $("#qsrgajgdm").openCombotree('getValue');//接收单位
var jsrPolicemanid = $("#qsrjh").combotree('getValue');//接收人警号
var fpgzyq = $("#fpgzyq").val();
if(jsrUnitcode=="" || jsrUnitcode==null){
......@@ -914,7 +914,7 @@ function fpfh(){
$('.layout_fp').fadeOut(500);
$("#jsryTd1").css("visibility",'hidden');
$("#jsryTd2").css("visibility",'hidden');
$("#qsrgajgdm").combotree('setValue','');
$("#qsrgajgdm").openCombotree('setValue','');
$("#qsrjh").combotree('setValue','');
}
......
......@@ -149,6 +149,12 @@
<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>
......
......@@ -317,6 +317,8 @@
<input type="hidden" name="bzwxyy" value="0" id="bzwxyy" >
<a onclick="xzlxfz(this)" class="bzwxyy" value="0" >比中非嫌疑人(被害人,被害人亲属等)<i></i></a>
<a onclick="xzlxfz(this)" class="bzwxyy" value="1" >非刑事案件或其他情况(请在内容中说明)<i></i></a>
<a onclick="xzlxfz(this)" class="bzwxyy" value="2" >信息不全(案件/人员)<i></i></a>
<a onclick="xzlxfz(this)" class="bzwxyy" value="3" >无本地案件<i></i></a>
</div>
</td>
</tr>
......@@ -468,7 +470,7 @@
<td class="ar necessary" width="15%">接收单位:</td>
<td width="35%">
<span class="textbox" style="width:220px;">
<input type="text" id="qsrgajgdm" name="qsrgajgdm" class="val easyui-openCombotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT&startId=<%=unitcodeStartId %>',method:'get',fit:true,textField : 'text', valueField : 'id',cascadeCheck:false"/>
<input type="text" id="qsrgajgdm" value="${tbYwZczl.zljsdwdm}" name="qsrgajgdm" class="val easyui-openCombotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT&startId=<%=unitcodeStartId %>',method:'get',fit:true,textField : 'text', valueField : 'id', cascadeCheck:false,minonly:false,multiple:true"/>
</span>
</td>
<td class="ar necessary" width="15%" style="visibility: hidden" id="jsryTd1">接收人员:</td>
......@@ -532,7 +534,6 @@
</html>
<script>
openCombotree('qsrgajgdm');
openCombotree('qsrjh');
openCombotree('qsrjh_yj');
$(document).ready(function() {
......
......@@ -381,6 +381,41 @@
<script type="text/javascript">
$(document).ready(function(){
if("${flag}" == "1"){//添加成功
layer.alert("保存成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "0"){
layer.alert("保存失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "3"){
layer.alert("修改失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "4"){
layer.alert("修改成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}
});
$('#ywlx').openCombotree({
onChange: function (n,o) {
$(".KQYAJ").hide();
......@@ -441,40 +476,7 @@
$('#zdsprjh').openCombotree('setValue',hiddenZpsprjh);
if("${flag}" == "1"){//添加成功
layer.alert("保存成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "0"){
layer.alert("保存失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "3"){
layer.alert("修改失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "4"){
layer.alert("修改成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWqqfbdzczlList";
window.open(url,"_self");
}
});
}
});
//提取DNA信息
function doSearch(){
......
......@@ -384,6 +384,40 @@
<script type="text/javascript">
$(document).ready(function(){
if("${flag}" == "1"){//添加成功
layer.alert("保存成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "0"){
layer.alert("保存失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "3"){
layer.alert("修改失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "4"){
layer.alert("修改成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}
$('#ywlx').openCombotree({
onChange: function (n,o) {
$(".KQYAJ").hide();
......@@ -489,39 +523,7 @@
if("${flag}" == "1"){//添加成功
layer.alert("保存成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "0"){
layer.alert("保存失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "3"){
layer.alert("修改失败!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}else if("${flag}" == "4"){
layer.alert("修改成功!","提示",function(res){
if(res){
layer.closeAll();
var url="/toGetWfqdzczlList";
window.open(url,"_self");
}
});
}
//刑事技术比中跳转
if("${param.type}" == "1"){
var zwbh = "${param.bzzybh}";
......
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