Skip to content

Z
zczlService
Commit a4e077b5 by mayunfei
Options

联络员新增类型

parent b7eb77e8
Showing with 101 additions and 55 deletions
src/main/java/com/founder/zczl/controller/ZczlController.java
......@@ -998,6 +998,33 @@ public class ZczlController {
if(xxzjbh!=null&&!"".equals(xxzjbh)){
sflly = "1";
}
if("1".equals(sflly)){
String ywlx = lly.getYwlx();
if(ywlx!=null) {
String ywlxStr = "";
String[] ywlxArr = ywlx.split(",");
//通过代码值拿到字典值
for (int t = 0; t < ywlxArr.length; t++) {
HashMap<String, String> codeMap = new HashMap<String, String>();
codeMap.put("groupid", "CODE_YWLXDM");
codeMap.put("code", ywlxArr[t]);
String name = zczlService.getNameByCode(codeMap);
if (t == 0) {
ywlxStr = name;
} else {
ywlxStr += "," + name;
}
objectMap.put("ywlx", ywlxStr);
}
}else{
objectMap.put("ywlx","请设置联络员类型");
}
}else{
objectMap.put("ywlx","请先设置为联络员");
}
objectMap.put("sflly",sflly);//是否联络员
objectMap.put("xxzjbh",xxzjbh);//是否联络员
jeMapList.add(objectMap);
......@@ -1113,6 +1140,27 @@ public class ZczlController {
objectMap.put("xxdjryxm", lly.getXxdjryxm());//设置人姓名
objectMap.put("xxdjdwgajgjgdm", lly.getXxdjdwgajgjgdm());//设置人单位
objectMap.put("djsj", lly.getDjsj());//设置时间
String ywlx = lly.getYwlx();
if(ywlx!=null){
String ywlxStr = "";
String[] ywlxArr = ywlx.split(",");
//通过代码值拿到字典值
for(int t=0;t<ywlxArr.length;t++){
HashMap<String,String> codeMap = new HashMap<String,String>();
codeMap.put("groupid", "CODE_YWLXDM");
codeMap.put("code", ywlxArr[t]);
String name = zczlService.getNameByCode(codeMap);
if(t==0){
ywlxStr = name;
}else{
ywlxStr +=","+name;
}
objectMap.put("ywlx",ywlxStr);
}
}else{
objectMap.put("ywlx","暂无类型");
}
objectMap.put("policemanid", lly.getPolicemanid());//联络员警号
jeMapList.add(objectMap);
}
......
src/main/java/com/founder/zczl/service/IZczlService.java
......@@ -5,6 +5,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -46,6 +47,8 @@ public interface IZczlService {
List<TbYwZczlLly> toQueryAllUser(TbYwZczlLly tbYwZczlLly,User user);
String getNameByCode(HashMap<String, String> codeMap);
Integer toQueryAllUserForTotal(TbYwZczlLly tbYwZczlLly);
boolean setLly(TbYwZczlLly lly);
......
src/main/java/com/founder/zczl/service/impl/ZczlService.java
......@@ -580,9 +580,9 @@ public class ZczlService implements IZczlService {
}
}else{
if(i == list.size() -1 && i % 500 == 0){
inString = inString + "or UNITCODE in ('"+list.get(i)+"'";
inString = inString + "or s.UNITCODE in ('"+list.get(i)+"'";
}else if(i % 500 == 0){
inString = inString + "or UNITCODE in ('"+list.get(i)+"'";
inString = inString + "or s.UNITCODE in ('"+list.get(i)+"'";
}else if((i+1) % 500 != 0 && i!=list.size()-1){
inString = inString+",'"+list.get(i)+"'";
}else{
......@@ -600,6 +600,11 @@ public class ZczlService implements IZczlService {
}
@Override
public String getNameByCode(HashMap<String, String> codeMap) {
return dictitemDao.getNameByCode(codeMap);
}
@Override
public Integer toQueryAllUserForTotal(TbYwZczlLly tbYwZczlLly){
return zczlDao.toQueryAllUserForTotal(tbYwZczlLly);
}
......
src/main/resources/application-pro.properties
spring.datasource.url=jdbc:oracle:thin:@192.168.0.103:1521:XZXT
spring.datasource.url=jdbc:oracle:thin:@192.168.0.102:1521:XZXT
spring.datasource.username=XZXT
spring.datasource.password=XZXT
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
......
src/main/resources/mapper/ZczlMapper.xml
......@@ -747,27 +747,29 @@
select * from (
select t.*,rownum rn from (
select
ID userId,
TRUE_NAME truename,
POLICEMANID policemanid,
USERNAME username,
UNITCODE unitcode,
(select name from sys_dictitem where groupid='CODE_XZUNIT' and code=UNITCODE) as unitname,
TELEPHONE telephone
from SYS_USER where scbz='0'
<if test="unitcode!=null and unitcode!=''"> and (UNITCODE in ${unitcode} )</if>
<if test="truename!=null and truename!=''"> and TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
s.ID userId,
s.TRUE_NAME truename,
s.POLICEMANID policemanid,
s.USERNAME username,
s.UNITCODE unitcode,
l.ywlx ywlx,
(select name from sys_dictitem where groupid='CODE_XZUNIT' and code=s.UNITCODE) as unitname,
s.TELEPHONE telephone
from SYS_USER s ,(select * from TB_YW_ZCZL_LLY where xxscpdbz = '0') l where s.scbz='0'
and s.identitycard = l.sfzh(+)
<if test="unitcode!=null and unitcode!=''"> and (s.UNITCODE in ${unitcode} )</if>
<if test="truename!=null and truename!=''"> and s.TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and s.POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
) t
WHERE ROWNUM <![CDATA[<=]]> #{end}
) WHERE RN > #{begin}
</select>
<select id="toQueryAllUserForTotal" parameterType="com.founder.model.TbYwZczlLly" resultType="java.lang.Integer">
select count(*) from SYS_USER where scbz='0'
<if test="unitcode!=null and unitcode!=''"> and UNITCODE in ${unitcode}</if>
<if test="truename!=null and truename!=''"> and TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
select count(*) from SYS_USER s where s.scbz='0'
<if test="unitcode!=null and unitcode!=''"> and s.UNITCODE in ${unitcode}</if>
<if test="truename!=null and truename!=''"> and s.TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and s.POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
</select>
<!-- 根据userid拿到用户信息 -->
......@@ -853,6 +855,7 @@
TRUENAME truename,
TELEPHONE telephone,
XXDJRYXM xxdjryxm,
ywlx ywlx,
(select name from sys_dictitem where groupid='CODE_UNIT' and code=XXDJDWGAJGJGDM) as xxdjdwgajgjgdm,
to_char(DJSJ,'yyyy-MM-dd hh24:mi:ss') as djsj
from TB_YW_ZCZL_LLY where 1=1 and XXSCPDBZ = '0' and UNITCODE = #{unitcode, jdbcType=VARCHAR}
......
src/main/resources/static/js/llycx.js
......@@ -9,12 +9,13 @@ function doClear(){
var table_title = [
{title:"联络员单位",field:"unitname",align:'center',width:'15%'},
{title:"联络员",field:"truename",align:'center',width:'15%'},
{title:"联络员",field:"truename",align:'center',width:'10%'},
{title:"联络类型",field:"ywlx",align:'center',width:'25%'},
{title:"联络员警号",field:"policemanid",align:'center',width:'10%'},
{title:"联系电话",field:"telephone",align:'center',width:'15%'},
{title:"设置人姓名",field:"xxdjryxm",align:'center',width:'15%'},
{title:"设置人单位",field:"xxdjdwgajgjgdm",align:'center',width:'15%'},
{title:"设置时间",field:"djsj",align:'center',width:'15%'}
{title:"联系电话",field:"telephone",align:'center',width:'10%'},
{title:"设置人姓名",field:"xxdjryxm",align:'center',width:'10%'},
{title:"设置人单位",field:"xxdjdwgajgjgdm",align:'center',width:'10%'},
{title:"设置时间",field:"djsj",align:'center',width:'10%'}
];
function doQuery(obj){
......
src/main/resources/static/js/llysz.js
......@@ -337,10 +337,11 @@ var table_title = [
{title:"操作",field:"xxzjbh",align:'center',width:'10%',formatter:function(val,row,index){
return getColumn(row);
}},
{title:"姓名",field:"truename",align:'center',width:'15%'},
{title:"警号",field:"policemanid",align:'center',width:'15%'},
{title:"系统账号",field:"username",align:'center',width:'20%'},
{title:"所属单位",field:"unitname",align:'center',width:'25%'},
{title:"姓名",field:"truename",align:'center',width:'10%'},
{title:"联络员类型",field:"ywlx",align:'center',width:'25%'},
{title:"警号",field:"policemanid",align:'center',width:'10%'},
{title:"系统账号",field:"username",align:'center',width:'10%'},
{title:"所属单位",field:"unitname",align:'center',width:'20%'},
{title:"联系电话",field:"telephone",align:'center',width:'15%'}
];
......
src/main/webapp/WEB-INF/jsp/zczl_xdzl.jsp
......@@ -171,20 +171,20 @@
<td class="ar necessary" width="13.3%">业务类型：</td>
<td width="20%">
<span class="textbox">
<input type="text" id="ywlx" name="ywlx" value="${tbYwZczl.ywlx}" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_YWLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<input type="text" id="ywlx" name="ywlx" value="${tbYwZczl.ywlx}" class="val easyui-openCombotree" data-options="url: '/queryTypeCode?type=CODE_YWLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span>
</td>
<td class="ar" width="13.3%">审批人：</td>
<td width="20%">
<span class="textbox">
<input type="hidden" id="hiddenZpsprjh" value="${tbYwZczl.zdsprjh}">
<input type="text" id="zdsprjh" name="zdsprjh" value="" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_SPJY&startId=${tbYwZczl.ywlx}',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<input type="text" id="zdsprjh" name="zdsprjh" value="" class="val easyui-openCombotree" data-options="url: '/queryTypeCode?type=CODE_SPJY&startId=${tbYwZczl.ywlx}',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span>
</td>
<td class="ar necessary" width="13.3%">侦查指令类型：</td>
<td width="20%">
<span class="textbox">
<input type="text" id="zllx" name="zllx" value="${tbYwZczl.zllx}" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_ZLLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<input type="text" id="zllx" name="zllx" value="${tbYwZczl.zllx}" class="val easyui-openCombotree" data-options="url: '/queryTypeCode?type=CODE_ZLLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span>
</td>
<td class="ar" width="13.3%"></td>
......@@ -194,17 +194,7 @@
<td class="ar necessary">接受单位：</td>
<td colspan="3">
<span class="textbox textbox-3">
<%if("65".equals(ssdw)) { %>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_DZXZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<%} else if("14".equals(ssdw)&&grade.equals("S")) { %>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<%} else if("62".equals(ssdw)) { %>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT_XDZL',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<%}else{%>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<% } %>
<%--<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_XZUNIT&rootId=650100000000',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
--%>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-openCombotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id', cascadeCheck:false,minonly:false,multiple:true"/>
</span>
</td>
<td></td>
......@@ -262,6 +252,7 @@
<!--- 代码框-->
<script type="text/javascript" src="/easyui-window/js/jquery.min.js"></script>
<script type="text/javascript" src="/easyui-window/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/easyui-window/js/jquery.easyui.my.js"></script>
<script type="text/javascript" src="/easyui-window/js/function.js"></script>
<script type="text/javascript" src="/easyui-window/js/easyui-lang-zh_CN.js"></script>
<!--- 日期时间-->
......@@ -280,12 +271,6 @@
watermark.load({ watermark_txt: "<%=truename%>"+" "+"<%=identitycard%>"+" "+"<%=unitcode%>"+" "+"<%=policeId%>"+" "+ip});
});
</script>
<script>
openCombotree('ywlx');
openCombotree('zllx');
openCombotree('zljsdwdm');
</script>
</body>
</html>
......@@ -294,8 +279,8 @@
$(document).ready(function(){
var hiddenZpsprjh = $("#hiddenZpsprjh").val();
$('#zdsprjh').combotree('setValue',hiddenZpsprjh);
$('#ywlx').combotree({
$('#zdsprjh').openCombotree('setValue',hiddenZpsprjh);
$('#ywlx').openCombotree({
onChange: function (n,o) {
debugger
//控制类案中的代码值
......@@ -385,17 +370,17 @@
layer.alert("回报期限必填！","提示");
return;
}
var ywlx= $("#ywlx").combotree("getValue");
var ywlx= $("#ywlx").openCombotree("getValue");
if(ywlx==''){
layer.alert("业务类型必填！","提示");
return;
}
var zllx= $("#zllx").combotree("getValue");
var zllx= $("#zllx").openCombotree("getValue");
if(zllx==''){
layer.alert("指令类型必填！","提示");
return;
}
var zljsdwdm= $("#zljsdwdm").combotree("getValue");
var zljsdwdm= $("#zljsdwdm").openCombotree("getValue");
if(zljsdwdm==''){
layer.alert("接受单位必填！","提示");
return;
......@@ -466,17 +451,17 @@
layer.alert("回报期限必填！","提示");
return;
}
var ywlx= $("#ywlx").combotree("getValue");
var ywlx= $("#ywlx").openCombotree("getValue");
if(ywlx==''){
layer.alert("业务类型必填！","提示");
return;
}
var zllx= $("#zllx").combotree("getValue");
var zllx= $("#zllx").openCombotree("getValue");
if(zllx==''){
layer.alert("指令类型必填！","提示");
return;
}
var zljsdwdm= $("#zljsdwdm").combotree("getValue");
var zljsdwdm= $("#zljsdwdm").openCombotree("getValue");
if(zljsdwdm==''){
layer.alert("接受单位必填！","提示");
return;
......
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