Skip to content

Z
zczlService
Commit 9f4393b4 by mayunfei
Options

侦查指令回退到水印版本 联络员类型为株洲特有需求

parent a4e077b5
Showing with 74 additions and 375 deletions
src/main/java/com/founder/model/TbYwZczlLly.java
...@@ -50,16 +50,6 @@ public class TbYwZczlLly extends BaseModel{ ...@@ -50,16 +50,6 @@ public class TbYwZczlLly extends BaseModel{
private Date gxsj = null;//更新时间 private Date gxsj = null;//更新时间
private String ywlx = null;
public String getYwlx() {
return ywlx;
}
public void setYwlx(String ywlx) {
this.ywlx = ywlx;
}
public String getXxzjbh() { public String getXxzjbh() {
return xxzjbh; return xxzjbh;
} }
......
src/main/java/com/founder/zczl/controller/ZczlController.java
...@@ -715,17 +715,15 @@ public class ZczlController { ...@@ -715,17 +715,15 @@ public class ZczlController {
*/ */
@RequestMapping("/queryLlys") @RequestMapping("/queryLlys")
@ResponseBody @ResponseBody
public String queryLlys(@RequestParam(value = "unitcodes") String unitcodes, public String queryLlys(@RequestParam(value = "unitcodes") String unitcodes,HttpServletRequest request){
@RequestParam(value = "ywlx") String ywlx,
HttpServletRequest request){
String message = "1"; String message = "1";
if(unitcodes!=null&&!"".equals(unitcodes.trim())){ if(unitcodes!=null&&!"".equals(unitcodes.trim())){
String[] unitArr = unitcodes.split(","); String[] unitArr = unitcodes.split(",");
if(unitArr!=null&&unitArr.length>0){ if(unitArr!=null&&unitArr.length>0){
for(int i=0;i<unitArr.length;i++){ for(int i=0;i<unitArr.length;i++){
String unit = unitArr[i]; String unit = unitArr[i];
//判断该单位是否存在该类型的联络员 //判断该单位是否存在联络员
boolean bool = zczlService.ifCzlly(unit,ywlx); boolean bool = zczlService.ifCzlly(unit);
//不存在 //不存在
if(!bool){ if(!bool){
//根据单位代码查询该单位的单位名 //根据单位代码查询该单位的单位名
...@@ -998,33 +996,6 @@ public class ZczlController { ...@@ -998,33 +996,6 @@ public class ZczlController {
if(xxzjbh!=null&&!"".equals(xxzjbh)){ if(xxzjbh!=null&&!"".equals(xxzjbh)){
sflly = "1"; 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("sflly",sflly);//是否联络员
objectMap.put("xxzjbh",xxzjbh);//是否联络员 objectMap.put("xxzjbh",xxzjbh);//是否联络员
jeMapList.add(objectMap); jeMapList.add(objectMap);
...@@ -1058,9 +1029,9 @@ public class ZczlController { ...@@ -1058,9 +1029,9 @@ public class ZczlController {
} }
}else{ }else{
//不存在联络员或联络员个数小于2 //不存在联络员或联络员个数小于2
//if(tbYwZczlLlyList==null||tbYwZczlLlyList.size()<2){ if(tbYwZczlLlyList==null||tbYwZczlLlyList.size()<2){
bool = true; bool = true;
//} }
} }
if(bool){ if(bool){
message = "1";//可以设置联络员 message = "1";//可以设置联络员
...@@ -1140,27 +1111,6 @@ public class ZczlController { ...@@ -1140,27 +1111,6 @@ public class ZczlController {
objectMap.put("xxdjryxm", lly.getXxdjryxm());//设置人姓名 objectMap.put("xxdjryxm", lly.getXxdjryxm());//设置人姓名
objectMap.put("xxdjdwgajgjgdm", lly.getXxdjdwgajgjgdm());//设置人单位 objectMap.put("xxdjdwgajgjgdm", lly.getXxdjdwgajgjgdm());//设置人单位
objectMap.put("djsj", lly.getDjsj());//设置时间 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());//联络员警号 objectMap.put("policemanid", lly.getPolicemanid());//联络员警号
jeMapList.add(objectMap); jeMapList.add(objectMap);
} }
...@@ -3374,20 +3324,6 @@ public class ZczlController { ...@@ -3374,20 +3324,6 @@ public class ZczlController {
} }
/** /**
* 拿到对应人员的联络员权限
* @return
*/
@RequestMapping("/getLlyqxByUserId")
@ResponseBody
public JSONArray getLlyqxByUserId(String userId){
List<String> qxList = new ArrayList<>();
Map map = zczlService.getLlyqxByUserId(userId);
qxList = (List)map.get("qxList");
JSONArray jsonArray = JSONArray.fromObject(qxList);
return jsonArray;
}
/**
* 权限分配 * 权限分配
* @return * @return
*/ */
...@@ -3409,18 +3345,6 @@ public class ZczlController { ...@@ -3409,18 +3345,6 @@ public class ZczlController {
return flag; return flag;
} }
/**
* 权限分配
* @return
*/
@RequestMapping("/doLlyQxfp")
@ResponseBody
public String doLlyQxfp(TbYwZczlLly tbYwZczlLly){
String flag = "0";
flag = zczlService.doLlyQxfp(tbYwZczlLly);
return flag;
}
//审批权限查询与设置--end //审批权限查询与设置--end
} }
......
src/main/java/com/founder/zczl/dao/ZczlDao.java
...@@ -17,8 +17,6 @@ public interface ZczlDao { ...@@ -17,8 +17,6 @@ public interface ZczlDao {
List<TbYwZczlLly> getLlysPolicemanId(String unitcode); List<TbYwZczlLly> getLlysPolicemanId(String unitcode);
List<TbYwZczlLly> getLlysByMap(Map map);
List<TbYwZczl> toQueryAllWfzdzczl(TbYwZczl tbYwZczl); List<TbYwZczl> toQueryAllWfzdzczl(TbYwZczl tbYwZczl);
Integer toQueryAllWfzdzczlForTotal(TbYwZczl tbYwZczl); Integer toQueryAllWfzdzczlForTotal(TbYwZczl tbYwZczl);
...@@ -157,13 +155,9 @@ public interface ZczlDao { ...@@ -157,13 +155,9 @@ public interface ZczlDao {
TbYwZczlSpqx getFpqxxxByUserId(String userId); TbYwZczlSpqx getFpqxxxByUserId(String userId);
TbYwZczlLly getLlyqxByUserId(String userId);
void insertQxfp(TbYwZczlSpqx tbYwZczlSpqx); void insertQxfp(TbYwZczlSpqx tbYwZczlSpqx);
int updateQxfp(TbYwZczlSpqx tbYwZczlSpqx); int updateQxfp(TbYwZczlSpqx tbYwZczlSpqx);
int updateLlyQxfp(TbYwZczlLly tbYwZczlLly);
List<String> queryAllUserIdByYwlx(String startId); List<String> queryAllUserIdByYwlx(String startId);
} }
src/main/java/com/founder/zczl/service/IZczlService.java
...@@ -5,7 +5,6 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -5,7 +5,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -15,7 +14,7 @@ import java.util.Map; ...@@ -15,7 +14,7 @@ import java.util.Map;
public interface IZczlService { public interface IZczlService {
boolean getLly(User user); boolean getLly(User user);
List<TbYwZczl> toQueryAllWfzdzczl(TbYwZczl tbYwZczl, User user,boolean sflly); List<TbYwZczl> toQueryAllWfzdzczl(TbYwZczl tbYwZczl, User user, boolean sflly);
Integer toQueryAllWfzdzczlForTotal(TbYwZczl tbYwZczl, User user, boolean sflly); Integer toQueryAllWfzdzczlForTotal(TbYwZczl tbYwZczl, User user, boolean sflly);
...@@ -45,9 +44,7 @@ public interface IZczlService { ...@@ -45,9 +44,7 @@ public interface IZczlService {
boolean llyDel(String xxzjbh, User user); boolean llyDel(String xxzjbh, User user);
List<TbYwZczlLly> toQueryAllUser(TbYwZczlLly tbYwZczlLly,User user); List<TbYwZczlLly> toQueryAllUser(TbYwZczlLly tbYwZczlLly, User user);
String getNameByCode(HashMap<String, String> codeMap);
Integer toQueryAllUserForTotal(TbYwZczlLly tbYwZczlLly); Integer toQueryAllUserForTotal(TbYwZczlLly tbYwZczlLly);
...@@ -59,7 +56,7 @@ public interface IZczlService { ...@@ -59,7 +56,7 @@ public interface IZczlService {
List<TbYwZczlLly> toQueryAllLlyByUnitcode(String unitcode); List<TbYwZczlLly> toQueryAllLlyByUnitcode(String unitcode);
boolean doAddZczlxx(TbYwZczl tbYwZczl, User user, MultipartFile[] files,HttpServletRequest request,String sfqqzl); boolean doAddZczlxx(TbYwZczl tbYwZczl, User user, MultipartFile[] files, HttpServletRequest request, String sfqqzl);
TbYwZczl getZczlxxByZczlbh(String zczlbh); TbYwZczl getZczlxxByZczlbh(String zczlbh);
...@@ -71,7 +68,7 @@ public interface IZczlService { ...@@ -71,7 +68,7 @@ public interface IZczlService {
boolean tqspOrDel(TbYwZczl tbYwZczl); boolean tqspOrDel(TbYwZczl tbYwZczl);
boolean ifCzlly(String unit,String ywlx); boolean ifCzlly(String unit);
String getUnitnameByUnitcode(String unit); String getUnitnameByUnitcode(String unit);
...@@ -105,13 +102,13 @@ public interface IZczlService { ...@@ -105,13 +102,13 @@ public interface IZczlService {
TbYwZczlHb getAllSchbxxByFpbh(String fpbh); TbYwZczlHb getAllSchbxxByFpbh(String fpbh);
List<TbYwZczlFp> getAllTjfpxx(Date fbsj_s, Date fbsj_e, String dwdm, String sfbdw,String unitcode,String userUnitcode); List<TbYwZczlFp> getAllTjfpxx(Date fbsj_s, Date fbsj_e, String dwdm, String sfbdw, String unitcode, String userUnitcode);
List<TbYwZczl> toQueryBxqjsdzczls(TbYwZczl tbYwZczl, String unitcode); List<TbYwZczl> toQueryBxqjsdzczls(TbYwZczl tbYwZczl, String unitcode);
Integer toQueryBxqjsdzczlsForTotal(TbYwZczl tbYwZczl, String unitcode); Integer toQueryBxqjsdzczlsForTotal(TbYwZczl tbYwZczl, String unitcode);
List<TbYwZczlFp> toQueryBxqjsdzczlsQs(String zczlbh,String unitcode,String flag); List<TbYwZczlFp> toQueryBxqjsdzczlsQs(String zczlbh, String unitcode, String flag);
List<TbYwZczlFp> getAllFpxxOrderByFpsj(String zczlbh); List<TbYwZczlFp> getAllFpxxOrderByFpsj(String zczlbh);
...@@ -149,9 +146,5 @@ public interface IZczlService { ...@@ -149,9 +146,5 @@ public interface IZczlService {
Map getFpqxxxByUserId(String userId); Map getFpqxxxByUserId(String userId);
Map getLlyqxByUserId(String userId);
String doQxfp(TbYwZczlSpqx tbYwZczlSpqx); String doQxfp(TbYwZczlSpqx tbYwZczlSpqx);
String doLlyQxfp(TbYwZczlLly tbYwZczlLly);
} }
src/main/java/com/founder/zczl/service/impl/ZczlService.java
...@@ -569,7 +569,6 @@ public class ZczlService implements IZczlService { ...@@ -569,7 +569,6 @@ public class ZczlService implements IZczlService {
}else{ }else{
//遍历list，拼接单位的字符串 //遍历list，拼接单位的字符串
for(int i=0;i<list.size();i++){ for(int i=0;i<list.size();i++){
if(i<500){ if(i<500){
if(i==0){ if(i==0){
inString = "('"+list.get(i)+"'"; inString = "('"+list.get(i)+"'";
...@@ -580,15 +579,16 @@ public class ZczlService implements IZczlService { ...@@ -580,15 +579,16 @@ public class ZczlService implements IZczlService {
} }
}else{ }else{
if(i == list.size() -1 && i % 500 == 0){ if(i == list.size() -1 && i % 500 == 0){
inString = inString + "or s.UNITCODE in ('"+list.get(i)+"'"; inString = inString + "or UNITCODE in ('"+list.get(i)+"'";
}else if(i % 500 == 0){ }else if(i % 500 == 0){
inString = inString + "or s.UNITCODE in ('"+list.get(i)+"'"; inString = inString + "or UNITCODE in ('"+list.get(i)+"'";
}else if((i+1) % 500 != 0 && i!=list.size()-1){ }else if((i+1) % 500 != 0 && i!=list.size()-1){
inString = inString+",'"+list.get(i)+"'"; inString = inString+",'"+list.get(i)+"'";
}else{ }else{
inString = inString+",'"+list.get(i)+"')"; inString = inString+",'"+list.get(i)+"')";
} }
} }
} }
} }
searchUnitcode = inString; searchUnitcode = inString;
...@@ -600,11 +600,6 @@ public class ZczlService implements IZczlService { ...@@ -600,11 +600,6 @@ public class ZczlService implements IZczlService {
} }
@Override @Override
public String getNameByCode(HashMap<String, String> codeMap) {
return dictitemDao.getNameByCode(codeMap);
}
@Override
public Integer toQueryAllUserForTotal(TbYwZczlLly tbYwZczlLly){ public Integer toQueryAllUserForTotal(TbYwZczlLly tbYwZczlLly){
return zczlDao.toQueryAllUserForTotal(tbYwZczlLly); return zczlDao.toQueryAllUserForTotal(tbYwZczlLly);
} }
...@@ -781,14 +776,11 @@ public class ZczlService implements IZczlService { ...@@ -781,14 +776,11 @@ public class ZczlService implements IZczlService {
* @return * @return
*/ */
@Override @Override
public boolean ifCzlly(String unit,String ywlx) { public boolean ifCzlly(String unit) {
boolean bool = false; boolean bool = false;
Map map = new HashMap();
map.put("unitcode",unit);
map.put("ywlx",ywlx);
try{ try{
List<TbYwZczlLly> llyxx = null; List<TbYwZczlLly> llyxx = null;
llyxx = zczlDao.getLlysByMap(map); llyxx = zczlDao.getLlysPolicemanId(unit);
if(llyxx!=null&&llyxx.size()>0){ if(llyxx!=null&&llyxx.size()>0){
bool = true; bool = true;
} }
...@@ -1893,26 +1885,6 @@ public class ZczlService implements IZczlService { ...@@ -1893,26 +1885,6 @@ public class ZczlService implements IZczlService {
return map; return map;
} }
@Override
public Map getLlyqxByUserId(String userId) {
List<String> qxList = new ArrayList<>();
String qxStr = null;
TbYwZczlLly llyqx = zczlDao.getLlyqxByUserId(userId);
if(llyqx!=null){
qxStr = llyqx.getYwlx();
if(qxStr!=null&&!"".equals(qxStr.trim())){//权限不为空
String[] qxArr = qxStr.split(",");
for(int i=0;i<qxArr.length;i++){
qxList.add(qxArr[i]);
}
}
}
Map map = new HashMap();
map.put("qxStr",qxStr);
map.put("qxList",qxList);
return map;
}
/** /**
* 新增或更新权限信息 * 新增或更新权限信息
* @param tbYwZczlSpqx * @param tbYwZczlSpqx
...@@ -1944,22 +1916,5 @@ public class ZczlService implements IZczlService { ...@@ -1944,22 +1916,5 @@ public class ZczlService implements IZczlService {
return flag; return flag;
} }
/**
* 新增或更新权限信息
* @param tbYwZczlLly
* @return
*/
@Override
public String doLlyQxfp(TbYwZczlLly tbYwZczlLly){
String flag = "0";
try{
int t = zczlDao.updateLlyQxfp(tbYwZczlLly);
flag = ""+t;
} catch (Exception e) {
throw new BaseException("修改审批权限出错！",e);
}
return flag;
}
//审批权限查询与设置--end //审批权限查询与设置--end
} }
src/main/resources/mapper/ZczlMapper.xml
...@@ -7,15 +7,6 @@ ...@@ -7,15 +7,6 @@
select * from TB_YW_ZCZL_LLY where unitcode= #{unitcode, jdbcType=VARCHAR} and xxscpdbz='0' select * from TB_YW_ZCZL_LLY where unitcode= #{unitcode, jdbcType=VARCHAR} and xxscpdbz='0'
</select> </select>
<!-- 拿到本单位类型联络员 -->
<select id="getLlysByMap" parameterType="java.util.Map" resultType="com.founder.model.TbYwZczlLly">
select * from TB_YW_ZCZL_LLY
where
unitcode=#{unitcode, jdbcType=VARCHAR}
and instr(ywlx,#{ywlx, jdbcType=VARCHAR}) > 0
and xxscpdbz='0'
</select>
<sql id="wfzdzczl-where"> <sql id="wfzdzczl-where">
<if test="zlwh!=null and zlwh!=''">and zczl.zlwh like '%'||#{zlwh, jdbcType=VARCHAR}||'%'</if> <if test="zlwh!=null and zlwh!=''">and zczl.zlwh like '%'||#{zlwh, jdbcType=VARCHAR}||'%'</if>
<if test="zczlbh!=null and zczlbh!=''">and zczl.zczlbh like '%'||#{zczlbh, jdbcType=VARCHAR}||'%'</if> <if test="zczlbh!=null and zczlbh!=''">and zczl.zczlbh like '%'||#{zczlbh, jdbcType=VARCHAR}||'%'</if>
...@@ -208,7 +199,6 @@ ...@@ -208,7 +199,6 @@
zczl.ZDSPRJH zdsprjh, zczl.ZDSPRJH zdsprjh,
zczl.SPYJ spyj zczl.SPYJ spyj
from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0' from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
and instr((select ywlx from TB_YW_ZCZL_LLY lly where lly.sfzh = #{qsrgmsfhm, jdbcType=VARCHAR} and lly.xxscpdbz = 0 ),zczl.ywlx) > 0
<include refid="wfzdzczl-where"/> <include refid="wfzdzczl-where"/>
) t ) t
WHERE ROWNUM <![CDATA[<=]]> #{end} WHERE ROWNUM <![CDATA[<=]]> #{end}
...@@ -217,7 +207,6 @@ ...@@ -217,7 +207,6 @@
<select id="toQueryAllWfzdzczlForTotal" parameterType="com.founder.model.TbYwZczl" resultType="java.lang.Integer"> <select id="toQueryAllWfzdzczlForTotal" parameterType="com.founder.model.TbYwZczl" resultType="java.lang.Integer">
select count(*) from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0' select count(*) from TB_YW_ZCZL zczl where 1=1 and zczl.xxscpdbz = '0'
and instr((select ywlx from TB_YW_ZCZL_LLY lly where lly.sfzh = #{qsrgmsfhm, jdbcType=VARCHAR} and lly.xxscpdbz = 0 ),zczl.ywlx) > 0
<include refid="wfzdzczl-where"/> <include refid="wfzdzczl-where"/>
</select> </select>
...@@ -710,7 +699,6 @@ ...@@ -710,7 +699,6 @@
TRUENAME truename, TRUENAME truename,
TELEPHONE telephone, TELEPHONE telephone,
XXDJRYXM xxdjryxm, XXDJRYXM xxdjryxm,
ywlx ywlx,
(select name from sys_dictitem where groupid='CODE_UNIT' and code=XXDJDWGAJGJGDM) as xxdjdwgajgjgdm, (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 to_char(DJSJ,'yyyy-MM-dd hh24:mi:ss') as djsj
from TB_YW_ZCZL_LLY where 1=1 and XXSCPDBZ = '0' from TB_YW_ZCZL_LLY where 1=1 and XXSCPDBZ = '0'
...@@ -747,29 +735,27 @@ ...@@ -747,29 +735,27 @@
select * from ( select * from (
select t.*,rownum rn from ( select t.*,rownum rn from (
select select
s.ID userId, ID userId,
s.TRUE_NAME truename, TRUE_NAME truename,
s.POLICEMANID policemanid, POLICEMANID policemanid,
s.USERNAME username, USERNAME username,
s.UNITCODE unitcode, UNITCODE unitcode,
l.ywlx ywlx, (select name from sys_dictitem where groupid='CODE_XZUNIT' and code=UNITCODE) as unitname,
(select name from sys_dictitem where groupid='CODE_XZUNIT' and code=s.UNITCODE) as unitname, TELEPHONE telephone
s.TELEPHONE telephone from SYS_USER where scbz='0'
from SYS_USER s ,(select * from TB_YW_ZCZL_LLY where xxscpdbz = '0') l where s.scbz='0' <if test="unitcode!=null and unitcode!=''"> and (UNITCODE in ${unitcode} )</if>
and s.identitycard = l.sfzh(+) <if test="truename!=null and truename!=''"> and TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="unitcode!=null and unitcode!=''"> and (s.UNITCODE in ${unitcode} )</if> <if test="policemanid!=null and policemanid!=''"> and POLICEMANID = #{policemanid, jdbcType=VARCHAR}</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 ) t
WHERE ROWNUM <![CDATA[<=]]> #{end} WHERE ROWNUM <![CDATA[<=]]> #{end}
) WHERE RN > #{begin} ) WHERE RN > #{begin}
</select> </select>
<select id="toQueryAllUserForTotal" parameterType="com.founder.model.TbYwZczlLly" resultType="java.lang.Integer"> <select id="toQueryAllUserForTotal" parameterType="com.founder.model.TbYwZczlLly" resultType="java.lang.Integer">
select count(*) from SYS_USER s where s.scbz='0' select count(*) from SYS_USER where scbz='0'
<if test="unitcode!=null and unitcode!=''"> and s.UNITCODE in ${unitcode}</if> <if test="unitcode!=null and unitcode!=''"> and UNITCODE in ${unitcode}</if>
<if test="truename!=null and truename!=''"> and s.TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if> <if test="truename!=null and truename!=''"> and TRUE_NAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and s.POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if> <if test="policemanid!=null and policemanid!=''"> and POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
</select> </select>
<!-- 根据userid拿到用户信息 --> <!-- 根据userid拿到用户信息 -->
...@@ -855,7 +841,6 @@ ...@@ -855,7 +841,6 @@
TRUENAME truename, TRUENAME truename,
TELEPHONE telephone, TELEPHONE telephone,
XXDJRYXM xxdjryxm, XXDJRYXM xxdjryxm,
ywlx ywlx,
(select name from sys_dictitem where groupid='CODE_UNIT' and code=XXDJDWGAJGJGDM) as xxdjdwgajgjgdm, (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 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} from TB_YW_ZCZL_LLY where 1=1 and XXSCPDBZ = '0' and UNITCODE = #{unitcode, jdbcType=VARCHAR}
...@@ -1787,13 +1772,6 @@ ...@@ -1787,13 +1772,6 @@
<include refid="spqx-where"/> <include refid="spqx-where"/>
</select> </select>
<select id="getLlyqxByUserId" parameterType="java.lang.String" resultType="com.founder.model.TbYwZczlLly">
select XXZJBH as xxzjbh,
USERID as userId,
YWLX as ywlx
from TB_YW_ZCZL_LLY where XXSCPDBZ=0 and USERID= #{userId, jdbcType=VARCHAR}
</select>
<select id="getFpqxxxByUserId" parameterType="java.lang.String" resultType="com.founder.model.TbYwZczlSpqx"> <select id="getFpqxxxByUserId" parameterType="java.lang.String" resultType="com.founder.model.TbYwZczlSpqx">
select XXZJBH as xxzjbh, select XXZJBH as xxzjbh,
USERID as userId, USERID as userId,
...@@ -1865,14 +1843,6 @@ ...@@ -1865,14 +1843,6 @@
where USERID=#{userId,jdbcType=VARCHAR} where USERID=#{userId,jdbcType=VARCHAR}
</update> </update>
<update id="updateLlyQxfp" parameterType="com.founder.model.TbYwZczlSpqx" >
update TB_YW_ZCZL_LLY
set
GXSJ = sysdate
,YWLX =#{ywlx,jdbcType=VARCHAR}
where XXSCPDBZ=0 and USERID=#{userId,jdbcType=VARCHAR}
</update>
<select id="queryAllUserIdByYwlx" parameterType="java.lang.String" resultType="java.lang.String"> <select id="queryAllUserIdByYwlx" parameterType="java.lang.String" resultType="java.lang.String">
select USERID as userId select USERID as userId
from TB_YW_ZCZL_SPQX spqx ,SYS_USER u where spqx.xxsc_pdbz=0 and spqx.ywlx like '%'||#{startId, jdbcType=VARCHAR}||'%' from TB_YW_ZCZL_SPQX spqx ,SYS_USER u where spqx.xxsc_pdbz=0 and spqx.ywlx like '%'||#{startId, jdbcType=VARCHAR}||'%'
......
src/main/resources/static/js/llycx.js
...@@ -9,13 +9,12 @@ function doClear(){ ...@@ -9,13 +9,12 @@ function doClear(){
var table_title = [ var table_title = [
{title:"联络员单位",field:"unitname",align:'center',width:'15%'}, {title:"联络员单位",field:"unitname",align:'center',width:'15%'},
{title:"联络员",field:"truename",align:'center',width:'10%'}, {title:"联络员",field:"truename",align:'center',width:'15%'},
{title:"联络类型",field:"ywlx",align:'center',width:'25%'},
{title:"联络员警号",field:"policemanid",align:'center',width:'10%'}, {title:"联络员警号",field:"policemanid",align:'center',width:'10%'},
{title:"联系电话",field:"telephone",align:'center',width:'10%'}, {title:"联系电话",field:"telephone",align:'center',width:'15%'},
{title:"设置人姓名",field:"xxdjryxm",align:'center',width:'10%'}, {title:"设置人姓名",field:"xxdjryxm",align:'center',width:'15%'},
{title:"设置人单位",field:"xxdjdwgajgjgdm",align:'center',width:'10%'}, {title:"设置人单位",field:"xxdjdwgajgjgdm",align:'center',width:'15%'},
{title:"设置时间",field:"djsj",align:'center',width:'10%'} {title:"设置时间",field:"djsj",align:'center',width:'15%'}
]; ];
function doQuery(obj){ function doQuery(obj){
......
src/main/resources/static/js/llysz.js
$(function(){ $(function(){
doQuery(); doQuery();
getAllYwlx();
}) })
function getColumn(row){ function getColumn(row){
var str = ""; var str = "";
if(row.sflly=='1'){ if(row.sflly=='1'){
str = "<a href=\"#\" onclick=\"del('"+row.xxzjbh+"');\" class=\"cz\"><span style='color: #f70909;'>删除</span></a>"; str = "<a href=\"#\" onclick=\"del('"+row.xxzjbh+"');\" class=\"cz\"><span style='color: #f70909;'>删除</span></a>";
str += " <a href=\"#\" onclick=\"getQx('"+row.userId+"');\" class=\"cz\"><span style='color: #7fd015;'>设置联络员类型</span></a>" str = str + " <a href=\"#\" onclick=\"yj_tk(this,event,'"+row.xxzjbh+"');\" class=\"cz pos\"><span style='color: #7fd015;'>移交</span><div class=\"right_po\"><table><thead><tr><th width=\"100%\">联络员姓名</th></tr></thead><tbody></tbody></tbody></table></div></a>"
}else{ }else{
str = "<a href=\"#\" onclick=\"setLly('"+row.userId+"');\" class=\"cz\"><span style='color: #7fd015;'>设置联络员</span></a>" str = "<a href=\"#\" onclick=\"setLly('"+row.userId+"');\" class=\"cz\"><span style='color: #7fd015;'>设置联络员</span></a>"
} }
...@@ -15,116 +14,6 @@ function getColumn(row){ ...@@ -15,116 +14,6 @@ function getColumn(row){
return str; return str;
} }
//显示设置权限界面
function getQx(userId){
$('.mask').show();
$('.layout').fadeIn(800);
$("#userId").val(userId);
//通过该人的userId查询具有的业务
var index = layer.load(1, {
content: '数据加载中...',
shade: [0.35,'#fff'],
success: function(layero) {
/*layero.css('padding-left', '30px');*/
layero.find('.layui-layer-content').css({
'padding-top': '40px',
'width': '70px',
'background-position-x': '16px'
});
}
});
$.ajax({
url:'/getLlyqxByUserId?userId='+userId,
type:"post",
success:function (data) {
layer.close(index);
if(data.length>0){
for(var i=0;i<data.length;i++){
var id = "ywlx"+data[i];
$('#'+id).prop("checked",true);
}
}
}
});
}
//分配权限
function doQxfp(){
var length = $('input[type=checkbox]:checked').length;
if(length<=0){
layer.alert("分配权限必选！","提示");
return;
}
var index = layer.load(1, {
content: '数据加载中...',
shade: [0.35,'#fff'],
success: function(layer) {
/*layer.css('padding-left', '30px');*/
layer.find('.layui-layer-content').css({
'padding-top': '40px',
'width': '70px',
'background-position-x': '16px'
});
}
});
$.ajax({
type: "POST",//方法类型
dataType: "json",//预期服务器返回的数据类型
url: "/doLlyQxfp",
data: $('#qxForm').serialize(),
success: function (data) {
layer.close(index);
if(data==0){
layer.alert('分配权限失败',"提示",function(res){
if(res){
layer.closeAll();
}
});
}else if(data==1){
layer.alert('分配权限成功',"提示",function(res){
if(res){
doBack();
doQuery();
layer.closeAll();
}
});
}
},
error : function() {
layer.close(index);
layer.alert('分配权限失败',"提示",function(res){
if(res){
layer.closeAll();
}
});
}
});
}
function doBack(){
$("#userId").val("");
$('.mask').hide();
$('.layout').fadeOut(500);
//清空所有选项
$('#checkboxTd').find("input[name='ywlx']").prop("checked",false);;
}
function getAllYwlx(){
$.ajax({
url:'/getAllYwlx',
type:"post",
success:function (data) {
var nr="";
for(var i=0;i<data.length;i++){
nr = nr +' <input class="ywlxClass" type=\"checkbox\" name=\"ywlx\" id="ywlx'+data[i].code+'" value="'+data[i].code+'" style=\"width: auto;zoom:150%;margin-top: 0px;\">'+data[i].name;
}
$("#checkboxTd").append(nr);
}
});
}
function yj_tk(el,event,xxzjbh) { function yj_tk(el,event,xxzjbh) {
//查询出本单位的联络员信息 //查询出本单位的联络员信息
var index = layer.load(1, { var index = layer.load(1, {
...@@ -329,6 +218,7 @@ function setLly(userId){ ...@@ -329,6 +218,7 @@ function setLly(userId){
} }
}); });
} }
} }
}); });
} }
...@@ -337,11 +227,10 @@ var table_title = [ ...@@ -337,11 +227,10 @@ var table_title = [
{title:"操作",field:"xxzjbh",align:'center',width:'10%',formatter:function(val,row,index){ {title:"操作",field:"xxzjbh",align:'center',width:'10%',formatter:function(val,row,index){
return getColumn(row); return getColumn(row);
}}, }},
{title:"姓名",field:"truename",align:'center',width:'10%'}, {title:"姓名",field:"truename",align:'center',width:'15%'},
{title:"联络员类型",field:"ywlx",align:'center',width:'25%'}, {title:"警号",field:"policemanid",align:'center',width:'15%'},
{title:"警号",field:"policemanid",align:'center',width:'10%'}, {title:"系统账号",field:"username",align:'center',width:'20%'},
{title:"系统账号",field:"username",align:'center',width:'10%'}, {title:"所属单位",field:"unitname",align:'center',width:'25%'},
{title:"所属单位",field:"unitname",align:'center',width:'20%'},
{title:"联系电话",field:"telephone",align:'center',width:'15%'} {title:"联系电话",field:"telephone",align:'center',width:'15%'}
]; ];
......
src/main/webapp/WEB-INF/jsp/llysz.jsp
...@@ -209,34 +209,5 @@ ...@@ -209,34 +209,5 @@
openCombotree('unitcode'); openCombotree('unitcode');
</script> </script>
</body> </body>
<div class="mask"></div>
<div class="layout">
<div class="layout_header">
<span>权限信息</span>
<%--<a class="close_x fr" id="close_x"><i class="fa fa-times"></i></a>--%>
</div>
<form name="qxForm" id="qxForm">
<input name="userId" id="userId" type="hidden">
<div class="layout_content">
<table class="layout_table">
<tr>
<td class="ar" width="15%">权限：</td>
<td colspan="3" style="color: #f60;" id="checkboxTd">
</td>
</tr>
<tr>
<td class="empty" colspan="4"></td>
</tr>
<tr>
<td colspan="4" style="text-align:center;">
<a class="btn_a btn_add" onclick="doQxfp()">分配</a>
<a class="btn_a btn_search" onclick="doBack()">返回</a>
</td>
</tr>
</table>
</div>
</form>
</div>
</html> </html>
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/zczl_qqxdzl.jsp
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
} }
//判断单位是否存在联络员 //判断单位是否存在联络员
$.ajax({ $.ajax({
url:'/queryLlys?unitcodes='+zljsdwdm+"&ywlx="+ywlx, url:'/queryLlys?unitcodes='+zljsdwdm,
type:"post", type:"post",
success:function (data) { success:function (data) {
layer.close(index); layer.close(index);
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
//判断单位是否存在联络员 //判断单位是否存在联络员
$.ajax({ $.ajax({
url:'/queryLlys?unitcodes='+zljsdwdm+"&ywlx="+ywlx, url:'/queryLlys?unitcodes='+zljsdwdm,
type:"post", type:"post",
success:function (data) { success:function (data) {
layer.close(index); layer.close(index);
......
src/main/webapp/WEB-INF/jsp/zczl_xdzl.jsp
...@@ -171,20 +171,20 @@ ...@@ -171,20 +171,20 @@
<td class="ar necessary" width="13.3%">业务类型：</td> <td class="ar necessary" width="13.3%">业务类型：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<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'"/> <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'"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">审批人：</td> <td class="ar" width="13.3%">审批人：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="hidden" id="hiddenZpsprjh" value="${tbYwZczl.zdsprjh}"> <input type="hidden" id="hiddenZpsprjh" value="${tbYwZczl.zdsprjh}">
<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'"/> <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'"/>
</span> </span>
</td> </td>
<td class="ar necessary" width="13.3%">侦查指令类型：</td> <td class="ar necessary" width="13.3%">侦查指令类型：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<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'"/> <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'"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%"></td> <td class="ar" width="13.3%"></td>
...@@ -194,7 +194,17 @@ ...@@ -194,7 +194,17 @@
<td class="ar necessary">接受单位：</td> <td class="ar necessary">接受单位：</td>
<td colspan="3"> <td colspan="3">
<span class="textbox textbox-3"> <span class="textbox textbox-3">
<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"/> <%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'"/>
--%>
</span> </span>
</td> </td>
<td></td> <td></td>
...@@ -252,7 +262,6 @@ ...@@ -252,7 +262,6 @@
<!--- 代码框--> <!--- 代码框-->
<script type="text/javascript" src="/easyui-window/js/jquery.min.js"></script> <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.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/function.js"></script>
<script type="text/javascript" src="/easyui-window/js/easyui-lang-zh_CN.js"></script> <script type="text/javascript" src="/easyui-window/js/easyui-lang-zh_CN.js"></script>
<!--- 日期时间--> <!--- 日期时间-->
...@@ -271,6 +280,12 @@ ...@@ -271,6 +280,12 @@
watermark.load({ watermark_txt: "<%=truename%>"+" "+"<%=identitycard%>"+" "+"<%=unitcode%>"+" "+"<%=policeId%>"+" "+ip}); watermark.load({ watermark_txt: "<%=truename%>"+" "+"<%=identitycard%>"+" "+"<%=unitcode%>"+" "+"<%=policeId%>"+" "+ip});
}); });
</script> </script>
<script>
openCombotree('ywlx');
openCombotree('zllx');
openCombotree('zljsdwdm');
</script>
</body> </body>
</html> </html>
...@@ -279,8 +294,8 @@ ...@@ -279,8 +294,8 @@
$(document).ready(function(){ $(document).ready(function(){
var hiddenZpsprjh = $("#hiddenZpsprjh").val(); var hiddenZpsprjh = $("#hiddenZpsprjh").val();
$('#zdsprjh').openCombotree('setValue',hiddenZpsprjh); $('#zdsprjh').combotree('setValue',hiddenZpsprjh);
$('#ywlx').openCombotree({ $('#ywlx').combotree({
onChange: function (n,o) { onChange: function (n,o) {
debugger debugger
//控制类案中的代码值 //控制类案中的代码值
...@@ -370,17 +385,17 @@ ...@@ -370,17 +385,17 @@
layer.alert("回报期限必填！","提示"); layer.alert("回报期限必填！","提示");
return; return;
} }
var ywlx= $("#ywlx").openCombotree("getValue"); var ywlx= $("#ywlx").combotree("getValue");
if(ywlx==''){ if(ywlx==''){
layer.alert("业务类型必填！","提示"); layer.alert("业务类型必填！","提示");
return; return;
} }
var zllx= $("#zllx").openCombotree("getValue"); var zllx= $("#zllx").combotree("getValue");
if(zllx==''){ if(zllx==''){
layer.alert("指令类型必填！","提示"); layer.alert("指令类型必填！","提示");
return; return;
} }
var zljsdwdm= $("#zljsdwdm").openCombotree("getValue"); var zljsdwdm= $("#zljsdwdm").combotree("getValue");
if(zljsdwdm==''){ if(zljsdwdm==''){
layer.alert("接受单位必填！","提示"); layer.alert("接受单位必填！","提示");
return; return;
...@@ -406,7 +421,7 @@ ...@@ -406,7 +421,7 @@
} }
//判断单位是否存在联络员 //判断单位是否存在联络员
$.ajax({ $.ajax({
url:'/queryLlys?unitcodes='+zljsdwdm+"&ywlx="+ywlx, url:'/queryLlys?unitcodes='+zljsdwdm,
type:"post", type:"post",
success:function (data) { success:function (data) {
layer.close(index); layer.close(index);
...@@ -451,17 +466,17 @@ ...@@ -451,17 +466,17 @@
layer.alert("回报期限必填！","提示"); layer.alert("回报期限必填！","提示");
return; return;
} }
var ywlx= $("#ywlx").openCombotree("getValue"); var ywlx= $("#ywlx").combotree("getValue");
if(ywlx==''){ if(ywlx==''){
layer.alert("业务类型必填！","提示"); layer.alert("业务类型必填！","提示");
return; return;
} }
var zllx= $("#zllx").openCombotree("getValue"); var zllx= $("#zllx").combotree("getValue");
if(zllx==''){ if(zllx==''){
layer.alert("指令类型必填！","提示"); layer.alert("指令类型必填！","提示");
return; return;
} }
var zljsdwdm= $("#zljsdwdm").openCombotree("getValue"); var zljsdwdm= $("#zljsdwdm").combotree("getValue");
if(zljsdwdm==''){ if(zljsdwdm==''){
layer.alert("接受单位必填！","提示"); layer.alert("接受单位必填！","提示");
return; return;
...@@ -476,7 +491,7 @@ ...@@ -476,7 +491,7 @@
//判断单位是否存在联络员 //判断单位是否存在联络员
$.ajax({ $.ajax({
url:'/queryLlys?unitcodes='+zljsdwdm+"&ywlx="+ywlx, url:'/queryLlys?unitcodes='+zljsdwdm,
type:"post", type:"post",
success:function (data) { success:function (data) {
layer.close(index); layer.close(index);
......
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